src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

rev 51202 : 8205523: Explicit barriers for interpreter

@@ -2367,10 +2367,11 @@
     __ lea(lock_reg, Address(rsp, lock_slot_offset * VMRegImpl::stack_slot_size));
 
     // Load the oop from the handle
     __ movptr(obj_reg, Address(oop_handle_reg, 0));
 
+    __ resolve(IS_NOT_NULL, obj_reg);
     if (UseBiasedLocking) {
       __ biased_locking_enter(lock_reg, obj_reg, swap_reg, rscratch1, false, lock_done, &slow_path_lock);
     }
 
     // Load immediate 1 into swap_reg %rax

@@ -2534,10 +2535,11 @@
   Label slow_path_unlock;
   if (method->is_synchronized()) {
 
     // Get locked oop from the handle we passed to jni
     __ movptr(obj_reg, Address(oop_handle_reg, 0));
+    __ resolve(IS_NOT_NULL, obj_reg);
 
     Label done;
 
     if (UseBiasedLocking) {
       __ biased_locking_exit(obj_reg, old_hdr, done);