stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8024919: G1: SPECjbb2013 crashes due to a broken object reference

Browse Source 
Pass correct new value to post_barrer() in Unsafe.getAndSetObject() C1 intrinsic

Reviewed-by: kvn, roland
This commit is contained in:
Igor Veresov 2013-10-31 04:16:40 -07:00
parent e43ac25584
commit 7a38dabd09
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
View File

@ -1468,19 +1468,18 @@ void LIRGenerator::do_UnsafeGetAndSetObject(UnsafeGetAndSetObject* x) {
addr = new LIR_Address(src.result(), offset, type); addr = new LIR_Address(src.result(), offset, type);
} }
if (data != dst) { // Because we want a 2-arg form of xchg and xadd
__ move(data, dst); __ move(data, dst);
data = dst;
}
if (x->is_add()) { if (x->is_add()) {
__ xadd(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr); __ xadd(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
} else { } else {
if (is_obj) { if (is_obj) {
// Do the pre-write barrier, if any. // Do the pre-write barrier, if any.
pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */, pre_barrier(LIR_OprFact::address(addr), LIR_OprFact::illegalOpr /* pre_val */,
true /* do_load */, false /* patch */, NULL); true /* do_load */, false /* patch */, NULL);
} }
__ xchg(LIR_OprFact::address(addr), data, dst, LIR_OprFact::illegalOpr); __ xchg(LIR_OprFact::address(addr), dst, dst, LIR_OprFact::illegalOpr);
if (is_obj) { if (is_obj) {
// Seems to be a precise address // Seems to be a precise address
post_barrier(LIR_OprFact::address(addr), data); post_barrier(LIR_OprFact::address(addr), data);