--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Thu Aug 09 17:11:11 2018 +0200
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Fri Jun 22 16:07:15 2018 +0200
@@ -3840,6 +3840,8 @@
   // check for NULL object
   __ null_check(r0);
 
+  __ resolve(IS_NOT_NULL, r0);
+
   const Address monitor_block_top(
         rfp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
   const Address monitor_block_bot(
@@ -3939,6 +3941,8 @@
   // check for NULL object
   __ null_check(r0);
 
+  __ resolve(IS_NOT_NULL, r0);
+
   const Address monitor_block_top(
         rfp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
   const Address monitor_block_bot(