oracle · graalvmbot · Jun 20, 2025 · Jun 5, 2025 · Jun 5, 2025 · Jun 5, 2025
diff --git a/common.json b/common.json
@@ -8,7 +8,7 @@
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+26-3319", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+2-83", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -45,13 +45,13 @@
 
     "oraclejdk24":       {"name": "jpg-jdk",   "version": "24", "build_id": "jdk-24.0.1+9", "platformspecific": true, "extrabundles": ["static-libs"]},
 
-    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-26+1", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+1-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+1-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+1-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+1-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+1-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+1-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "26",      "build_id": "jdk-26+2", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-26+2-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-26+2-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-26+2-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-26+2-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-26+2-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-26+2-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java
@@ -55,8 +55,8 @@ public final class JVMCIVersionCheck {
      */
     private static final Map<String, Map<String, Version>> JVMCI_MIN_VERSIONS = Map.of(
                     "26", Map.of(
-                                    "Oracle Corporation", createLabsJDKVersion("26+1", 1),
-                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+1", 1)));
+                                    "Oracle Corporation", createLabsJDKVersion("26+2", 1),
+                                    DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("26+2", 1)));
     private static final int NA = 0;
     /**
      * Minimum Java release supported by Graal.

diff --git a/...le.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java b/...le.svm.core.genscavenge/src/com/oracle/svm/core/genscavenge/AbstractCollectionPolicy.java
@@ -338,7 +338,7 @@ public final UnsignedWord getMinimumHeapSize() {
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     protected abstract long gcCount();
 
-    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/gc/shared/genArguments.cpp#L195-L310")
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/share/gc/shared/genArguments.cpp#L190-L305")
     @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+21/src/hotspot/share/gc/parallel/psYoungGen.cpp#L146-L168")
     protected SizeParameters computeSizeParameters(SizeParameters existing) {
         UnsignedWord minYoungSpaces = minSpaceSize(); // eden

diff --git a/....oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java b/....oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxThreadCpuTimeSupport.java
@@ -66,7 +66,7 @@ public long getThreadCpuTime(IsolateThread isolateThread, boolean includeSystemT
         return fastCpuTime(pthread);
     }
 
-    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+10/src/hotspot/os/linux/os_linux.cpp#L5113-L5125")
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/linux/os_linux.cpp#L4939-L4951")
     @Uninterruptible(reason = "Called from uninterruptible code.", mayBeInlined = true)
     private static long fastCpuTime(pthread_t pthread) {
         CIntPointer threadsClockId = StackValue.get(Integer.BYTES);

diff --git a/.../com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java b/.../com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/thread/PosixPlatformThreads.java
@@ -354,7 +354,7 @@ protected void park(boolean isAbsolute, long time) {
         }
     }
 
-    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+10/src/hotspot/os/posix/os_posix.cpp#L1662-L1738")
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/posix/os_posix.cpp#L1830-L1906")
     private void park0(boolean isAbsolute, long time) {
         int status = Pthread.pthread_mutex_trylock_no_transition(mutex);
         if (status == Errno.EBUSY()) {
@@ -393,7 +393,7 @@ private void park0(boolean isAbsolute, long time) {
     }
 
     @Override
-    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-23+10/src/hotspot/os/posix/os_posix.cpp#L1740-L1763")
+    @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/posix/os_posix.cpp#L1908-L1931")
     protected void unpark() {
         StackOverflowCheck.singleton().makeYellowZoneAvailable();
         try {

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/container/ContainerLibrary.java
@@ -60,11 +60,11 @@
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/osContainer_linux.hpp")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+26/src/hotspot/os/linux/os_linux.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/linux/os_linux.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/linux/os_linux.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/include/jvm_md.h")
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/os/posix/os_posix.cpp")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/os/posix/os_posix.cpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+25/src/hotspot/os/posix/os_posix.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+18/src/hotspot/os/posix/os_posix.inline.hpp")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+26/src/hotspot/share/memory/allocation.hpp")

diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SunMiscSubstitutions.java
@@ -198,11 +198,6 @@ private Class<?> defineClass0(String name, byte[] b, int off, int len, ClassLoad
 
 @TargetClass(jdk.internal.access.SharedSecrets.class)
 final class Target_jdk_internal_access_SharedSecrets {
-    @Substitute
-    private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
-        return null;
-    }
-
     /**
      * The JavaIOAccess implementation installed by the class initializer of java.io.Console
      * captures state like "is a tty". The only way to remove such state is by resetting the field.
@@ -215,10 +210,6 @@ private static Target_jdk_internal_access_JavaAWTAccess getJavaAWTAccess() {
 final class Target_jdk_internal_access_JavaIOAccess {
 }
 
-@TargetClass(jdk.internal.access.JavaAWTAccess.class)
-final class Target_jdk_internal_access_JavaAWTAccess {
-}
-
 @TargetClass(className = "sun.reflect.misc.MethodUtil")
 final class Target_sun_reflect_misc_MethodUtil {
     @Substitute

diff --git a/...src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java b/...src/com/oracle/svm/core/jdk/localization/BundleContentSubstitutedLocalizationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -52,7 +52,6 @@
 
 import jdk.graal.compiler.debug.GraalError;
 import sun.util.resources.OpenListResourceBundle;
-import sun.util.resources.ParallelListResourceBundle;
 
 public class BundleContentSubstitutedLocalizationSupport extends LocalizationSupport {
 
@@ -135,7 +134,7 @@ private static boolean isBundleSupported(ResourceBundle bundle) {
 
     @Platforms(Platform.HOSTED_ONLY.class)
     private static boolean isBundleSupported(Class<?> bundleClass) {
-        return ListResourceBundle.class.isAssignableFrom(bundleClass) || OpenListResourceBundle.class.isAssignableFrom(bundleClass) || ParallelListResourceBundle.class.isAssignableFrom(bundleClass);
+        return ListResourceBundle.class.isAssignableFrom(bundleClass) || OpenListResourceBundle.class.isAssignableFrom(bundleClass);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)

diff --git a/.../src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java b/.../src/com/oracle/svm/core/jdk/localization/compression/utils/BundleSerializationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.function.Supplier;
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -53,7 +54,11 @@ public static Map<String, Object> extractContent(ResourceBundle bundle) {
         Class<?> clazz = bundle.getClass().getSuperclass();
         while (clazz != null && ResourceBundle.class.isAssignableFrom(clazz)) {
             try {
-                return (Map<String, Object>) ReflectionUtil.lookupField(clazz, "lookup").get(bundle);
+                Object lookup = ReflectionUtil.lookupField(clazz, "lookup").get(bundle);
+                if (lookup instanceof Supplier) {
+                    return ((Supplier<Map<String, Object>>) lookup).get();
+                }
+                return (Map<String, Object>) lookup;
             } catch (ReflectionUtil.ReflectionUtilError | ReflectiveOperationException e) {
                 clazz = clazz.getSuperclass();
             }

diff --git a/.../substitutions/Target_sun_util_resources_OpenListResourceBundle_SubstituteLoadLookup.java b/.../substitutions/Target_sun_util_resources_OpenListResourceBundle_SubstituteLoadLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -38,20 +38,13 @@
 @SuppressWarnings({"static-method"})
 final class Target_sun_util_resources_OpenListResourceBundle_SubstituteLoadLookup {
 
-    @Alias private volatile Map<String, Object> lookup;
-
     @Substitute
-    private void loadLookup() {
-        LocalizationSupport support = ImageSingletons.lookup(LocalizationSupport.class);
-        Map<String, Object> content = support.getBundleContentOf(this);
-        // use the supplied map implementation specified by the factory method
-        Map<String, Object> tmp = createMap(content.size());
-        tmp.putAll(content);
-        synchronized (this) {
-            if (lookup == null) {
-                lookup = content;
-            }
-        }
+    private Map<String, Object> lookup0() {
+        Map<String, Object> preloadedContent = ImageSingletons.lookup(LocalizationSupport.class).getBundleContentOf(this);
+        /* Use the type of map provided by the subclass. */
+        Map<String, Object> map = createMap(preloadedContent.size());
+        map.putAll(preloadedContent);
+        return map;
     }
 
     @Alias

