[GR-51935] Feature Cleanup Part 2.

PullRequest: graal/16903

Author: teshull

sdk/src/com.oracle.svm.core.annotate/src/com/oracle/svm/core/annotate/RecomputeFieldValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -212,11 +212,4 @@ enum Kind {
      * @since 22.3
      */
     boolean isFinal() default false;
-
-    /**
-     * If true, ignores previously computed values and calculates the value for every field read.
-     * 
-     * @since 22.3
-     */
-    boolean disableCaching() default false;
 }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/typestate/TypeState.java

@@ -165,6 +165,7 @@ public static TypeState forConstant(PointsToAnalysis bb, JavaConstant constant,
     }
 
     public static SingleTypeState forExactType(PointsToAnalysis bb, AnalysisType exactType, boolean canBeNull) {
+        assert exactType.getContextInsensitiveAnalysisObject() != null : exactType;
         return forExactType(bb, exactType.getContextInsensitiveAnalysisObject(), canBeNull);
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecurityProvidersFilter.java

@@ -64,7 +64,6 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 
-import sun.security.jca.ProviderList;
 import sun.security.util.SecurityConstants;
 
 /*
@@ -290,7 +289,6 @@ final class Target_javax_crypto_JceSecurity {
     // value == PROVIDER_VERIFIED is successfully verified
     // value is failure cause Exception in error case
     @Alias //
-    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = VerificationCacheTransformer.class, disableCaching = true) //
     private static Map<Object, Object> verificationResults;
 
     @Alias //
@@ -334,13 +332,6 @@ static Exception getVerificationResult(Provider p) {
         throw VMError.unsupportedFeature("Trying to verify a provider that was not registered at build time: " + p + ". " +
                         "All providers must be registered and verified in the Native Image builder. ");
     }
-
-    private static class VerificationCacheTransformer implements FieldValueTransformer {
-        @Override
-        public Object transform(Object receiver, Object originalValue) {
-            return SecurityProvidersFilter.instance().cleanVerificationCache(originalValue);
-        }
-    }
 }
 
 @TargetClass(className = "javax.crypto.JceSecurity", innerClass = "WeakIdentityWrapper")
@@ -549,21 +540,6 @@ final class Target_sun_security_jca_ProviderConfig_ProviderLoader {
     static Target_sun_security_jca_ProviderConfig_ProviderLoader INSTANCE;
 }
 
-@TargetClass(className = "sun.security.jca.Providers")
-final class Target_sun_security_jca_Providers {
-    @Alias//
-    @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = ProviderListTransformer.class, disableCaching = true)//
-    private static ProviderList providerList;
-
-    private static class ProviderListTransformer implements FieldValueTransformer {
-        @Override
-        public Object transform(Object receiver, Object originalValue) {
-            ProviderList originalProviderList = (ProviderList) originalValue;
-            return SecurityProvidersFilter.instance().cleanUnregisteredProviders(originalProviderList);
-        }
-    }
-}
-
 /** Dummy class to have a class with the file's name. */
 public final class SecuritySubstitutions {
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SecuritySubstitutions.java

@@ -51,18 +51,6 @@ final class Target_java_lang_ThreadGroup {
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = ThreadGroupThreadsRecomputation.class)//
     Thread[] injectedThreads;
 
-    /*
-     * JavaThreadsFeature.reachableThreadGroups is updated in an object replacer, during analysis,
-     * thus the recomputation may see an incomplete value. By disabling caching eventually the
-     * recomputed value will be the correct one. No additional caching is necessary since
-     * reachableThreadGroups will eventually reach a stable value during analysis and there is no
-     * risk to discover new objects in later phases.
-     */
-    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = ThreadGroupNGroupsRecomputation.class, disableCaching = true)//
-    private int ngroups;
-    @Alias @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = ThreadGroupGroupsRecomputation.class, disableCaching = true)//
-    private ThreadGroup[] groups;
-
     /*
      * All ThreadGroups in the image heap are strong and will be stored in ThreadGroup.groups.
      */
@@ -146,38 +134,6 @@ public Object transform(Object receiver, Object originalValue) {
     }
 }
 
