src/hotspot/share/cds/archiveUtils.hpp

@@ -47,10 +47,11 @@
  // fixed, but _ptr_end can be expanded as more objects are dumped.
  class ArchivePtrMarker : AllStatic {
    static CHeapBitMap*  _ptrmap;
    static CHeapBitMap*  _rw_ptrmap;
    static CHeapBitMap*  _ro_ptrmap;
+   static CHeapBitMap*  _cc_ptrmap;
    static VirtualSpace* _vs;
  
    // Once _ptrmap is compacted, we don't allow bit marking anymore. This is to
    // avoid unintentional copy operations after the bitmap has been finalized and written.
    static bool         _compacted;

@@ -58,11 +59,11 @@
    static address* ptr_base() { return (address*)_vs->low();  } // committed lower bound (inclusive)
    static address* ptr_end()  { return (address*)_vs->high(); } // committed upper bound (exclusive)
  
  public:
    static void initialize(CHeapBitMap* ptrmap, VirtualSpace* vs);
-   static void initialize_rw_ro_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap);
+   static void initialize_rw_ro_cc_maps(CHeapBitMap* rw_ptrmap, CHeapBitMap* ro_ptrmap, CHeapBitMap* cc_ptrmap);
    static void mark_pointer(address* ptr_loc);
    static void clear_pointer(address* ptr_loc);
    static void compact(address relocatable_base, address relocatable_end);
    static void compact(size_t max_non_null_offset);
  

@@ -87,14 +88,19 @@
  
    static CHeapBitMap* ro_ptrmap() {
      return _ro_ptrmap;
    }
  
+   static CHeapBitMap* cc_ptrmap() {
+     return _cc_ptrmap;
+   }
+ 
    static void reset_map_and_vs() {
      _ptrmap = nullptr;
      _rw_ptrmap = nullptr;
      _ro_ptrmap = nullptr;
+     _cc_ptrmap = nullptr;
      _vs = nullptr;
    }
  };
  
  // SharedDataRelocator is used to shift pointers in the CDS archive.

@@ -257,10 +263,16 @@
    static const uintx MAX_SHARED_DELTA = 0x7FFFFFFF;
    static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
    static bool has_aot_initialized_mirror(InstanceKlass* src_ik);
    template <typename T> static Array<T>* archive_array(GrowableArray<T>* tmp_array);
  
+   static const char* builtin_loader_name_or_null(oop loader); // "boot", "platform", "app", or nullptr
+   static const char* builtin_loader_name(oop loader); // "boot", "platform", or "app". Asserts if not a built-in-loader.
+ 
+   static bool builtin_loader_from_type(const char* loader_type, oop* value_ret);
+   static oop builtin_loader_from_type(int loader_type);
+ 
    // offset must represent an object of type T in the mapped shared space. Return
    // a direct pointer to this object.
    template <typename T> T static from_offset(u4 offset) {
      T p = (T)(SharedBaseAddress + offset);
      assert(Metaspace::is_in_shared_metaspace(p), "must be");