Fixed SetIdentityForValueTypesPhase on native-image.

tzezula · tzezula · commit a5b439fe47c8 · 2025-10-31T14:07:05.000+01:00
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java
@@ -295,6 +295,8 @@ private static InlineKind getInlineKind(TruffleCompilerRuntime runtime, Annotati
 
     public abstract ConstantFieldInfo getConstantFieldInfo(ResolvedJavaField field);
 
+    public abstract boolean isValueType(ResolvedJavaType type);
+
     public EconomicMap<ResolvedJavaMethod, EncodedGraph> getOrCreateEncodedGraphCache() {
         return EconomicMap.create();
     }
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotPartialEvaluator.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotPartialEvaluator.java
@@ -100,6 +100,11 @@ public ConstantFieldInfo getConstantFieldInfo(ResolvedJavaField field) {
         return constantInfoCache.get(field);
     }
 
+    @Override
+    public boolean isValueType(ResolvedJavaType type) {
+        return AnnotationValueSupport.getDeclaredAnnotationValue(types.CompilerDirectives_ValueType, type) != null;
+    }
+
     @Override
     public PartialEvaluationMethodInfo getMethodInfo(ResolvedJavaMethod method) {
         return methodInfoCache.get(method);
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/SetIdentityForValueTypesPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/SetIdentityForValueTypesPhase.java
@@ -24,12 +24,10 @@
  */
 package jdk.graal.compiler.truffle.phases;
 
-import jdk.graal.compiler.annotation.AnnotationValueSupport;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.virtual.VirtualInstanceNode;
 import jdk.graal.compiler.nodes.virtual.VirtualObjectNode;
 import jdk.graal.compiler.phases.BasePhase;
-import jdk.graal.compiler.truffle.KnownTruffleTypes;
 import jdk.graal.compiler.truffle.TruffleTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -38,12 +36,11 @@ public final class SetIdentityForValueTypesPhase extends BasePhase<TruffleTierCo
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
         graph.checkCancellation();
-        KnownTruffleTypes types = context.types();
         for (VirtualObjectNode virtualObjectNode : graph.getNodes(VirtualObjectNode.TYPE)) {
             if (virtualObjectNode instanceof VirtualInstanceNode) {
                 VirtualInstanceNode virtualInstanceNode = (VirtualInstanceNode) virtualObjectNode;
                 ResolvedJavaType type = virtualInstanceNode.type();
-                if (AnnotationValueSupport.getDeclaredAnnotationValue(types.CompilerDirectives_ValueType, type) != null) {
+                if (context.getPartialEvaluator().isValueType(type)) {
                     virtualInstanceNode.setIdentity(false);
                 }
             }
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/GraalGraphObjectReplacer.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/runtimecompilation/GraalGraphObjectReplacer.java
@@ -367,7 +367,7 @@ public synchronized SubstrateType createType(JavaType original) {
             VMError.guarantee(!(forbidNewTypes || (original instanceof HostedType)), "Too late to create a new type: %s", aType);
             aType.registerAsReachable("type reachable from Graal graphs");
             DynamicHub hub = ((SVMHost) aUniverse.hostVM()).dynamicHub(aType);
-            SubstrateType newType = new SubstrateType(aType.getJavaKind(), hub);
+            SubstrateType newType = universeFactory.createType(aType, hub);
             sType = types.putIfAbsent(aType, newType);
             if (sType == null) {
                 sType = newType;
diff --git a/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateUniverseFactory.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateUniverseFactory.java
@@ -24,6 +24,8 @@
  */
 package com.oracle.svm.graal.meta;
 
+import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.svm.core.hub.DynamicHub;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
@@ -42,6 +44,10 @@
 @Platforms(Platform.HOSTED_ONLY.class)
 public class SubstrateUniverseFactory {
 
+    public SubstrateType createType(AnalysisType analysisType, DynamicHub hub) {
+        return new SubstrateType(analysisType.getJavaKind(), hub);
+    }
+
     public SubstrateMethod createMethod(AnalysisMethod aMethod, ImageCodeInfo imageCodeInfo, HostedStringDeduplication stringTable) {
         return new SubstrateMethod(aMethod, imageCodeInfo, stringTable);
     }
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java
@@ -27,6 +27,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
+import jdk.vm.ci.meta.ResolvedJavaType;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -98,10 +99,15 @@ public final PartialEvaluationMethodInfo getMethodInfo(ResolvedJavaMethod method
     }
 
     @Override
-    public ConstantFieldInfo getConstantFieldInfo(ResolvedJavaField field) {
+    public final ConstantFieldInfo getConstantFieldInfo(ResolvedJavaField field) {
         return ((TruffleField) field).getConstantFieldInfo();
     }
 
+    @Override
+    public final boolean isValueType(ResolvedJavaType type) {
+        return ((TruffleType) type).isValueType();
+    }
+
     @Override
     protected void registerGraphBuilderInvocationPlugins(InvocationPlugins invocationPlugins, boolean canDelayIntrinsification) {
         super.registerGraphBuilderInvocationPlugins(invocationPlugins, canDelayIntrinsification);
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleType.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleType.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.truffle.api;
+
+import com.oracle.svm.core.hub.DynamicHub;
+import com.oracle.svm.graal.meta.SubstrateType;
+import jdk.vm.ci.meta.JavaKind;
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
+
+public class SubstrateTruffleType extends SubstrateType implements TruffleType {
+
+    private final boolean valueType;
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public SubstrateTruffleType(JavaKind kind, DynamicHub hub, boolean valueType) {
+        super(kind, hub);
+        this.valueType = valueType;
+    }
+
+    @Override
+    public boolean isValueType() {
+        return valueType;
+    }
+}
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleUniverseFactory.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstrateTruffleUniverseFactory.java
@@ -28,6 +28,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.oracle.graal.pointsto.meta.AnalysisType;
+import com.oracle.svm.core.hub.DynamicHub;
+import com.oracle.svm.graal.meta.SubstrateType;
 import com.oracle.svm.truffle.TruffleFeature;
 import com.oracle.svm.util.OriginalClassProvider;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -88,6 +91,14 @@ public SubstrateField createField(AnalysisField aField, HostedStringDeduplicatio
         return new SubstrateTruffleField(aField, stringTable, canonicalFieldInfo);
     }
 
+    @Override
+    public SubstrateType createType(AnalysisType analysisType, DynamicHub hub) {
+        SubstrateAnnotationExtractor extractor = (SubstrateAnnotationExtractor) ImageSingletons.lookup(AnnotationExtractor.class);
+        Map<ResolvedJavaType, AnnotationValue> annotations = extractor.getDeclaredAnnotationValues(analysisType);
+        boolean valueType = annotations.containsKey(OriginalClassProvider.getOriginalType(truffleFeature.getTypes().CompilerDirectives_ValueType));
+        return new SubstrateTruffleType(analysisType.getJavaKind(), hub, valueType);
+    }
+
     @Platforms(Platform.HOSTED_ONLY.class)
     static PartialEvaluationMethodInfo createPartialEvaluationMethodInfo(TruffleCompilerRuntime runtime, ResolvedJavaMethod method,
                     KnownTruffleTypes types) {
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleType.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/TruffleType.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.truffle.api;
+
+public interface TruffleType {
+
+    boolean isValueType();
+}

Original file line number	Diff line number	Diff line change
`@@ -295,6 +295,8 @@ private static InlineKind getInlineKind(TruffleCompilerRuntime runtime, Annotati`
`295`	`295`
`296`	`296`	`public abstract ConstantFieldInfo getConstantFieldInfo(ResolvedJavaField field);`
`297`	`297`
	`298`	`+ public abstract boolean isValueType(ResolvedJavaType type);`
	`299`	`+`
`298`	`300`	`public EconomicMap<ResolvedJavaMethod, EncodedGraph> getOrCreateEncodedGraphCache() {`
`299`	`301`	`return EconomicMap.create();`
`300`	`302`	`}`