--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp Thu Aug 09 17:11:11 2018 +0200
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp Fri Jun 22 16:07:15 2018 +0200
@@ -1839,6 +1839,8 @@
// Load the oop from the handle
__ ldr(obj_reg, Address(oop_handle_reg, 0));
+ __ resolve(IS_NOT_NULL, obj_reg);
+
if (UseBiasedLocking) {
__ biased_locking_enter(lock_reg, obj_reg, swap_reg, tmp, false, lock_done, &slow_path_lock);
}
@@ -2001,6 +2003,8 @@
// Get locked oop from the handle we passed to jni
__ ldr(obj_reg, Address(oop_handle_reg, 0));
+ __ resolve(IS_NOT_NULL, obj_reg);
+
Label done;
if (UseBiasedLocking) {