# HG changeset patch
# User enevill
# Date 1437038018 0
#      Thu Jul 16 09:13:38 2015 +0000
# Node ID 53c34fb96a2f3c86115c36581727e23f15456c2d
# Parent  2545ed8e99c5f05fe8b810f0c65353a7064b5af1
8131483: aarch64: illegal stlxr instructions
Summary: Do not generate stlxr with Ws == Xn
Reviewed-by: duke

diff --git a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
--- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
@@ -3791,8 +3791,8 @@
     br(Assembler::HI, slow_case);
 
     // If heap_top hasn't been changed by some other thread, update it.
-    stlxr(rscratch1, end, rscratch1);
-    cbnzw(rscratch1, retry);
+    stlxr(rscratch2, end, rscratch1);
+    cbnzw(rscratch2, retry);
   }
 }