src/hotspot/share/classfile/systemDictionary.cpp

@@ -147,12 +147,10 @@
                          vmSymbols::getPlatformClassLoader_name(),
                          vmSymbols::void_classloader_signature(),
                          CHECK);
 
   _java_platform_loader = (oop)result.get_jobject();
-
-  CDS_ONLY(SystemDictionaryShared::initialize(CHECK);)
 }
 
 ClassLoaderData* SystemDictionary::register_loader(Handle class_loader) {
   if (class_loader() == NULL) return ClassLoaderData::the_null_class_loader_data();
   return ClassLoaderDataGraph::find_or_create(class_loader);

@@ -1968,10 +1966,12 @@
 
   // Allocate private object used as system class loader lock
   _system_loader_lock_obj = oopFactory::new_intArray(0, CHECK);
   // Initialize basic classes
   initialize_preloaded_classes(CHECK);
+
+  CDS_ONLY(SystemDictionaryShared::initialize_locks();)
 }
 
 // Compact table of directions on the initialization of klasses:
 static const short wk_init_info[] = {
   #define WK_KLASS_INIT_INFO(name, symbol, option) \