src/cpu/aarch64/vm/interp_masm_aarch64.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2014, Red Hat Inc. 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) 2014, Red Hat Inc. 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
*** 268,278 ****
    Register tmp = index;  // reuse
    lslw(tmp, tmp, LogBytesPerHeapOop);
  
    get_constant_pool(result);
    // load pointer for resolved_references[] objArray
!   ldr(result, Address(result, ConstantPool::resolved_references_offset_in_bytes()));
    // JNIHandles::resolve(obj);
    ldr(result, Address(result, 0));
    // Add in the index
    add(result, result, tmp);
    load_heap_oop(result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)));
--- 268,279 ----
    Register tmp = index;  // reuse
    lslw(tmp, tmp, LogBytesPerHeapOop);
  
    get_constant_pool(result);
    // load pointer for resolved_references[] objArray
!   ldr(result, Address(result, ConstantPool::cache_offset_in_bytes()));
!   ldr(result, Address(result, ConstantPoolCache::resolved_references_offset_in_bytes()));
    // JNIHandles::resolve(obj);
    ldr(result, Address(result, 0));
    // Add in the index
    add(result, result, tmp);
    load_heap_oop(result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)));