8266522: Shenandoah: Shenandoah LRB calls wrong runtime barrier on aarch64

zhengyu123 · zhengyu123 · commit 71d0858b3216 · 2021-05-05T12:14:12.000Z
Reviewed-by: rkennke
diff --git a/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
@@ -281,7 +281,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,
   } else {
     assert(is_phantom, "only remaining strength");
     assert(!is_narrow, "phantom access cannot be narrow");
-    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_weak));
+    __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_phantom));
   }
   __ blr(lr);
   __ mov(rscratch1, r0);

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ void ShenandoahBarrierSetAssembler::load_reference_barrier(MacroAssembler* masm,`
`281`	`281`	`} else {`
`282`	`282`	`assert(is_phantom, "only remaining strength");`
`283`	`283`	`assert(!is_narrow, "phantom access cannot be narrow");`
`284`		`- __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_weak));`
	`284`	`+ __ mov(lr, CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_phantom));`
`285`	`285`	`}`
`286`	`286`	`__ blr(lr);`
`287`	`287`	`__ mov(rscratch1, r0);`