--- old/src/hotspot/share/classfile/systemDictionary.cpp	2020-08-12 15:00:49.892267357 -0700
+++ new/src/hotspot/share/classfile/systemDictionary.cpp	2020-08-12 15:00:49.652258322 -0700
@@ -30,6 +30,7 @@
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/classLoaderDataGraph.inline.hpp"
+#include "classfile/classLoaderDataShared.hpp"
 #include "classfile/classLoaderExt.hpp"
 #include "classfile/dictionary.hpp"
 #include "classfile/javaClasses.inline.hpp"
@@ -2121,6 +2122,7 @@
     // call. No mirror objects are accessed/restored in the above call.
     // Mirrors are restored after java.lang.Class is loaded.
     HeapShared::fixup_mapped_heap_regions();
+    CDS_JAVA_HEAP_ONLY(ClassLoaderDataShared::restore_archived_oops_for_null_class_loader_data());
 
     // Initialize the constant pool for the Object_class
     assert(Object_klass()->is_shared(), "must be");