--- old/src/hotspot/share/runtime/thread.cpp	2017-10-09 17:13:10.120077974 -0700
+++ new/src/hotspot/share/runtime/thread.cpp	2017-10-09 17:13:09.760044160 -0700
@@ -3748,8 +3748,8 @@
   // Final system initialization including security manager and system class loader
   call_initPhase3(CHECK_JNI_ERR);
 
-  // cache the system class loader
-  SystemDictionary::compute_java_system_loader(CHECK_(JNI_ERR));
+  // cache the system and platform class loaders
+  SystemDictionary::compute_java_loaders(CHECK_JNI_ERR);
 
 #if INCLUDE_JVMCI
   if (EnableJVMCI) {