Ask irscope whether ACP has been run. The addInstrs field was not wor…

…king
jruby · Oct 7, 2014 · 8071211 · 8071211
1 parent 23a3d2f
commit 8071211
Showing 1 changed file with 1 addition and 6 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
@@ -15,8 +15,6 @@
 import java.util.ListIterator;
 
 public class AddCallProtocolInstructions extends CompilerPass {
-    boolean addedInstrs = false;
-
     @Override
     public String getLabel() {
         return "Add Call Protocol Instructions (push/pop of dyn-scope, frame, impl-class values)";
@@ -157,9 +155,6 @@ public Object execute(IRScope scope, Object... data) {
         // Run on all nested closures.
         for (IRClosure c: scope.getClosures()) execute(c);
 
-        // Mark as done
-        addedInstrs = true;
-
         // LVA information is no longer valid after the pass
         scope.setDataFlowSolution(LiveVariablesProblem.NAME, null);
 
@@ -168,7 +163,7 @@ public Object execute(IRScope scope, Object... data) {
 
     @Override
     public Object previouslyRun(IRScope scope) {
-        return addedInstrs ? new Object() : null;
+        return scope.hasExplicitCallProtocol();
     }
 
     @Override