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 516832 follow up - better assert coverage with conservative gc

Browse Source
This commit is contained in:
Igor Bukanov 2010-06-17 15:35:52 +02:00
parent a3a94a3484
commit 5b76e21662
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/src/jsgc.cpp
View File

@ -90,24 +90,6 @@
#include "jsobjinlines.h" #include "jsobjinlines.h"
#include "jshashtable.h" #include "jshashtable.h"
/*
* Include the headers for mmap.
*/
#if defined(XP_WIN)
# include <windows.h>
#endif
#if defined(XP_UNIX) || defined(XP_BEOS)
# include <unistd.h>
# include <sys/mman.h>
#endif
/* On Mac OS X MAP_ANONYMOUS is not defined. */
#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
# define MAP_ANONYMOUS MAP_ANON
#endif
#if !defined(MAP_ANONYMOUS)
# define MAP_ANONYMOUS 0
#endif
using namespace js; using namespace js;
/* /*
@ -1211,6 +1193,8 @@ ConservativeGCStackMarker::markWord(jsuword w)
/* Make sure the thing is not on the freelist of the arena. */ /* Make sure the thing is not on the freelist of the arena. */
JSGCThing *cursor = ainfo->freeList; JSGCThing *cursor = ainfo->freeList;
while (cursor) { while (cursor) {
JS_ASSERT((((jsuword) cursor) & GC_ARENA_MASK) % thingSize == 0);
JS_ASSERT(!IsMarkedGCThing(cursor));
/* If the cursor moves past the thing, it's not in the freelist. */ /* If the cursor moves past the thing, it's not in the freelist. */
if (thing < cursor) if (thing < cursor)
break; break;
@ -1218,6 +1202,7 @@ ConservativeGCStackMarker::markWord(jsuword w)
/* If we find it on the freelist, it's dead. */ /* If we find it on the freelist, it's dead. */
if (thing == cursor) if (thing == cursor)
RETURN(notlive); RETURN(notlive);
JS_ASSERT_IF(cursor->link, cursor < cursor->link);
cursor = cursor->link; cursor = cursor->link;
} }
} }
@ -1278,18 +1263,21 @@ ConservativeGCStackMarker::markRange(jsuword *begin, jsuword *end)
void void
ConservativeGCStackMarker::markRoots() ConservativeGCStackMarker::markRoots()
{ {
/* Do conservative scanning of the stack. */ /* Do conservative scanning of the stack and registers. */
for (ThreadDataIter i(trc->context->runtime); !i.empty(); i.popFront()) { for (ThreadDataIter i(trc->context->runtime); !i.empty(); i.popFront()) {
JSThreadData *td = i.threadData(); JSThreadData *td = i.threadData();
ConservativeGCThreadData *ctd = &td->conservativeGC; ConservativeGCThreadData *ctd = &td->conservativeGC;
if (ctd->isEnabled()) { if (ctd->isEnabled()) {
jsuword *stackMin, *stackEnd;
#if JS_STACK_GROWTH_DIRECTION > 0 #if JS_STACK_GROWTH_DIRECTION > 0
JS_ASSERT(td->nativeStackBase <= ctd->nativeStackTop); stackMin = td->nativeStackBase;
markRange(td->nativeStackBase, ctd->nativeStackTop); stackEnd = ctd->nativeStackTop;
#else #else
JS_ASSERT(td->nativeStackBase >= ctd->nativeStackTop + 1); stackMin = ctd->nativeStackTop + 1;
markRange(ctd->nativeStackTop + 1, td->nativeStackBase); stackEnd = td->nativeStackBase;
#endif #endif
JS_ASSERT(stackMin <= stackEnd);
markRange(stackMin, stackEnd);
markRange(ctd->registerSnapshot.words, markRange(ctd->registerSnapshot.words,
JS_ARRAY_END(ctd->registerSnapshot.words)); JS_ARRAY_END(ctd->registerSnapshot.words));
} }