src/cpu/ppc/vm/interp_masm_ppc_64.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 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) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 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
*** 452,462 ****
    // Convert from field index to resolved_references() index and from
    // word index to byte offset. Since this is a java object, it can be compressed.
    Register tmp = index;  // reuse
    sldi(tmp, index, LogBytesPerHeapOop);
    // Load pointer for resolved_references[] objArray.
!   ld(result, ConstantPool::resolved_references_offset_in_bytes(), result);
    // JNIHandles::resolve(result)
    ld(result, 0, result);
  #ifdef ASSERT
    Label index_ok;
    lwa(R0, arrayOopDesc::length_offset_in_bytes(), result);
--- 452,463 ----
    // Convert from field index to resolved_references() index and from
    // word index to byte offset. Since this is a java object, it can be compressed.
    Register tmp = index;  // reuse
    sldi(tmp, index, LogBytesPerHeapOop);
    // Load pointer for resolved_references[] objArray.
!   ld(result, ConstantPool::cache_offset_in_bytes(), result);
!   ld(result, ConstantPoolCache::resolved_references_offset_in_bytes(), result);
    // JNIHandles::resolve(result)
    ld(result, 0, result);
  #ifdef ASSERT
    Label index_ok;
    lwa(R0, arrayOopDesc::length_offset_in_bytes(), result);