call assign_class_loader_type() in KlassFactory

calvinccheung · Mar 20, 2024 · c39f89e · c39f89e
1 parent 923ef35
commit c39f89e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/src/hotspot/share/cds/archiveBuilder.cpp b/src/hotspot/share/cds/archiveBuilder.cpp
@@ -740,10 +740,6 @@ void ArchiveBuilder::make_klasses_shareable() {
       assert(k->is_instance_klass(), " must be");
       num_instance_klasses ++;
       InstanceKlass* ik = InstanceKlass::cast(k);
-      if (CDSConfig::is_dumping_dynamic_archive()) {
-        // For static dump, class loader type are already set.
-        ik->assign_class_loader_type();
-      }
       if (ik->is_shared_boot_class()) {
         type = "boot";
         num_boot_klasses ++;

diff --git a/src/hotspot/share/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp
@@ -97,6 +97,7 @@ InstanceKlass* KlassFactory::check_shared_class_file_load_hook(
 
       if (class_loader.is_null()) {
         new_ik->set_classpath_index(path_index);
+        new_ik->assign_class_loader_type();
       }
 
       return new_ik;

diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
@@ -972,11 +972,6 @@ void InstanceKlass::rewrite_class(TRAPS) {
   }
   Rewriter::rewrite(this, CHECK);
   set_rewritten();
-#if INCLUDE_CDS
-  if (CDSConfig::is_dumping_dynamic_archive()) {
-    assign_class_loader_type();
-  }
-#endif
 }
 
 // Now relocate and link method entry points after class is rewritten.