src/cpu/s390/vm/templateTable_s390.cpp

@@ -2380,10 +2380,11 @@
 
   // klass overwrite register
   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);
   }
 }
 
 void TemplateTable::load_invoke_cp_cache_entry(int byte_no,
                                                Register method,