[GR-71719] Fix early inlining and escape analysis needs two unwrap types on SVM.

PullRequest: graal/22750

Author: chumer

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/CachingPEGraphDecoder.java

@@ -25,6 +25,7 @@
 package jdk.graal.compiler.truffle;
 
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.graalvm.collections.EconomicMap;
@@ -128,7 +129,7 @@ private EncodedGraph createGraph(ResolvedJavaMethod method) {
         try (DebugContext.Scope scope = debug.scope("createGraph", graphToEncode)) {
             Providers p = this.graphCacheProviders;
 
-            new PrePartialEvaluationSuite(graphToEncode.getOptions(), truffleTypes, p, canonicalizer, (m) -> buildGraph(m, canonicalizer)).apply(graphToEncode, p);
+            new PrePartialEvaluationSuite(graphToEncode.getOptions(), truffleTypes, p, canonicalizer, (m) -> buildGraph(m, canonicalizer), Function.identity()).apply(graphToEncode, p);
 
             new ConvertDeoptimizeToGuardPhase(canonicalizer).apply(graphToEncode, p);
             if (GraalOptions.EarlyGVN.getValue(graphToEncode.getOptions())) {

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/PrePartialEvaluationSuite.java

@@ -33,6 +33,7 @@
 import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.truffle.KnownTruffleTypes;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
  * This suite is intended to run on every graph prior to partial evaluation. It is not optional, as
@@ -44,10 +45,10 @@ public final class PrePartialEvaluationSuite extends PhaseSuite<Providers> {
 
     @SuppressWarnings("this-escape")
     public PrePartialEvaluationSuite(OptionValues optionValues, KnownTruffleTypes truffleTypes, Providers providers, CanonicalizerPhase canonicalizer,
-                    Function<ResolvedJavaMethod, StructuredGraph> graphLookup) {
+                    Function<ResolvedJavaMethod, StructuredGraph> graphLookup, Function<ResolvedJavaType, ResolvedJavaType> unwrapType) {
         // only if Truffle is installed we can apply these phases.
-        appendPhase(new TruffleEarlyInliningPhase(optionValues, canonicalizer, truffleTypes, providers, graphLookup));
-        appendPhase(new TruffleEarlyEscapeAnalysisPhase(canonicalizer, optionValues, truffleTypes));
+        appendPhase(new TruffleEarlyInliningPhase(optionValues, canonicalizer, truffleTypes, providers, graphLookup, unwrapType));
+        appendPhase(new TruffleEarlyEscapeAnalysisPhase(canonicalizer, optionValues, truffleTypes, unwrapType));
 
     }
 

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleEarlyEscapeAnalysisPhase.java

@@ -25,6 +25,7 @@
 package jdk.graal.compiler.truffle.phases;
 
 import java.util.Map;
+import java.util.function.Function;
 
 import jdk.graal.compiler.annotation.AnnotationValue;
 import jdk.graal.compiler.annotation.AnnotationValueSupport;
@@ -40,11 +41,12 @@
  */
 public final class TruffleEarlyEscapeAnalysisPhase extends PartialEscapePhase {
 
-    private final KnownTruffleTypes types;
+    private final ResolvedJavaType unwrappedAnnotationType;
 
-    public TruffleEarlyEscapeAnalysisPhase(CanonicalizerPhase canonicalizer, OptionValues options, KnownTruffleTypes truffleTypes) {
+    public TruffleEarlyEscapeAnalysisPhase(CanonicalizerPhase canonicalizer, OptionValues options, KnownTruffleTypes truffleTypes,
+                    Function<ResolvedJavaType, ResolvedJavaType> unwrapType) {
         super(false, canonicalizer, options);
-        this.types = truffleTypes;
+        this.unwrappedAnnotationType = unwrapType.apply(truffleTypes.CompilerDirectives_EarlyEscapeAnalysis);
     }
 
     @Override
@@ -55,7 +57,7 @@ public boolean checkContract() {
     @Override
     protected boolean matchGraph(StructuredGraph graph) {
         Map<ResolvedJavaType, AnnotationValue> declaredAnnotationValues = AnnotationValueSupport.getDeclaredAnnotationValues(graph.method());
-        if (!declaredAnnotationValues.containsKey(types.CompilerDirectives_EarlyEscapeAnalysis)) {
+        if (!declaredAnnotationValues.containsKey(unwrappedAnnotationType)) {
             return false;
         }
         // we do not respect the PE only option for Truffle because PE depends on escape analysis

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleEarlyInliningPhase.java

@@ -77,17 +77,18 @@ static class Options {
     }
 
     private final Providers providers;
-    private final KnownTruffleTypes types;
     private final Function<ResolvedJavaMethod, StructuredGraph> lookup;
-    protected final CanonicalizerPhase canonicalizer;
+    private final ResolvedJavaType unwrappedAnnotationType;
+    private final CanonicalizerPhase canonicalizer;
     private final int maxDepth;
 
-    public TruffleEarlyInliningPhase(OptionValues options, CanonicalizerPhase canonicalizer, KnownTruffleTypes types, Providers providers, Function<ResolvedJavaMethod, StructuredGraph> lookup) {
-        this.types = types;
+    public TruffleEarlyInliningPhase(OptionValues options, CanonicalizerPhase canonicalizer, KnownTruffleTypes types, Providers providers,
+                    Function<ResolvedJavaMethod, StructuredGraph> lookup, Function<ResolvedJavaType, ResolvedJavaType> unwrapType) {
         this.providers = providers;
         this.lookup = lookup;
         this.canonicalizer = canonicalizer;
         this.maxDepth = Options.TruffleEarlyInliningMaxDepth.getValue(options);
+        this.unwrappedAnnotationType = unwrapType.apply(types.CompilerDirectives_EarlyInline);
     }
 
     @Override
@@ -176,7 +177,7 @@ private boolean shouldInline(Invoke invoke) {
             return false;
         }
         Map<ResolvedJavaType, AnnotationValue> declaredAnnotationValues = AnnotationValueSupport.getDeclaredAnnotationValues(targetMethod);
-        if (!declaredAnnotationValues.containsKey(types.CompilerDirectives_EarlyInline)) {
+        if (!declaredAnnotationValues.containsKey(unwrappedAnnotationType)) {
             return false;
         }
         String failureMessage = InliningUtil.checkInvokeConditions(invoke);

substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleRuntimeCompilationFeature.java

@@ -39,6 +39,7 @@
 import com.oracle.svm.graal.hosted.runtimecompilation.RuntimeCompilationFeature;
 import com.oracle.svm.graal.hosted.runtimecompilation.RuntimeCompiledMethodSupport;
 import com.oracle.svm.hosted.FeatureImpl;
+import com.oracle.svm.util.OriginalClassProvider;
 
 import jdk.graal.compiler.debug.DebugContext;
 import jdk.graal.compiler.nodes.StructuredGraph;
@@ -82,9 +83,10 @@ protected void applyParsingHookPhases(DebugContext debug, StructuredGraph graph,
         if (!ImageSingletons.contains(KnownTruffleTypes.class)) {
             return;
         }
+
         KnownTruffleTypes truffleTypes = ImageSingletons.lookup(KnownTruffleTypes.class);
         new PrePartialEvaluationSuite(debug.getOptions(), truffleTypes,
-                        providers, canonicalizer, buildGraph).apply(graph, providers);
+                        providers, canonicalizer, buildGraph, OriginalClassProvider::getOriginalType).apply(graph, providers);
     }
 
     @SuppressWarnings("javadoc")