src/cpu/s390/vm/interp_masm_s390.cpp

*** 362,373 ****
    Register tmp = index;  // reuse
    z_sllg(index, index, LogBytesPerHeapOop); // Offset into resolved references array.
    // Load pointer for resolved_references[] objArray.
    z_lg(result, ConstantPool::cache_offset_in_bytes(), result);
    z_lg(result, ConstantPoolCache::resolved_references_offset_in_bytes(), result);
!   // JNIHandles::resolve(result)
!   z_lg(result, 0, result); // Load resolved references array itself.
  #ifdef ASSERT
    NearLabel index_ok;
    z_lgf(Z_R0, Address(result, arrayOopDesc::length_offset_in_bytes()));
    z_sllg(Z_R0, Z_R0, LogBytesPerHeapOop);
    compare64_and_branch(tmp, Z_R0, Assembler::bcondLow, index_ok);
--- 362,372 ----
    Register tmp = index;  // reuse
    z_sllg(index, index, LogBytesPerHeapOop); // Offset into resolved references array.
    // Load pointer for resolved_references[] objArray.
    z_lg(result, ConstantPool::cache_offset_in_bytes(), result);
    z_lg(result, ConstantPoolCache::resolved_references_offset_in_bytes(), result);
!   resolve_oop_handle(result); // Load resolved references array itself.
  #ifdef ASSERT
    NearLabel index_ok;
    z_lgf(Z_R0, Address(result, arrayOopDesc::length_offset_in_bytes()));
    z_sllg(Z_R0, Z_R0, LogBytesPerHeapOop);
    compare64_and_branch(tmp, Z_R0, Assembler::bcondLow, index_ok);