8348426: Generate binary file for -XX:AOTMode=record -XX:AOTConfiguration=file

Reviewed-by: ccheung, asmehra, kvn, iveresov

Author: iklam

src/hotspot/share/cds/aotClassLocation.cpp

@@ -989,8 +989,14 @@ bool AOTClassLocationConfig::validate(bool has_aot_linked_classes, bool* has_ext
     const char* hint_msg = log_is_enabled(Info, class, path) ?
         "" : " (hint: enable -Xlog:class+path=info to diagnose the failure)";
     if (RequireSharedSpaces && !PrintSharedArchiveAndExit) {
-      log_error(cds)("%s%s", mismatch_msg, hint_msg);
-      MetaspaceShared::unrecoverable_loading_error();
+      if (CDSConfig::is_dumping_final_static_archive()) {
+        log_error(cds)("class path and/or module path are not compatible with the "
+                       "ones specified when the AOTConfiguration file was recorded%s", hint_msg);
+        vm_exit_during_initialization("Unable to use create AOT cache.", nullptr);
+      } else {
+        log_error(cds)("%s%s", mismatch_msg, hint_msg);
+        MetaspaceShared::unrecoverable_loading_error();
+      }
     } else {
       log_warning(cds)("%s%s", mismatch_msg, hint_msg);
     }

src/hotspot/share/cds/archiveBuilder.cpp

@@ -507,9 +507,8 @@ bool ArchiveBuilder::is_excluded(Klass* klass) {
     return SystemDictionaryShared::is_excluded_class(ik);
   } else if (klass->is_objArray_klass()) {
     Klass* bottom = ObjArrayKlass::cast(klass)->bottom_klass();
-    if (MetaspaceShared::is_shared_static(bottom)) {
+    if (CDSConfig::is_dumping_dynamic_archive() && MetaspaceShared::is_shared_static(bottom)) {
       // The bottom class is in the static archive so it's clearly not excluded.
-      assert(CDSConfig::is_dumping_dynamic_archive(), "sanity");
       return false;
     } else if (bottom->is_instance_klass()) {
       return SystemDictionaryShared::is_excluded_class(InstanceKlass::cast(bottom));
@@ -521,7 +520,7 @@ bool ArchiveBuilder::is_excluded(Klass* klass) {
 
 ArchiveBuilder::FollowMode ArchiveBuilder::get_follow_mode(MetaspaceClosure::Ref *ref) {
   address obj = ref->obj();
-  if (MetaspaceShared::is_in_shared_metaspace(obj)) {
+  if (CDSConfig::is_dumping_dynamic_archive() && MetaspaceShared::is_in_shared_metaspace(obj)) {
     // Don't dump existing shared metadata again.
     return point_to_it;
   } else if (ref->msotype() == MetaspaceObj::MethodDataType ||

src/hotspot/share/cds/archiveUtils.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -255,11 +255,23 @@ class ReadClosure : public SerializeClosure {
 };
 
 class ArchiveUtils {
+  template <typename T> static Array<T>* archive_non_ptr_array(GrowableArray<T>* tmp_array);
+  template <typename T> static Array<T>* archive_ptr_array(GrowableArray<T>* tmp_array);
+
 public:
   static const uintx MAX_SHARED_DELTA = 0x7FFFFFFF;
   static void log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) NOT_CDS_RETURN;
   static bool has_aot_initialized_mirror(InstanceKlass* src_ik);
-  template <typename T> static Array<T>* archive_array(GrowableArray<T>* tmp_array);
+
+  template <typename T, ENABLE_IF(!std::is_pointer<T>::value)>
+  static Array<T>* archive_array(GrowableArray<T>* tmp_array) {
+    return archive_non_ptr_array(tmp_array);
+  }
+
+  template <typename T, ENABLE_IF(std::is_pointer<T>::value)>
+  static Array<T>* archive_array(GrowableArray<T>* tmp_array) {
+    return archive_ptr_array(tmp_array);
+  }
 
   // The following functions translate between a u4 offset and an address in the
   // the range of the mapped CDS archive (e.g., Metaspace::is_in_shared_metaspace()).

src/hotspot/share/cds/archiveUtils.inline.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,8 @@
 #include "cds/archiveUtils.hpp"
 
 #include "cds/archiveBuilder.hpp"
+#include "cds/cdsConfig.hpp"
+#include "cds/metaspaceShared.hpp"
 #include "oops/array.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/growableArray.hpp"
@@ -52,13 +54,40 @@ inline bool SharedDataRelocator::do_bit(size_t offset) {
 
 // Returns the address of an Array<T> that's allocated in the ArchiveBuilder "buffer" space.
 template <typename T>
-Array<T>* ArchiveUtils::archive_array(GrowableArray<T>* tmp_array) {
+Array<T>* ArchiveUtils::archive_non_ptr_array(GrowableArray<T>* tmp_array) {
+  ArchiveBuilder* builder = ArchiveBuilder::current();
+
   Array<T>* archived_array = ArchiveBuilder::new_ro_array<T>(tmp_array->length());
   for (int i = 0; i < tmp_array->length(); i++) {
     archived_array->at_put(i, tmp_array->at(i));
-    if (std::is_pointer<T>::value) {
+  }
+
+  return archived_array;
+}
+
+// Returns the address of an Array<T> that's allocated in the ArchiveBuilder "buffer" space.
+// All pointers in tmp_array must point to:
+//    - a buffered object; or
+//    - a source object that has been archived; or
+//    - (only when dumping dynamic archive) an object in the static archive.
+template <typename T>
+Array<T>* ArchiveUtils::archive_ptr_array(GrowableArray<T>* tmp_array) {
+  ArchiveBuilder* builder = ArchiveBuilder::current();
+  const bool is_dynamic_dump = CDSConfig::is_dumping_dynamic_archive();
+
+  Array<T>* archived_array = ArchiveBuilder::new_ro_array<T>(tmp_array->length());
+  for (int i = 0; i < tmp_array->length(); i++) {
+      T ptr = tmp_array->at(i);
+      if (!builder->is_in_buffer_space(ptr)) {
+        if (is_dynamic_dump && MetaspaceShared::is_in_shared_metaspace(ptr)) {
+          // We have a pointer that lives in the dynamic archive but points into
+          // the static archive.
+        } else {
+          ptr = builder->get_buffered_addr(ptr);
+        }
+      }
+      archived_array->at_put(i, ptr);
       ArchivePtrMarker::mark_pointer(archived_array->adr_at(i));
-    }
   }
 
   return archived_array;