[JDK-8358703] Adapt JDK-8358520: Improve lazy computation in BreakIteratorResourceBundle and related classes

PullRequest: graal/21028

Author: mur47x111

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

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/KnownTruffleTypes.java

@@ -221,7 +221,7 @@ private static ResolvedJavaField getThrowableJFRTracingField(MetaAccessProvider
         ResolvedJavaType throwableType = metaAccess.lookupJavaType(Throwable.class);
         for (ResolvedJavaField staticField : throwableType.getStaticFields()) {
             if (staticField.getName().equals("jfrTracing") &&
-                            staticField.getType().equals(metaAccess.lookupJavaType(boolean.class)) && staticField.isVolatile()) {
+                            staticField.getType().equals(metaAccess.lookupJavaType(boolean.class))) {
                 return staticField;
             }
         }

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();
             }