[GR-57649] Use replaceObjectWithConstant in reflection plugin.

PullRequest: graal/18737

Author: teshull

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java

@@ -622,14 +622,18 @@ public Object replaceObject(Object source) {
     }
 
     public JavaConstant replaceObjectWithConstant(Object source) {
+        return replaceObjectWithConstant(source, getHostedValuesProvider()::forObject);
+    }
+
+    public JavaConstant replaceObjectWithConstant(Object source, Function<Object, JavaConstant> converter) {
         assert !(source instanceof ImageHeapConstant) : source;
 
         var replacedObject = replaceObject0(source, true);
         if (replacedObject instanceof ImageHeapConstant constant) {
             return constant;
         }
 
-        return getHostedValuesProvider().forObject(replacedObject);
+        return converter.apply(replacedObject);
     }
 
     /**

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/ReflectionPlugins.java

@@ -422,7 +422,22 @@ private boolean processClassGetClassLoader(GraphBuilderContext b, ResolvedJavaMe
             return false;
         }
 
-        return pushConstant(b, targetMethod, clazz::getName, JavaKind.Object, clazz.getClassLoader(), true) != null;
+        // GR-57649 generalize code if needed in more places
+        ClassLoader loader = clazz.getClassLoader();
+        JavaConstant result;
+        if (loader == null) {
+            result = JavaConstant.NULL_POINTER;
+        } else {
+            result = getIntrinsicConstant(b, loader);
+        }
+
+        if (result != null) {
+            b.addPush(JavaKind.Object, ConstantNode.forConstant(result, b.getMetaAccess()));
+            traceConstant(b, targetMethod, clazz::getName, result);
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -669,6 +684,25 @@ private <T> T getIntrinsic(GraphBuilderContext context, T element) {
         return (T) aUniverse.replaceObject(element);
     }
 
+    /**
+     * Same as {@link #getIntrinsic}, but returns a {@link JavaConstant}.
+     */
+    private JavaConstant getIntrinsicConstant(GraphBuilderContext context, Object element) {
+        if (reason == ParsingReason.AutomaticUnsafeTransformation || reason == ParsingReason.EarlyClassInitializerAnalysis) {
+            /* We are analyzing the static initializers and should always intrinsify. */
+            return context.getSnippetReflection().forObject(element);
+        }
+        if (isDeleted(element, context.getMetaAccess())) {
+            /*
+             * Should not intrinsify. Will fail during the reflective lookup at runtime. @Delete-ed
+             * elements are ignored by the reflection plugins regardless of the value of
+             * ReportUnsupportedElementsAtRuntime.
+             */
+            return null;
+        }
+        return aUniverse.replaceObjectWithConstant(element, context.getSnippetReflection()::forObject);
+    }
+
     private static <T> boolean isDeleted(T element, MetaAccessProvider metaAccess) {
         AnnotatedElement annotated = null;
         try {