jruby · Dec 20, 2017 · Dec 20, 2017 · Dec 20, 2017
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.1.15.0
+9.1.16.0-SNAPSHOT
diff --git a/core/pom.xml b/core/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.1.15.0</version>
+    <version>9.1.16.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>

diff --git a/core/src/main/java/org/jruby/ir/IRVisitor.java b/core/src/main/java/org/jruby/ir/IRVisitor.java
@@ -132,6 +132,7 @@ private void error(Object object) {
     public void ThrowExceptionInstr(ThrowExceptionInstr throwexceptioninstr) { error(throwexceptioninstr); }
     public void ToggleBacktraceInstr(ToggleBacktraceInstr instr) { error(instr); }
     public void ToAryInstr(ToAryInstr toaryinstr) { error(toaryinstr); }
+    public void TraceInstr(TraceInstr toaryinstr) { error(toaryinstr); }
     public void UndefMethodInstr(UndefMethodInstr undefmethodinstr) { error(undefmethodinstr); }
     public void UnresolvedSuperInstr(UnresolvedSuperInstr unresolvedsuperinstr) { error(unresolvedsuperinstr); }
     public void UpdateBlockExecutionStateInstr (UpdateBlockExecutionStateInstr instr) { error(instr); }

diff --git a/core/src/main/java/org/jruby/ir/instructions/TraceInstr.java b/core/src/main/java/org/jruby/ir/instructions/TraceInstr.java
@@ -1,15 +1,21 @@
 package org.jruby.ir.instructions;
 
+import org.jruby.ir.IRFlags;
+import org.jruby.ir.IRScope;
+import org.jruby.ir.IRVisitor;
 import org.jruby.ir.Operation;
 import org.jruby.ir.persistence.IRReaderDecoder;
 import org.jruby.ir.persistence.IRWriterEncoder;
+import org.jruby.ir.runtime.IRRuntimeHelpers;
 import org.jruby.ir.transformations.inlining.CloneInfo;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.RubyEvent;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
+import java.util.EnumSet;
+
 // FIXME: When presistence is revisited this should strip these out of code streams on save and add them in if
 // tracing is on for load.
 /**
@@ -71,13 +77,24 @@ public static TraceInstr decode(IRReaderDecoder d) {
 
     @Override
     public Object interpret(ThreadContext context, StaticScope currScope, DynamicScope currDynScope, IRubyObject self, Object[] temp) {
-        if (context.runtime.hasEventHooks()) {
-            // FIXME: Try and statically generate END linenumber instead of hacking it.
-            int linenumber = getLinenumber() == -1 ? context.getLine()+1 : getLinenumber();
-
-            context.trace(getEvent(), getName(), context.getFrameKlazz(), getFilename(), linenumber);
-        }
+        IRRuntimeHelpers.callTrace(context, getEvent(), getName(), getFilename(), getLinenumber());
 
         return null;
     }
+
+    @Override
+    public void visit(IRVisitor visitor) {
+        visitor.TraceInstr(this);
+    }
+
+    @Override
+    public boolean computeScopeFlags(IRScope scope) {
+        EnumSet<IRFlags> flags = scope.getFlags();
+
+        if (flags.contains(IRFlags.REQUIRES_FRAME)) return false;
+
+        flags.add(IRFlags.REQUIRES_FRAME);
+
+        return true;
+    }
 }
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -1966,6 +1966,16 @@ public static RubyArray newArray(ThreadContext context, IRubyObject obj0, IRubyO
         return RubyArray.newArray(context.runtime, obj0, obj1);
     }
 
+    @JIT
+    public static void callTrace(ThreadContext context, RubyEvent event, String name, String filename, int line) {
+        if (context.runtime.hasEventHooks()) {
+            // FIXME: Try and statically generate END linenumber instead of hacking it.
+            int linenumber = line == -1 ? context.getLine()+1 : line;
+
+            context.trace(event, name, context.getFrameKlazz(), filename, linenumber);
+        }
+    }
+
     private static IRRuntimeHelpersSites sites(ThreadContext context) {
         return context.sites.IRRuntimeHelpers;
     }

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -2168,6 +2168,21 @@ public void ToAryInstr(ToAryInstr toaryinstr) {
         jvmStoreLocal(toaryinstr.getResult());
     }
 
+    @Override
+    public void TraceInstr(TraceInstr traceInstr) {
+        jvmMethod().loadContext();
+        jvmAdapter().getstatic(p(RubyEvent.class), traceInstr.getEvent().name(), ci(RubyEvent.class));
+        String name = traceInstr.getName();
+        if (name == null) {
+            jvmAdapter().aconst_null();
+        } else {
+            jvmAdapter().ldc(name);
+        }
+        jvmAdapter().ldc(traceInstr.getFilename());
+        jvmAdapter().ldc(traceInstr.getLinenumber());
+        jvmMethod().invokeIRHelper("callTrace", sig(void.class, ThreadContext.class, RubyEvent.class, String.class, String.class, int.class));
+    }
+
     @Override
     public void UndefMethodInstr(UndefMethodInstr undefmethodinstr) {
         jvmMethod().loadContext();

diff --git a/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java b/core/src/main/java/org/jruby/runtime/MixedModeIRBlockBody.java
@@ -3,6 +3,7 @@
 import org.jruby.EvalType;
 import org.jruby.RubyModule;
 import org.jruby.compiler.Compilable;
+import org.jruby.compiler.NotCompilableException;
 import org.jruby.ir.IRClosure;
 import org.jruby.ir.IRScope;
 import org.jruby.ir.interpreter.Interpreter;
@@ -164,25 +165,25 @@ protected void promoteToFullBuild(ThreadContext context) {
         if (context.runtime.isBooting() && !Options.JIT_KERNEL.load()) return; // don't JIT during runtime boot
 
         if (callCount >= 0) {
-            // ensure we've got code ready for JIT
-            ensureInstrsReady();
-            closure.getNearestTopLocalVariableScope().prepareForCompilation();
-
-            // if we don't have an explicit protocol, disable JIT
-            if (!closure.hasExplicitCallProtocol()) {
-                if (Options.JIT_LOGGING.load()) {
-                    LOG.info("JIT failed; no protocol found in block: " + closure);
-                }
-                callCount = -1;
-                return;
-            }
-
             synchronized (this) {
                 // check call count again
                 if (callCount < 0) return;
 
                 if (callCount++ >= Options.JIT_THRESHOLD.load()) {
                     callCount = -1;
+
+                    // ensure we've got code ready for JIT
+                    ensureInstrsReady();
+                    closure.getNearestTopLocalVariableScope().prepareForCompilation();
+
+                    // if we don't have an explicit protocol, disable JIT
+                    if (!closure.hasExplicitCallProtocol()) {
+                        if (Options.JIT_LOGGING.load()) {
+                            LOG.info("JIT failed; no protocol found in block: " + closure);
+                        }
+                        return;
+                    }
+
                     context.runtime.getJITCompiler().buildThresholdReached(context, this);
                 }
             }

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFIY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>9.1.15.0</version>
+    <version>9.1.16.0-SNAPSHOT</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Lib Setup</name>
@@ -28,7 +28,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>9.1.15.0</version>
+      <version>9.1.16.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@ DO NOT MODIFIY - GENERATED CODE
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>9.1.15.0</version>
+  <version>9.1.16.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>JRuby</name>
   <description>JRuby is the effort to recreate the Ruby (http://www.ruby-lang.org) interpreter in Java.</description>
@@ -271,9 +271,6 @@ DO NOT MODIFIY - GENERATED CODE
                   <requireMavenVersion>
                     <version>[3.3.0,)</version>
                   </requireMavenVersion>
-                  <requireReleaseDeps>
-                    <message>No Snapshots Allowed!</message>
-                  </requireReleaseDeps>
                 </rules>
               </configuration>
             </execution>