Merge tag 'jdk-26+2'

Author: zapster

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 },

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

substratevm/src/com.oracle.svm.core/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)

substratevm/src/com.oracle.svm.core/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();
             }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/substitutions/Target_sun_util_resources_OpenListResourceBundle_SubstituteLoadLookup.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
@@ -159,10 +158,7 @@ public class LocalizationFeature implements InternalFeature {
 
     private Function<String, Class<?>> findClassByName;
 
-    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,9 +287,6 @@ 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");
 
         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";
@@ -346,27 +339,11 @@ 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(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 +484,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);
                                 }
                             }