Fix for fix for #3577.

jruby · Jan 6, 2016 · b56f3ca · b56f3ca
1 parent f9c2c97
commit b56f3ca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java b/core/src/main/java/org/jruby/ir/passes/AddCallProtocolInstructions.java
@@ -152,10 +152,14 @@ public Object execute(IRScope scope, Object... data) {
                     i = instrs.next();
                     // Breaks & non-local returns in blocks will throw exceptions
                     // and pops for them will be handled in the GEB
-                    if (!bb.isExitBB() && i instanceof ReturnInstr || i instanceof RethrowSavedExcInLambdaInstr) {
+                    if (!bb.isExitBB() && i instanceof ReturnInstr) {
                         if (requireBinding) fixReturn(scope, (ReturnInstr)i, instrs);
                         // Add before the break/return
-                        instrs.previous();
+                        i = instrs.previous();
+                        if (i instanceof RethrowSavedExcInLambdaInstr) {
+                            // back up one more to precede rethrow
+                            i = instrs.previous();
+                        }
                         popSavedState(scope, bb == geb, requireBinding, requireFrame, savedViz, savedFrame, instrs);
                         if (bb == geb) gebProcessed = true;
                         break;