From c730fc7e88c6c5812ac77c10e0a7da0c2ffb0182 Mon Sep 17 00:00:00 2001
From: johnc <unknown>
Date: Thu, 1 Oct 2009 15:56:19 -0700
Subject: [PATCH] 6887186: G1: Incorrect code generated for G1 pre-barrier by
 C1 on SPARC Summary: Modify operand passed to C1 pre-barrier to be the
 operand representing the address of the object field that is being stored.
 Reviewed-by: never

---
 src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
index f9e123bbb..1e3006c6a 100644
--- a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+++ b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
@@ -668,7 +668,7 @@ void LIRGenerator::do_CompareAndSwap(Intrinsic* x, ValueType* type) {
   __ add(obj.result(), offset.result(), addr);
 
   if (type == objectType) {  // Write-barrier needed for Object fields.
-    pre_barrier(obj.result(), false, NULL);
+    pre_barrier(addr, false, NULL);
   }
 
   if (type == objectType)
-- 
GitLab