Bug 1301496 - Simplify runtime check when tracing helper threads r=terrence a=decoder

js/src/jit-test/tests/gc/bug-1301496.js

@@ -0,0 +1,7 @@
+if (helperThreadCount() == 0)
+    quit();
+startgc(1, 'shrinking');
+offThreadCompileScript("");
+// Adapted from randomly chosen test: js/src/jit-test/tests/parser/bug-1263355-13.js
+gczeal(9);
+newGlobal();

js/src/jit/CompileWrappers.cpp

@@ -188,6 +188,12 @@ CompileRuntime::setMinorGCShouldCancelIonCompilations()
     runtime()->gc.storeBuffer.setShouldCancelIonCompilations();
 }
 
+bool
+CompileRuntime::runtimeMatches(JSRuntime* rt)
+{
+    return rt == runtime();
+}
+
 Zone*
 CompileZone::zone()
 {

js/src/jit/CompileWrappers.h

@@ -86,6 +86,8 @@ class CompileRuntime
 
     const Nursery& gcNursery();
     void setMinorGCShouldCancelIonCompilations();
+
+    bool runtimeMatches(JSRuntime* rt);
 };
 
 class CompileZone

js/src/jit/IonBuilder.cpp

@@ -14622,7 +14622,7 @@ IonBuilder::convertToBoolean(MDefinition* input)
 void
 IonBuilder::trace(JSTracer* trc)
 {
-    if (script_->zoneFromAnyThread()->runtimeFromAnyThread() != trc->runtime())
+    if (!compartment->runtime()->runtimeMatches(trc->runtime()))
         return;
 
     TraceManuallyBarrieredEdge(trc, &script_, "IonBuiler::script_");

js/src/jscntxt.h

@@ -162,6 +162,10 @@ class ExclusiveContext : public ContextFriendFields,
         return options_;
     }
 
+    bool runtimeMatches(JSRuntime* rt) const {
+        return runtime_ == rt;
+    }
+
   protected:
     js::gc::ArenaLists* arenas_;
 

js/src/vm/HelperThreads.cpp

@@ -345,7 +345,7 @@ ParseTask::~ParseTask()
 void
 ParseTask::trace(JSTracer* trc)
 {
-    if (exclusiveContextGlobal->zoneFromAnyThread()->runtimeFromAnyThread() != trc->runtime())
+    if (!cx->runtimeMatches(trc->runtime()))
         return;
 
     TraceManuallyBarrieredEdge(trc, &exclusiveContextGlobal, "ParseTask::exclusiveContextGlobal");

js/src/vm/HelperThreads.h

@@ -568,7 +568,7 @@ struct ParseTask
     bool finish(JSContext* cx);
 
     bool runtimeMatches(JSRuntime* rt) {
-        return exclusiveContextGlobal->runtimeFromAnyThread() == rt;
+        return cx->runtimeMatches(rt);
     }
 
     virtual ~ParseTask();