Fix jit.threshold=-1 with -X-C to not perform unrequested Full builds

jruby · Jul 23, 2015 · 31d5310 · 31d5310
1 parent 8c884c0
commit 31d5310
Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/InterpretedIRMethod.java
@@ -41,7 +41,9 @@ public InterpretedIRMethod(IRScope method, Visibility visibility, RubyModule imp
         this.method.getStaticScope().determineModule();
         this.signature = getStaticScope().getSignature();
 
-        // FIXME: Enable no full build promotion option (perhaps piggy back JIT threshold)
+        if (!method.getManager().getInstanceConfig().getCompileMode().shouldJIT()) {
+            callCount = -1;
+        }
     }
 
     public IRScope getIRScope() {

diff --git a/core/src/main/java/org/jruby/internal/runtime/methods/MixedModeIRMethod.java b/core/src/main/java/org/jruby/internal/runtime/methods/MixedModeIRMethod.java
@@ -43,7 +43,6 @@ public MixedModeIRMethod(IRScope method, Visibility visibility, RubyModule imple
         this.signature = getStaticScope().getSignature();
 
         // disable JIT if JIT is disabled
-        // FIXME: kinda hacky, but I use IRMethod data in JITCompiler.
         if (!implementationClass.getRuntime().getInstanceConfig().getCompileMode().shouldJIT()) {
             this.box.callCount = -1;
         }

diff --git a/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java b/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java
@@ -30,7 +30,7 @@ public InterpretedIRBlockBody(IRClosure closure, Signature signature) {
 
         // JIT currently JITs blocks along with their method and no on-demand by themselves.  We only
         // promote to full build here if we are -X-C.
-        if (closure.getManager().getInstanceConfig().getCompileMode() != RubyInstanceConfig.CompileMode.OFF) {
+        if (!closure.getManager().getInstanceConfig().getCompileMode().shouldJIT()) {
             callCount = -1;
         }
     }