src/hotspot/cpu/s390/macroAssembler_s390.cpp

*** 4669,4678 ****
--- 4669,4679 ----
  void MacroAssembler::load_mirror(Register mirror, Register method) {
    mem2reg_opt(mirror, Address(method, Method::const_offset()));
    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);
  }
  
  //---------------------------------------------------------------
  //---  Operations on arrays.
  //---------------------------------------------------------------