--- a/src/hotspot/cpu/x86/templateTable_x86.cpp	Thu Aug 09 17:11:11 2018 +0200
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp	Fri Jun 22 16:07:15 2018 +0200
@@ -4357,6 +4357,8 @@
   // check for NULL object
   __ null_check(rax);
 
+  __ resolve(IS_NOT_NULL, rax);
+
   const Address monitor_block_top(
         rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
   const Address monitor_block_bot(
@@ -4454,6 +4456,8 @@
   // check for NULL object
   __ null_check(rax);
 
+  __ resolve(IS_NOT_NULL, rax);
+
   const Address monitor_block_top(
         rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
   const Address monitor_block_bot(