#438: revert M1371908 for startup assertions and crashes

classilla · Dec 16, 2017 · 956fd74 · 956fd74
1 parent 96e1bd0
commit 956fd74
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 37 deletions.
diff --git a/js/src/jit-test/tests/gc/bug-1371908.js b/js/src/jit-test/tests/gc/bug-1371908.js
diff --git a/js/src/jit-test/tests/gc/bug1146213.js b/js/src/jit-test/tests/gc/bug1146213.js
diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
@@ -6845,11 +6845,7 @@ gc::MergeCompartments(JSCompartment* source, JSCompartment* target)
 
     JSRuntime* rt = source->runtimeFromMainThread();
 
-    MOZ_ASSERT(!source->zone()->wasGCStarted());
-    MOZ_ASSERT(!target->zone()->wasGCStarted());
-    JS::AutoAssertOnGC nogc(rt);
-
-    AutoTraceSession session(rt);
+    AutoPrepareForTracing prepare(rt, SkipAtoms);
 
     // Cleanup tables and other state in the source compartment that will be
     // meaningless after merging into the target compartment.

diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp
@@ -1103,13 +1103,12 @@ GlobalHelperThreadState::mergeParseTaskCompartment(JSRuntime* rt, ParseTask* par
                                                    Handle<GlobalObject*> global,
                                                    JSCompartment* dest)
 {
-    // Finish any ongoing incremental GC that may affect the destination zone.
-    if (JS::IsIncrementalGCInProgress(rt) && dest->zone()->wasGCStarted())
-        JS::FinishIncrementalGC(rt, JS::gcreason::API);
-
     // After we call LeaveParseTaskZone() it's not safe to GC until we have
     // finished merging the contents of the parse task's compartment into the
-    // destination compartment.
+    // destination compartment.  Finish any ongoing incremental GC first and
+    // assert that no allocation can occur. (Bug 1371908 changes this, but
+    // generates assertion failures.)
+    gc::AutoFinishGC finishGC(rt);
     JS::AutoAssertNoAlloc noAlloc(rt);
 
     LeaveParseTaskZone(rt, parseTask);