# HG changeset patch # User Christian Wimmer # Date 1367598264 25200 # Node ID 7931508747f531bb95020e584a09d3409ad41c01 # Parent 5bf09c5cd2e66fb60b46440b68cb5e7675984b1a Fix parameters of node intrinsics to use more specific Location and LocationIdentity types. diff -r 5bf09c5cd2e6 -r 7931508747f5 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 16:30:39 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/SnippetLocationNode.java Fri May 03 09:24:24 2013 -0700 @@ -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 5bf09c5cd2e6 -r 7931508747f5 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 16:30:39 2013 +0200 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/extended/WriteNode.java Fri May 03 09:24:24 2013 -0700 @@ -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() {