src/share/vm/oops/constantPool.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. 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
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. 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
   * published by the Free Software Foundation.
*** 107,116 ****
--- 107,126 ----
  
  objArrayOop ConstantPool::resolved_references() const {
    return (objArrayOop)JNIHandles::resolve(_resolved_references);
  }
  
+ // Called from outside constant pool resolution where a resolved_reference array
+ // may not be present.
+ objArrayOop ConstantPool::resolved_references_or_null() const {
+   if (_cache == NULL) {
+     return NULL;
+   } else {
+     return (objArrayOop)JNIHandles::resolve(_resolved_references);
+   }
+ }
+ 
  // Create resolved_references array and mapping array for original cp indexes
  // The ldc bytecode was rewritten to have the resolved reference array index so need a way
  // to map it back for resolving and some unlikely miscellaneous uses.
  // The objects created by invokedynamic are appended to this list.
  void ConstantPool::initialize_resolved_references(ClassLoaderData* loader_data,