--- old/src/cpu/s390/vm/macroAssembler_s390.cpp	2017-08-11 17:44:17.553934615 -0400
+++ new/src/cpu/s390/vm/macroAssembler_s390.cpp	2017-08-11 17:44:17.321271107 -0400
@@ -4660,6 +4660,12 @@
   }
 }
 
+// ((OopHandle)result).resolve();
+void MacroAssembler::resolve_oop_handle(Register result) {
+  // OopHandle::resolve is an indirection.
+  z_lg(result, 0, result);
+}
+
 void MacroAssembler::load_mirror(Register mirror, Register method) {
   mem2reg_opt(mirror, Address(method, Method::const_offset()));
   mem2reg_opt(mirror, Address(mirror, ConstMethod::constants_offset()));