bug 737365 - followup to fix !JS_THREADSAFE build. r=none
authorIgor Bukanov <igor@mir2.org>
Wed, 04 Apr 2012 18:05:51 +0200
changeset 90984 06b921a803ace2755c880304f4ecbac13552e305
parent 90983 d96543e0f7113f3cec65a7c1bfc771651fac8eda
child 90985 5024ecda8259f885588f8c330a8cd4d10dfd48f8
push id7953
push userigor@mir2.org
push dateWed, 04 Apr 2012 16:07:14 +0000
treeherdermozilla-inbound@06b921a803ac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnone
bugs737365
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 737365 - followup to fix !JS_THREADSAFE build. r=none
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3110,17 +3110,21 @@ SweepPhase(JSContext *cx, JSGCInvocation
     if (rt->hasContexts() && rt->gcHelperThread.prepareForBackgroundSweep())
         cx->gcBackgroundFree = &rt->gcHelperThread;
 #endif
 
     /* Purge the ArenaLists before sweeping. */
     for (GCCompartmentsIter c(rt); !c.done(); c.next())
         c->arenas.purge();
 
+#ifdef JS_THREADSAFE
     FreeOp fop(rt, !!cx->gcBackgroundFree, false);
+#else
+    FreeOp fop(rt, false, false);
+#endif
     {
         gcstats::AutoPhase ap(rt->gcStats, gcstats::PHASE_FINALIZE_START);
         if (rt->gcFinalizeCallback)
             rt->gcFinalizeCallback(&fop, JSFINALIZE_START);
     }
 
     /* Finalize unreachable (key,value) pairs in all weak maps. */
     WeakMapBase::sweepAll(&rt->gcMarker);