src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp

@@ -135,11 +135,10 @@
   return METHOD_ID(klass, method);
 }
 
 static traceid cld_id(CldPtr cld, bool leakp) {
   assert(cld != NULL, "invariant");
-  assert(!cld->is_unsafe_anonymous(), "invariant");
   if (leakp) {
     SET_LEAKP(cld);
   } else {
     SET_TRANSIENT(cld);
   }

@@ -512,11 +511,10 @@
   _artifacts->tally(mw);
 }
 
 static int write_classloader(JfrCheckpointWriter* writer, CldPtr cld, bool leakp) {
   assert(cld != NULL, "invariant");
-  assert(!cld->is_unsafe_anonymous(), "invariant");
   // class loader type
   const Klass* class_loader_klass = cld->class_loader_klass();
   if (class_loader_klass == NULL) {
     // (primordial) boot class loader
     writer->write(artifact_id(cld)); // class loader instance id

@@ -570,11 +568,11 @@
 class CLDCallback : public CLDClosure {
  public:
   CLDCallback() {}
   void do_cld(ClassLoaderData* cld) {
     assert(cld != NULL, "invariant");
-    if (cld->is_unsafe_anonymous()) {
+    if (cld->is_shortlived()) {
       return;
     }
     do_class_loader_data(cld);
   }
 };