Bug 1529735, assert that only either sCCRunner or sICCRunner is active, not both, r=mccr8
authorOlli Pettay <Olli.Pettay@helsinki.fi>
Sat, 02 Mar 2019 18:39:41 +0200
changeset 520040 f3dc67a87eb4650f37d56e1d1bc8d79ab9653890
parent 520039 d016ded4616b2c02f00a75f9e80c233b6b050f01
child 520041 997e98493dbcd55c95b4a6eb4a44f563cd6174e9
child 520060 c30bc007da8adc8447622411387b4abc5bf8aa7c
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1529735
milestone67.0a1
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
Bug 1529735, assert that only either sCCRunner or sICCRunner is active, not both, r=mccr8
dom/base/nsJSEnvironment.cpp
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1901,21 +1901,22 @@ void nsJSContext::RunNextCollectorTimer(
     runnable = sInterSliceGCRunner;
   } else {
     // Check the CC timers after the GC timers, because the CC timers won't do
     // anything if a GC is in progress.
     MOZ_ASSERT(!sCCLockedOut,
                "Don't check the CC timers if the CC is locked out.");
 
     if (sCCRunner) {
+      MOZ_ASSERT(!sICCRunner,
+                 "Shouldn't have both sCCRunner and sICCRunner active at the "
+                 "same time");
       sCCRunner->SetDeadline(aDeadline);
       runnable = sCCRunner;
-    }
-
-    if (sICCRunner) {
+    } else if (sICCRunner) {
       sICCRunner->SetDeadline(aDeadline);
       runnable = sICCRunner;
     }
   }
 
   if (runnable) {
     runnable->Run();
   }