-@Platforms(Platform.HOSTED_ONLY.class)
-class ThreadGroupNUnstartedThreadsRecomputation implements FieldValueTransformer {
-    @Override
-    public Object transform(Object receiver, Object originalValue) {
-        ThreadGroup group = (ThreadGroup) receiver;
-        int result = 0;
-        for (Thread thread : JavaThreadsFeature.singleton().reachableThreads.keySet()) {
-            /* The main thread is recomputed as running and therefore not counted as unstarted. */
-            if (thread.getThreadGroup() == group && thread != PlatformThreads.singleton().mainThread) {
-                result++;
-            }
-        }
-        return result;
-    }
-}
-
-@Platforms(Platform.HOSTED_ONLY.class)
-class ThreadGroupNThreadsRecomputation implements FieldValueTransformer {
-    @Override
-    public Object transform(Object receiver, Object originalValue) {
-        ThreadGroup group = (ThreadGroup) receiver;
-
-        if (group == PlatformThreads.singleton().mainGroup) {
-            /* The main group contains the main thread, which we recompute as running. */
-            return 1;
-        } else {
-            /* No other thread group has a thread running at startup. */
-            return 0;
-        }
-    }
-}
-
 @Platforms(Platform.HOSTED_ONLY.class)
 class ThreadGroupThreadsRecomputation implements FieldValueTransformer {
     @Override
@@ -194,24 +150,6 @@ public Object transform(Object receiver, Object originalValue) {
     }
 }
 
