Remove JDK21 specific BaseLocale cache code

We still have to use reflection because spotbugs still runs on JDK21

Author: patrick96

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java

@@ -112,7 +112,6 @@
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.util.Providers;
-import jdk.graal.compiler.serviceprovider.JavaVersionUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 @AutomaticallyRegisteredFeature
@@ -191,45 +190,33 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
          * the cost of having to recreate the Locale and BaseLocale objects once when they're
          * requested.
          *
-         * On JDK21, ReferencedKeySet and ReferencedKeyMap don't exist, so we can't reference them
-         * directly and have to go through reflection.
+         * On JDK21, ReferencedKeySet and ReferencedKeyMap don't exist. We have to go through
+         * reflection to access them because analysis tools like spotbugs still run on JDK21
          */
-        if (JavaVersionUtil.JAVA_SPEC > 21) {
-            Field baseLocaleCacheField = accessImpl.findField("sun.util.locale.BaseLocale$1InterningCache", "CACHE");
-            Field localeCacheField = accessImpl.findField("java.util.Locale$LocaleCache", "LOCALE_CACHE");
-
-            access.registerFieldValueTransformer(baseLocaleCacheField, (receiver, originalValue) -> {
-                /*
-                 * Executes `ReferencedKeySet.create(true,
-                 * ReferencedKeySet.concurrentHashMapSupplier())` with reflection.
-                 */
-                Class<?> referencedKeySetClazz = ReflectionUtil.lookupClass("jdk.internal.util.ReferencedKeySet");
-                Method createMethod = ReflectionUtil.lookupMethod(referencedKeySetClazz, "create", boolean.class, Supplier.class);
-                Method concurrentHashMapSupplierMethod = ReflectionUtil.lookupMethod(referencedKeySetClazz, "concurrentHashMapSupplier");
-                return ReflectionUtil.invokeMethod(createMethod, null, true, ReflectionUtil.invokeMethod(concurrentHashMapSupplierMethod, null));
-            });
-
-            access.registerFieldValueTransformer(localeCacheField, (receiver, originalValue) -> {
-                /*
-                 * Executes `ReferencedKeyMap.create(true,
-                 * ReferencedKeyMap.concurrentHashMapSupplier())` with reflection.
-                 */
-                Class<?> referencedKeyMapClazz = ReflectionUtil.lookupClass("jdk.internal.util.ReferencedKeyMap");
-                Method createMethod = ReflectionUtil.lookupMethod(referencedKeyMapClazz, "create", boolean.class, Supplier.class);
-                Method concurrentHashMapSupplierMethod = ReflectionUtil.lookupMethod(referencedKeyMapClazz, "concurrentHashMapSupplier");
-                return ReflectionUtil.invokeMethod(createMethod, null, true, ReflectionUtil.invokeMethod(concurrentHashMapSupplierMethod, null));
-            });
-        } else {
+        Field baseLocaleCacheField = accessImpl.findField("sun.util.locale.BaseLocale$1InterningCache", "CACHE");
+        Field localeCacheField = accessImpl.findField("java.util.Locale$LocaleCache", "LOCALE_CACHE");
+
+        access.registerFieldValueTransformer(baseLocaleCacheField, (receiver, originalValue) -> {
             /*
-             * These fields contain an instance of the declaring class (Cache). It has a default
-             * constructor that we can invoke to create an empty cache.
+             * Executes `ReferencedKeySet.create(true,
+             * ReferencedKeySet.concurrentHashMapSupplier())` with reflection.
              */
-            Field baseLocaleCacheField = accessImpl.findField("sun.util.locale.BaseLocale$Cache", "CACHE");
-            Field localeCacheField = accessImpl.findField("java.util.Locale$Cache", "LOCALECACHE");
+            Class<?> referencedKeySetClazz = ReflectionUtil.lookupClass("jdk.internal.util.ReferencedKeySet");
+            Method createMethod = ReflectionUtil.lookupMethod(referencedKeySetClazz, "create", boolean.class, Supplier.class);
+            Method concurrentHashMapSupplierMethod = ReflectionUtil.lookupMethod(referencedKeySetClazz, "concurrentHashMapSupplier");
+            return ReflectionUtil.invokeMethod(createMethod, null, true, ReflectionUtil.invokeMethod(concurrentHashMapSupplierMethod, null));
+        });
 
-            access.registerFieldValueTransformer(baseLocaleCacheField, (receiver, originalValue) -> ReflectionUtil.newInstance(originalValue.getClass()));
-            access.registerFieldValueTransformer(localeCacheField, (receiver, originalValue) -> ReflectionUtil.newInstance(originalValue.getClass()));
-        }
+        access.registerFieldValueTransformer(localeCacheField, (receiver, originalValue) -> {
+            /*
+             * Executes `ReferencedKeyMap.create(true,
+             * ReferencedKeyMap.concurrentHashMapSupplier())` with reflection.
+             */
+            Class<?> referencedKeyMapClazz = ReflectionUtil.lookupClass("jdk.internal.util.ReferencedKeyMap");
+            Method createMethod = ReflectionUtil.lookupMethod(referencedKeyMapClazz, "create", boolean.class, Supplier.class);
+            Method concurrentHashMapSupplierMethod = ReflectionUtil.lookupMethod(referencedKeyMapClazz, "concurrentHashMapSupplier");
+            return ReflectionUtil.invokeMethod(createMethod, null, true, ReflectionUtil.invokeMethod(concurrentHashMapSupplierMethod, null));
+        });
     }
 
     @Override