--- a/src/hotspot/cpu/s390/templateTable_s390.cpp	Fri Sep 29 10:44:58 2017 +0200
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp	Tue Oct 03 16:42:04 2017 -0400
@@ -2382,6 +2382,7 @@
   if (is_static) {
     __ mem2reg_opt(obj, Address(cache, index, cp_base_offset + ConstantPoolCacheEntry::f1_offset()));
     __ mem2reg_opt(obj, Address(obj, Klass::java_mirror_offset()));
+    __ resolve_oop_handle(obj);
   }
 }