Mercurial > hg > truffle

changeset 16507:32f326c239a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move setDominator() and setDominated() to AbstractBlock.
author Josef Eisl <josef.eisl@jku.at>
date Tue, 15 Jul 2014 10:17:10 +0200
parents 505c17ed39da
children 79bbd0e9f1c9
files graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlockBase.java graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/Block.java
diffstat 4 files changed, 16 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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<T> getDominated();
 
+    void setDominated(List<T> blocks);
+
     T getPostdominator();
 
     double probability();
--- 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<T> successors;
 
     private T dominator;
+    private List<T> dominated;
 
     private boolean align;
     private int linearScanNumber;
@@ -73,6 +74,17 @@
         this.dominator = dominator;
     }
 
+    public List<T> getDominated() {
+        if (dominated == null) {
+            return Collections.emptyList();
+        }
+        return dominated;
+    }
+
+    public void setDominated(List<T> blocks) {
+        dominated = blocks;
+    }
+
     @Override
     public String toString() {
         return "B" + id;
--- 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<BciBlock> getDominated() {
-            return null;
-        }
-
         public BciBlock getPostdominator() {
             return null;
         }
--- 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<Block> loop;
 
-    protected List<Block> dominated;
     protected Block postdominator;
 
     protected Block(BeginNode node) {
@@ -98,13 +97,6 @@
         return b;
     }
 
-    public List<Block> getDominated() {
-        if (dominated == null) {
-            return Collections.emptyList();
-        }
-        return dominated;
-    }
-
     public Block getPostdominator() {
         return postdominator;
     }