Restore $! before running rest of ensure block

Fixes the psych exception tests seen in travis.
jruby · May 10, 2015 · 74db0b7 · 74db0b7
1 parent 69c3acf
commit 74db0b7
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
@@ -2225,10 +2225,10 @@ public Operand buildEnsureInternal(Node ensureBodyNode, Node ensurerNode) {
             activeRescuers.peek());
 
         ensureBodyBuildStack.push(ebi);
-        Operand ensureRetVal = ensurerNode == null ? manager.getNil() : build(ensurerNode);
         // Restore $!
         addInstr(new PutGlobalVarInstr("$!", savedGlobalException));
         ebi.savedGlobalException = savedGlobalException;
+        Operand ensureRetVal = ensurerNode == null ? manager.getNil() : build(ensurerNode);
         ensureBodyBuildStack.pop();
 
         // ------------ Build the protected region ------------