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

bug: object being moved to 'finobj' list might not be sweeped by

Browse Source 
the collector
This commit is contained in:
Roberto Ierusalimschy 2012-05-30 13:01:10 -03:00
parent b77a90681e
commit 6fcdfc6d4f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lgc.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 2.129 2012/05/28 20:41:00 roberto Exp roberto $ ** $Id: lgc.c,v 2.130 2012/05/29 17:52:17 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -864,10 +864,11 @@ void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
else { /* move 'o' to 'finobj' list */ else { /* move 'o' to 'finobj' list */
GCObject **p; GCObject **p;
GCheader *ho = gch(o); GCheader *ho = gch(o);
lua_assert(!isdead(g, o));
/* avoid removing current sweep object */ /* avoid removing current sweep object */
if (g->sweepgc == &ho->next) { if (g->sweepgc == &ho->next) {
/* step to next object in the list */ /* step to next object in the list */
g->sweepgc = (ho->next == NULL) ? NULL : &gch(ho->next)->next; g->sweepgc = sweeplist(L, g->sweepgc, 1);
} }
/* search for pointer pointing to 'o' */ /* search for pointer pointing to 'o' */
for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ } for (p = &g->allgc; *p != o; p = &gch(*p)->next) { /* empty */ }
@ -875,6 +876,9 @@ void luaC_checkfinalizer (lua_State *L, GCObject *o, Table *mt) {
ho->next = g->finobj; /* link it in list 'finobj' */ ho->next = g->finobj; /* link it in list 'finobj' */
g->finobj = o; g->finobj = o;
l_setbit(ho->marked, SEPARATED); /* mark it as such */ l_setbit(ho->marked, SEPARATED); /* mark it as such */
if (!keepinvariant(g)) /* not keeping invariant? */
makewhite(g, o); /* "sweep" object */
else
resetoldbit(o); /* see MOVE OLD rule */ resetoldbit(o); /* see MOVE OLD rule */
} }
} }
@ -996,7 +1000,6 @@ static l_mem atomic (lua_State *L) {
clearvalues(g, g->allweak, origall); clearvalues(g, g->allweak, origall);
g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */ g->currentwhite = cast_byte(otherwhite(g)); /* flip current white */
entersweep(L); /* prepare to sweep strings */ entersweep(L); /* prepare to sweep strings */
/*lua_checkmemory(L);*/
return trav; /* estimate of the objects marked by 'atomic' */ return trav; /* estimate of the objects marked by 'atomic' */
} }