Bug 579524 - DEBUG_CC broken by fatval. r=sayrer

js/src/xpconnect/src/nsXPConnect.cpp

@@ -495,7 +495,7 @@ NoteJSRoot(JSTracer *trc, void *thing, uint32 kind)
                                  nsXPConnect::GetXPConnect());
         }
     }
-    else if(kind != JSTRACE_DOUBLE && kind != JSTRACE_STRING)
+    else if(kind != JSTRACE_STRING)
     {
         JS_TraceChildren(trc, thing, kind);
     }

xpcom/base/nsCycleCollector.cpp

@@ -3146,13 +3146,17 @@ nsCycleCollector::DestroyReversedEdges()
 void
 nsCycleCollector::ShouldBeFreed(nsISupports *n)
 {
-    mExpectedGarbage.PutEntry(n);
+    if (n) {
+        mExpectedGarbage.PutEntry(n);
+    }
 }
 
 void
 nsCycleCollector::WasFreed(nsISupports *n)
 {
-    mExpectedGarbage.RemoveEntry(n);
+    if (n) {
+        mExpectedGarbage.RemoveEntry(n);
+    }
 }
 #endif