--- old/src/hotspot/share/classfile/systemDictionary.cpp	2018-05-14 22:55:39.628070948 -0700
+++ new/src/hotspot/share/classfile/systemDictionary.cpp	2018-05-14 22:55:39.036048413 -0700
@@ -149,8 +149,6 @@
                          CHECK);
 
   _java_platform_loader = (oop)result.get_jobject();
-
-  CDS_ONLY(SystemDictionaryShared::initialize(CHECK);)
 }
 
 ClassLoaderData* SystemDictionary::register_loader(Handle class_loader) {
@@ -1970,6 +1968,8 @@
   _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: