--- old/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java	2017-03-20 17:38:06.000000000 -0700
+++ new/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.hotspot.aarch64/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java	2017-03-20 17:38:06.000000000 -0700
@@ -39,13 +39,11 @@
 import org.graalvm.compiler.hotspot.HotSpotLIRGenerator;
 import org.graalvm.compiler.hotspot.HotSpotLockStack;
 import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder;
-import org.graalvm.compiler.hotspot.nodes.DirectCompareAndSwapNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode;
 import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode;
 import org.graalvm.compiler.lir.LIRFrameState;
 import org.graalvm.compiler.lir.Variable;
 import org.graalvm.compiler.lir.aarch64.AArch64BreakpointOp;
-import org.graalvm.compiler.lir.aarch64.AArch64Move.CompareAndSwapOp;
 import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
 import org.graalvm.compiler.nodes.BreakpointNode;
 import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
@@ -70,7 +68,6 @@
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.Value;
-import jdk.vm.ci.meta.ValueKind;
 
 /**
  * LIR generator specialized for AArch64 HotSpot.
@@ -181,20 +178,6 @@
     }
 
     @Override
-    public void visitDirectCompareAndSwap(DirectCompareAndSwapNode x) {
-        AllocatableValue address = gen.asAllocatable(operand(x.getAddress()));
-        AllocatableValue cmpValue = gen.asAllocatable(operand(x.expectedValue()));
-        AllocatableValue newValue = gen.asAllocatable(operand(x.newValue()));
-        ValueKind<?> kind = cmpValue.getValueKind();
-        assert kind.equals(newValue.getValueKind());
-
-        Variable result = gen.newVariable(newValue.getValueKind());
-        Variable scratch = gen.newVariable(LIRKind.value(AArch64Kind.DWORD));
-        append(new CompareAndSwapOp(result, cmpValue, newValue, address, scratch));
-        setResult(x, result);
-    }
-
-    @Override
     public void visitBreakpointNode(BreakpointNode node) {
         JavaType[] sig = new JavaType[node.arguments().size()];
         for (int i = 0; i < sig.length; i++) {