--- old/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	2018-07-02 13:48:17.166620933 +0200
+++ new/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	2018-07-02 13:48:16.883624458 +0200
@@ -3840,7 +3840,7 @@
   // check for NULL object
   __ null_check(r0);
 
-  __ resolve_for_write(OOP_NOT_NULL, r0);
+  __ resolve(IS_NOT_NULL, r0);
 
   const Address monitor_block_top(
         rfp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
@@ -3941,7 +3941,7 @@
   // check for NULL object
   __ null_check(r0);
 
-  __ resolve_for_write(OOP_NOT_NULL, r0);
+  __ resolve(IS_NOT_NULL, r0);
 
   const Address monitor_block_top(
         rfp, frame::interpreter_frame_monitor_block_top_offset * wordSize);