Mercurial > hg > graal-compiler
changeset 9556:54748fae40d7
Merge (fixed: 7931508747f5 Fix parameters of node intrinsics to use more specific Location and LocationIden)
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Fri, 03 May 2013 20:29:33 +0200 |
parents | 76937211a12d (current diff) 7931508747f5 (diff) |
children | 9e77e858b6eb |
files | |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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() {