-@Platforms(Platform.HOSTED_ONLY.class)
-class ThreadGroupNGroupsRecomputation implements FieldValueTransformer {
-    @Override
-    public Object transform(Object receiver, Object originalValue) {
-        ThreadGroup group = (ThreadGroup) receiver;
-        return JavaThreadsFeature.singleton().reachableThreadGroups.get(group).ngroups;
-    }
-}
-
-@Platforms(Platform.HOSTED_ONLY.class)
-class ThreadGroupGroupsRecomputation implements FieldValueTransformer {
-    @Override
-    public Object transform(Object receiver, Object originalValue) {
-        ThreadGroup group = (ThreadGroup) receiver;
-        return JavaThreadsFeature.singleton().reachableThreadGroups.get(group).groups;
-    }
-}
-
 final class ThreadGroupThreadsAccessor {
     static Thread[] get(Target_java_lang_ThreadGroup that) {
         return that.injectedThreads;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaLangThreadGroupSubstitutions.java

@@ -24,157 +24,22 @@
  */
 package com.oracle.svm.core.thread;
 
-import java.util.Arrays;
-import java.util.Map;
-
-import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.Platform;
-import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
-
-import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
-import com.oracle.svm.core.util.ConcurrentIdentityHashMap;
-import com.oracle.svm.core.util.UserError;
-import com.oracle.svm.util.ClassUtil;
-
-@AutomaticallyRegisteredFeature
-@Platforms(Platform.HOSTED_ONLY.class)
-class JavaThreadsFeature implements InternalFeature {
-
-    static JavaThreadsFeature singleton() {
-        return ImageSingletons.lookup(JavaThreadsFeature.class);
-    }
-
-    /**
-     * All {@link Thread} objects that are reachable in the image heap. Only unstarted threads,
-     * i.e., threads in state NEW, are allowed.
-     */
-    final Map<Thread, Boolean> reachableThreads = new ConcurrentIdentityHashMap<>();
-    /**
-     * All {@link ThreadGroup} objects that are reachable in the image heap. The value of the map is
-     * a helper object storing information that is used by the field value recomputations.
-     */
-    final Map<ThreadGroup, ReachableThreadGroup> reachableThreadGroups = new ConcurrentIdentityHashMap<>();
-    /** No new threads and thread groups can be discovered after the static analysis. */
-    private boolean sealed;
-
-    @Override
-    public void duringSetup(DuringSetupAccess access) {
-        access.registerObjectReplacer(this::collectReachableObjects);
-
-        /*
-         * This currently only means that we don't support setting custom values for
-         * java.lang.ScopedValue.cacheSize at runtime.
-         */
-        RuntimeClassInitialization.initializeAtBuildTime("java.lang.ScopedValue");
-        RuntimeClassInitialization.initializeAtBuildTime("java.lang.ScopedValue$Cache");
-    }
-
-    private Object collectReachableObjects(Object original) {
-        if (original instanceof Thread) {
-            Thread thread = (Thread) original;
-            if (thread.getState() == Thread.State.NEW) {
-                registerReachableObject(reachableThreads, thread, Boolean.TRUE);
-            } else {
-                /*
-                 * Started Threads must not be in the image heap. The error is reported in
-                 * DisallowedImageHeapObjectFeature (which is in a hosted project).
-                 */
-            }
-
-        } else if (original instanceof ThreadGroup) {
-            ThreadGroup group = (ThreadGroup) original;
-            if (registerReachableObject(reachableThreadGroups, group, new ReachableThreadGroup())) {
-                ThreadGroup parent = group.getParent();
-                if (parent != null) {
-                    /* Ensure ReachableThreadGroup object for parent is created. */
-                    collectReachableObjects(parent);
-                    /*
-                     * Build the tree of thread groups that is then written out in the image heap.
-                     * This tree is a subtree of all thread groups in the image generator,
-                     * containing only the thread groups that were found as reachable at run time.
-                     */
-                    reachableThreadGroups.get(parent).add(group);
-                } else {
-                    assert group == PlatformThreads.singleton().systemGroup;
-                }
-            }
-        }
-        return original;
-    }
-
-    private <K, V> boolean registerReachableObject(Map<K, V> map, K object, V value) {
-        boolean result = map.putIfAbsent(object, value) == null;
-        if (sealed && result) {
-            throw UserError.abort("%s is reachable in the image heap but was not seen during the points-to analysis: %s", ClassUtil.getUnqualifiedName(object.getClass()), object);
-        }
-        return result;
-    }
-
-    @Override
-    public void afterAnalysis(AfterAnalysisAccess access) {
-        /*
-         * No more changes to the reachable threads and thread groups are allowed after the
-         * analysis.
-         */
-        sealed = true;
 
-        /*
-         * Compute the maximum thread id and autonumber sequence from all reachable threads, and use
-         * these numbers as the initial values at run time. This still means that numbers are not
-         * dense when threads other than the main thread are reachable. However, changing the thread
-         * id or autonumber of a thread that the user created during image generation would be an
-         * intrusion with unpredictable side effects.
-         */
-        long maxThreadId = 0;
-        int maxAutonumber = -1;
-        for (Thread thread : reachableThreads.keySet()) {
-            maxThreadId = Math.max(maxThreadId, threadId(thread));
-            maxAutonumber = Math.max(maxAutonumber, autonumberOf(thread));
-        }
-        assert maxThreadId >= 1 : "main thread with id 1 must always be found";
-        JavaThreads.threadSeqNumber.set(maxThreadId);
-        JavaThreads.threadInitNumber.set(maxAutonumber);
-    }
+public abstract class JavaThreadsFeature implements InternalFeature {
 
-    static long threadId(Thread thread) {
+    protected static long threadId(Thread thread) {
         if (thread == PlatformThreads.singleton().mainThread) {
             return 1;
         }
         return JavaThreads.getThreadId(thread);
     }
 
-    private static final String AUTONUMBER_PREFIX = "Thread-";
-
-    static int autonumberOf(Thread thread) {
-        if (thread.getName().startsWith(AUTONUMBER_PREFIX)) {
-            try {
-                return Integer.parseInt(thread.getName().substring(AUTONUMBER_PREFIX.length()));
-            } catch (NumberFormatException ex) {
-                /*
-                 * Ignore. If the suffix is not a valid integer number, then the thread name is not
-                 * an autonumber name.
-                 */
-            }
-        }
-        return -1;
+    protected static void setThreadSeqNumber(long num) {
+        JavaThreads.threadSeqNumber.set(num);
     }
-}
-
-@Platforms(Platform.HOSTED_ONLY.class)
-class ReachableThreadGroup {
-    int ngroups;
-    ThreadGroup[] groups;
 
-    /* Copy of ThreadGroup.add(). */
-    synchronized void add(ThreadGroup g) {
-        if (groups == null) {
-            groups = new ThreadGroup[4];
-        } else if (ngroups == groups.length) {
-            groups = Arrays.copyOf(groups, ngroups * 2);
-        }
-        groups[ngroups] = g;
-        ngroups++;
+    protected static void setThreadInitNumber(int num) {
+        JavaThreads.threadInitNumber.set(num);
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/JavaThreadsFeature.java

@@ -28,11 +28,12 @@
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 
 import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.graal.RuntimeCompilation;
 import com.oracle.svm.core.meta.DirectSubstrateObjectConstant;
 import com.oracle.svm.core.meta.ObjectConstantEquality;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
-import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.vm.ci.meta.Constant;
@@ -84,6 +85,8 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(ObjectConstantEquality.class, new IsolateAwareObjectConstantEquality());
+        if (RuntimeCompilation.isEnabled()) {
+            ImageSingletons.add(ObjectConstantEquality.class, new IsolateAwareObjectConstantEquality());
+        }
     }
 }