--- old/src/hotspot/share/memory/heapShared.cpp	2020-08-31 08:10:37.622564176 -0700
+++ new/src/hotspot/share/memory/heapShared.cpp	2020-08-31 08:10:37.398555744 -0700
@@ -277,7 +277,9 @@
     log_info(cds)("Dumping objects to open archive heap region ...");
     copy_open_archive_heap_objects(open);
 
-    ClassLoaderDataShared::init_archived_oops();
+    if (MetaspaceShared::use_full_module_graph()) {
+      ClassLoaderDataShared::init_archived_oops();
+    }
 
     destroy_archived_object_cache();
   }