Bug 1299108: IonMonkey - Fix hazard, r=bustage
authorHannes Verschore <hv1989@gmail.com>
Wed, 05 Oct 2016 23:33:23 +0200
changeset 316627 2b874833c927846fb36d670f0cd0be31ecc9f0d2
parent 316626 d7df8e59c649a1ce2a41a166556a2afdd4c0cb6b
child 316628 ef948812fe08a374f90ee583bbea03e30b00a9dd
push id82498
push userhv1989@gmail.com
push dateWed, 05 Oct 2016 21:34:19 +0000
treeherdermozilla-inbound@2b874833c927 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1299108
milestone52.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 1299108: IonMonkey - Fix hazard, r=bustage
js/src/jit/Ion.cpp
--- a/js/src/jit/Ion.cpp
+++ b/js/src/jit/Ion.cpp
@@ -2556,17 +2556,17 @@ jit::CanEnter(JSContext* cx, RunState& s
     if (JitOptions.eagerCompilation && !rscript->hasBaselineScript()) {
         MethodStatus status = CanEnterBaselineMethod(cx, state);
         if (status != Method_Compiled)
             return status;
     }
 
     // Skip if the script is being compiled off thread (again).
     // MaybeCreateThisForConstructor could have started an ion compilation.
-    if (script->isIonCompilingOffThread())
+    if (rscript->isIonCompilingOffThread())
         return Method_Skipped;
 
     // Attempt compilation. Returns Method_Compiled if already compiled.
     bool constructing = state.isInvoke() && state.asInvoke()->constructing();
     MethodStatus status = Compile(cx, rscript, nullptr, nullptr, constructing);
     if (status != Method_Compiled) {
         if (status == Method_CantCompile)
             ForbidCompilation(cx, rscript);