Do what the interpreter does for pre-loading dynamic scope.

This feels wrong but delegate.rb seems to blow up in test:mri:jit without it.
jruby · Dec 8, 2015 · c5ae2cd · c5ae2cd
1 parent 7de397f
commit c5ae2cd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -158,10 +158,11 @@ public void emitScope(IRScope scope, String name, Signature signature, boolean s
             jvmMethod().loadContext();
             jvmMethod().invokeVirtual(Type.getType(ThreadContext.class), Method.getMethod("org.jruby.runtime.DynamicScope getCurrentScope()"));
             jvmStoreLocal(DYNAMIC_SCOPE);
-        } else {
-            // just assign null so it verifies ok
+        } else if (scope instanceof IRClosure) {
+            // just load scope from context
             // FIXME: don't do this if we won't need the scope
-            jvmAdapter().aconst_null();
+            jvmMethod().loadContext();
+            jvmAdapter().invokevirtual(p(ThreadContext.class), "getCurrentScope", sig(DynamicScope.class));
             jvmStoreLocal(DYNAMIC_SCOPE);
         }