--- old/src/hotspot/share/classfile/classLoaderExt.cpp	2019-10-01 15:26:41.249118148 -0700
+++ new/src/hotspot/share/classfile/classLoaderExt.cpp	2019-10-01 15:26:40.725098623 -0700
@@ -62,7 +62,7 @@
 }
 
 void ClassLoaderExt::setup_app_search_path() {
-  assert(DumpSharedSpaces || DynamicDumpSharedSpaces,
+  assert(Arguments::is_dumping_archive(),
          "this function is only used at CDS dump time");
   _app_class_paths_start_index = ClassLoader::num_boot_classpath_entries();
   char* app_class_path = os::strdup(Arguments::get_appclasspath());
@@ -92,7 +92,7 @@
   }
 }
 void ClassLoaderExt::setup_module_paths(TRAPS) {
-  assert(DumpSharedSpaces || DynamicDumpSharedSpaces,
+  assert(Arguments::is_dumping_archive(),
          "this function is only used with CDS dump time");
   _app_module_paths_start_index = ClassLoader::num_boot_classpath_entries() +
                               ClassLoader::num_app_classpath_entries();
@@ -231,7 +231,7 @@
 void ClassLoaderExt::record_result(const s2 classpath_index,
                                    InstanceKlass* result,
                                    TRAPS) {
-  assert(DumpSharedSpaces || DynamicDumpSharedSpaces, "Sanity");
+  assert(Arguments::is_dumping_archive(), "Sanity");
 
   // We need to remember where the class comes from during dumping.
   oop loader = result->class_loader();