Revert "Only consider break jumps actually originating from this proc."

This reverts commit fad37ea. commit 85ffd61 eliminates the need for this extra logic. Fixes #1270
jruby · Mar 20, 2015 · 3456198 · 3456198
1 parent 85ffd61
commit 3456198
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java b/core/src/main/java/org/jruby/ir/runtime/IRRuntimeHelpers.java
@@ -187,23 +187,21 @@ public static IRubyObject initiateBreak(ThreadContext context, DynamicScope dynS
         }
     }
 
-    @Interp @JIT
+    @JIT
     public static IRubyObject handleBreakAndReturnsInLambdas(ThreadContext context, StaticScope scope, DynamicScope dynScope, Object exc, Block.Type blockType) throws RuntimeException {
         if ((exc instanceof IRBreakJump) && inNonMethodBodyLambda(scope, blockType)) {
             // We just unwound all the way up because of a non-local break
-            if (((IRBreakJump)exc).scopeToReturnTo == dynScope) throw IRException.BREAK_LocalJumpError.getException(context.getRuntime());
-        }
-
-        if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
+            throw IRException.BREAK_LocalJumpError.getException(context.getRuntime());
+        } else if (exc instanceof IRReturnJump && (blockType == null || inLambda(blockType))) {
             // Ignore non-local return processing in non-lambda blocks.
             // Methods have a null blocktype
             return handleNonlocalReturn(scope, dynScope, exc, blockType);
+        } else {
+            // Propagate
+            Helpers.throwException((Throwable)exc);
+            // should not get here
+            return null;
         }
-
-        // Propagate
-        Helpers.throwException((Throwable)exc);
-        // should not get here
-        return null;
     }
 
     @JIT