--- old/src/hotspot/share/classfile/classLoaderExt.cpp	2020-03-26 15:57:22.000000000 -0700
+++ new/src/hotspot/share/classfile/classLoaderExt.cpp	2020-03-26 15:57:21.000000000 -0700
@@ -284,13 +284,12 @@
 
   ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
   Handle protection_domain;
+  ClassLoadInfo cl_info(protection_domain);
 
   InstanceKlass* result = KlassFactory::create_from_stream(stream,
                                                            name,
                                                            loader_data,
-                                                           protection_domain,
-                                                           NULL, // unsafe_anonymous_host
-                                                           NULL, // cp_patches
+                                                           cl_info,
                                                            THREAD);
 
   if (HAS_PENDING_EXCEPTION) {