diff --git a/...stitutions/Target_sun_util_resources_ParallelListResourceBundle_SubstituteLoadLookup.java b/...stitutions/Target_sun_util_resources_ParallelListResourceBundle_SubstituteLoadLookup.java
diff --git a/...ratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmti/headers/JvmtiDirectives.java b/...ratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jvmti/headers/JvmtiDirectives.java
@@ -35,7 +35,7 @@
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.util.BasedOnJDKFile;
 
-@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-25+23/src/hotspot/share/prims/jvmti.xml")
+@BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-26+2/src/hotspot/share/prims/jvmti.xml")
 @BasedOnJDKFile("https://github.com/openjdk/jdk/blob/jdk-24+11/src/hotspot/share/prims/jvmtiH.xsl")
 class JvmtiDirectives implements CContext.Directives {
     private final Path jdkIncludeDir = Paths.get(System.getProperty("java.home")).resolve("include");

diff --git a/...com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java b/...com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/localization/LocalizationFeature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -102,7 +102,6 @@
 import sun.util.locale.provider.LocaleProviderAdapter;
 import sun.util.locale.provider.ResourceBundleBasedAdapter;
 import sun.util.resources.LocaleData;
-import sun.util.resources.ParallelListResourceBundle;
 
 /**
  * LocalizationFeature is the core class of SVM localization support. It contains all the options
@@ -162,7 +161,6 @@ public class LocalizationFeature implements InternalFeature {
     private Field baseLocaleCacheField;
     private Field localeCacheField;
     private Field candidatesCacheField;
-    private Field localeObjectCacheMapField;
     private Field langAliasesCacheField;
     private Field parentLocalesMapField;
     @Platforms(Platform.HOSTED_ONLY.class) private ImageClassLoader imageClassLoader;
@@ -291,10 +289,9 @@ public void duringSetup(DuringSetupAccess a) {
         }
         langAliasesCacheField = access.findField(CLDRLocaleProviderAdapter.class, "langAliasesCache");
         parentLocalesMapField = access.findField(CLDRLocaleProviderAdapter.class, "parentLocalesMap");
-        baseLocaleCacheField = access.findField("sun.util.locale.BaseLocale$1InterningCache", "CACHE");
-        localeCacheField = access.findField("java.util.Locale$LocaleCache", "LOCALE_CACHE");
-        localeObjectCacheMapField = null;
         candidatesCacheField = access.findField("java.util.ResourceBundle$Control", "CANDIDATES_CACHE");
+        baseLocaleCacheField = access.findField("sun.util.locale.BaseLocale", "CACHE");
+        localeCacheField = access.findField("java.util.Locale", "LOCALE_CACHE");
 
         String reason = "All ResourceBundleControlProvider that are registered as services end up as objects in the image heap, and are therefore registered to be initialized at image build time";
         ServiceLoader.load(ResourceBundleControlProvider.class).stream()
@@ -346,27 +343,14 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
     @Override
     public void duringAnalysis(DuringAnalysisAccess a) {
         DuringAnalysisAccessImpl access = (DuringAnalysisAccessImpl) a;
-        scanLocaleCache(access, baseLocaleCacheField);
-        scanLocaleCache(access, localeCacheField);
-        scanLocaleCache(access, candidatesCacheField);
+
+        access.rescanRoot(baseLocaleCacheField);
+        access.rescanRoot(localeCacheField);
+        access.rescanRoot(candidatesCacheField);
         access.rescanRoot(langAliasesCacheField);
         access.rescanRoot(parentLocalesMapField);
     }
 
-    private void scanLocaleCache(DuringAnalysisAccessImpl access, Field cacheFieldField) {
-        access.rescanRoot(cacheFieldField);
-
-        Object localeCache;
-        try {
-            localeCache = cacheFieldField.get(null);
-        } catch (ReflectiveOperationException ex) {
-            throw VMError.shouldNotReachHere(ex);
-        }
-        if (localeCache != null && localeObjectCacheMapField != null) {
-            access.rescanField(localeCache, localeObjectCacheMapField);
-        }
-    }
-
     @Platforms(Platform.HOSTED_ONLY.class)
     private static Set<Locale> processLocalesOption() {
         Set<Locale> locales = new HashSet<>();
@@ -507,10 +491,6 @@ protected void addResourceBundles() {
                                         prepareNegativeBundle(ConfigurationCondition.alwaysTrue(), baseName, locale, true);
                                         continue; /* No bundle for this `locale`. */
                                     }
-                                    if (bundle instanceof ParallelListResourceBundle) {
-                                        /* Make sure the `bundle` content is complete. */
-                                        localeData.setSupplementary((ParallelListResourceBundle) bundle);
-                                    }
                                     prepareJDKBundle(bundle, locale);
                                 }
                             }

diff --git a/web-image/mx.web-image/suite.py b/web-image/mx.web-image/suite.py
@@ -185,7 +185,11 @@
                 "java.compiler",
             ],
             "requiresConcealed": {
-                "java.base": ["sun.nio.ch", "sun.security.provider", "jdk.internal.reflect"],
+                "java.base": [
+                    "sun.nio.ch",
+                    "sun.security.provider",
+                    "jdk.internal.reflect",
+                ],
                 "jdk.internal.vm.ci": ["jdk.vm.ci.code.site", "jdk.vm.ci.code", "jdk.vm.ci.common", "jdk.vm.ci.meta"],
             },
             "javaCompliance": "21+",