src/hotspot/share/classfile/classLoaderData.hpp

@@ -258,11 +258,11 @@
   // Support for walking class loader data objects
   ClassLoaderData* _next; /// Next loader_datas created
 
   // JFR support
   Klass*  _class_loader_klass;
-  Symbol* _class_loader_name;
+  Symbol* _class_loader_name_id;
   JFR_ONLY(DEFINE_TRACE_ID_FIELD;)
 
   void set_next(ClassLoaderData* next) { _next = next; }
   ClassLoaderData* next() const        { return _next; }
 

@@ -360,12 +360,10 @@
   void inc_keep_alive();
   void dec_keep_alive();
 
   void initialize_holder(Handle holder);
 
-  inline unsigned int identity_hash() const { return (unsigned int)(((intptr_t)this) >> 3); }
-
   void oops_do(OopClosure* f, bool must_claim, bool clear_modified_oops = false);
 
   void classes_do(KlassClosure* klass_closure);
   Klass* klasses() { return _klasses; }
 

@@ -375,11 +373,10 @@
   void print()                                     { print_on(tty); }
   void print_on(outputStream* out) const PRODUCT_RETURN;
   void print_value()                               { print_value_on(tty); }
   void print_value_on(outputStream* out) const;
   void verify();
-  const char* loader_name() const;
 
   OopHandle add_handle(Handle h);
   void remove_handle(OopHandle h);
   void init_handle_locked(OopHandle& pd, Handle h);  // used for concurrent access to ModuleEntry::_pd field
   void add_class(Klass* k, bool publicize = true);

@@ -402,15 +399,14 @@
 
   // Returns Klass* of associated class loader, or NULL if associated loader is <bootstrap>.
   // Also works if unloading.
   Klass* class_loader_klass() const { return _class_loader_klass; }
 
-  // Returns Name of associated class loader.
-  // Returns NULL if associated class loader is <bootstrap> or if no name has been set for
-  //   this loader.
-  // Also works if unloading.
-  Symbol* class_loader_name() const { return _class_loader_name; }
+  // Both methods return the class loader's nameAndId in char* or Symbol* format.
+  // Both methods work during unloading.
+  const char* loader_name() const;
+  Symbol* class_loader_name() const { return _class_loader_name_id; }
 
   JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
 };
 
 // An iterator that distributes Klasses to parallel worker threads.