# HG changeset patch # User Bernhard Urban # Date 1382693088 -7200 # Node ID e0634d52796f8580bbec03c650c8832ecdea22b5 # Parent 68e8834ad888b811efb0e847974753c22c349487 HotSpotHostLowering: use location identity from CAS node to create location diff -r 68e8834ad888 -r e0634d52796f graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostLoweringProvider.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostLoweringProvider.java Thu Oct 24 18:34:58 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostLoweringProvider.java Fri Oct 25 11:24:48 2013 +0200 @@ -186,7 +186,7 @@ } else if (n instanceof CompareAndSwapNode) { // Separate out GC barrier semantics CompareAndSwapNode cas = (CompareAndSwapNode) n; - LocationNode location = IndexedLocationNode.create(ANY_LOCATION, cas.expected().kind(), cas.displacement(), cas.offset(), graph, 1); + LocationNode location = IndexedLocationNode.create(cas.getLocationIdentity(), cas.expected().kind(), cas.displacement(), cas.offset(), graph, 1); LoweredCompareAndSwapNode atomicNode = graph.add(new LoweredCompareAndSwapNode(cas.object(), location, cas.expected(), cas.newValue(), getCompareAndSwapBarrier(cas), cas.expected().kind() == Kind.Object)); atomicNode.setStateAfter(cas.stateAfter());