wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 600139 - Delayed marking can skip marking live objects r=igor

Browse Source
This commit is contained in:
Gregor Wagner 2010-10-08 16:25:57 -07:00
parent 91c97f62fa
commit 1f3d45495c
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/src/jsgc.cpp
View File

@ -1440,12 +1440,20 @@ GCMarker::markDelayedChildren()
{
while (Arena<Cell> *a = unmarkedArenaStackTop) {
/*
* The following assert verifies that the current arena belongs to the
* unmarked stack, since DelayMarkingChildren ensures that even for
* the stack's bottom, prevUnmarked != 0 but rather points to
* itself.
* markingDelay->link == current arena indicates last arena on stack.
* If marking gets delayed at the same arena again, the arena is pushed
* again in delayMarkingChildren. markingDelay->link has to be cleared,
* otherwise the arena is not pushed again.
*/
MarkingDelay *markingDelay = a->getMarkingDelay();
unmarkedArenaStackTop = (markingDelay->link != a)
? markingDelay->link
: NULL;
markingDelay->link = NULL;
#ifdef DEBUG
markLaterCount -= Arena<FreeCell>::ThingsPerArena;
#endif
switch (a->header()->thingKind) {
case FINALIZE_OBJECT:
reinterpret_cast<Arena<JSObject> *>(a)->markDelayedChildren(this);
@ -1473,22 +1481,7 @@ GCMarker::markDelayedChildren()
break;
#endif
default:
JS_ASSERT(false);
}
/*
* Pop the arena off the stack. If we try to mark a thing on the same
* arena and that marking gets delayed, the arena will be put back
* into the worklist.
*/
if (unmarkedArenaStackTop == a) {
unmarkedArenaStackTop = (markingDelay->link != a)
? markingDelay->link
: NULL;
markingDelay->link = NULL;
#ifdef DEBUG
markLaterCount -= Arena<FreeCell>::ThingsPerArena;
#endif
JS_NOT_REACHED("wrong thingkind");
}
}
JS_ASSERT(markLaterCount == 0);