8352437: Support --add-exports with -XX:+AOTClassLinking

Reviewed-by: matsaave

Author: iklam

src/hotspot/share/cds/archiveBuilder.cpp

@@ -1544,6 +1544,7 @@ void ArchiveBuilder::write_archive(FileMapInfo* mapinfo, ArchiveHeapInfo* heap_i
   mapinfo->close();
 
   if (log_is_enabled(Info, cds)) {
+    log_info(cds)("Full module graph = %s", CDSConfig::is_dumping_full_module_graph() ? "enabled" : "disabled");
     print_stats();
   }
 

src/hotspot/share/classfile/modules.cpp

@@ -541,132 +541,103 @@ void Modules::verify_archived_modules() {
   ModuleEntry::verify_archived_module_entries();
 }
 
-char* Modules::_archived_main_module_name = nullptr;
-char* Modules::_archived_addmods_names = nullptr;
-char* Modules::_archived_native_access_flags = nullptr;
-
-void Modules::dump_main_module_name() {
-  const char* module_name = Arguments::get_property("jdk.module.main");
-  if (module_name != nullptr) {
-    _archived_main_module_name = ArchiveBuilder::current()->ro_strdup(module_name);
-  }
-}
-
-void Modules::check_archived_flag_consistency(char* archived_flag, const char* runtime_flag, const char* property) {
-  log_info(cds)("%s %s", property,
-    archived_flag != nullptr ? archived_flag : "(null)");
-  bool disable = false;
-  if (runtime_flag == nullptr) {
-    if (archived_flag != nullptr) {
-      log_info(cds)("Mismatched values for property %s: %s specified during dump time but not during runtime", property, archived_flag);
-      disable = true;
-    }
-  } else {
-    if (archived_flag == nullptr) {
-      log_info(cds)("Mismatched values for property %s: %s specified during runtime but not during dump time", property, runtime_flag);
-      disable = true;
-    } else if (strcmp(runtime_flag, archived_flag) != 0) {
-      log_info(cds)("Mismatched values for property %s: runtime %s dump time %s", property, runtime_flag, archived_flag);
-      disable = true;
+class Modules::ArchivedProperty {
+  const char* _prop;
+  const bool _numbered;
+  const char* _archived_value;
+
+  const char* get_flattened_value() const {
+    if (_numbered) {
+      return get_numbered_property_as_sorted_string();
+    } else {
+      return Arguments::get_property(_prop);
     }
   }
 
-  if (disable) {
-    log_info(cds)("Disabling optimized module handling");
-    CDSConfig::stop_using_optimized_module_handling();
-  }
-  log_info(cds)("optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
-  log_info(cds)("full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
-}
+  void runtime_check() const;
+  const char* get_numbered_property_as_sorted_string() const;
 
-void Modules::dump_archived_module_info() {
-  // Write module name into archive
-  CDS_JAVA_HEAP_ONLY(Modules::dump_main_module_name();)
-  // Write module names from --add-modules into archive
-  CDS_JAVA_HEAP_ONLY(Modules::dump_addmods_names();)
-  // Write native enable-native-access flag into archive
-  CDS_JAVA_HEAP_ONLY(Modules::dump_native_access_flag());
-}
-
-void Modules::serialize_archived_module_info(SerializeClosure* soc) {
-  CDS_JAVA_HEAP_ONLY(Modules::serialize(soc);)
-  CDS_JAVA_HEAP_ONLY(Modules::serialize_addmods_names(soc);)
-  CDS_JAVA_HEAP_ONLY(Modules::serialize_native_access_flags(soc);)
-}
+public:
+  ArchivedProperty(const char* prop, bool numbered)
+    : _prop(prop), _numbered(numbered), _archived_value(nullptr) {}
 
-void Modules::serialize(SerializeClosure* soc) {
-  soc->do_ptr(&_archived_main_module_name);
-  if (soc->reading()) {
-    const char* runtime_main_module = Arguments::get_property("jdk.module.main");
-    log_info(cds)("_archived_main_module_name %s",
-      _archived_main_module_name != nullptr ? _archived_main_module_name : "(null)");
-
-    check_archived_flag_consistency(_archived_main_module_name, runtime_main_module, "jdk.module.main");
-
-    // Don't hold onto the pointer, in case we might decide to unmap the archive.
-    _archived_main_module_name = nullptr;
+  void dump() {
+    ResourceMark rm;
+    const char* str = get_flattened_value();
+    if (str != nullptr) {
+      _archived_value = ArchiveBuilder::current()->ro_strdup(str);
+    }
   }
-}
 
-void Modules::dump_native_access_flag() {
-  ResourceMark rm;
-  const char* native_access_names = get_native_access_flags_as_sorted_string();
-  if (native_access_names != nullptr) {
-    _archived_native_access_flags = ArchiveBuilder::current()->ro_strdup(native_access_names);
+  void serialize(SerializeClosure* soc) {
+    soc->do_ptr(&_archived_value);
+    if (soc->reading()) {
+      runtime_check();
+      // Don't hold onto the pointer, in case we might decide to unmap the archive.
+      _archived_value = nullptr;
+    }
   }
-}
+};
 
-// Caller needs ResourceMark
-const char* Modules::get_native_access_flags_as_sorted_string() {
-  return get_numbered_property_as_sorted_string("jdk.module.enable.native.access");
-}
+Modules::ArchivedProperty Modules::_archived_props[] = {
+  // numbered
+  {"jdk.module.main", false},
 
-void Modules::serialize_native_access_flags(SerializeClosure* soc) {
-  soc->do_ptr(&_archived_native_access_flags);
-  if (soc->reading()) {
-    ResourceMark rm;
-    check_archived_flag_consistency(_archived_native_access_flags, get_native_access_flags_as_sorted_string(), "jdk.module.enable.native.access");
+  // non-numbered
+  {"jdk.module.addexports", true},             // --add-exports
+  {"jdk.module.addmods", true},                // --add-modules
+  {"jdk.module.enable.native.access", true},   // --enable-native-access
+};
 
-    // Don't hold onto the pointer, in case we might decide to unmap the archive.
-    _archived_native_access_flags = nullptr;
-  }
+constexpr size_t Modules::num_archived_props() {
+  return sizeof(_archived_props) / sizeof(_archived_props[0]);
 }
 
-void Modules::dump_addmods_names() {
-  ResourceMark rm;
-  const char* addmods_names = get_addmods_names_as_sorted_string();
-  if (addmods_names != nullptr) {
-    _archived_addmods_names = ArchiveBuilder::current()->ro_strdup(addmods_names);
-  }
+Modules::ArchivedProperty& Modules::archived_prop(size_t i) {
+  assert(i < num_archived_props(), "oob");
+  return _archived_props[i];
 }
 
-// Caller needs ResourceMark
-const char* Modules::get_addmods_names_as_sorted_string() {
-  return get_numbered_property_as_sorted_string("jdk.module.addmods");
-}
+void Modules::ArchivedProperty::runtime_check() const {
+  ResourceMark rm;
+  const char* runtime_value = get_flattened_value();
+  log_info(cds)("archived module property %s: %s", _prop,
+                _archived_value != nullptr ? _archived_value : "(null)");
 
-void Modules::serialize_addmods_names(SerializeClosure* soc) {
-  soc->do_ptr(&_archived_addmods_names);
-  if (soc->reading()) {
-    ResourceMark rm;
-    check_archived_flag_consistency(_archived_addmods_names, get_addmods_names_as_sorted_string(), "jdk.module.addmods");
+  bool disable = false;
+  if (runtime_value == nullptr) {
+    if (_archived_value != nullptr) {
+      log_info(cds)("Mismatched values for property %s: %s specified during dump time but not during runtime", _prop, _archived_value);
+      disable = true;
+    }
+  } else {
+    if (_archived_value == nullptr) {
+      log_info(cds)("Mismatched values for property %s: %s specified during runtime but not during dump time", _prop, runtime_value);
+      disable = true;
+    } else if (strcmp(runtime_value, _archived_value) != 0) {
+      log_info(cds)("Mismatched values for property %s: runtime %s dump time %s", _prop, runtime_value, _archived_value);
+      disable = true;
+    }
+  }
 
-    // Don't hold onto the pointer, in case we might decide to unmap the archive.
-    _archived_addmods_names = nullptr;
+  if (disable) {
+    log_info(cds)("Disabling optimized module handling");
+    CDSConfig::stop_using_optimized_module_handling();
   }
 }
 
 // Caller needs ResourceMark
-const char* Modules::get_numbered_property_as_sorted_string(const char* property) {
+const char* Modules::ArchivedProperty::get_numbered_property_as_sorted_string() const {
+  assert(_numbered, "sanity");
   // theoretical string size limit for decimal int, but the following loop will end much sooner due to
   // OS command-line size limit.
   const int max_digits = 10;
   const int extra_symbols_count = 2; // includes '.', '\0'
-  size_t prop_len = strlen(property) + max_digits + extra_symbols_count;
+  size_t prop_len = strlen(_prop) + max_digits + extra_symbols_count;
   char* prop_name = resource_allocate_bytes(prop_len);
   GrowableArray<const char*> list;
   for (unsigned int i = 0;; i++) {
-    jio_snprintf(prop_name, prop_len, "%s.%d", property, i);
+    jio_snprintf(prop_name, prop_len, "%s.%d", _prop, i);
     const char* prop_value = Arguments::get_property(prop_name);
     if (prop_value == nullptr) {
       break;
@@ -713,6 +684,22 @@ const char* Modules::get_numbered_property_as_sorted_string(const char* property
   return (st.size() > 0) ? st.as_string() : nullptr;  // Example: "java.base,java.compiler"
 }
 
+void Modules::dump_archived_module_info() {
+  for (size_t i = 0; i < num_archived_props(); i++) {
+    archived_prop(i).dump();
+  }
+}
+
+void Modules::serialize_archived_module_info(SerializeClosure* soc) {
+  for (size_t i = 0; i < num_archived_props(); i++) {
+    archived_prop(i).serialize(soc);
+  }
+  if (soc->reading()) {
+    log_info(cds)("optimized module handling: %s", CDSConfig::is_using_optimized_module_handling() ? "enabled" : "disabled");
+    log_info(cds)("full module graph: %s", CDSConfig::is_using_full_module_graph() ? "enabled" : "disabled");
+  }
+}
+
 void Modules::define_archived_modules(Handle h_platform_loader, Handle h_system_loader, TRAPS) {
   assert(CDSConfig::is_using_full_module_graph(), "must be");
 

src/hotspot/share/classfile/modules.hpp

@@ -59,23 +59,15 @@ class Modules : AllStatic {
   static void verify_archived_modules() NOT_CDS_JAVA_HEAP_RETURN;
   static void dump_archived_module_info() NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_archived_module_info(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
-  static void dump_main_module_name() NOT_CDS_JAVA_HEAP_RETURN;
-  static void serialize(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
-  static void check_archived_flag_consistency(char* archived_flag, const char* runtime_flag, const char* property) NOT_CDS_JAVA_HEAP_RETURN;
 
-  static void dump_native_access_flag() NOT_CDS_JAVA_HEAP_RETURN;
-  static const char* get_native_access_flags_as_sorted_string() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
-  static void serialize_native_access_flags(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
-
-  static void dump_addmods_names() NOT_CDS_JAVA_HEAP_RETURN;
-  static const char* get_addmods_names_as_sorted_string() NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
-  static void serialize_addmods_names(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
-
-  static const char* get_numbered_property_as_sorted_string(const char* property) NOT_CDS_JAVA_HEAP_RETURN_(nullptr);
 #if INCLUDE_CDS_JAVA_HEAP
-  static char* _archived_main_module_name;
-  static char* _archived_addmods_names;
-  static char* _archived_native_access_flags;
+private:
+  class ArchivedProperty;
+
+  static ArchivedProperty _archived_props[];
+  static constexpr size_t num_archived_props();
+  static ArchivedProperty& archived_prop(size_t i);
+public:
 #endif
 
   // Provides the java.lang.Module for the unnamed module defined

src/hotspot/share/runtime/arguments.cpp

@@ -331,8 +331,7 @@ bool Arguments::is_incompatible_cds_internal_module_property(const char* propert
 bool Arguments::internal_module_property_helper(const char* property, bool check_for_cds) {
   if (strncmp(property, MODULE_PROPERTY_PREFIX, MODULE_PROPERTY_PREFIX_LEN) == 0) {
     const char* property_suffix = property + MODULE_PROPERTY_PREFIX_LEN;
-    if (matches_property_suffix(property_suffix, ADDEXPORTS, ADDEXPORTS_LEN) ||
-        matches_property_suffix(property_suffix, ADDREADS, ADDREADS_LEN) ||
+    if (matches_property_suffix(property_suffix, ADDREADS, ADDREADS_LEN) ||
         matches_property_suffix(property_suffix, ADDOPENS, ADDOPENS_LEN) ||
         matches_property_suffix(property_suffix, PATCH, PATCH_LEN) ||
         matches_property_suffix(property_suffix, LIMITMODS, LIMITMODS_LEN) ||
@@ -343,7 +342,8 @@ bool Arguments::internal_module_property_helper(const char* property, bool check
 
     if (!check_for_cds) {
       // CDS notes: these properties are supported by CDS archived full module graph.
-      if (matches_property_suffix(property_suffix, PATH, PATH_LEN) ||
+      if (matches_property_suffix(property_suffix, ADDEXPORTS, ADDEXPORTS_LEN) ||
+          matches_property_suffix(property_suffix, PATH, PATH_LEN) ||
           matches_property_suffix(property_suffix, ADDMODS, ADDMODS_LEN) ||
           matches_property_suffix(property_suffix, ENABLE_NATIVE_ACCESS, ENABLE_NATIVE_ACCESS_LEN)) {
         return true;

src/java.base/share/classes/jdk/internal/module/ModuleBootstrap.java

@@ -143,7 +143,6 @@ private static boolean canUseArchivedBootLayer() {
                getProperty("jdk.module.patch.0") == null &&       // --patch-module
                getProperty("jdk.module.limitmods") == null &&     // --limit-modules
                getProperty("jdk.module.addreads.0") == null &&    // --add-reads
-               getProperty("jdk.module.addexports.0") == null &&  // --add-exports
                getProperty("jdk.module.addopens.0") == null;      // --add-opens
     }
 

test/hotspot/jtreg/TEST.groups

@@ -412,6 +412,8 @@ hotspot_appcds_dynamic = \
  -runtime/cds/appcds/complexURI \
  -runtime/cds/appcds/customLoader \
  -runtime/cds/appcds/dynamicArchive \
+ -runtime/cds/appcds/jigsaw/ExactOptionMatch.java \
+ -runtime/cds/appcds/jigsaw/modulepath/AddExports.java \
  -runtime/cds/appcds/jigsaw/modulepath/ModulePathAndFMG.java \
  -runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java \
  -runtime/cds/appcds/loaderConstraints/DynamicLoaderConstraintsTest.java \
@@ -527,7 +529,9 @@ hotspot_aot_classlinking = \
  -runtime/cds/appcds/javaldr/GCDuringDump.java \
  -runtime/cds/appcds/javaldr/LockDuringDump.java \
  -runtime/cds/appcds/jigsaw/classpathtests/EmptyClassInBootClassPath.java \
+ -runtime/cds/appcds/jigsaw/ExactOptionMatch.java \
  -runtime/cds/appcds/jigsaw/JigsawOptionsCombo.java \
+ -runtime/cds/appcds/jigsaw/modulepath/AddExports.java \
  -runtime/cds/appcds/jigsaw/modulepath/AddOpens.java \
  -runtime/cds/appcds/jigsaw/modulepath/AddModules.java \
  -runtime/cds/appcds/jigsaw/modulepath/JvmtiAddPath.java \