Backed out changeset 24fb27182a1d (bug 1341096)

js/src/jsgc.cpp

@@ -7546,11 +7546,7 @@ JS::IsIncrementalGCInProgress(JSContext* cx)
 JS_PUBLIC_API(bool)
 JS::IsIncrementalBarrierNeeded(JSContext* cx)
 {
-    if (JS::CurrentThreadIsHeapBusy())
-        return false;
-
-    auto state = cx->runtime()->gc.state();
-    return state != gc::State::NotActive || state <= gc::State::Sweep;
+    return cx->runtime()->gc.state() == gc::State::Mark && !JS::CurrentThreadIsHeapBusy();
 }
 
 JS_PUBLIC_API(void)