jruby · Sep 17, 2014 · Sep 17, 2014
Showing with 12 additions and 4 deletions.

+1 −3 core/src/main/java/org/jruby/RubyProc.java

+1 −1 core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java

+10 −0 core/src/main/java/org/jruby/parser/StaticScope.java
diff --git a/core/src/main/java/org/jruby/RubyProc.java b/core/src/main/java/org/jruby/RubyProc.java
@@ -152,9 +152,7 @@ private void setup(Block procBlock) {
 
             // modify the block with a new backref/lastline-grabbing scope
             StaticScope oldScope = block.getBody().getStaticScope();
-            StaticScope newScope = getRuntime().getStaticScopeFactory().newBlockScope(oldScope.getEnclosingScope(), oldScope.getVariables());
-            newScope.setPreviousCRefScope(oldScope.getPreviousCRefScope());
-            newScope.setModule(oldScope.getModule());
+            StaticScope newScope = oldScope.duplicate();
             block.getBody().setStaticScope(newScope);
         } else {
             // just use as is

diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -105,7 +105,7 @@ public static IRubyObject handleNonlocalReturn(StaticScope scope, DynamicScope d
             IRReturnJump rj = (IRReturnJump)rjExc;
 
             // - If we are in a lambda or if we are in the method scope we are supposed to return from, stop propagating
-            if (inNonMethodBodyLambda((StaticScope)scope, blockType) || (rj.methodToReturnFrom == dynScope)) {
+            if (inNonMethodBodyLambda(scope, blockType) || (rj.methodToReturnFrom == dynScope)) {
                 if (isDebug()) System.out.println("---> Non-local Return reached target in scope: " + dynScope);
                 return (IRubyObject) rj.returnValue;
             }

diff --git a/core/src/main/java/org/jruby/parser/StaticScope.java b/core/src/main/java/org/jruby/parser/StaticScope.java
@@ -556,4 +556,14 @@ public String toString() {
     public Type getType() {
         return type;
     }
+
+    public StaticScope duplicate() {
+        StaticScope dupe = new StaticScope(type, enclosingScope, variableNames == null ? NO_NAMES : variableNames);
+        dupe.setIRScope(irScope);
+        dupe.setScopeType(scopeType);
+        dupe.setPreviousCRefScope(previousCRefScope);
+        dupe.setModule(cref);
+
+        return dupe;
+    }
 }