--- a/src/hotspot/share/memory/universe.cpp	Fri May 17 10:48:02 2019 -0400
+++ b/src/hotspot/share/memory/universe.cpp	Fri May 17 08:29:55 2019 -0700
@@ -711,13 +711,14 @@
   {
     SymbolTable::create_table();
     StringTable::create_table();
+  }
 
 #if INCLUDE_CDS
-    if (DumpSharedSpaces) {
-      MetaspaceShared::prepare_for_dumping();
-    }
+  if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
+    MetaspaceShared::prepare_for_dumping();
+  }
 #endif
-  }
+
   if (strlen(VerifySubSet) > 0) {
     Universe::initialize_verify_flags();
   }