src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

rev 50081 : [mq]: primitives2.patch

@@ -631,11 +631,11 @@
       __ bind(L);
     }
 #endif // ASSERT
 
     __ bind(done);
-    __ resolve_for_write(0, rax);
+    __ resolve_for_write(OOP_NOT_NULL, rax);
   }
 
   // add space for monitor & lock
   __ subptr(rsp, entry_size); // add space for a monitor entry
   __ movptr(monitor_block_top, rsp);  // set new monitor block top

@@ -737,11 +737,10 @@
   // Preserve the sender sp in case the load barrier
   // calls the runtime
   NOT_LP64(__ push(rsi));
 
   // Load the value of the referent field.
-  __ resolve_for_read(OOP_NOT_NULL, rax);
   const Address field_address(rax, referent_offset);
   __ load_heap_oop(rax, field_address, /*tmp1*/ rbx, /*tmp_thread*/ rdx, ON_WEAK_OOP_REF);
 
   // _areturn
   const Register sender_sp = NOT_LP64(rsi) LP64_ONLY(r13);