src/hotspot/share/cds/archiveBuilder.hpp

@@ -143,10 +143,14 @@
          _buffered_addr = ref->obj();
        } else {
          _buffered_addr = nullptr;
        }
      }
+     SourceObjInfo(address src, address buf) {
+       _source_addr = src;
+       _buffered_addr = buf;
+     }
  
      // This constructor is only used for regenerated objects (created by LambdaFormInvokers, etc).
      //   src = address of a Method or InstanceKlass that has been regenerated.
      //   renegerated_obj_info = info for the regenerated version of src.
      SourceObjInfo(address src, SourceObjInfo* renegerated_obj_info) :

@@ -215,18 +219,20 @@
    // Note: this region does NOT exist in the cds archive.
    DumpRegion _pz_region;
  
    DumpRegion _rw_region;
    DumpRegion _ro_region;
+   DumpRegion _cc_region;
  
    // Combined bitmap to track pointers in both RW and RO regions. This is updated
    // as objects are copied into RW and RO.
    CHeapBitMap _ptrmap;
  
    // _ptrmap is split into these two bitmaps which are written into the archive.
    CHeapBitMap _rw_ptrmap;   // marks pointers in the RW region
    CHeapBitMap _ro_ptrmap;   // marks pointers in the RO region
+   CHeapBitMap _cc_ptrmap;   // marks pointers in the CC region
  
    SourceObjList _rw_src_objs;                 // objs to put in rw region
    SourceObjList _ro_src_objs;                 // objs to put in ro region
    ResizeableResourceHashtable<address, SourceObjInfo, AnyObj::C_HEAP, mtClassShared> _src_obj_table;
    ResizeableResourceHashtable<address, address, AnyObj::C_HEAP, mtClassShared> _buffered_to_src_table;

@@ -235,10 +241,15 @@
    unsigned int _entropy_seed;
  
    // statistics
    DumpAllocStats _alloc_stats;
    size_t _total_heap_region_size;
+   struct {
+     size_t _num_ptrs;
+     size_t _num_tagged_ptrs;
+     size_t _num_nulled_ptrs;
+   } _relocated_ptr_info;
  
    void print_region_stats(FileMapInfo *map_info, ArchiveHeapInfo* heap_info);
    void print_bitmap_region_stats(size_t size, size_t total_size);
    void print_heap_region_stats(ArchiveHeapInfo* heap_info, size_t total_size);
  

@@ -255,17 +266,20 @@
        _oldtop = _current->_ro_region.top();
      }
      ~OtherROAllocMark();
    };
  
+   void count_relocated_pointer(bool tagged, bool nulled);
+ 
  private:
    FollowMode get_follow_mode(MetaspaceClosure::Ref *ref);
  
    void iterate_sorted_roots(MetaspaceClosure* it);
    void sort_klasses();
    static int compare_symbols_by_address(Symbol** a, Symbol** b);
    static int compare_klass_by_name(Klass** a, Klass** b);
+   void update_hidden_class_loader_type(InstanceKlass* ik) NOT_CDS_JAVA_HEAP_RETURN;
  
    void make_shallow_copies(DumpRegion *dump_region, const SourceObjList* src_objs);
    void make_shallow_copy(DumpRegion *dump_region, SourceObjInfo* src_info);
  
    void relocate_embedded_pointers(SourceObjList* src_objs);

@@ -370,17 +384,24 @@
    static void serialize_dynamic_archivable_items(SerializeClosure* soc);
  
    DumpRegion* pz_region() { return &_pz_region; }
    DumpRegion* rw_region() { return &_rw_region; }
    DumpRegion* ro_region() { return &_ro_region; }
+   DumpRegion* cc_region() { return &_cc_region; }
+ 
+   void start_cc_region();
+   void end_cc_region();
  
    static char* rw_region_alloc(size_t num_bytes) {
      return current()->rw_region()->allocate(num_bytes);
    }
    static char* ro_region_alloc(size_t num_bytes) {
      return current()->ro_region()->allocate(num_bytes);
    }
+   static char* cc_region_alloc(size_t num_bytes) {
+     return current()->cc_region()->allocate(num_bytes);
+   }
  
    template <typename T>
    static Array<T>* new_ro_array(int length) {
      size_t byte_size = Array<T>::byte_sizeof(length, sizeof(T));
      Array<T>* array = (Array<T>*)ro_region_alloc(byte_size);

@@ -409,10 +430,11 @@
    void dump_rw_metadata();
    void dump_ro_metadata();
    void relocate_metaspaceobj_embedded_pointers();
    void record_regenerated_object(address orig_src_obj, address regen_src_obj);
    void make_klasses_shareable();
+   void make_training_data_shareable();
    void relocate_to_requested();
    void write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_info);
    void write_region(FileMapInfo* mapinfo, int region_idx, DumpRegion* dump_region,
                      bool read_only,  bool allow_exec);
  

@@ -424,18 +446,21 @@
    void mark_and_relocate_to_buffered_addr(address* ptr_location);
    template <typename T> void mark_and_relocate_to_buffered_addr(T ptr_location) {
      mark_and_relocate_to_buffered_addr((address*)ptr_location);
    }
  
+   bool has_been_archived(address src_addr) const;
+ 
    bool has_been_buffered(address src_addr) const;
    template <typename T> bool has_been_buffered(T src_addr) const {
      return has_been_buffered((address)src_addr);
    }
  
    address get_buffered_addr(address src_addr) const;
    template <typename T> T get_buffered_addr(T src_addr) const {
-     return (T)get_buffered_addr((address)src_addr);
+     CDS_ONLY(return (T)get_buffered_addr((address)src_addr);)
+     NOT_CDS(return nullptr;)
    }
  
    address get_source_addr(address buffered_addr) const;
    template <typename T> T get_source_addr(T buffered_addr) const {
      return (T)get_source_addr((address)buffered_addr);

@@ -444,11 +469,12 @@
    // All klasses and symbols that will be copied into the archive
    GrowableArray<Klass*>*  klasses() const { return _klasses; }
    GrowableArray<Symbol*>* symbols() const { return _symbols; }
  
    static bool is_active() {
-     return (_current != nullptr);
+     CDS_ONLY(return (_current != nullptr));
+     NOT_CDS(return false;)
    }
  
    static ArchiveBuilder* current() {
      assert(_current != nullptr, "ArchiveBuilder must be active");
      return _current;