# HG changeset patch
# User Thomas Wuerthinger <thomas@wuerthinger.net>
# Date 1308920480 -7200
# Node ID 33da84ebbe50b39409580f457289aabbd13c9f19
# Parent  f35a9ae24f11f60e5d63f515d304b2b2067e60b3
Node class clean up.

diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/PhiSimplifier.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/PhiSimplifier.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/gen/PhiSimplifier.java	Fri Jun 24 15:01:20 2011 +0200
@@ -52,7 +52,7 @@
 
         if (phi.valueCount() == 1 && !cannotSimplify.isMarked(phi)) {
             Value result = phi.valueAt(0);
-            phi.replace(result);
+            phi.replaceAndDelete(result);
             return result;
         }
 
@@ -113,7 +113,7 @@
             assert phiSubst != null : "illegal phi function";
             visited.clear(phi);
 
-            phi.replace(phiSubst);
+            phi.replaceAndDelete(phiSubst);
 
             return phiSubst;
         }
diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java	Fri Jun 24 15:01:20 2011 +0200
@@ -41,7 +41,7 @@
             if (op != null) {
                 Node canonical = op.canonical(node);
                 if (canonical != node) {
-                    node.replace(canonical);
+                    node.replaceAndDelete(canonical);
                     nodeWorkList.replaced(canonical, node, EdgeType.USAGES);
                     //System.out.println("-->" + n + " canonicalized to " + canonical);
                     GraalMetrics.NodesCanonicalized++;
diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java	Fri Jun 24 15:01:20 2011 +0200
@@ -49,7 +49,7 @@
                 FixedNode next = merge.next();
                 EndNode endNode = merge.endAt(0);
                 merge.delete();
-                endNode.replace(next);
+                endNode.replaceAndDelete(next);
             }
         }
         // remove if nodes with constant-value comparison
@@ -118,10 +118,10 @@
             assert loop.predecessors().size() == 1;
             for (Node usage : new ArrayList<Node>(loop.usages())) {
                 assert usage instanceof Phi;
-                usage.replace(((Phi) usage).valueAt(0));
+                usage.replaceAndDelete(((Phi) usage).valueAt(0));
             }
 
-            loop.replace(loop.next());
+            loop.replaceAndDelete(loop.next());
         }
     }
 
diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/GraphBuilderPhase.java	Fri Jun 24 15:01:20 2011 +0200
@@ -208,7 +208,7 @@
         for (Node n : graph.getNodes()) {
             if (n instanceof Placeholder && !loopExits.isMarked(n)) {
                 Placeholder p = (Placeholder) n;
-                p.replace(p.next());
+                p.replaceAndDelete(p.next());
             }
         }
 
@@ -327,7 +327,7 @@
                     FixedNode next = p.next();
                     p.setNext(null);
                     EndNode end = new EndNode(graph);
-                    p.replace(end);
+                    p.replaceAndDelete(end);
                     merge.setNext(next);
                     merge.addEnd(end);
                     merge.setStateAfter(existingState);
@@ -1277,7 +1277,7 @@
                     merge.addEnd(begin.forwardEdge());
                     merge.setNext(begin.next());
                     merge.setStateAfter(begin.stateAfter());
-                    begin.replace(merge);
+                    begin.replaceAndDelete(merge);
                 }
             }
         }
diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Fri Jun 24 15:01:20 2011 +0200
@@ -374,7 +374,7 @@
         }
 
         if (pred instanceof Placeholder) {
-            pred.replace(((Placeholder) pred).next());
+            pred.replaceAndDelete(((Placeholder) pred).next());
         }
 
         if (returnNode != null) {
@@ -390,7 +390,7 @@
             returnDuplicate.inputs().clearAll();
             Node n = invoke.next();
             invoke.setNext(null);
-            returnDuplicate.replace(n);
+            returnDuplicate.replaceAndDelete(n);
         }
 
         if (exceptionEdge != null) {
@@ -407,12 +407,12 @@
                 unwindDuplicate.inputs().clearAll();
                 Node n = obj.next();
                 obj.setNext(null);
-                unwindDuplicate.replace(n);
+                unwindDuplicate.replaceAndDelete(n);
             }
         } else {
             if (unwindNode != null) {
                 Unwind unwindDuplicate = (Unwind) duplicates.get(unwindNode);
-                unwindDuplicate.replace(new Deoptimize(DeoptAction.InvalidateRecompile, compilation.graph));
+                unwindDuplicate.replaceAndDelete(new Deoptimize(DeoptAction.InvalidateRecompile, compilation.graph));
             }
         }
 
diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoopPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoopPhase.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/LoopPhase.java	Fri Jun 24 15:01:20 2011 +0200
@@ -76,11 +76,11 @@
                         Phi phi = new Phi(kind, loopBegin, graph); // (gd) assumes order on loopBegin preds - works in collab with graph builder
                         phi.addInput(c2.init());
                         phi.addInput(add);
-                        c2.replace(phi);
+                        c2.replaceAndDelete(phi);
                     } else {
                         IntegerSub sub = new IntegerSub(kind, c2.init(), c1.init(), graph);
                         IntegerAdd add = new IntegerAdd(kind, c1, sub, graph);
-                        c2.replace(add);
+                        c2.replaceAndDelete(add);
                     }
                 }
             }
@@ -131,7 +131,7 @@
                         Graph graph = loopBegin.graph();
                         LoopCounter counter = new LoopCounter(init.kind, init, stride, loopBegin, graph);
                         counters.add(counter);
-                        phi.replace(counter);
+                        phi.replaceAndDelete(counter);
                         if (loopEndState != null) {
                             loopEndState.inputs().replace(backEdge, counter);
                         }
diff -r f35a9ae24f11 -r 33da84ebbe50 graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/HotSpotRuntime.java
--- a/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/HotSpotRuntime.java	Fri Jun 24 14:59:27 2011 +0200
+++ b/graal/com.oracle.max.graal.runtime/src/com/oracle/max/graal/runtime/HotSpotRuntime.java	Fri Jun 24 15:01:20 2011 +0200
@@ -254,7 +254,7 @@
             ReadNode memoryRead = new ReadNode(field.field().kind().stackKind(), field.object(), new LocationNode(field.field(), field.field().kind(), displacement, graph), graph);
             memoryRead.setGuard((GuardNode) tool.createGuard(new IsNonNull(field.object(), graph)));
             memoryRead.setNext(field.next());
-            field.replace(memoryRead);
+            field.replaceAndDelete(memoryRead);
         } else if (n instanceof StoreField) {
             StoreField field = (StoreField) n;
             if (field.isVolatile()) {
@@ -277,7 +277,7 @@
             } else {
                 memoryWrite.setNext(field.next());
             }
-            field.replace(memoryWrite);
+            field.replaceAndDelete(memoryWrite);
         }
     }
 }