--- old/src/hotspot/share/classfile/systemDictionary.cpp	2018-11-14 04:29:34.661768048 -0500
+++ new/src/hotspot/share/classfile/systemDictionary.cpp	2018-11-14 04:29:33.105678997 -0500
@@ -999,6 +999,7 @@
                                               const bool is_weaknonfindable,
                                               const bool can_access_vm_annotations,
                                               InstanceKlass* dynamic_nest_host,
+                                              Handle classData,
                                               TRAPS) {
 
   EventClassLoad class_load_start_event;
@@ -1041,6 +1042,7 @@
                                                       is_nonfindable,
                                                       can_access_vm_annotations,
                                                       dynamic_nest_host,
+                                                      classData,
                                                       CHECK_NULL);
 
   if ((is_nonfindable || (unsafe_anonymous_host != NULL)) && k != NULL) {
@@ -1070,6 +1072,7 @@
     }
 
     // Initialize it now, since nobody else will.
+    // FIXME: why must we eager initialize? It should be initialized upon use.
     k->eager_initialize(CHECK_NULL);
 
     // notify jvmti
@@ -1146,6 +1149,7 @@
                                          false, // is_nonfindable
                                          false, // can_access_vm_annotations
                                          dynamic_nest_host,
+                                         Handle(), // classData
                                          CHECK_NULL);
   }