Reset scope state after adding GEB for lambdas

* Fixes crashers running specs with all passes enabled.
jruby · Sep 29, 2014 · 929ffb9 · 929ffb9
1 parent 22291ec
commit 929ffb9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/ir/IRScope.java b/core/src/main/java/org/jruby/ir/IRScope.java
@@ -592,7 +592,10 @@ public synchronized Instr[] prepareForInterpretation(boolean isLambda) {
         if (isLambda) {
             // Add a global ensure block to catch uncaught breaks
             // and throw a LocalJumpError.
-            ((IRClosure)this).addGEBForUncaughtBreaks();
+            if (((IRClosure)this).addGEBForUncaughtBreaks()) {
+                resetState();
+                computeScopeFlags();
+            }
         }
 
         runCompilerPasses(getManager().getCompilerPasses(this));
@@ -631,7 +634,10 @@ public synchronized List<BasicBlock> prepareForCompilation() {
         // Add a global ensure block to catch uncaught breaks
         // and throw a LocalJumpError.
         if (this instanceof IRClosure) {
-            ((IRClosure)this).addGEBForUncaughtBreaks();
+            if (((IRClosure)this).addGEBForUncaughtBreaks()) {
+                resetState();
+                computeScopeFlags();
+            }
         }
 
         runCompilerPasses(getManager().getJITPasses(this));

diff --git a/core/src/main/java/org/jruby/ir/dataflow/analyses/LiveVariableNode.java b/core/src/main/java/org/jruby/ir/dataflow/analyses/LiveVariableNode.java
@@ -281,7 +281,7 @@ void markDeadInstructions() {
                 Integer dv = problem.getDFVar(v);
 
                 // If 'v' is not live at the instruction site, and it has no side effects, mark it dead!
-                // System.out.println("df var for " + v + " is " + dv.getId());
+                // System.out.println("df var for " + v + " is " + dv);
                 if (living.get(dv)) {
                     living.clear(dv);
                     // System.out.println("NO! LIVE result:" + v);