src/share/vm/oops/cpCache.hpp

*** 26,35 ****
--- 26,36 ----
  #define SHARE_VM_OOPS_CPCACHEOOP_HPP
  
  #include "interpreter/bytecodes.hpp"
  #include "memory/allocation.hpp"
  #include "oops/array.hpp"
+ #include "oops/oopHandle.hpp"
  #include "runtime/orderAccess.hpp"
  #include "utilities/align.hpp"
  
  class PSPromotionManager;
  
*** 411,421 ****
  
    // The following fields need to be modified at runtime, so they cannot be
    // stored in the ConstantPool, which is read-only.
    // Array of resolved objects from the constant pool and map from resolved
    // object index to original constant pool index
!   jobject              _resolved_references;
    Array<u2>*           _reference_map;
  
    // Sizing
    debug_only(friend class ClassVerifier;)
  
--- 412,422 ----
  
    // The following fields need to be modified at runtime, so they cannot be
    // stored in the ConstantPool, which is read-only.
    // Array of resolved objects from the constant pool and map from resolved
    // object index to original constant pool index
!   OopHandle            _resolved_references;
    Array<u2>*           _reference_map;
  
    // Sizing
    debug_only(friend class ClassVerifier;)
  
*** 446,457 ****
  
    int length() const                             { return _length; }
    void metaspace_pointers_do(MetaspaceClosure* it);
    MetaspaceObj::Type type() const                { return ConstantPoolCacheType; }
  
!   jobject resolved_references()           { return _resolved_references; }
!   void set_resolved_references(jobject s) { _resolved_references = s; }
    Array<u2>* reference_map() const        { return _reference_map; }
    void set_reference_map(Array<u2>* o)    { _reference_map = o; }
  
    // Assembly code support
    static int resolved_references_offset_in_bytes() { return offset_of(ConstantPoolCache, _resolved_references); }
--- 447,458 ----
  
    int length() const                             { return _length; }
    void metaspace_pointers_do(MetaspaceClosure* it);
    MetaspaceObj::Type type() const                { return ConstantPoolCacheType; }
  
!   oop resolved_references()                 { return _resolved_references.resolve(); }
!   void set_resolved_references(OopHandle s) { _resolved_references = s; }
    Array<u2>* reference_map() const        { return _reference_map; }
    void set_reference_map(Array<u2>* o)    { _reference_map = o; }
  
    // Assembly code support
    static int resolved_references_offset_in_bytes() { return offset_of(ConstantPoolCache, _resolved_references); }