# HG changeset patch # User Josef Eisl # Date 1398696516 -7200 # Node ID 9398d53c15b46496488832c9287068230e16d436 # Parent 8117e9cadb481f90350779fc5f513950b932cc55 Add BaselineControlFlowGraph.compute() factory. diff -r 8117e9cadb48 -r 9398d53c15b4 graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Thu Apr 24 14:00:07 2014 +0200 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Mon Apr 28 16:48:36 2014 +0200 @@ -120,7 +120,7 @@ // add loops ? how do we add looks when we haven't parsed the bytecode? // create the control flow graph - BaselineControlFlowGraph cfg = new BaselineControlFlowGraph(blockMap); + BaselineControlFlowGraph cfg = BaselineControlFlowGraph.compute(blockMap); // create the LIR List> linearScanOrder = ComputeBlockOrder.computeLinearScanOrder(blockMap.blocks.size(), blockMap.startBlock); diff -r 8117e9cadb48 -r 9398d53c15b4 graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java --- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java Thu Apr 24 14:00:07 2014 +0200 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineControlFlowGraph.java Mon Apr 28 16:48:36 2014 +0200 @@ -35,10 +35,15 @@ private Collection> loops; private BitSet visited; - public BaselineControlFlowGraph(BciBlockMapping blockMap) { + public static BaselineControlFlowGraph compute(BciBlockMapping blockMap) { + BaselineControlFlowGraph cfg = new BaselineControlFlowGraph(blockMap); + cfg.computeLoopInformation(); + return cfg; + } + + private BaselineControlFlowGraph(BciBlockMapping blockMap) { blocks = blockMap.blocks; loops = new ArrayList<>(); - computeLoopInformation(); } public List getBlocks() {