--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp	Fri Sep 29 10:44:58 2017 +0200
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp	Tue Oct 03 16:42:04 2017 -0400
@@ -4671,6 +4671,7 @@
   mem2reg_opt(mirror, Address(mirror, ConstMethod::constants_offset()));
   mem2reg_opt(mirror, Address(mirror, ConstantPool::pool_holder_offset_in_bytes()));
   mem2reg_opt(mirror, Address(mirror, Klass::java_mirror_offset()));
+  resolve_oop_handle(mirror);
 }
 
 //---------------------------------------------------------------