# HG changeset patch
# User tonyp
# Date 1254581588 14400
# Node ID 708275a44e4a0bc870c10a5a96ccee7f81cd592e
# Parent  46b819ba120b19e5000c452073d3d8e35325a2a2# Parent  a0107ba3bc5324e89d8b5f94e241f0a61cfaf03f
Merge

diff -r 46b819ba120b -r 708275a44e4a src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
--- a/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Wed Sep 30 13:25:39 2009 -0700
+++ b/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp	Sat Oct 03 10:53:08 2009 -0400
@@ -668,7 +668,7 @@
   __ 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)