From 75d98cae1d09ac4e14ae2aa3c75c8c31b5829a5e Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Thu, 8 Dec 2016 11:03:42 -1000 Subject: [PATCH] Bug 1322536 - Make some mScanInProgress checks fatal in release builds. r=smaug MozReview-Commit-ID: 2hNtePfSxkF --HG-- extra : rebase_source : 7434f50ef61e01297c87be15e34ecdb00acdb9f6 --- 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 40656ba714ea..ca7057628c57 100644 --- a/xpcom/base/nsCycleCollector.cpp +++ b/xpcom/base/nsCycleCollector.cpp @@ -2871,7 +2871,7 @@ nsCycleCollector::MarkRoots(SliceBudget& aBudget) JS::AutoAssertNoGC nogc; TimeLog timeLog; AutoRestore ar(mScanInProgress); - MOZ_ASSERT(!mScanInProgress); + MOZ_RELEASE_ASSERT(!mScanInProgress); mScanInProgress = true; MOZ_ASSERT(mIncrementalPhase == GraphBuildingPhase); @@ -3192,7 +3192,7 @@ nsCycleCollector::ScanRoots(bool aFullySynchGraphBuild) { JS::AutoAssertNoGC nogc; AutoRestore ar(mScanInProgress); - MOZ_ASSERT(!mScanInProgress); + MOZ_RELEASE_ASSERT(!mScanInProgress); mScanInProgress = true; mWhiteNodeCount = 0; MOZ_ASSERT(mIncrementalPhase == ScanAndCollectWhitePhase); @@ -3855,7 +3855,7 @@ nsCycleCollector::BeginCollection(ccType aCCType, } AutoRestore ar(mScanInProgress); - MOZ_ASSERT(!mScanInProgress); + MOZ_RELEASE_ASSERT(!mScanInProgress); mScanInProgress = true; mPurpleBuf.SelectPointers(*mBuilder); timeLog.Checkpoint("SelectPointers()");