Unwrap ImageHeapInstance for debug info and reflection metadata.

Author: cstancu

substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java

@@ -693,7 +693,7 @@ public void visitBreakpointNode(BreakpointNode node) {
 
         @Override
         protected DebugInfoBuilder createDebugInfoBuilder(StructuredGraph graph, NodeValueMap nodeValueMap) {
-            return new SubstrateDebugInfoBuilder(graph, gen.getProviders().getMetaAccessExtensionProvider(), nodeValueMap);
+            return new SubstrateDebugInfoBuilder(graph, getProviders().getSnippetReflection(), gen.getProviders().getMetaAccessExtensionProvider(), nodeValueMap);
         }
 
         private boolean getDestroysCallerSavedRegisters(ResolvedJavaMethod targetMethod) {

substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java

@@ -828,7 +828,7 @@ public void visitBreakpointNode(BreakpointNode node) {
 
         @Override
         protected DebugInfoBuilder createDebugInfoBuilder(StructuredGraph graph, NodeValueMap nodeValueMap) {
-            return new SubstrateDebugInfoBuilder(graph, gen.getProviders().getMetaAccessExtensionProvider(), nodeValueMap);
+            return new SubstrateDebugInfoBuilder(graph, getProviders().getSnippetReflection(), gen.getProviders().getMetaAccessExtensionProvider(), nodeValueMap);
         }
 
         @Override

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/LLVMGenerator.java

@@ -56,7 +56,6 @@
 import org.graalvm.compiler.core.common.memory.BarrierType;
 import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
 import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
 import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
 import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
 import org.graalvm.compiler.core.common.spi.LIRKindTool;
@@ -204,7 +203,7 @@ public BarrierSetLIRGeneratorTool getBarrierSet() {
     }
 
     @Override
-    public CodeGenProviders getProviders() {
+    public Providers getProviders() {
         return providers;
     }
 

substratevm/src/com.oracle.svm.core.graal.llvm/src/com/oracle/svm/core/graal/llvm/NodeLLVMBuilder.java

@@ -149,7 +149,7 @@ public class NodeLLVMBuilder implements NodeLIRBuilderTool, SubstrateNodeLIRBuil
     protected NodeLLVMBuilder(StructuredGraph graph, LLVMGenerator gen) {
         this.gen = gen;
         this.builder = gen.getBuilder();
-        this.debugInfoBuilder = new SubstrateDebugInfoBuilder(graph, gen.getProviders().getMetaAccessExtensionProvider(), this);
+        this.debugInfoBuilder = new SubstrateDebugInfoBuilder(graph, gen.getProviders().getSnippetReflection(), gen.getProviders().getMetaAccessExtensionProvider(), this);
         setCompilationResultMethod(gen.getCompilationResult(), graph);
 
         for (HIRBlock block : graph.getLastSchedule().getCFG().getBlocks()) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/code/SubstrateDebugInfoBuilder.java

@@ -24,10 +24,12 @@
  */
 package com.oracle.svm.core.graal.code;
 
+import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
 import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
 import org.graalvm.compiler.core.gen.DebugInfoBuilder;
 import org.graalvm.compiler.nodes.FrameState;
 import org.graalvm.compiler.nodes.StructuredGraph;
+import org.graalvm.compiler.nodes.ValueNode;
 import org.graalvm.compiler.nodes.spi.NodeValueMap;
 
 import com.oracle.svm.core.meta.SharedMethod;
@@ -36,6 +38,7 @@
 
 import jdk.vm.ci.code.StackLockValue;
 import jdk.vm.ci.code.VirtualObject;
+import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.JavaValue;
@@ -44,17 +47,28 @@
 public final class SubstrateDebugInfoBuilder extends DebugInfoBuilder {
 
     private final SharedMethod method;
+    private final SnippetReflectionProvider snippetReflection;
 
-    public SubstrateDebugInfoBuilder(StructuredGraph graph, MetaAccessExtensionProvider metaAccessExtensionProvider, NodeValueMap nodeValueMap) {
+    public SubstrateDebugInfoBuilder(StructuredGraph graph, SnippetReflectionProvider snippetReflection, MetaAccessExtensionProvider metaAccessExtensionProvider, NodeValueMap nodeValueMap) {
         super(nodeValueMap, metaAccessExtensionProvider, graph.getDebug());
         this.method = (SharedMethod) graph.method();
+        this.snippetReflection = snippetReflection;
     }
 
     @Override
     protected JavaKind storageKind(JavaType type) {
         return ((SharedType) type).getStorageKind();
     }
 
+    @Override
+    protected JavaValue toJavaValue(ValueNode valueNode) {
+        JavaValue value = super.toJavaValue(valueNode);
+        if (value instanceof JavaConstant constant) {
+            return snippetReflection.unwrapConstant(constant);
+        }
+        return value;
+    }
+
     @Override
     protected JavaValue computeLockValue(FrameState state, int lockIndex) {
         JavaValue object = toJavaValue(state.lockAt(lockIndex));

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationExceptionProxyValue.java

@@ -63,7 +63,7 @@ public List<Class<?>> getTypes() {
     @Override
     public List<JavaConstant> getExceptionProxies(SnippetReflectionProvider snippetReflection) {
         if (objectConstant == null) {
-            objectConstant = snippetReflection.forObject(exceptionProxy);
+            objectConstant = snippetReflection.unwrapConstant(snippetReflection.forObject(exceptionProxy));
         }
         return Collections.singletonList(objectConstant);
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionMetadataEncoderImpl.java

@@ -73,6 +73,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
 
+import com.oracle.graal.pointsto.heap.ImageHeapConstant;
 import com.oracle.graal.pointsto.infrastructure.WrappedElement;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
@@ -281,8 +282,8 @@ public void addClassMetadata(MetaAccessProvider metaAccess, HostedType type, Cla
         if (signers != null) {
             signerConstants = new JavaConstant[signers.length];
             for (int i = 0; i < signers.length; ++i) {
-                signerConstants[i] = snippetReflection.forObject(signers[i]);
-                encoders.objectConstants.addObject(signerConstants[i]);
+                signerConstants[i] = snippetReflection.unwrapConstant(snippetReflection.forObject(signers[i]));
+                addConstantObject(signerConstants[i]);
             }
         }
         AnalysisType analysisType = type.getWrapped();
@@ -292,8 +293,13 @@ public void addClassMetadata(MetaAccessProvider metaAccess, HostedType type, Cla
         registerClass(type, new ClassMetadata(innerTypes, enclosingMethodInfo, recordComponents, permittedSubtypes, nestMemberTypes, signerConstants, flags, annotations, typeAnnotations));
     }
 
+    private void addConstantObject(JavaConstant constant) {
+        assert !(constant instanceof ImageHeapConstant);
+        encoders.objectConstants.addObject(constant);
+    }
+
     private void registerError(Throwable error) {
-        encoders.objectConstants.addObject(snippetReflection.forObject(error));
+        addConstantObject(snippetReflection.unwrapConstant(snippetReflection.forObject(error)));
     }
 
     private static final Method getEnclosingMethod0 = ReflectionUtil.lookupMethod(Class.class, "getEnclosingMethod0");
@@ -416,8 +422,8 @@ public void addReflectionExecutableMetadata(MetaAccessProvider metaAccess, Hoste
         ReflectParameterMetadata[] reflectParameters = registerReflectParameters(reflectMethod);
         JavaConstant accessorConstant = null;
         if (accessor != null) {
-            accessorConstant = snippetReflection.forObject(accessor);
-            encoders.objectConstants.addObject(accessorConstant);
+            accessorConstant = snippetReflection.unwrapConstant(snippetReflection.forObject(accessor));
+            addConstantObject(accessorConstant);
         }
 
         if (isMethod) {
@@ -452,8 +458,8 @@ public void addHeapAccessibleObjectMetadata(MetaAccessProvider metaAccess, Wrapp
         AnnotationMemberValue annotationDefault = isMethod ? registerAnnotationDefaultValues((AnalysisMethod) analysisObject) : null;
         ReflectParameterMetadata[] reflectParameters = isExecutable ? registerReflectParameters((Executable) object) : null;
         AccessibleObject holder = ReflectionMetadataEncoder.getHolder(object);
-        JavaConstant heapObjectConstant = snippetReflection.forObject(holder);
-        encoders.objectConstants.addObject(heapObjectConstant);
+        JavaConstant heapObjectConstant = snippetReflection.unwrapConstant(snippetReflection.forObject(holder));
+        addConstantObject(heapObjectConstant);
 
         AccessibleObjectMetadata metadata;
         if (isMethod) {
@@ -528,7 +534,7 @@ private void registerValues(AnnotationMemberValue annotationValue) {
             encoders.sourceMethodNames.addObject(string);
         }
         for (JavaConstant proxy : annotationValue.getExceptionProxies(snippetReflection)) {
-            encoders.objectConstants.addObject(proxy);
+            addConstantObject(snippetReflection.unwrapConstant(proxy));
         }
     }
 
@@ -737,7 +743,7 @@ public void encodeAllAndInstall() {
     }
 
     private int encodeErrorIndex(Throwable error) {
-        int index = encoders.objectConstants.getIndex(snippetReflection.forObject(error));
+        int index = encoders.objectConstants.getIndex(snippetReflection.unwrapConstant(snippetReflection.forObject(error)));
         int encodedIndex = FIRST_ERROR_INDEX - index;
         VMError.guarantee(ReflectionMetadataDecoderImpl.isErrorIndex(encodedIndex));
         return encodedIndex;