--- old/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp	2019-12-03 19:36:40.000000000 -0800
+++ new/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp	2019-12-03 19:36:40.000000000 -0800
@@ -129,7 +129,7 @@
 
 class LoaderTreeNode : public ResourceObj {
 
-  // We walk the CLDG and, for each CLD which is non-unsafe_anonymous, add
+  // We walk the CLDG and, for each CLD which is findable, add
   // a tree node.
   // To add a node we need its parent node; if the parent node does not yet
   // exist - because we have not yet encountered the CLD for the parent loader -
@@ -220,7 +220,7 @@
       if (print_classes) {
         if (_classes != NULL) {
           for (LoadedClassInfo* lci = _classes; lci; lci = lci->_next) {
-            // Non-unsafe anonymous classes should live in the primary CLD of its loader
+            // Hidden and unsafe anonymous classes should live in the primary CLD of its loader
             assert(lci->_cld == _cld, "must be");
 
             branchtracker.print(st);
@@ -258,7 +258,7 @@
               st->print("%*s ", indentation, "");
             }
             st->print("%s", lci->_klass->external_name());
-            // For unsafe anonymous classes, also print CLD if verbose. Should be a different one than the primary CLD.
+            // For hidden and unsafe anonymous classes, also print CLD if verbose. Should be a different one than the primary CLD.
             assert(lci->_cld != _cld, "must be");
             if (verbose) {
               st->print("  (Loader Data: " PTR_FORMAT ")", p2i(lci->_cld));
@@ -319,14 +319,14 @@
     _next = info;
   }
 
-  void add_classes(LoadedClassInfo* first_class, int num_classes, bool is_unsafe_anonymous) {
-    LoadedClassInfo** p_list_to_add_to = is_unsafe_anonymous ? &_anon_classes : &_classes;
+  void add_classes(LoadedClassInfo* first_class, int num_classes, bool is_hidden) {
+    LoadedClassInfo** p_list_to_add_to = is_hidden ? &_anon_classes : &_classes;
     // Search tail.
     while ((*p_list_to_add_to) != NULL) {
       p_list_to_add_to = &(*p_list_to_add_to)->_next;
     }
     *p_list_to_add_to = first_class;
-    if (is_unsafe_anonymous) {
+    if (is_hidden) {
       _num_anon_classes += num_classes;
     } else {
       _num_classes += num_classes;
@@ -421,7 +421,7 @@
     LoadedClassCollectClosure lccc(cld);
     const_cast<ClassLoaderData*>(cld)->classes_do(&lccc);
     if (lccc._num_classes > 0) {
-      info->add_classes(lccc._list, lccc._num_classes, cld->is_unsafe_anonymous());
+      info->add_classes(lccc._list, lccc._num_classes, cld->is_shortlived());
     }
   }
 
@@ -481,7 +481,7 @@
     assert(info != NULL, "must be");
 
     // Update CLD in node, but only if this is the primary CLD for this loader.
-    if (cld->is_unsafe_anonymous() == false) {
+    if (cld->is_shortlived() == false) {
       assert(info->cld() == NULL, "there should be only one primary CLD per loader");
       info->set_cld(cld);
     }