src/hotspot/share/oops/cpCache.hpp

*** 1,7 ***
  /*
!  * Copyright (c) 1998, 2019, 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) 1998, 2020, 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.

*** 415,11 ***
    // object index to original constant pool index
    OopHandle            _resolved_references;
    Array<u2>*           _reference_map;
    // The narrowOop pointer to the archived resolved_references. Set at CDS dump
    // time when caching java heap object is supported.
!   CDS_JAVA_HEAP_ONLY(narrowOop _archived_references;)
  
    // Sizing
    debug_only(friend class ClassVerifier;)
  
    // Constructor
--- 415,11 ---
    // object index to original constant pool index
    OopHandle            _resolved_references;
    Array<u2>*           _reference_map;
    // The narrowOop pointer to the archived resolved_references. Set at CDS dump
    // time when caching java heap object is supported.
!   CDS_JAVA_HEAP_ONLY(int _archived_references_index;)
  
    // Sizing
    debug_only(friend class ClassVerifier;)
  
    // Constructor

*** 442,10 ***
--- 442,11 ---
    void metaspace_pointers_do(MetaspaceClosure* it);
    MetaspaceObj::Type type() const         { return ConstantPoolCacheType; }
  
    oop  archived_references() NOT_CDS_JAVA_HEAP_RETURN_(NULL);
    void set_archived_references(oop o) NOT_CDS_JAVA_HEAP_RETURN;
+   void clear_archived_references() NOT_CDS_JAVA_HEAP_RETURN;
  
    inline oop resolved_references();
    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; }