--- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp	Wed May 30 07:42:48 2018 -0700
+++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.cpp	Wed May 30 17:30:06 2018 +0200
@@ -25,6 +25,7 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.hpp"
 #include "memory/metaspace/printCLDMetaspaceInfoClosure.hpp"
+#include "memory/metaspace/printMetaspaceInfoKlassClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -33,19 +34,31 @@
 
 namespace metaspace {
 
-PrintCLDMetaspaceInfoClosure::PrintCLDMetaspaceInfoClosure(outputStream* out, size_t scale, bool do_print, bool break_down_by_chunktype)
-: _out(out), _scale(scale), _do_print(do_print), _break_down_by_chunktype(break_down_by_chunktype)
-, _num_loaders(0)
+PrintCLDMetaspaceInfoClosure::PrintCLDMetaspaceInfoClosure(outputStream* out, size_t scale, bool do_print,
+    bool do_print_classes, bool break_down_by_chunktype)
+: _out(out), _scale(scale), _do_print(do_print), _do_print_classes(do_print_classes)
+, _break_down_by_chunktype(break_down_by_chunktype)
+, _num_loaders(0), _num_loaders_unloading(0), _num_loaders_without_metaspace(0)
 {
   memset(_num_loaders_by_spacetype, 0, sizeof(_num_loaders_by_spacetype));
 }
 
+static const char* classes_plural(uintx num) {
+  return num == 1 ? "" : "es";
+}
+
 void PrintCLDMetaspaceInfoClosure::do_cld(ClassLoaderData* cld) {
 
   assert(SafepointSynchronize::is_at_safepoint(), "Must be at a safepoint");
 
+  if (cld->is_unloading()) {
+    _num_loaders_unloading ++;
+    return;
+  }
+
   ClassLoaderMetaspace* msp = cld->metaspace_or_null();
   if (msp == NULL) {
+    _num_loaders_without_metaspace ++;
     return;
   }
 
@@ -99,6 +112,35 @@
       _out->print(" instance of %s", class_name);
     }
 
+    if (_do_print_classes) {
+      streamIndentor sti(_out, 6);
+      _out->cr_indent();
+      _out->print("Loaded classes: ");
+      PrintMetaspaceInfoKlassClosure pkic(_out, true);
+      cld->classes_do(&pkic);
+      _out->cr_indent();
+      _out->print("-total-: ");
+      _out->print(UINTX_FORMAT " class%s", pkic._num_classes, classes_plural(pkic._num_classes));
+      if (pkic._num_instance_classes > 0 || pkic._num_array_classes > 0) {
+        _out->print(" (");
+        if (pkic._num_instance_classes > 0) {
+          _out->print(UINTX_FORMAT " instance class%s", pkic._num_instance_classes,
+              classes_plural(pkic._num_instance_classes));
+        }
+        if (pkic._num_array_classes > 0) {
+          if (pkic._num_instance_classes > 0) {
+            _out->print(", ");
+          }
+          _out->print(UINTX_FORMAT " array class%s", pkic._num_array_classes,
+              classes_plural(pkic._num_array_classes));
+        }
+        _out->print(").");
+      }
+    }
+
+    _out->cr();
+
+
     _out->cr();
 
     // Print statistics