src/hotspot/share/classfile/systemDictionary.cpp

*** 87,96 ****
--- 87,99 ----
  #include "classfile/systemDictionaryShared.hpp"
  #endif
  #if INCLUDE_JVMCI
  #include "jvmci/jvmciRuntime.hpp"
  #endif
+ #if INCLUDE_JFR
+ #include "jfr/jfr.hpp"
+ #endif
  
  PlaceholderTable*      SystemDictionary::_placeholders        = NULL;
  Dictionary*            SystemDictionary::_shared_dictionary   = NULL;
  LoaderConstraintTable* SystemDictionary::_loader_constraints  = NULL;
  ResolutionErrorTable*  SystemDictionary::_resolution_errors   = NULL;
*** 1854,1863 ****
--- 1857,1867 ----
      GCTraceTime(Debug, gc, phases) t("ClassLoaderData", gc_timer);
  
      // First, mark for unload all ClassLoaderData referencing a dead class loader.
      unloading_occurred = ClassLoaderDataGraph::do_unloading(do_cleaning);
      if (unloading_occurred) {
+       JFR_ONLY(Jfr::on_unloading_classes();)
        ClassLoaderDataGraph::clean_module_and_package_info();
      }
    }
  
    // TODO: just return if !unloading_occurred.