--- old/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp	2018-07-02 13:48:22.242557701 +0200
+++ new/src/hotspot/cpu/x86/templateInterpreterGenerator_x86_64.cpp	2018-07-02 13:48:21.978560989 +0200
@@ -256,7 +256,7 @@
       __ movl(crc,   Address(rsp, 5*wordSize)); // Initial CRC
     } else {
       __ movptr(buf, Address(rsp, 3*wordSize)); // byte[] array
-      __ resolve_for_read(OOP_NOT_NULL, buf);
+      __ resolve(IS_NOT_NULL | ACCESS_READ, buf);
       __ addptr(buf, arrayOopDesc::base_offset_in_bytes(T_BYTE)); // + header size
       __ movl2ptr(off, Address(rsp, 2*wordSize)); // offset
       __ addq(buf, off); // + offset
@@ -312,7 +312,7 @@
       //    "When calculating operand stack length, values of type long and double have length two."
     } else {
       __ movptr(buf, Address(rsp, 3 * wordSize)); // byte[] array
-      __ resolve_for_read(OOP_NOT_NULL, buf);
+      __ resolve(IS_NOT_NULL | ACCESS_READ, buf);
       __ addptr(buf, arrayOopDesc::base_offset_in_bytes(T_BYTE)); // + header size
       __ movl2ptr(off, Address(rsp, 2 * wordSize)); // offset
       __ addq(buf, off); // + offset