src/hotspot/share/memory/metaspaceShared.cpp

@@ -23,10 +23,11 @@
  */
 
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "classfile/classLoaderDataGraph.hpp"
+#include "classfile/classLoaderDataShared.hpp"
 #include "classfile/classListParser.hpp"
 #include "classfile/classLoaderExt.hpp"
 #include "classfile/dictionary.hpp"
 #include "classfile/loaderConstraints.hpp"
 #include "classfile/javaClasses.inline.hpp"

@@ -592,11 +593,11 @@
   soc->do_tag(--tag);
 
   serialize_cloned_cpp_vtptrs(soc);
   soc->do_tag(--tag);
 
-  CDS_JAVA_HEAP_ONLY(ClassLoaderData::serialize(soc));
+  CDS_JAVA_HEAP_ONLY(ClassLoaderDataShared::serialize(soc));
 
   soc->do_tag(666);
 }
 
 address MetaspaceShared::i2i_entry_code_buffers(size_t total_size) {

@@ -1422,11 +1423,11 @@
       iterate_roots(&rw_copier);
 
 #if INCLUDE_CDS_JAVA_HEAP
       // Archive the ModuleEntry's and PackageEntry's of the 3 built-in loaders
       char* start = _rw_region.top();
-      ClassLoaderData::allocate_archived_tables();
+      ClassLoaderDataShared::allocate_archived_tables();
       ArchiveCompactor::alloc_stats()->record_modules(_rw_region.top() - start, /*read_only*/false);
 #endif
     }
     {
       // allocate and shallow-copy of RO object, immediately following the RW region

@@ -1436,11 +1437,11 @@
       ResourceMark rm;
       ShallowCopier ro_copier(true);
       iterate_roots(&ro_copier);
 #if INCLUDE_CDS_JAVA_HEAP
       char* start = _ro_region.top();
-      ClassLoaderData::init_archived_tables();
+      ClassLoaderDataShared::init_archived_tables();
       ArchiveCompactor::alloc_stats()->record_modules(_ro_region.top() - start, /*read_only*/true);
 #endif
     }
     {
       log_info(cds)("Relocating embedded pointers ... ");