Mercurial > hg > truffle

changeset 2943:3891afa020da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small change.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Thu, 09 Jun 2011 17:33:59 +0200
parents c20600a46188
children cc4b538852e3
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java
diffstat 1 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java	Thu Jun 09 17:29:11 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoweringPhase.java	Thu Jun 09 17:33:59 2011 +0200
@@ -33,19 +33,18 @@
     @Override
     protected void run(Graph graph) {
         NodeMap<Node> javaBlockNodes = graph.createNodeMap();
-        NodeBitMap nodeBitMap = graph.createNodeBitMap();
         for (Node n : graph.getNodes()) {
             if (n instanceof FixedNode) {
                 LoweringOp op = n.lookup(LoweringOp.class);
                 if (op != null) {
-                    Node javaBlockNode = getJavaBlockNode(javaBlockNodes, n, nodeBitMap);
+                    Node javaBlockNode = getJavaBlockNode(javaBlockNodes, n);
                 }
             }
 
         }
     }
 
-    private Node getJavaBlockNode(NodeMap<Node> javaBlockNodes, Node n, NodeBitMap nodeBitMap) {
+    private Node getJavaBlockNode(NodeMap<Node> javaBlockNodes, Node n) {
         assert n instanceof FixedNode;
         if (javaBlockNodes.get(n) == null) {
 
@@ -61,16 +60,16 @@
             assert count > 0;
             if (count == 1) {
                 if (Schedule.trueSuccessorCount(truePred) == 1) {
-                    javaBlockNodes.set(n, getJavaBlockNode(javaBlockNodes, truePred, nodeBitMap));
+                    javaBlockNodes.set(n, getJavaBlockNode(javaBlockNodes, truePred));
                 } else {
-                    // Single predecessor is a split => we are our own block node.
+                    // Single predecessor is a split => we are our own Java block node.
                     javaBlockNodes.set(n, n);
                 }
             } else {
                 Node dominator = null;
                 for (Node pred : n.predecessors()) {
                     if (pred instanceof FixedNode) {
-                       dominator = getCommonDominator(dominator, pred, nodeBitMap);
+                       dominator = getCommonDominator(javaBlockNodes, dominator, pred);
                     }
                 }
             }
@@ -80,7 +79,7 @@
         return javaBlockNodes.get(n);
     }
 
-    private Node getCommonDominator(Node a, Node b, NodeBitMap map) {
+    private Node getCommonDominator(NodeMap<Node> javaBlockNodes, Node a, Node b) {
         if (a == null) {
             return b;
         }
@@ -89,8 +88,7 @@
             return a;
         }
 
-
-        map.clearAll();
+        Node cur = getJavaBlockNode(javaBlockNodes, a);
     }
 
     public interface LoweringOp extends Op {