Mercurial > hg > graal-compiler
diff graal/GraalCompiler/src/com/sun/c1x/graph/IR.java @ 2616:3558ca7088c0
FrameState and Graphviz changes:
* removed popx, pushx methods from GraphBuilder
* FrameState subclass of Value
* added String shortName() to Node
* added GraphvizPrinter option to use short names
* small hack in GraphvizPrinter: omit FrameState->Local connections
* added GraalGraphviz to implicit classpatch (read from GRAAL env var)
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Mon, 09 May 2011 17:00:25 +0200 |
parents | 0c6564c254af |
children | 7c8ad40c1f88 |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java Mon May 09 14:11:13 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java Mon May 09 17:00:25 2011 +0200 @@ -24,7 +24,6 @@ import java.util.*; -import com.oracle.graal.graph.*; import com.sun.c1x.*; import com.sun.c1x.debug.*; import com.sun.c1x.ir.*; @@ -62,8 +61,6 @@ */ private List<BlockBegin> orderedBlocks; - private final Graph graph = new Graph(); - /** * Creates a new IR instance for the specified compilation. * @param compilation the compilation @@ -96,7 +93,7 @@ private void buildGraph() { // Graph builder must set the startBlock and the osrEntryBlock - new GraphBuilder(compilation, this, graph).build(); + new GraphBuilder(compilation, this, compilation.graph).build(); assert startBlock != null; verifyAndPrint("After graph building"); @@ -176,12 +173,12 @@ } // create new successor and mark it for special block order treatment - BlockBegin newSucc = new BlockBegin(bci, nextBlockNumber(), graph); + BlockBegin newSucc = new BlockBegin(bci, nextBlockNumber(), compilation.graph); newSucc.setCriticalEdgeSplit(true); // This goto is not a safepoint. - Goto e = new Goto(target, null, false, graph); + Goto e = new Goto(target, null, false, compilation.graph); newSucc.appendNext(e, bci); newSucc.setEnd(e); // setup states @@ -276,8 +273,4 @@ public final int maxLocks() { return maxLocks; } - - public Graph graph() { - return graph; - } }