Mercurial > hg > truffle
changeset 2123:df307487d610
7010665: Misplaced membar in C1 implementation of Unsafe.get/putXXX
Summary: Modify membars to match regular volatile variable handling
Reviewed-by: iveresov, kvn, never
author | dholmes |
---|---|
date | Sun, 09 Jan 2011 17:16:16 -0500 |
parents | 55d7d18ccff9 |
children | e31d8c656c5b |
files | src/share/vm/c1/c1_LIRGenerator.cpp |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1/c1_LIRGenerator.cpp Fri Jan 07 13:59:48 2011 -0800 +++ b/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(); }