Bug 934568 - Don't make ScanRoots CC OOM assertion fatal due to Win7 debug M2 failures. s=smaug

This commit is contained in:
Andrew McCreight 2013-11-06 16:58:13 -08:00
parent 9b6101f326
commit e38ae1edc4

View File

@ -2132,8 +2132,7 @@ nsCycleCollector::MarkRoots(GCGraphBuilder &aBuilder)
}
if (aBuilder.RanOutOfMemory()) {
MOZ_ASSERT(false,
"Ran out of memory while building cycle collector graph");
MOZ_ASSERT(false, "Ran out of memory while building cycle collector graph");
CC_TELEMETRY(_OOM, true);
}
}
@ -2267,7 +2266,7 @@ nsCycleCollector::ScanRoots(nsICycleCollectorListener *aListener)
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);
}