# HG changeset patch # User Josef Eisl # Date 1405412230 -7200 # Node ID 32f326c239a5fd7fff9709ce902db778b32acf0f # Parent 505c17ed39da8571398168e79833b1b0d1c118ee Move setDominator() and setDominated() to AbstractBlock. diff -r 505c17ed39da -r 32f326c239a5 graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java --- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java Mon Jul 14 19:56:44 2014 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java Tue Jul 15 10:17:10 2014 +0200 @@ -58,8 +58,12 @@ T getDominator(); + void setDominator(T block); + List getDominated(); + void setDominated(List blocks); + T getPostdominator(); double probability(); diff -r 505c17ed39da -r 32f326c239a5 graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlockBase.java --- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlockBase.java Mon Jul 14 19:56:44 2014 +0200 +++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlockBase.java Tue Jul 15 10:17:10 2014 +0200 @@ -32,6 +32,7 @@ protected List successors; private T dominator; + private List dominated; private boolean align; private int linearScanNumber; @@ -73,6 +74,17 @@ this.dominator = dominator; } + public List getDominated() { + if (dominated == null) { + return Collections.emptyList(); + } + return dominated; + } + + public void setDominated(List blocks) { + dominated = blocks; + } + @Override public String toString() { return "B" + id; diff -r 505c17ed39da -r 32f326c239a5 graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java --- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Mon Jul 14 19:56:44 2014 +0200 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java Tue Jul 15 10:17:10 2014 +0200 @@ -247,10 +247,6 @@ return 1D; } - public List getDominated() { - return null; - } - public BciBlock getPostdominator() { return null; } diff -r 505c17ed39da -r 32f326c239a5 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java Mon Jul 14 19:56:44 2014 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java Tue Jul 15 10:17:10 2014 +0200 @@ -37,7 +37,6 @@ protected double probability; protected Loop loop; - protected List dominated; protected Block postdominator; protected Block(BeginNode node) { @@ -98,13 +97,6 @@ return b; } - public List getDominated() { - if (dominated == null) { - return Collections.emptyList(); - } - return dominated; - } - public Block getPostdominator() { return postdominator; }