diff -r 5c83830390ba -r 319173c62caa src/hotspot/share/memory/universe.cpp
--- a/src/hotspot/share/memory/universe.cpp	Wed Oct 02 13:57:03 2019 -0400
+++ b/src/hotspot/share/memory/universe.cpp	Wed Oct 02 16:55:08 2019 -0700
@@ -710,7 +710,7 @@
   }
 
 #if INCLUDE_CDS
-  if (DumpSharedSpaces || DynamicDumpSharedSpaces) {
+  if (Arguments::is_dumping_archive()) {
     MetaspaceShared::prepare_for_dumping();
   }
 #endif