Put post logic before blocks' rethrow instruction, if present.

Temporary fix for #3577. The longer term fix will be to make the instruction insert logic in AddCallProtocol less sensitive to the contents of exit blocks.
jruby · Jan 6, 2016 · f9c2c97 · f9c2c97
1 parent 8994d95
commit f9c2c97
Showing 1 changed file with 1 addition and 1 deletion.
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,7 +152,7 @@ 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) {
+                    if (!bb.isExitBB() && i instanceof ReturnInstr || i instanceof RethrowSavedExcInLambdaInstr) {
                         if (requireBinding) fixReturn(scope, (ReturnInstr)i, instrs);
                         // Add before the break/return
                         instrs.previous();