Take #2: Restore $! in ensure blocks only if it has been rescued

* 48d0f64 was an incomplete fix.
jruby · May 10, 2015 · b35f9d3 · b35f9d3
1 parent bc83de0
commit b35f9d3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/org/jruby/ir/IRBuilder.java b/core/src/main/java/org/jruby/ir/IRBuilder.java
@@ -2228,7 +2228,7 @@ public Operand buildEnsureInternal(Node ensureBodyNode, Node ensurerNode) {
 
         ensureBodyBuildStack.push(ebi);
         // Restore $! if we the exception was rescued
-        if (ensureBodyNode != null) {
+        if (ensureBodyNode != null && ensureBodyNode instanceof RescueNode) {
             addInstr(new PutGlobalVarInstr("$!", savedGlobalException));
             ebi.savedGlobalException = savedGlobalException;
         }