Skip to content

Commit 033a121

Browse files
committed
8360679: Shenandoah: AOT saved adapter calls into broken GC barrier stub
Reviewed-by: kvn Backport-of: 8477630970b61e3178abd7ac812ed97e181e2684
1 parent 1867eff commit 033a121

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,8 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
292292
} else {
293293
assert(is_phantom, "only remaining strength");
294294
assert(!is_narrow, "phantom access cannot be narrow");
295-
__ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_phantom));
295+
// AOT saved adapters need relocation for this call.
296+
__ lea(lr, RuntimeAddress(CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_phantom)));
296297
}
297298
__ blr(lr);
298299
__ mov(rscratch1, r0);

0 commit comments

Comments
 (0)