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

8229470: Shenandoah: Fix C1 getAndSetObject() failure

Browse Source 
Reviewed-by: shade
This commit is contained in:
Roman Kennke 2019-08-13 16:05:58 +02:00
parent b1ea3a780c
commit a8aedcea47
2 changed files with 6 additions and 0 deletions
src/hotspot/cpu
aarch64/gc/shenandoah/c1
shenandoahBarrierSetC1_aarch64.cpp
x86/gc/shenandoah/c1
shenandoahBarrierSetC1_x86.cpp

3
src/hotspot/cpu/aarch64/gc/shenandoah/c1/shenandoahBarrierSetC1_aarch64.cpp

@ -100,6 +100,9 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRIt
if (access.is_oop()) {
result = load_reference_barrier(access.gen(), result);
LIR_Opr tmp = gen->new_register(type);
__ move(result, tmp);
result = tmp;
if (ShenandoahSATBBarrier) {
pre_barrier(access.gen(), access.access_emit_info(), access.decorators(), LIR_OprFact::illegalOpr,
result /* pre_val */);

3
src/hotspot/cpu/x86/gc/shenandoah/c1/shenandoahBarrierSetC1_x86.cpp

@ -111,6 +111,9 @@ LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRIt
if (access.is_oop()) {
result = load_reference_barrier(access.gen(), result);
LIR_Opr tmp = gen->new_register(type);
__ move(result, tmp);
result = tmp;
if (ShenandoahSATBBarrier) {
pre_barrier(access.gen(), access.access_emit_info(), access.decorators(), LIR_OprFact::illegalOpr,
result /* pre_val */);