Fix incorrect CFG fetch in LocalOptimizationPass

* Now -X-C runs with all passes again.
jruby · Mar 3, 2015 · 6ec9f98 · 6ec9f98
1 parent 8e1e2f8
commit 6ec9f98
Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/ir/interpreter/FullInterpreterContext.java b/core/src/main/java/org/jruby/ir/interpreter/FullInterpreterContext.java
@@ -93,9 +93,6 @@ public void generateInstructionsForIntepretation() {
 
         cfg.getExitBB().getLabel().setTargetPC(ipc + 1);  // Exit BB ipc
 
-        // System.out.println("SCOPE: " + getName());
-        // System.out.println("INSTRS: " + cfg().toStringInstrs());
-
         Instr[] linearizedInstrArray = newInstrs.toArray(new Instr[newInstrs.size()]);
 
         // Pass 2: Use ipc info from previous to mark all linearized instrs rpc
@@ -115,6 +112,9 @@ public void generateInstructionsForIntepretation() {
 
         instructions = linearizedInstrArray;
         temporaryVariablecount = getScope().getTemporaryVariablesCount();
+
+        // System.out.println("SCOPE: " + getScope().getName());
+        // System.out.println("INSTRS: " + cfg.toStringInstrs());
     }
 
     @Override

diff --git a/core/src/main/java/org/jruby/ir/passes/LocalOptimizationPass.java b/core/src/main/java/org/jruby/ir/passes/LocalOptimizationPass.java
@@ -26,7 +26,7 @@ public Object execute(IRScope s, Object... data) {
             run(c, false, true);
         }
 
-        for (BasicBlock b: ((CFG) data[0]).getBasicBlocks()) {
+        for (BasicBlock b: s.getCFG().getBasicBlocks()) {
             runLocalOptsOnInstrList(s, b.getInstrs().listIterator(), false);
         }