src/cpu/s390/vm/interp_masm_s390.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2016 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
--- 1,7 ----
  /*
!  * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2016 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
*** 369,379 ****
    //  - from word index to byte offset.
    // Since this is a java object, it is potentially compressed.
    Register tmp = index;  // reuse
    z_sllg(index, index, LogBytesPerHeapOop); // Offset into resolved references array.
    // Load pointer for resolved_references[] objArray.
!   z_lg(result, ConstantPool::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()));
--- 369,380 ----
    //  - from word index to byte offset.
    // Since this is a java object, it is potentially compressed.
    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()));