# HG changeset patch
# User Lukas Stadler <lukas.stadler@oracle.com>
# Date 1404828754 -7200
# Node ID 36ae19c8fb4ed17ee9f735235705c28fea0d25d9
# Parent  680f52926754581770963cd5b22d03fdabf66b6d
clean up MemoryNode interface (remove asMemory... methods)

diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DeoptimizationFetchUnrollInfoCallNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -67,12 +67,4 @@
 
     @NodeIntrinsic
     public static native Word fetchUnrollInfo(long registerSaver);
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return null;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/DirectCompareAndSwapNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -96,12 +96,4 @@
      */
     @NodeIntrinsic
     public static native Word compareAndSwap(Object object, long offset, Word expectedValue, Word newValue, @ConstantNodeParameter LocationIdentity locationIdentity);
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/StubForeignCallNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -83,12 +83,4 @@
         }
         return super.toString(verbosity);
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nodes/UncommonTrapCallNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -70,12 +70,4 @@
 
     @NodeIntrinsic
     public static native Word uncommonTrap(long registerSaver, int trapRequest);
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return null;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMemoryCheckpoint.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMemoryCheckpoint.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractMemoryCheckpoint.java	Tue Jul 08 16:12:34 2014 +0200
@@ -37,12 +37,4 @@
     protected AbstractMemoryCheckpoint(Stamp stamp, FrameState stateAfter) {
         super(stamp, stateAfter);
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/InvokeWithExceptionNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -232,12 +232,4 @@
         updateUsagesInterface(this.guard, guard);
         this.guard = guard;
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/KillingBeginNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -48,12 +48,4 @@
     public LocationIdentity getLocationIdentity() {
         return locationIdentity;
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryPhiNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -45,14 +45,6 @@
         return locationIdentity;
     }
 
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return null;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return this;
-    }
-
     @Override
     public NodeInputList<ValueNode> values() {
         return values;
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/MemoryProxyNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -63,14 +63,6 @@
         return (MemoryNode) value();
     }
 
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return getOriginalMemoryNode().asMemoryCheckpoint();
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return getOriginalMemoryNode().asMemoryPhi();
-    }
-
     public Node getOriginalNode() {
         return value.asNode();
     }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/StartNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -36,12 +36,4 @@
     public LocationIdentity getLocationIdentity() {
         return LocationIdentity.ANY_LOCATION;
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractWriteNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/AbstractWriteNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -92,12 +92,4 @@
         updateUsages(lastLocationAccess, newLla);
         lastLocationAccess = newLla;
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/FloatingReadNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -82,7 +82,8 @@
     @Override
     public boolean verify() {
         MemoryNode lla = getLastLocationAccess();
-        assert lla == null || lla.asMemoryCheckpoint() != null || lla.asMemoryPhi() != null : "lastLocationAccess of " + this + " should be a MemoryCheckpoint, but is " + lla;
+        assert lla == null || lla instanceof MemoryCheckpoint || lla instanceof MemoryProxy || lla instanceof MemoryPhiNode : "lastLocationAccess of " + this +
+                        " should be a MemoryCheckpoint, but is " + lla;
         return super.verify();
     }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MembarNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -62,14 +62,6 @@
         generator.getLIRGeneratorTool().emitMembar(barriers);
     }
 
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
-
     @SuppressWarnings("unused")
     @NodeIntrinsic
     public static void memoryBarrier(@ConstantNodeParameter int barriers) {
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MemoryNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MemoryNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/MemoryNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -31,8 +31,4 @@
 public interface MemoryNode extends NodeInterface {
 
     ValueNode asNode();
-
-    MemoryCheckpoint asMemoryCheckpoint();
-
-    MemoryPhiNode asMemoryPhi();
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/UnsafeStoreNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -120,14 +120,6 @@
         return stateAfter;
     }
 
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
-
     // specialized on value type until boxing/unboxing is sorted out in intrinsification
 
     @SuppressWarnings("unused")
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/ExceptionObjectNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -70,12 +70,4 @@
         assertTrue(stateAfter() != null, "an exception handler needs a frame state");
         return super.verify();
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredAtomicReadAndWriteNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -69,14 +69,6 @@
         gen.setResult(this, result);
     }
 
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
-
     public boolean canNullCheck() {
         return false;
     }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/java/LoweredCompareAndSwapNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -84,12 +84,4 @@
         Value result = gen.getLIRGeneratorTool().emitCompareAndSwap(address, gen.operand(getExpectedValue()), gen.operand(getNewValue()), Constant.INT_1, Constant.INT_0);
         gen.setResult(this, result);
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/FloatingReadPhase.java	Tue Jul 08 16:12:34 2014 +0200
@@ -158,7 +158,7 @@
             for (MemoryMap state : states) {
                 MemoryNode last = state.getLastLocationAccess(key);
                 if (isPhi) {
-                    merged.asMemoryPhi().addInput(ValueNodeUtil.asNode(last));
+                    ((MemoryPhiNode) merged).addInput(ValueNodeUtil.asNode(last));
                 } else {
                     if (merged == last) {
                         // nothing to do
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MacroStateSplitNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -62,14 +62,6 @@
         return LocationIdentity.ANY_LOCATION;
     }
 
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return this;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
-
     protected void replaceSnippetInvokes(StructuredGraph snippetGraph) {
         for (MethodCallTargetNode call : snippetGraph.getNodes(MethodCallTargetNode.class)) {
             Invoke invoke = call.invoke();
diff -r 680f52926754 -r 36ae19c8fb4e graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MemoryAnchorNode.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MemoryAnchorNode.java	Wed Jul 09 20:24:34 2014 +0200
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/nodes/MemoryAnchorNode.java	Tue Jul 08 16:12:34 2014 +0200
@@ -44,12 +44,4 @@
     public Node canonical(CanonicalizerTool tool) {
         return usages().isEmpty() ? null : this;
     }
-
-    public MemoryCheckpoint asMemoryCheckpoint() {
-        return null;
-    }
-
-    public MemoryPhiNode asMemoryPhi() {
-        return null;
-    }
 }