Introduce a typeReached check for Class.forName

Author: vjovanov

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationCondition.java

@@ -53,33 +53,40 @@
 public final class ConfigurationCondition {
 
     /* Cached to save space: it is used as a marker for all non-conditional elements */
-    private static final ConfigurationCondition JAVA_LANG_OBJECT_REACHED = new ConfigurationCondition(Object.class);
+    private static final ConfigurationCondition JAVA_LANG_OBJECT_REACHED = new ConfigurationCondition(Object.class, true);
 
     public static ConfigurationCondition alwaysTrue() {
         return JAVA_LANG_OBJECT_REACHED;
     }
 
     private final Class<?> type;
 
-    public static ConfigurationCondition create(Class<?> type) {
+    private final boolean runtimeChecked;
+
+    public static ConfigurationCondition create(Class<?> type, boolean runtimeChecked) {
         if (JAVA_LANG_OBJECT_REACHED.getType().equals(type)) {
             return JAVA_LANG_OBJECT_REACHED;
         }
-        return new ConfigurationCondition(type);
+        return new ConfigurationCondition(type, runtimeChecked);
     }
 
     public boolean isAlwaysTrue() {
         return ConfigurationCondition.alwaysTrue().equals(this);
     }
 
-    private ConfigurationCondition(Class<?> type) {
+    private ConfigurationCondition(Class<?> type, boolean runtimeChecked) {
+        this.runtimeChecked = runtimeChecked;
         this.type = type;
     }
 
     public Class<?> getType() {
         return type;
     }
 
+    public boolean isRuntimeChecked() {
+        return runtimeChecked;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -88,13 +95,12 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        ConfigurationCondition condition = (ConfigurationCondition) o;
-        return Objects.equals(type, condition.type);
+        ConfigurationCondition that = (ConfigurationCondition) o;
+        return runtimeChecked == that.runtimeChecked && Objects.equals(type, that.type);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type);
+        return Objects.hash(type, runtimeChecked);
     }
-
 }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/UnresolvedConfigurationCondition.java

@@ -47,18 +47,20 @@
  */
 public class UnresolvedConfigurationCondition implements Comparable<UnresolvedConfigurationCondition> {
     private final String typeName;
-    private static final UnresolvedConfigurationCondition JAVA_LANG_OBJECT_REACHED = new UnresolvedConfigurationCondition(Object.class.getTypeName());
+    private final boolean runtimeChecked;
+    private static final UnresolvedConfigurationCondition JAVA_LANG_OBJECT_REACHED = new UnresolvedConfigurationCondition(Object.class.getTypeName(), true);
 
-    public static UnresolvedConfigurationCondition create(String typeName) {
+    public static UnresolvedConfigurationCondition create(String typeName, boolean runtimeChecked) {
         Objects.requireNonNull(typeName);
         if (JAVA_LANG_OBJECT_REACHED.getTypeName().equals(typeName)) {
             return JAVA_LANG_OBJECT_REACHED;
         }
-        return new UnresolvedConfigurationCondition(typeName);
+        return new UnresolvedConfigurationCondition(typeName, runtimeChecked);
     }
 
-    protected UnresolvedConfigurationCondition(String typeName) {
+    protected UnresolvedConfigurationCondition(String typeName, boolean runtimeChecked) {
         this.typeName = typeName;
+        this.runtimeChecked = runtimeChecked;
     }
 
     public static UnresolvedConfigurationCondition alwaysTrue() {
@@ -69,6 +71,14 @@ public String getTypeName() {
         return typeName;
     }
 
+    public boolean isRuntimeChecked() {
+        return runtimeChecked;
+    }
+
+    public boolean isAlwaysTrue() {
+        return typeName.equals(JAVA_LANG_OBJECT_REACHED.getTypeName());
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -77,26 +87,28 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        UnresolvedConfigurationCondition condition = (UnresolvedConfigurationCondition) o;
-        return Objects.equals(typeName, condition.typeName);
+        UnresolvedConfigurationCondition that = (UnresolvedConfigurationCondition) o;
+        return runtimeChecked == that.runtimeChecked && Objects.equals(typeName, that.typeName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(typeName);
+        return Objects.hash(typeName, runtimeChecked);
     }
 
     @Override
-    public String toString() {
-        return "[\"typeReachable\": \"" + typeName + "\"" + "]";
+    public int compareTo(UnresolvedConfigurationCondition o) {
+        int res = Boolean.compare(runtimeChecked, o.runtimeChecked);
+        if (res != 0) {
+            return res;
+        }
+        return typeName.compareTo(o.typeName);
     }
 
     @Override
-    public int compareTo(UnresolvedConfigurationCondition c) {
-        return this.typeName.compareTo(c.typeName);
+    public String toString() {
+        var field = runtimeChecked ? "typeReached" : "typeReachable";
+        return "[" + field + ": \"" + typeName + "\"" + "]";
     }
 
-    public boolean isAlwaysTrue() {
-        return typeName.equals(JAVA_LANG_OBJECT_REACHED.getTypeName());
-    }
 }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/conditional/ConditionalConfigurationComputer.java

@@ -171,7 +171,7 @@ private ConfigurationSet deduceConditionalConfiguration(Map<MethodInfo, List<Met
         for (List<MethodCallNode> value : methodCallNodes.values()) {
             for (MethodCallNode node : value) {
                 String className = node.methodInfo.getJavaDeclaringClassName();
-                UnresolvedConfigurationCondition condition = UnresolvedConfigurationCondition.create(className);
+                UnresolvedConfigurationCondition condition = UnresolvedConfigurationCondition.create(className, false);
                 var resolveCondition = ConfigurationConditionResolver.identityResolver().resolveCondition(condition);
                 addConfigurationWithCondition(configurationSet, node.configuration, resolveCondition.get());
             }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java

@@ -60,20 +60,26 @@
 @InternalVMMethod
 public final class ClassInitializationInfo {
 
-    /**
-     * Singleton for classes that are already initialized during image building and do not need
-     * class initialization at runtime, but have {@code <clinit>} methods.
-     */
-    public static final ClassInitializationInfo INITIALIZED_INFO_SINGLETON = new ClassInitializationInfo(InitState.FullyInitialized, true);
+    /** Singleton for classes that failed to link during image building. */
+    public static ClassInitializationInfo createFailedInfo() {
+        return new ClassInitializationInfo(InitState.InitializationError);
+    }
 
     /**
      * Singleton for classes that are already initialized during image building and do not need
      * class initialization at runtime, and don't have {@code <clinit>} methods.
      */
-    public static final ClassInitializationInfo NO_INITIALIZER_INFO_SINGLETON = new ClassInitializationInfo(InitState.FullyInitialized, false);
+    public static ClassInitializationInfo createNoInitializerInfo() {
+        return new ClassInitializationInfo(InitState.FullyInitialized, false, true);
+    }
 
-    /** Singleton for classes that failed to link during image building. */
-    public static final ClassInitializationInfo FAILED_INFO_SINGLETON = new ClassInitializationInfo(InitState.InitializationError);
+    /**
+     * For classes that are already initialized during image building and do not need class
+     * initialization at runtime, but have {@code <clinit>} methods.
+     */
+    public static ClassInitializationInfo createInitializedInfo() {
+        return new ClassInitializationInfo(InitState.FullyInitialized, true, true);
+    }
 
     enum InitState {
         /**
@@ -133,11 +139,20 @@ interface ClassInitializerFunctionPointer extends CFunctionPointer {
      * at native image's build time or run time.
      */
     private boolean hasInitializer;
+    private boolean buildTimeInitialized;
+
+    private boolean reached;
+
+    public boolean isReached() {
+        return reached;
+    }
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    private ClassInitializationInfo(InitState initState, boolean hasInitializer) {
+    private ClassInitializationInfo(InitState initState, boolean hasInitializer, boolean buildTime) {
         this(initState);
         this.hasInitializer = hasInitializer;
+        this.buildTimeInitialized = buildTime;
+        this.reached = false;
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
@@ -164,6 +179,14 @@ public boolean isInitialized() {
         return initState == InitState.FullyInitialized;
     }
 
+    public boolean isInitializationError() {
+        return initState == InitState.InitializationError;
+    }
+
+    public boolean isBuildTimeInitialized() {
+        return buildTimeInitialized;
+    }
+
     private boolean isBeingInitialized() {
         return initState == InitState.BeingInitialized;
     }
@@ -176,6 +199,23 @@ private boolean isReentrantInitialization(IsolateThread thread) {
         return thread.equal(initThread);
     }
 
+    private static void reach(DynamicHub hub) {
+        var current = hub;
+        do {
+            current.getClassInitializationInfo().reached = true;
+            current = current.getSuperHub();
+        } while (current != null);
+
+        reachInterfaces(hub);
+    }
+
+    private static void reachInterfaces(DynamicHub hub) {
+        for (DynamicHub superInterface : hub.getInterfaces()) {
+            superInterface.getClassInitializationInfo().reached = true;
+            reachInterfaces(superInterface);
+        }
+    }
+
     /**
      * Perform class initialization. This is the slow-path that should only be called after checking
      * {@link #isInitialized}.
@@ -187,6 +227,12 @@ private boolean isReentrantInitialization(IsolateThread thread) {
     private static void initialize(ClassInitializationInfo info, DynamicHub hub) {
         IsolateThread self = CurrentIsolate.getCurrentThread();
 
+        reach(hub);
+
+        if (info.isInitialized()) {
+            return;
+        }
+
         /*
          * GR-43118: If a predefined class is not loaded, and the caller class is loaded, set the
          * classloader of the initialized class to the class loader of the caller class.

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedNode.java

@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.core.classinitialization;
 
+import org.graalvm.word.LocationIdentity;
+
 import jdk.graal.compiler.core.common.type.StampFactory;
 import jdk.graal.compiler.graph.Node;
 import jdk.graal.compiler.graph.Node.NodeIntrinsicFactory;
@@ -42,8 +44,6 @@
 import jdk.graal.compiler.nodes.spi.CanonicalizerTool;
 import jdk.graal.compiler.nodes.spi.Lowerable;
 import jdk.graal.compiler.nodes.type.StampTool;
-import org.graalvm.word.LocationIdentity;
-
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
@@ -54,22 +54,24 @@ public class EnsureClassInitializedNode extends WithExceptionNode implements Can
     public static final NodeClass<EnsureClassInitializedNode> TYPE = NodeClass.create(EnsureClassInitializedNode.class);
 
     @Input private ValueNode hub;
+    private final boolean requiredForTypeReached;
     @Input(InputType.State) private FrameState stateAfter;
 
     public static boolean intrinsify(GraphBuilderContext b, ValueNode hub) {
         b.add(new EnsureClassInitializedNode(b.nullCheckedValue(hub)));
         return true;
     }
 
-    public EnsureClassInitializedNode(ValueNode hub, FrameState stateAfter) {
+    public EnsureClassInitializedNode(ValueNode hub, FrameState stateAfter, boolean requiredForTypeReached) {
         super(TYPE, StampFactory.forVoid());
         this.hub = hub;
+        this.requiredForTypeReached = requiredForTypeReached;
         assert StampTool.isPointerNonNull(hub) : "Hub must already be null-checked";
         this.stateAfter = stateAfter;
     }
 
     public EnsureClassInitializedNode(ValueNode hub) {
-        this(hub, null);
+        this(hub, null, false);
     }
 
     public ValueNode getHub() {
@@ -108,7 +110,7 @@ public ResolvedJavaType constantTypeOrNull(ConstantReflectionProvider constantRe
     @Override
     public Node canonical(CanonicalizerTool tool) {
         ResolvedJavaType type = constantTypeOrNull(tool.getConstantReflection());
-        if (type != null) {
+        if (type != null && !requiredForTypeReached) {
             for (FrameState cur = stateAfter; cur != null; cur = cur.outerFrameState()) {
                 if (!needsRuntimeInitialization(cur.getMethod().getDeclaringClass(), type)) {
                     return null;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/classinitialization/EnsureClassInitializedSnippets.java

@@ -28,6 +28,15 @@
 
 import java.util.Map;
 
+import org.graalvm.word.LocationIdentity;
+
+import com.oracle.svm.core.graal.nodes.ForeignCallWithExceptionNode;
+import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
+import com.oracle.svm.core.graal.snippets.SubstrateTemplates;
+import com.oracle.svm.core.hub.DynamicHub;
+import com.oracle.svm.core.snippets.SnippetRuntime;
+import com.oracle.svm.core.snippets.SnippetRuntime.SubstrateForeignCallDescriptor;
+
 import jdk.graal.compiler.api.replacements.Snippet;
 import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import jdk.graal.compiler.graph.Node;
@@ -43,14 +52,6 @@
 import jdk.graal.compiler.replacements.SnippetTemplate.Arguments;
 import jdk.graal.compiler.replacements.SnippetTemplate.SnippetInfo;
 import jdk.graal.compiler.replacements.Snippets;
-import org.graalvm.word.LocationIdentity;
-
-import com.oracle.svm.core.graal.nodes.ForeignCallWithExceptionNode;
-import com.oracle.svm.core.graal.snippets.NodeLoweringProvider;
-import com.oracle.svm.core.graal.snippets.SubstrateTemplates;
-import com.oracle.svm.core.hub.DynamicHub;
-import com.oracle.svm.core.snippets.SnippetRuntime;
-import com.oracle.svm.core.snippets.SnippetRuntime.SubstrateForeignCallDescriptor;
 
 public final class EnsureClassInitializedSnippets extends SubstrateTemplates implements Snippets {
     private static final SubstrateForeignCallDescriptor INITIALIZE = SnippetRuntime.findForeignCall(ClassInitializationInfo.class, "initialize", HAS_SIDE_EFFECT, LocationIdentity.any());
@@ -72,13 +73,13 @@ private static void ensureClassIsInitializedSnippet(@Snippet.NonNullParameter Dy
          */
         ClassInitializationInfo infoNonNull = (ClassInitializationInfo) PiNode.piCastNonNull(info, SnippetAnchorNode.anchor());
 
-        if (BranchProbabilityNode.probability(BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY, !infoNonNull.isInitialized())) {
-            callInitialize(INITIALIZE, infoNonNull, DynamicHub.toClass(hub));
+        if (!BranchProbabilityNode.probability(BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY, infoNonNull.isInitialized() & infoNonNull.isReached())) {
+            callInitializationRoutine(INITIALIZE, infoNonNull, DynamicHub.toClass(hub));
         }
     }
 
     @NodeIntrinsic(value = ForeignCallWithExceptionNode.class)
-    private static native void callInitialize(@ConstantNodeParameter ForeignCallDescriptor descriptor, ClassInitializationInfo info, Class<?> clazz);
+    private static native void callInitializationRoutine(@ConstantNodeParameter ForeignCallDescriptor descriptor, ClassInitializationInfo info, Class<?> clazz);
 
     @SuppressWarnings("unused")
     public static void registerLowerings(OptionValues options, Providers providers, Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings) {