diff -r 0a8436eda2fa -r 01bca26734bb src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp --- a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Fri Jul 26 10:52:47 2019 +0200 +++ b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp Mon Jul 29 11:14:06 2019 +0200 @@ -306,7 +306,7 @@ __ push_call_clobbered_registers(); __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native)); __ mov(r0, rscratch2); - __ blrt(lr, 1, 0, MacroAssembler::ret_type_integral); + __ blr(lr); __ mov(rscratch2, r0); __ pop_call_clobbered_registers(); __ mov(dst, rscratch2); @@ -635,7 +635,7 @@ __ push_call_clobbered_registers(); __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier)); - __ blrt(lr, 1, 0, MacroAssembler::ret_type_integral); + __ blr(lr); __ mov(rscratch1, r0); __ pop_call_clobbered_registers(); __ mov(r0, rscratch1);