# HG changeset patch
# User dholmes
# Date 1294611376 18000
# Node ID 48e7725b6bc4efaa7ede08663f9bb648c84afffd
# Parent  88030b16fe3d894bca4dc0c12af6e4e4817961b5
7010665: Misplaced membar in C1 implementation of Unsafe.get/putXXX
Summary: Modify membars to match regular volatile variable handling
Reviewed-by: iveresov, kvn, never

diff -r 88030b16fe3d -r 48e7725b6bc4 hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Fri Jan 07 13:59:48 2011 -0800
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp	Sun Jan 09 17:16:16 2011 -0500
@@ -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();
 }