GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-28 06:03:00 +08:00
Code Issues Projects Releases Wiki Activity

dead objects are not collectable.

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2011-09-24 18:12:01 -03:00
parent 5645a84368
commit 87912786af
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lgc.c
View File

@ -100,12 +100,13 @@ static void reallymarkobject (global_State *g, GCObject *o);
/*
** mark a table entry as dead (therefore removing it from the table)
** if key is not marked, mark its entry as dead (therefore removing it
** from the table)
*/
static void removeentry (Node *n) {
lua_assert(ttisnil(gval(n)));
if (iscollectable(gkey(n)))
setdeadvalue(gkey(n)); /* dead key; remove it */
if (valiswhite(gkey(n)))
setdeadvalue(gkey(n)); /* unused and unmarked key; remove it */
}

8
lobject.h
View File

@ -1,5 +1,5 @@
/*
** $Id: lobject.h,v 2.60 2011/06/13 14:13:06 roberto Exp roberto $
** $Id: lobject.h,v 2.61 2011/07/04 20:29:02 roberto Exp roberto $
** Type definitions for Lua objects
** See Copyright Notice in lua.h
*/
@ -132,7 +132,7 @@ typedef struct lua_TValue TValue;
#define ttislcf(o) checktag((o), LUA_TLCF)
#define ttisuserdata(o) checktag((o), ctb(LUA_TUSERDATA))
#define ttisthread(o) checktag((o), ctb(LUA_TTHREAD))
#define ttisdeadkey(o) checktag((o), ctb(LUA_TDEADKEY))
#define ttisdeadkey(o) checktag((o), LUA_TDEADKEY)
#define ttisequal(o1,o2) (rttype(o1) == rttype(o2))
@ -151,6 +151,8 @@ typedef struct lua_TValue TValue;
#define hvalue(o) check_exp(ttistable(o), &val_(o).gc->h)
#define bvalue(o) check_exp(ttisboolean(o), val_(o).b)
#define thvalue(o) check_exp(ttisthread(o), &val_(o).gc->th)
/* a dead value may get the 'gc' field, but cannot access its contents */
#define deadvalue(o) check_exp(ttisdeadkey(o), cast(void *, val_(o).gc))
#define l_isfalse(o) (ttisnil(o) || (ttisboolean(o) && bvalue(o) == 0))
@ -224,7 +226,7 @@ typedef struct lua_TValue TValue;
val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TPROTO)); \
checkliveness(G(L),io); }
#define setdeadvalue(obj) settt_(obj, ctb(LUA_TDEADKEY))
#define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY)

4
ltable.c
View File

@ -1,5 +1,5 @@
/*
** $Id: ltable.c,v 2.62 2011/08/17 20:26:47 roberto Exp roberto $
** $Id: ltable.c,v 2.63 2011/09/15 17:09:02 roberto Exp roberto $
** Lua tables (hash)
** See Copyright Notice in lua.h
*/
@ -152,7 +152,7 @@ static int findindex (lua_State *L, Table *t, StkId key) {
/* key may be dead already, but it is ok to use it in `next' */
if (luaV_rawequalobj(gkey(n), key) ||
(ttisdeadkey(gkey(n)) && iscollectable(key) &&
gcvalue(gkey(n)) == gcvalue(key))) {
deadvalue(gkey(n)) == gcvalue(key))) {
i = cast_int(n - gnode(t, 0)); /* key index in hash table */
/* hash elements are numbered after array ones */
return i + t->sizearray;