Back out 338760b1955c (bug 902922) for discovering that we have a cycle collecter OOM 100% of the time in Win7 mochitest-2 shutdown
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 27 Oct 2013 09:38:35 -0700
changeset 152405 2d5462474ba29f5108bcc77d94c9e902d2f1317d
parent 152404 338760b1955c4f7795a9909ba8c902f24fd184b1
child 152406 0ea543f598ed3a8c0611fff8d4dfeaa0c85ddbba
push id25537
push userphilringnalda@gmail.com
push dateMon, 28 Oct 2013 02:22:50 +0000
treeherdermozilla-central@5e49bfec9ecb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs902922
milestone27.0a1
backs out338760b1955c4f7795a9909ba8c902f24fd184b1
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
Back out 338760b1955c (bug 902922) for discovering that we have a cycle collecter OOM 100% of the time in Win7 mochitest-2 shutdown
xpcom/base/nsCycleCollector.cpp
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2127,17 +2127,17 @@ nsCycleCollector::MarkRoots(GCGraphBuild
             aBuilder.SetLastChild();
         }
     }
     if (mGraph.mRootCount > 0) {
         aBuilder.SetLastChild();
     }
 
     if (aBuilder.RanOutOfMemory()) {
-        MOZ_ASSERT(false,
+        NS_ASSERTION(false,
                      "Ran out of memory while building cycle collector graph");
         CC_TELEMETRY(_OOM, true);
     }
 }
 
 
 ////////////////////////////////////////////////////////////////////////
 // Bacon & Rajan's |ScanRoots| routine.
@@ -2245,34 +2245,34 @@ nsCycleCollector::ScanWeakMaps()
             if (mColor == black && kColor == black && vColor != black) {
                 GraphWalker<ScanBlackVisitor>(ScanBlackVisitor(mWhiteNodeCount, failed)).Walk(wm->mVal);
                 anyChanged = true;
             }
         }
     } while (anyChanged);
 
     if (failed) {
-        MOZ_ASSERT(false, "Ran out of memory in ScanWeakMaps");
+        NS_ASSERTION(false, "Ran out of memory in ScanWeakMaps");
         CC_TELEMETRY(_OOM, true);
     }
 }
 
 void
 nsCycleCollector::ScanRoots(nsICycleCollectorListener *aListener)
 {
     mWhiteNodeCount = 0;
 
     // On the assumption that most nodes will be black, it's
     // probably faster to use a GraphWalker than a
     // NodePool::Enumerator.
     bool failed = false;
     GraphWalker<scanVisitor>(scanVisitor(mWhiteNodeCount, failed)).WalkFromRoots(mGraph);
 
     if (failed) {
-        MOZ_ASSERT(false, "Ran out of memory in ScanRoots");
+        NS_ASSERTION(false, "Ran out of memory in ScanRoots");
         CC_TELEMETRY(_OOM, true);
     }
 
     ScanWeakMaps();
 
     if (aListener) {
         aListener->BeginResults();