From 0e5debd55add36c5f2a07a53839f44b32d4b75f8 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Sun, 27 Oct 2013 07:51:31 -0400 Subject: [PATCH] Bug 934568 - Make cycle collector OOM assertions fatal in debug builds. r=mccr8 --- xpcom/base/nsCycleCollector.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp index a578176147b..1bcd577a9e5 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -2132,7 +2132,7 @@ nsCycleCollector::MarkRoots(GCGraphBuilder &aBuilder) } if (aBuilder.RanOutOfMemory()) { - NS_ASSERTION(false, + MOZ_ASSERT(false, "Ran out of memory while building cycle collector graph"); CC_TELEMETRY(_OOM, true); } @@ -2250,7 +2250,7 @@ nsCycleCollector::ScanWeakMaps() } while (anyChanged); if (failed) { - NS_ASSERTION(false, "Ran out of memory in ScanWeakMaps"); + MOZ_ASSERT(false, "Ran out of memory in ScanWeakMaps"); CC_TELEMETRY(_OOM, true); } } @@ -2267,7 +2267,7 @@ nsCycleCollector::ScanRoots(nsICycleCollectorListener *aListener) GraphWalker(scanVisitor(mWhiteNodeCount, failed)).WalkFromRoots(mGraph); if (failed) { - NS_ASSERTION(false, "Ran out of memory in ScanRoots"); + MOZ_ASSERT(false, "Ran out of memory in ScanRoots"); CC_TELEMETRY(_OOM, true); }