Skip to content

Commit 536b35b

Browse files
committed
8254319: Shenandoah: Interpreter native-LRB needs to activate during HAS_FORWARDED
Reviewed-by: shade, zgu
1 parent be26972 commit 536b35b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler
282282
__ ldrb(rscratch2, gc_state);
283283

284284
// Check for heap in evacuation phase
285-
__ tbz(rscratch2, ShenandoahHeap::EVACUATION_BITPOS, done);
285+
__ tbz(rscratch2, ShenandoahHeap::HAS_FORWARDED_BITPOS, done);
286286

287287
__ mov(rscratch2, dst);
288288
__ push_call_clobbered_registers();

src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier_native(MacroAssembler
366366
assert_different_registers(dst, thread);
367367

368368
Address gc_state(thread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
369-
__ testb(gc_state, ShenandoahHeap::EVACUATION);
369+
__ testb(gc_state, ShenandoahHeap::HAS_FORWARDED);
370370
#ifndef _LP64
371371
__ pop(thread);
372372
#endif

0 commit comments

Comments
 (0)