Reinstated ArchiveLoaderLookupCache after merging JEP 483 from mainline

Author: iklam

src/hotspot/share/cds/cdsConfig.cpp

@@ -589,8 +589,6 @@ bool CDSConfig::check_vm_args_consistency(bool patch_mod_javabase, bool mode_fla
     FLAG_SET_ERGO_IF_DEFAULT(ArchivePackages, true);
     FLAG_SET_ERGO_IF_DEFAULT(ArchiveProtectionDomains, true);
     FLAG_SET_ERGO_IF_DEFAULT(ArchiveReflectionData, true);
-
-    FLAG_SET_ERGO(ArchiveLoaderLookupCache, false);  // FIXME -- leyden+JEP483 merge
   } else {
     // All of these *might* depend on AOTClassLinking. Better be safe than sorry.
     // TODO: more fine-grained handling.

src/hotspot/share/classfile/systemDictionaryShared.cpp

@@ -338,7 +338,6 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
     }
   }
 
- if (!CDSConfig::preserve_all_dumptime_verification_states(k)) {
   if (!k->is_linked()) {
     if (has_class_failed_verification(k)) {
       return warn_excluded(k, "Failed verification");
@@ -351,7 +350,7 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
       return warn_excluded(k, "Unlinked class not supported by AOTClassLinking");
     }
   } else {
-    if (!k->can_be_verified_at_dumptime()) {
+    if (!k->can_be_verified_at_dumptime() && !CDSConfig::preserve_all_dumptime_verification_states(k)) {
       // We have an old class that has been linked (e.g., it's been executed during
       // dump time). This class has been verified using the old verifier, which
       // doesn't save the verification constraints, so check_verification_constraints()
@@ -361,7 +360,6 @@ bool SystemDictionaryShared::check_for_exclusion_impl(InstanceKlass* k) {
       return warn_excluded(k, "Old class has been linked");
     }
   }
- }
 
   InstanceKlass* super = k->java_super();
   if (super != nullptr && check_for_exclusion(super, nullptr)) {

test/hotspot/jtreg/runtime/cds/appcds/aotClassLinking/AOTClassLinkingVerification.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 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
@@ -99,7 +99,7 @@ public static void main(String[] args) throws Exception {
         app1Jar = new File(args[0]);
         assertNotShared(UnlinkedSub.class);
         assertShared(UnlinkedSuper.class);
-        assertShared(Unlinked.class);
+        assertNotShared(Unlinked.class); // failed verification during dump time
         assertNotShared(Foo.class);
         assertNotShared(NotFoo.class);
         String s = Unlinked.doit();
@@ -108,28 +108,28 @@ public static void main(String[] args) throws Exception {
         }
 
         Class cls_BadOldClass = Class.forName("BadOldClass", false, classLoader);
-        assertShared(cls_BadOldClass);
+        assertNotShared(cls_BadOldClass); // failed verification during dump time
         try {
             cls_BadOldClass.newInstance();
             throw new RuntimeException("BadOldClass cannot be verified");
         } catch (VerifyError expected) {}
 
         Class cls_BadOldClass2 = Class.forName("BadOldClass2", false, classLoader);
-        assertShared(cls_BadOldClass2);
+        assertNotShared(cls_BadOldClass2); // failed verification during dump time
         try {
             cls_BadOldClass2.newInstance();
             throw new RuntimeException("BadOldClass2 cannot be verified");
         } catch (VerifyError expected) {}
 
         Class cls_BadNewClass = Class.forName("BadNewClass", false, classLoader);
-        assertShared(cls_BadNewClass);
+        assertNotShared(cls_BadNewClass); // failed verification during dump time
         try {
             cls_BadNewClass.newInstance();
             throw new RuntimeException("BadNewClass cannot be verified");
         } catch (VerifyError expected) {}
 
         Class cls_BadNewClass2 = Class.forName("BadNewClass2", false, classLoader);
-        assertShared(cls_BadNewClass2);
+        assertNotShared(cls_BadNewClass2); // failed verification during dump time
         try {
             cls_BadNewClass2.newInstance();
             throw new RuntimeException("BadNewClass2 cannot be verified");