--- old/src/hotspot/share/classfile/classLoaderData.cpp	2020-04-02 11:54:17.000000000 -0700
+++ new/src/hotspot/share/classfile/classLoaderData.cpp	2020-04-02 11:54:16.000000000 -0700
@@ -151,11 +151,11 @@
   }
 
   if (!has_class_mirror_holder) {
-    // The holder is initialized later for weak hidden and unsafe anonymous classes,
+    // The holder is initialized later for non-strong hidden classes and unsafe anonymous classes,
     // and before calling anything that call class_loader().
     initialize_holder(h_class_loader);
 
-    // A ClassLoaderData created solely for an weak hidden or unsafe anonymous class should
+    // A ClassLoaderData created solely for a non-strong hidden class or unsafe anonymous class should
     // never have a ModuleEntryTable or PackageEntryTable created for it. The defining package
     // and module for an unsafe anonymous class will be found in its host class.
     _packages = new PackageEntryTable(PackageEntryTable::_packagetable_entry_size);
@@ -418,8 +418,8 @@
 
   oop to;
   if (to_cld->has_class_mirror_holder()) {
-    // Just return if a weak hidden or unsafe anonymous class is attempting to record a dependency
-    // to itself.  (Note that every weak hidden or unsafe anonymous class has its own unique class
+    // Just return if a non-strong hidden class or unsafe anonymous class is attempting to record a dependency
+    // to itself.  (Note that every non-strong hidden class or unsafe anonymous class has its own unique class
     // loader data.)
     if (to_cld == from_cld) {
       return;
@@ -618,7 +618,7 @@
 
 // Unloading support
 bool ClassLoaderData::is_alive() const {
-  bool alive = keep_alive()         // null class loader and incomplete weak hidden or unsafe anonymous klasses.
+  bool alive = keep_alive()         // null class loader and incomplete non-strong hidden class or unsafe anonymous class.
       || (_holder.peek() != NULL);  // and not cleaned by the GC weak handle processing.
 
   return alive;
@@ -730,7 +730,7 @@
 // Returns true if the class loader for this class loader data is one of
 // the 3 builtin (boot application/system or platform) class loaders,
 // including a user-defined system class loader.  Note that if the class
-// loader data is for a weak hidden or unsafe anonymous class then it may
+// loader data is for a non-strong hidden class or unsafe anonymous class then it may
 // get freed by a GC even if its class loader is one of these loaders.
 bool ClassLoaderData::is_builtin_class_loader_data() const {
   return (is_boot_class_loader_data() ||
@@ -740,7 +740,7 @@
 
 // Returns true if this class loader data is a class loader data
 // that is not ever freed by a GC.  It must be the CLD for one of the builtin
-// class loaders and not the CLD for a weak hidden or unsafe anonymous class.
+// class loaders and not the CLD for a non-strong hidden class or unsafe anonymous class.
 bool ClassLoaderData::is_permanent_class_loader_data() const {
   return is_builtin_class_loader_data() && !has_class_mirror_holder();
 }
@@ -877,7 +877,7 @@
   }
 }
 
-// These CLDs are to contain weak hidden or unsafe anonymous classes used for JSR292
+// These CLDs are to contain non-strong hidden classes or unsafe anonymous classes used for JSR292
 ClassLoaderData* ClassLoaderData::has_class_mirror_holder_cld(Handle loader) {
   // Add a new class loader data to the graph.
   return ClassLoaderDataGraph::add(loader, true);