# HG changeset patch
# User iveresov
# Date 1401299963 36000
# Node ID 273a462437e9e4730c1f95cdb82b80e352cd0e9f
# Parent  09619752c16dd570115af4dca112c5f3b5c05253
8044090: C1: Old value instead of new one is passed to post-barrier in UnsafeGetAndSetObject
Summary: Pass correct value to post-barrier in UnsafeGetAndSetObject
Reviewed-by: roland, vlivanov

diff -r 09619752c16d -r 273a462437e9 src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Wed May 28 06:26:05 2014 -0700
+++ b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Wed May 28 07:59:23 2014 -1000
@@ -1221,10 +1221,8 @@
   bool is_obj = (type == T_ARRAY || type == T_OBJECT);
   LIR_Opr offset = off.result();
 
-  if (data != dst) {
-    __ move(data, dst);
-    data = dst;
-  }
+  // Because we want a 2-arg form of xchg
+  __ move(data, dst);
 
   assert (!x->is_add() && (type == T_INT || (is_obj LP64_ONLY(&& UseCompressedOops))), "unexpected type");
   LIR_Address* addr;
@@ -1254,7 +1252,7 @@
     pre_barrier(ptr, LIR_OprFact::illegalOpr /* pre_val */,
                 true /* do_load */, false /* patch */, NULL);
   }
-  __ xchg(LIR_OprFact::address(addr), data, dst, tmp);
+  __ xchg(LIR_OprFact::address(addr), dst, dst, tmp);
   if (is_obj) {
     // Seems to be a precise address
     post_barrier(ptr, data);