--- old/src/hotspot/share/prims/jvm.cpp	2020-02-27 16:16:48.343242071 -0800
+++ new/src/hotspot/share/prims/jvm.cpp	2020-02-27 16:16:45.805141545 -0800
@@ -468,6 +468,10 @@
 
 JVM_ENTRY_NO_ENV(void, JVM_BeforeHalt())
   JVMWrapper("JVM_BeforeHalt");
+  // Link all classes for dynamic CDS dumping before vm exit.
+  if (DynamicDumpSharedSpaces) {
+    MetaspaceShared::link_and_cleanup_shared_classes(false, THREAD);
+  }
   EventShutdown event;
   if (event.should_commit()) {
     event.set_reason("Shutdown requested from Java");