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 553671 part 1 followup - Minor cleanups in GC() suggested by jwalden in review.

Browse Source 
--HG--
extra : rebase_source : b2cabed0b2de6c044a04fa00f7e1593fddf88786
This commit is contained in:
Jason Orendorff 2010-04-08 07:54:18 -05:00
parent 926b177eaa
commit aac995ee3e
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/jsgc.cpp
View File

@ -2863,12 +2863,6 @@ static void
GC(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
{
JSRuntime *rt = cx->runtime;
JSTracer trc;
JSGCArena *emptyArenas, *a, **ap;
#ifdef JS_GCMETER
uint32 nlivearenas, nkilledarenas, nthings;
#endif
rt->gcNumber++;
JS_ASSERT(!rt->gcUnmarkedArenaStackTop);
JS_ASSERT(rt->gcMarkLaterCount == 0);
@ -2876,12 +2870,13 @@ GC(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
/*
* Mark phase.
*/
JSTracer trc;
JS_TRACER_INIT(&trc, cx, NULL);
rt->gcMarkingTracer = &trc;
JS_ASSERT(IS_GC_MARKING_TRACER(&trc));
#ifdef DEBUG
for (a = rt->gcDoubleArenaList.head; a; a = a->info.prev)
for (JSGCArena *a = rt->gcDoubleArenaList.head; a; a = a->info.prev)
JS_ASSERT(!a->info.hasMarkedDoubles);
#endif
@ -2953,7 +2948,7 @@ GC(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
* function we use separated list finalizers when a debug hook is
* installed.
*/
emptyArenas = NULL;
JSGCArena *emptyArenas = NULL;
if (!cx->debugHooks->objectHook) {
FinalizeArenaList<JSObject, FinalizeObject>
(cx, FINALIZE_OBJECT, &emptyArenas);
@ -2986,9 +2981,11 @@ GC(JSContext *cx, JSGCInvocationKind gckind GCTIMER_PARAM)
}
TIMESTAMP(gcTimer.sweepStringEnd);
ap = &rt->gcDoubleArenaList.head;
METER((nlivearenas = 0, nkilledarenas = 0, nthings = 0));
while ((a = *ap) != NULL) {
JSGCArena **ap = &rt->gcDoubleArenaList.head;
#ifdef JS_GCMETER
uint32 nlivearenas = 0, nkilledarenas = 0, nthings = 0;
#endif
while (JSGCArena *a = *ap) {
if (!a->info.hasMarkedDoubles) {
/* No marked double values in the arena. */
*ap = a->info.prev;