Bug 1287063 - Remove isGCScheduled check from activeGCInAtomsZone. r=jonco
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 18 Jul 2016 14:35:33 +0200
changeset 330652 be09c9391d44f82e08c483996b2dbfe37f1327bb
parent 330651 f298d01adec5beb9e59b8f192033a8d19c64d21a
child 330653 2fb342547aa8c02298f38714058411a651ea4b90
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjonco
bugs1287063
milestone50.0a1
Bug 1287063 - Remove isGCScheduled check from activeGCInAtomsZone. r=jonco
js/src/jit-test/tests/gc/bug1287063.js
js/src/vm/Runtime.cpp
new file mode 100644
--- /dev/null
+++ b/js/src/jit-test/tests/gc/bug1287063.js
@@ -0,0 +1,4 @@
+if (helperThreadCount() === 0)
+    quit();
+schedulegc("");
+offThreadCompileScript("");
--- a/js/src/vm/Runtime.cpp
+++ b/js/src/vm/Runtime.cpp
@@ -849,17 +849,16 @@ JSRuntime::onOutOfMemoryCanGC(AllocFunct
     return onOutOfMemory(allocFunc, bytes, reallocPtr);
 }
 
 bool
 JSRuntime::activeGCInAtomsZone()
 {
     Zone* zone = atomsCompartment_->zone();
     return (zone->needsIncrementalBarrier() && !gc.isVerifyPreBarriersEnabled()) ||
-           zone->isGCScheduled() ||
            zone->wasGCStarted();
 }
 
 void
 JSRuntime::setUsedByExclusiveThread(Zone* zone)
 {
     MOZ_ASSERT(!zone->usedByExclusiveThread);
     zone->usedByExclusiveThread = true;