8382398: [lworld] 8372617 needs further work for Valhalla, assertion in AOTCodeFlags.java

Author: iklam

src/hotspot/share/code/aotCodeCache.cpp

@@ -217,6 +217,11 @@ void AOTCodeCache::initialize() {
     }
   }
 
+  if (AOTAdapterCaching && !AOTStubCaching) {
+    // In Valhalla, adapters can call Stub:forward_exception_stub, so we must enable stub caching.
+    FLAG_SET_ERGO(AOTStubCaching, true);
+  }
+
   bool is_dumping = false;
   bool is_using   = false;
   if (CDSConfig::is_dumping_final_static_archive() && CDSConfig::is_dumping_aot_linked_classes()) {

test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java

@@ -112,6 +112,11 @@ public static void main(String... args) throws Exception {
         // Run only 2 modes (0 - no AOT code, 1 - AOT adapters) until JDK-8357398 is fixed
         for (int mode = 0; mode < 4; mode++) {
             t.setTestMode(mode);
+            if (t.isAdapterCachingOn() && !t.isStubCachingOn()) {
+                // In Valhalla, -XX:+AOTAdapterCaching will ergonomically turn on -XX:+AOTStubCaching, so
+                // no need to test this combination.
+                continue;
+            }
             t.run(new String[] {"AOT", "--two-step-training"});
         }
     }