jruby · Jan 5, 2018 · Jan 5, 2018 · Jan 5, 2018 · Jan 5, 2018
diff --git a/core/src/main/java/org/jruby/ir/Compiler.java b/core/src/main/java/org/jruby/ir/Compiler.java
@@ -17,7 +17,6 @@
 import org.jruby.ir.targets.JVMVisitorMethodContext;
 import org.jruby.parser.StaticScope;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.DynamicScope;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;

diff --git a/core/src/main/java/org/jruby/ir/IRScriptBody.java b/core/src/main/java/org/jruby/ir/IRScriptBody.java
@@ -30,7 +30,7 @@ public DynamicScope getToplevelScope() {
         return toplevelScope;
     }
 
-    public void setTopLevelBindingScope(DynamicScope tlbScope) {
+    public void setTopLevelScope(DynamicScope tlbScope) {
         this.toplevelScope = tlbScope;
     }
 

diff --git a/core/src/main/java/org/jruby/ir/IRTranslator.java b/core/src/main/java/org/jruby/ir/IRTranslator.java
@@ -27,7 +27,7 @@ public R execute(Ruby runtime, ParseResult result, S specificObject) {
             // FIXME: In terms of writing and reading we should emit enough to rebuild IC + minimal IRScope state
             InterpreterContext ic = IRBuilder.buildRoot(runtime.getIRManager(), (RootNode) result);
             scope = (IRScriptBody) ic.getScope();
-            scope.setTopLevelBindingScope(((RootNode) result).getScope());
+            scope.setTopLevelScope(((RootNode) result).getScope());
 
             if (RubyInstanceConfig.IR_WRITING) {
                 try {

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -1692,12 +1692,31 @@ public void PushBlockFrameInstr(PushBlockFrameInstr instr) {
 
     @Override
     public void PushMethodBindingInstr(PushMethodBindingInstr pushbindinginstr) {
-        jvmMethod().loadContext();
-        jvmMethod().loadStaticScope();
-        jvmAdapter().invokestatic(p(DynamicScope.class), "newDynamicScope", sig(DynamicScope.class, StaticScope.class));
-        jvmAdapter().dup();
-        jvmStoreLocal(DYNAMIC_SCOPE);
-        jvmMethod().invokeVirtual(Type.getType(ThreadContext.class), Method.getMethod("void pushScope(org.jruby.runtime.DynamicScope)"));
+        IRScope scope = jvm.methodData().scope;
+        if (scope.isScriptScope() &&
+                scope.getTopLevelScope() != null) {
+            // script scope, so we don't push a new scope; instead we push the top-level scope it provides
+            jvmMethod().loadContext();
+
+            jvmMethod().loadStaticScope();
+            jvmAdapter().invokevirtual(p(StaticScope.class), "getScope", sig(IRScope.class));
+            jvmAdapter().invokevirtual(p(IRScope.class), "getTopLevelScope", sig(DynamicScope.class));
+
+            jvmAdapter().dup();
+            jvmStoreLocal(DYNAMIC_SCOPE);
+
+            jvmAdapter().dup_x1();
+            jvmAdapter().invokevirtual(p(DynamicScope.class), "growIfNeeded", sig(void.class));
+
+            jvmAdapter().invokevirtual(p(ThreadContext.class), "preScopedBody", sig(void.class, DynamicScope.class));
+        } else {
+            jvmMethod().loadContext();
+            jvmMethod().loadStaticScope();
+            jvmAdapter().invokestatic(p(DynamicScope.class), "newDynamicScope", sig(DynamicScope.class, StaticScope.class));
+            jvmAdapter().dup();
+            jvmStoreLocal(DYNAMIC_SCOPE);
+            jvmMethod().invokeVirtual(Type.getType(ThreadContext.class), Method.getMethod("void pushScope(org.jruby.runtime.DynamicScope)"));
+        }
     }
 
     @Override

diff --git a/test/mri/excludes/TestRipper/ParserEvents.rb b/test/mri/excludes/TestRipper/ParserEvents.rb
@@ -0,0 +1 @@
+exclude :test_block_variables, "RLIMITing causes crash without JVM heap tweaking"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		exclude :test_block_variables, "RLIMITing causes crash without JVM heap tweaking"