8377351: [lworld] runtime/clinit/ClassInitBarrier.java crashes with SIGSEGV/EAV with AOT class linking and --enable-preview

Reviewed-by: chagedorn, thartmann

Author: dafedafe

src/hotspot/share/code/aotCodeCache.cpp

@@ -508,21 +508,32 @@ bool AOTCodeCache::Config::verify(AOTCodeCache* cache) const {
     return false;
   }
 
-  // The following checks do not affect AOT adapters caching
+  // The following checks do not affect AOT code, but can disable
+  // AOT stub/adapters caching if they are incompatible with runtime settings
+  // (adapters too as they access oops when buffering scalarized value objects).
 
   if (((_flags & compressedOops) != 0) != UseCompressedOops) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with UseCompressedOops = %s", UseCompressedOops ? "false" : "true");
+    log_debug(aot, codecache, init)("AOT Stub/Adapter Cache disabled: it was created with UseCompressedOops = %s", UseCompressedOops ? "false" : "true");
     AOTStubCaching = false;
+    if (InlineTypePassFieldsAsArgs) {
+      AOTAdapterCaching = false;
+    }
   }
   if (_compressedOopShift != (uint)CompressedOops::shift()) {
-    log_debug(aot, codecache, init)("AOT Code Cache disabled: it was created with different CompressedOops::shift(): %d vs current %d", _compressedOopShift, CompressedOops::shift());
+    log_debug(aot, codecache, init)("AOT Stub/Adapter Cache disabled: it was created with different CompressedOops::shift(): %d vs current %d", _compressedOopShift, CompressedOops::shift());
     AOTStubCaching = false;
+    if (InlineTypePassFieldsAsArgs) {
+      AOTAdapterCaching = false;
+    }
   }
 
-  // This should be the last check as it only disables AOTStubCaching
+  // This should be the last check as it only disables AOTStub/AdapterCaching
   if ((_compressedOopBase == nullptr || CompressedOops::base() == nullptr) && (_compressedOopBase != CompressedOops::base())) {
-    log_debug(aot, codecache, init)("AOTStubCaching is disabled: incompatible CompressedOops::base(): %p vs current %p", _compressedOopBase, CompressedOops::base());
+    log_debug(aot, codecache, init)("AOT Stub/Adapter Cache disabled: incompatible CompressedOops::base(): %p vs current %p", _compressedOopBase, CompressedOops::base());
     AOTStubCaching = false;
+    if (InlineTypePassFieldsAsArgs) {
+      AOTAdapterCaching = false;
+    }
   }
 
   if (!verify_cpu_features(cache)) {

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

@@ -202,9 +202,9 @@ public void checkExecution(OutputAnalyzer out, RunMode runMode) throws Exception
                      throw new RuntimeException("Failed to find CompressedOops settings");
                  }
                  if (aotCacheShift != currentShift) {
-                     out.shouldContain("AOT Code Cache disabled: it was created with different CompressedOops::shift()");
+                     out.shouldContain("AOT Stub/Adapter Cache disabled: it was created with different CompressedOops::shift()");
                  } else if ((aotCacheBase == 0 || currentBase == 0) && (aotCacheBase != currentBase)) {
-                     out.shouldContain("AOTStubCaching is disabled: incompatible CompressedOops::base()");
+                     out.shouldContain("AOT Stub/Adapter Cache disabled: incompatible CompressedOops::base()");
                  } else {
                      out.shouldMatch("Read \\d+ entries table at offset \\d+ from AOT Code Cache");
                  }