From 8184ce39a8a732352ee841fed09cae905d27643c Mon Sep 17 00:00:00 2001 From: Vladimir Kozlov Date: Thu, 22 May 2025 06:09:34 +0000 Subject: [PATCH] 8357514: Disable AOT caching for runtime stubs Reviewed-by: iveresov, iklam --- src/hotspot/share/code/aotCodeCache.cpp | 3 +++ .../hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/hotspot/share/code/aotCodeCache.cpp b/src/hotspot/share/code/aotCodeCache.cpp index f9e7d330b04..2ae5e763968 100644 --- a/src/hotspot/share/code/aotCodeCache.cpp +++ b/src/hotspot/share/code/aotCodeCache.cpp @@ -139,6 +139,9 @@ void AOTCodeCache::initialize() { return; // AOTCache must be specified to dump and use AOT code } + // Disable stubs caching until JDK-8357398 is fixed. + FLAG_SET_ERGO(AOTStubCaching, false); + if (VerifyOops) { // Disable AOT stubs caching when VerifyOops flag is on. // Verify oops code generated a lot of C strings which overflow diff --git a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java index 92e0808b4d1..0e70638b8d4 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/aotCode/AOTCodeFlags.java @@ -50,7 +50,8 @@ import jdk.test.lib.process.OutputAnalyzer; public class AOTCodeFlags { public static void main(String... args) throws Exception { Tester t = new Tester(); - for (int mode = 0; mode < 3; mode++) { + // Run only 2 modes (0 - no AOT code, 1 - AOT adapters) until JDK-8357398 is fixed + for (int mode = 0; mode < 2; mode++) { t.setTestMode(mode); t.run(new String[] {"AOT"}); }