--- old/src/hotspot/share/oops/cpCache.cpp	2019-10-01 15:26:54.970629421 -0700
+++ new/src/hotspot/share/oops/cpCache.cpp	2019-10-01 15:26:54.444609821 -0700
@@ -708,7 +708,7 @@
 }
 
 void ConstantPoolCache::walk_entries_for_initialization(bool check_only) {
-  assert(DumpSharedSpaces || DynamicDumpSharedSpaces, "sanity");
+  assert(Arguments::is_dumping_archive(), "sanity");
   // When dumping the archive, we want to clean up the ConstantPoolCache
   // to remove any effect of linking due to the execution of Java code --
   // each ConstantPoolCacheEntry will have the same contents as if