Bug 829430 - Use the right check for if we're GCing. r=billm a=lsblakk
authorAndrew McCreight <amccreight@mozilla.com>
Tue, 15 Jan 2013 09:10:36 -0800
changeset 123779 5bc3b1121d9a9b9e576b6c66d109f4399cb7acba
parent 123778 6460df19342bb88f83234d2fd58c55828036e9ca
child 123780 932c91fda1cf3d4fda6f22f78a770622dfc3ccdb
push idunknown
push userunknown
push dateunknown
reviewersbillm, lsblakk
bugs829430
milestone20.0a2
Bug 829430 - Use the right check for if we're GCing. r=billm a=lsblakk
js/xpconnect/src/nsXPConnect.cpp
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -491,17 +491,17 @@ struct FixWeakMappingGrayBitsTracer : pu
 
 private:
 
     static void
     FixWeakMappingGrayBits(js::WeakMapTracer *trc, JSObject *m,
                            void *k, JSGCTraceKind kkind,
                            void *v, JSGCTraceKind vkind)
     {
-        MOZ_ASSERT(!js::IsIncrementalBarrierNeeded(trc->runtime),
+        MOZ_ASSERT(!js::IsIncrementalGCInProgress(trc->runtime),
                    "Don't call FixWeakMappingGrayBits during a GC.");
 
         FixWeakMappingGrayBitsTracer *tracer = static_cast<FixWeakMappingGrayBitsTracer*>(trc);
 
         // If nothing that could be held alive by this entry is marked gray, return.
         bool delegateMightNeedMarking = k && xpc_IsGrayGCThing(k);
         bool valueMightNeedMarking = v && xpc_IsGrayGCThing(v) && vkind != JSTRACE_STRING;
         if (!delegateMightNeedMarking && !valueMightNeedMarking)