Do not promote interpreted blocks to full builds unless -X-C

jruby · Mar 7, 2015 · 214f545 · 214f545
1 parent 3c1cd3b
commit 214f545
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java b/core/src/main/java/org/jruby/runtime/InterpretedIRBlockBody.java
@@ -2,6 +2,7 @@
 
 import org.jruby.EvalType;
 import org.jruby.Ruby;
+import org.jruby.RubyInstanceConfig;
 import org.jruby.RubyModule;
 import org.jruby.compiler.FullBuildSource;
 import org.jruby.ir.IRClosure;
@@ -29,6 +30,12 @@ public InterpretedIRBlockBody(IRClosure closure, Signature signature) {
         this.closure = closure;
         this.pushScope = true;
         this.reuseParentScope = false;
+
+        // 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) {
+            callCount = -1;
+        }
     }
 
     @Override