--- old/src/hotspot/share/classfile/systemDictionary.cpp	2018-11-15 17:16:15.719877127 -0500
+++ new/src/hotspot/share/classfile/systemDictionary.cpp	2018-11-15 17:16:15.435877137 -0500
@@ -1934,7 +1934,7 @@
   ClassLoaderData::the_null_class_loader_data()->dictionary()->remove_classes_in_error_state();
   RemoveClassesClosure rcc;
   MutexLocker ml(ClassLoaderDataGraph_lock);
-  ClassLoaderDataGraph::cld_do(&rcc);
+  ClassLoaderDataGraph::loaded_cld_do(&rcc);
 }
 
 // ----------------------------------------------------------------------------
@@ -3076,7 +3076,7 @@
   assert(DumpSharedSpaces, "dump time only");
   Dictionary* master_dictionary = ClassLoaderData::the_null_class_loader_data()->dictionary();
   CombineDictionariesClosure cdc(master_dictionary);
-  ClassLoaderDataGraph::cld_do(&cdc);
+  ClassLoaderDataGraph::loaded_cld_do(&cdc);
 
   // These tables are no longer valid or necessary. Keeping them around will
   // cause SystemDictionary::verify() to fail. Let's empty them.