# HG changeset patch
# User dcubed
# Date 1294680200 28800
# Node ID e31d8c656c5b4b87a97c69814af07683a70e348a
# Parent  e24ab3fa6aafad3efabbe7dba9918c5f461a20b1# Parent  df307487d610d02a343c2c493ea7dcaf2d64fc15
Merge

diff -r e24ab3fa6aaf -r e31d8c656c5b src/share/vm/c1/c1_LIRGenerator.cpp
--- a/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Jan 07 22:56:35 2011 -0800
+++ b/src/share/vm/c1/c1_LIRGenerator.cpp	Mon Jan 10 09:23:20 2011 -0800
@@ -1990,9 +1990,8 @@
 
   LIR_Opr reg = reg = rlock_result(x, x->basic_type());
 
+  get_Object_unsafe(reg, src.result(), off.result(), type, x->is_volatile());
   if (x->is_volatile() && os::is_MP()) __ membar_acquire();
-  get_Object_unsafe(reg, src.result(), off.result(), type, x->is_volatile());
-  if (x->is_volatile() && os::is_MP()) __ membar();
 }
 
 
@@ -2014,6 +2013,7 @@
 
   if (x->is_volatile() && os::is_MP()) __ membar_release();
   put_Object_unsafe(src.result(), off.result(), data.result(), type, x->is_volatile());
+  if (x->is_volatile() && os::is_MP()) __ membar();
 }