Stray crud from last experiements

jruby · Nov 23, 2015 · 55dc011 · 55dc011
1 parent cce9819
commit 55dc011
Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/ir/representations/CFG.java b/core/src/main/java/org/jruby/ir/representations/CFG.java
@@ -517,7 +517,7 @@ public void collapseStraightLineBBs() {
         }
     }
 
-    private void optimize(List<BasicBlock> returnBBs) {
+    public void optimize(List<BasicBlock> returnBBs) {
         // Propagate returns backwards where possible.
         // If:
         // - there is an edge from BB: x -> r, and

diff --git a/core/src/main/java/org/jruby/ir/transformations/inlining/CFGInliner.java b/core/src/main/java/org/jruby/ir/transformations/inlining/CFGInliner.java
@@ -16,7 +16,7 @@
 import java.util.List;
 
 public class CFGInliner {
-    private static final boolean debug = true;
+    private static final boolean debug = false;
     private final FullInterpreterContext fullInterpreterContext;
     private final CFG cfg;
     private final IRScope hostScope;
@@ -294,6 +294,7 @@ public void inlineMethod(IRScope methodScope, RubyModule implClass, int classTok
             inlineClosureAtYieldSite(ii, ((WrappedIRClosure) closureArg).getClosure(), (BasicBlock) t.a, (YieldInstr) t.b);
         }
 
+        // FIXME: If we keep track of returnBB's we can call fulle cfg.optimize
         // Optimize cfg by merging straight-line bbs
         cfg.collapseStraightLineBBs();
 
@@ -328,7 +329,6 @@ private void inlineClosureAtYieldSite(InlineCloneInfo ii, IRClosure cl, BasicBlo
         // 2. Merge closure cfg into the current cfg
         CFG closureCFG = cl.getCFG();
 
-        printInlineCFG(closureCFG);
         BasicBlock closureGEB = closureCFG.getGlobalEnsureBB();
         for (BasicBlock b : closureCFG.getBasicBlocks()) {
             if (!b.isEntryBB() && !b.isExitBB() && b != closureGEB) cfg.addBasicBlock(b.cloneForInlining(ii));