8361325: Refactor ClassLoaderExt

Reviewed-by: coleenp, sspitsyn

Author: calvinccheung

src/hotspot/share/cds/archiveBuilder.cpp

@@ -38,7 +38,6 @@
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderDataShared.hpp"
-#include "classfile/classLoaderExt.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"

src/hotspot/share/cds/cdsProtectionDomain.cpp

@@ -27,7 +27,6 @@
 #include "cds/cdsProtectionDomain.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
-#include "classfile/classLoaderExt.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/moduleEntry.hpp"
 #include "classfile/systemDictionaryShared.hpp"

src/hotspot/share/cds/classListParser.cpp

@@ -30,7 +30,7 @@
 #include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "cds/unregisteredClasses.hpp"
-#include "classfile/classLoaderExt.hpp"
+#include "classfile/classLoader.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"

src/hotspot/share/cds/filemap.cpp

@@ -39,7 +39,6 @@
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoader.inline.hpp"
 #include "classfile/classLoaderData.inline.hpp"
-#include "classfile/classLoaderExt.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"

src/hotspot/share/cds/heapShared.cpp

@@ -38,7 +38,6 @@
 #include "cds/metaspaceShared.hpp"
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/classLoaderData.hpp"
-#include "classfile/classLoaderExt.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/modules.hpp"
 #include "classfile/stringTable.hpp"

src/hotspot/share/cds/metaspaceShared.cpp

@@ -49,7 +49,6 @@
 #include "cds/metaspaceShared.hpp"
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderDataShared.hpp"
-#include "classfile/classLoaderExt.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/loaderConstraints.hpp"
 #include "classfile/modules.hpp"

src/hotspot/share/classfile/classLoader.cpp

@@ -25,11 +25,11 @@
 #include "cds/aotClassLocation.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
+#include "cds/dynamicArchive.hpp"
 #include "cds/heapShared.hpp"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.inline.hpp"
 #include "classfile/classLoaderData.inline.hpp"
-#include "classfile/classLoaderExt.hpp"
 #include "classfile/classLoadInfo.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/klassFactory.hpp"
@@ -1283,7 +1283,47 @@ void ClassLoader::record_result(JavaThread* current, InstanceKlass* ik,
   const char* const file_name = file_name_for_class_name(class_name,
                                                          ik->name()->utf8_length());
   assert(file_name != nullptr, "invariant");
-  ClassLoaderExt::record_result_for_builtin_loader(checked_cast<s2>(classpath_index), ik, redefined);
+  record_result_for_builtin_loader(checked_cast<s2>(classpath_index), ik, redefined);
+}
+
+void ClassLoader::record_result_for_builtin_loader(s2 classpath_index, InstanceKlass* result, bool redefined) {
+  assert(CDSConfig::is_dumping_archive(), "sanity");
+
+  oop loader = result->class_loader();
+  if (SystemDictionary::is_system_class_loader(loader)) {
+    AOTClassLocationConfig::dumptime_set_has_app_classes();
+  } else if (SystemDictionary::is_platform_class_loader(loader)) {
+    AOTClassLocationConfig::dumptime_set_has_platform_classes();
+  } else {
+    precond(loader == nullptr);
+  }
+
+  if (CDSConfig::is_dumping_preimage_static_archive() || CDSConfig::is_dumping_dynamic_archive()) {
+    if (!AOTClassLocationConfig::dumptime()->is_valid_classpath_index(classpath_index, result)) {
+      classpath_index = -1;
+    }
+  }
+
+  AOTClassLocationConfig::dumptime_update_max_used_index(classpath_index);
+  result->set_shared_classpath_index(classpath_index);
+
+#if INCLUDE_CDS_JAVA_HEAP
+  if (CDSConfig::is_dumping_heap() && AllowArchivingWithJavaAgent && result->defined_by_boot_loader() &&
+      classpath_index < 0 && redefined) {
+    // When dumping the heap (which happens only during static dump), classes for the built-in
+    // loaders are always loaded from known locations (jimage, classpath or modulepath),
+    // so classpath_index should always be >= 0.
+    // The only exception is when a java agent is used during dump time (for testing
+    // purposes only). If a class is transformed by the agent, the AOTClassLocation of
+    // this class may point to an unknown location. This may break heap object archiving,
+    // which requires all the boot classes to be from known locations. This is an
+    // uncommon scenario (even in test cases). Let's simply disable heap object archiving.
+    ResourceMark rm;
+    log_warning(aot)("heap objects cannot be written because class %s maybe modified by ClassFileLoadHook.",
+                     result->external_name());
+    CDSConfig::disable_heap_dumping();
+  }
+#endif // INCLUDE_CDS_JAVA_HEAP
 }
 
 void ClassLoader::record_hidden_class(InstanceKlass* ik) {
@@ -1308,6 +1348,17 @@ void ClassLoader::record_hidden_class(InstanceKlass* ik) {
     }
   }
 }
+
+void ClassLoader::append_boot_classpath(ClassPathEntry* new_entry) {
+  if (CDSConfig::is_using_archive()) {
+    warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
+    FileMapInfo::current_info()->set_has_platform_or_app_classes(false);
+    if (DynamicArchive::is_mapped()) {
+      FileMapInfo::dynamic_info()->set_has_platform_or_app_classes(false);
+    }
+  }
+  add_to_boot_append_entries(new_entry);
+}
 #endif // INCLUDE_CDS
 
 // Initialize the class loader's access to methods in libzip.  Parse and

src/hotspot/share/classfile/classLoader.hpp

@@ -345,7 +345,9 @@ class ClassLoader: AllStatic {
   static char* uri_to_path(const char* uri);
   static void  record_result(JavaThread* current, InstanceKlass* ik,
                              const ClassFileStream* stream, bool redefined);
+  static void record_result_for_builtin_loader(s2 classpath_index, InstanceKlass* result, bool redefined);
   static void record_hidden_class(InstanceKlass* ik);
+  static void append_boot_classpath(ClassPathEntry* new_entry);
 #endif
 
   static char* lookup_vm_options();