# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1367605773 -7200
# Node ID 54748fae40d7f59707788e5190d697bb5a19309d
# Parent  76937211a12d2f2c9b36fc1a826dd5590a877374# Parent  7931508747f531bb95020e584a09d3409ad41c01
Merge (fixed: 7931508747f5 Fix parameters of node intrinsics to use more specific Location and LocationIden)

diff -r 76937211a12d -r 54748fae40d7 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java	Fri May 03 20:28:54 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java	Fri May 03 20:29:33 2013 +0200
@@ -98,8 +98,8 @@
     }
 
     @NodeIntrinsic
-    public static native Location constantLocation(Object identity, Kind kind, long displacement);
+    public static native Location constantLocation(LocationIdentity identity, Kind kind, long displacement);
 
     @NodeIntrinsic
-    public static native Location indexedLocation(Object identity, Kind kind, long displacement, int index, int indexScaling);
+    public static native Location indexedLocation(LocationIdentity identity, Kind kind, long displacement, int index, int indexScaling);
 }
diff -r 76937211a12d -r 54748fae40d7 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java	Fri May 03 20:28:54 2013 +0200
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java	Fri May 03 20:29:33 2013 +0200
@@ -25,6 +25,7 @@
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.nodes.*;
+import com.oracle.graal.nodes.extended.LocationNode.Location;
 import com.oracle.graal.nodes.extended.LocationNode.LocationIdentity;
 import com.oracle.graal.nodes.spi.*;
 import com.oracle.graal.nodes.type.*;
@@ -91,7 +92,7 @@
     }
 
     @NodeIntrinsic
-    public static native void writeMemory(Object object, Object value, Object location, @ConstantNodeParameter WriteBarrierType barrierType);
+    public static native void writeMemory(Object object, Object value, Location location, @ConstantNodeParameter WriteBarrierType barrierType);
 
     @Override
     public LocationIdentity[] getLocationIdentities() {