--- old/src/hotspot/share/memory/metaspaceShared.cpp	2020-08-12 15:04:50.425321450 -0700
+++ new/src/hotspot/share/memory/metaspaceShared.cpp	2020-08-12 15:04:50.221313771 -0700
@@ -25,6 +25,7 @@
 #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"
@@ -594,7 +595,7 @@
   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);
 }
@@ -1424,7 +1425,7 @@
 #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
     }
@@ -1438,7 +1439,7 @@
       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
     }