Bug 975849 - Remove overly strict assertion from CycleCollectedJSRuntime::TraverseRoots to restore previous behavior. r=smaug
authorAndrew McCreight <continuation@gmail.com>
Wed, 26 Feb 2014 13:18:17 -0800
changeset 171061 eebc9dfce3f44c578224cde0cac812b228c80d2e
parent 171060 3b91918ab945707fb3cc7eee0f0b5b7054876ddc
child 171062 9abeb9a2d6cd40584bacd78ad097a06434a39e0a
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewerssmaug
bugs975849
milestone30.0a1
Bug 975849 - Remove overly strict assertion from CycleCollectedJSRuntime::TraverseRoots to restore previous behavior. r=smaug
xpcom/base/CycleCollectedJSRuntime.cpp
--- a/xpcom/base/CycleCollectedJSRuntime.cpp
+++ b/xpcom/base/CycleCollectedJSRuntime.cpp
@@ -872,18 +872,16 @@ nsCycleCollectionParticipant*
 CycleCollectedJSRuntime::ZoneParticipant()
 {
     return &mJSZoneCycleCollectorGlobal;
 }
 
 nsresult
 CycleCollectedJSRuntime::TraverseRoots(nsCycleCollectionNoteRootCallback &aCb)
 {
-  MOZ_ASSERT(!NeedCollect(), "Cannot cycle collect if GC has not run first!");
-
   TraverseNativeRoots(aCb);
 
   NoteWeakMapsTracer trc(mJSRuntime, TraceWeakMapping, aCb);
   js::TraceWeakMaps(&trc);
 
   return NS_OK;
 }