Mercurial > hg > truffle

changeset 11879:7e57add9c0d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
broadened types in SimplifierTool interface so that it can be moved to the com.oracle.graal.graph project (GRAAL-506)
author Doug Simon <doug.simon@oracle.com>
date Tue, 01 Oct 2013 20:30:04 +0200
parents 73a2f5fc8625
children 9a747d8e0d0f
files graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/SimplifierTool.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java
diffstat 4 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java	Tue Oct 01 07:23:33 2013 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StructuredGraph.java	Tue Oct 01 20:30:04 2013 +0200
@@ -250,7 +250,7 @@
         node.safeDelete();
     }
 
-    public void replaceFloating(FloatingNode node, ValueNode replacement) {
+    public void replaceFloating(FloatingNode node, Node replacement) {
         assert node != null && replacement != null && node.isAlive() && replacement.isAlive() : "cannot replace " + node + " with " + replacement;
         node.replaceAtUsages(replacement);
         node.safeDelete();
@@ -324,7 +324,7 @@
         for (Node successor : snapshot) {
             if (successor != null && successor.isAlive()) {
                 if (successor != survivingSuccessor) {
-                    GraphUtil.killCFG((AbstractBeginNode) successor);
+                    GraphUtil.killCFG(successor);
                 }
             }
         }
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/SimplifierTool.java	Tue Oct 01 07:23:33 2013 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/SimplifierTool.java	Tue Oct 01 20:30:04 2013 +0200
@@ -23,14 +23,13 @@
 package com.oracle.graal.nodes.spi;
 
 import com.oracle.graal.graph.*;
-import com.oracle.graal.nodes.*;
 
 /**
  * @see Simplifiable
  */
 public interface SimplifierTool extends CanonicalizerTool {
 
-    void deleteBranch(FixedNode branch);
+    void deleteBranch(Node branch);
 
     /**
      * Adds a node to the worklist independent of whether it has already been on the worklist.
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Tue Oct 01 07:23:33 2013 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/util/GraphUtil.java	Tue Oct 01 20:30:04 2013 +0200
@@ -43,7 +43,7 @@
         }
     };
 
-    public static void killCFG(FixedNode node) {
+    public static void killCFG(Node node) {
         assert node.isAlive();
         if (node instanceof AbstractEndNode) {
             // We reached a control flow end.
@@ -58,7 +58,7 @@
              * while processing one branch.
              */
             for (Node successor : node.successors()) {
-                killCFG((FixedNode) successor);
+                killCFG(successor);
             }
         }
         propagateKill(node);
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Tue Oct 01 07:23:33 2013 -0700
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/CanonicalizerPhase.java	Tue Oct 01 20:30:04 2013 +0200
@@ -247,7 +247,7 @@
                 return Debug.scope("CanonicalizeNode", node, new Callable<Boolean>() {
 
                     public Boolean call() {
-                        ValueNode canonical = ((Canonicalizable) node).canonical(tool);
+                        Node canonical = ((Canonicalizable) node).canonical(tool);
                         return performReplacement(node, canonical);
                     }
                 });
@@ -280,7 +280,7 @@
 //                                         --------------------------------------------
 //       X: must not happen (checked with assertions)
 // @formatter:on
-        private boolean performReplacement(final Node node, ValueNode canonical) {
+        private boolean performReplacement(final Node node, Node canonical) {
             if (canonical == node) {
                 Debug.log("Canonicalizer: work on %s", node);
                 return false;
@@ -362,7 +362,7 @@
         private final class Tool implements SimplifierTool {
 
             @Override
-            public void deleteBranch(FixedNode branch) {
+            public void deleteBranch(Node branch) {
                 branch.predecessor().replaceFirstSuccessor(branch, null);
                 GraphUtil.killCFG(branch);
             }