8352579: Refactor CDS legacy optimization for lambda proxy classes

Reviewed-by: ccheung, matsaave

Author: iklam

src/hotspot/share/cds/aotArtifactFinder.cpp

@@ -27,6 +27,7 @@
 #include "cds/aotClassInitializer.hpp"
 #include "cds/dumpTimeClassInfo.inline.hpp"
 #include "cds/heapShared.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "logging/log.hpp"
 #include "memory/metaspaceClosure.hpp"
@@ -114,13 +115,13 @@ void AOTArtifactFinder::find_artifacts() {
         // All non-hidden classes are always included into the AOT cache
         add = true;
       } else {
-        if (!CDSConfig::is_dumping_invokedynamic()) {
+        if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
           // Legacy support of lambda proxies -- these are always included into the AOT cache
-          if (SystemDictionaryShared::is_registered_lambda_proxy_class(ik)) {
+          if (LambdaProxyClassDictionary::is_registered_lambda_proxy_class(ik)) {
             add = true;
           }
         } else {
-          assert(!SystemDictionaryShared::is_registered_lambda_proxy_class(ik),
+          assert(!LambdaProxyClassDictionary::is_registered_lambda_proxy_class(ik),
                  "registered lambda proxies are only for legacy lambda proxy support");
         }
       }

src/hotspot/share/cds/archiveUtils.cpp

@@ -31,6 +31,7 @@
 #include "cds/dynamicArchive.hpp"
 #include "cds/filemap.hpp"
 #include "cds/heapShared.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
@@ -351,7 +352,7 @@ void ReadClosure::do_tag(int tag) {
 
 void ArchiveUtils::log_to_classlist(BootstrapInfo* bootstrap_specifier, TRAPS) {
   if (ClassListWriter::is_enabled()) {
-    if (SystemDictionaryShared::is_supported_invokedynamic(bootstrap_specifier)) {
+    if (LambdaProxyClassDictionary::is_supported_invokedynamic(bootstrap_specifier)) {
       const constantPoolHandle& pool = bootstrap_specifier->pool();
       if (SystemDictionaryShared::is_builtin_loader(pool->pool_holder()->class_loader_data())) {
         // Currently lambda proxy classes are supported only for the built-in loaders.

src/hotspot/share/cds/cdsConfig.cpp

@@ -648,12 +648,16 @@ void CDSConfig::log_reasons_for_not_dumping_heap() {
   log_info(cds)("Archived java heap is not supported: %s", reason);
 }
 
+// This is *Legacy* optimization for lambdas before JEP 483. May be removed in the future.
+bool CDSConfig::is_dumping_lambdas_in_legacy_mode() {
+  return !is_dumping_method_handles();
+}
+
 #if INCLUDE_CDS_JAVA_HEAP
 bool CDSConfig::are_vm_options_incompatible_with_dumping_heap() {
   return check_options_incompatible_with_dumping_heap() != nullptr;
 }
 
-
 bool CDSConfig::is_dumping_heap() {
   if (!(is_dumping_classic_static_archive() || is_dumping_final_static_archive())
       || are_vm_options_incompatible_with_dumping_heap()

src/hotspot/share/cds/cdsConfig.hpp

@@ -131,6 +131,9 @@ class CDSConfig : public AllStatic {
   // Misc CDS features
   static bool allow_only_single_java_thread()                NOT_CDS_RETURN_(false);
 
+  // This is *Legacy* optimization for lambdas before JEP 483. May be removed in the future.
+  static bool is_dumping_lambdas_in_legacy_mode()            NOT_CDS_RETURN_(false);
+
   // optimized_module_handling -- can we skip some expensive operations related to modules?
   static bool is_using_optimized_module_handling()           { return CDS_ONLY(_is_using_optimized_module_handling) NOT_CDS(false); }
   static void stop_using_optimized_module_handling()         NOT_CDS_RETURN;

src/hotspot/share/cds/classListParser.cpp

@@ -26,6 +26,7 @@
 #include "cds/archiveUtils.hpp"
 #include "cds/classListParser.hpp"
 #include "cds/lambdaFormInvokers.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/metaspaceShared.hpp"
 #include "cds/unregisteredClasses.hpp"
 #include "classfile/classLoaderExt.hpp"
@@ -657,7 +658,7 @@ void ClassListParser::resolve_indy_impl(Symbol* class_name_symbol, TRAPS) {
       constantPoolHandle pool(THREAD, cp);
       BootstrapInfo bootstrap_specifier(pool, pool_index, indy_index);
       Handle bsm = bootstrap_specifier.resolve_bsm(CHECK);
-      if (!SystemDictionaryShared::is_supported_invokedynamic(&bootstrap_specifier)) {
+      if (!LambdaProxyClassDictionary::is_supported_invokedynamic(&bootstrap_specifier)) {
         log_debug(cds, lambda)("is_supported_invokedynamic check failed for cp_index %d", pool_index);
         continue;
       }

src/hotspot/share/cds/dynamicArchive.cpp

@@ -31,6 +31,7 @@
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/dynamicArchive.hpp"
+#include "cds/lambdaProxyClassDictionary.hpp"
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.inline.hpp"
@@ -159,8 +160,10 @@ class DynamicArchiveBuilder : public ArchiveBuilder {
       ArchiveBuilder::serialize_dynamic_archivable_items(&wc);
     }
 
-    log_info(cds)("Adjust lambda proxy class dictionary");
-    SystemDictionaryShared::adjust_lambda_proxy_class_dictionary();
+    if (CDSConfig::is_dumping_lambdas_in_legacy_mode()) {
+      log_info(cds)("Adjust lambda proxy class dictionary");
+      LambdaProxyClassDictionary::adjust_dumptime_table();
+    }
 
     relocate_to_requested();