[GR-65389] Use LIR lowering for DeoptimizeNode

tkrodriguez · tkrodriguez · commit e98678ba30fe · 2025-07-19T17:09:07.000Z
PullRequest: graal/20864
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationTask.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/CompilationTask.java
@@ -313,7 +313,7 @@ protected HotSpotCompilationRequestResult performCompilation(DebugContext debug)
                     ListIterator<BasePhase<? super LowTierContext>> lowTierPhasesIterator = suites.getLowTier().findPhase(SchedulePhase.FinalSchedulePhase.class);
                     if (lowTierPhasesIterator != null) {
                         lowTierPhasesIterator.previous();
-                        lowTierPhasesIterator.add(new ForceDeoptSpeculationPhase(decompileCount, null));
+                        lowTierPhasesIterator.add(new ForceDeoptSpeculationPhase(decompileCount));
                     }
                 }
                 result = compiler.compile(graph, shouldRetainLocalVariables, shouldUsePreciseUnresolvedDeopts, eagerResolving, compilationId, debug, suites);
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ForceDeoptSpeculationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/ForceDeoptSpeculationPhase.java
@@ -28,17 +28,14 @@
 
 import java.util.Optional;
 
-import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.graph.Node;
-import jdk.graal.compiler.nodes.ConstantNode;
 import jdk.graal.compiler.nodes.DeoptimizeNode;
 import jdk.graal.compiler.nodes.DynamicDeoptimizeNode;
 import jdk.graal.compiler.nodes.GraphState;
 import jdk.graal.compiler.nodes.ImplicitNullCheckNode;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.ValueNode;
-import jdk.graal.compiler.nodes.extended.ForeignCallNode;
 import jdk.graal.compiler.nodes.spi.CoreProviders;
 import jdk.graal.compiler.phases.BasePhase;
 import jdk.graal.compiler.phases.util.GraphSignature;
@@ -63,33 +60,8 @@ public class ForceDeoptSpeculationPhase extends BasePhase<CoreProviders> {
      */
     final int recompileCount;
 
-    /**
-     * Specifies the descriptor of deoptimize calls that have a speculation as an argument. Those
-     * speculation arguments also have to be replaced if they are not proper speculations.
-     */
-    final ForeignCallDescriptor deoptimizeCallDescriptor;
-    final int deoptimizeCallSpeculationReasonArgumentIndex;
-
-    public ForceDeoptSpeculationPhase(int recompileCount, ForeignCallDescriptor deoptimizeCallDescriptor) {
+    public ForceDeoptSpeculationPhase(int recompileCount) {
         this.recompileCount = recompileCount;
-        int speculationReasonArgumentIndex = -1;
-        if (deoptimizeCallDescriptor != null) {
-            Class<?>[] argumentTypes = deoptimizeCallDescriptor.getArgumentTypes();
-            for (int i = 0; i < argumentTypes.length; i++) {
-                if (SpeculationLog.SpeculationReason.class.equals(argumentTypes[i])) {
-                    speculationReasonArgumentIndex = i;
-                    break;
-                }
-            }
-        }
-        if (speculationReasonArgumentIndex >= 0) {
-            this.deoptimizeCallDescriptor = deoptimizeCallDescriptor;
-            this.deoptimizeCallSpeculationReasonArgumentIndex = speculationReasonArgumentIndex;
-        } else {
-            this.deoptimizeCallDescriptor = null;
-            this.deoptimizeCallSpeculationReasonArgumentIndex = -1;
-        }
-
     }
 
     public static class TooManyDeoptimizationsError extends GraalError {
@@ -121,20 +93,6 @@ protected void run(StructuredGraph graph, CoreProviders context) {
                     deopt.setSpeculation(speculation);
                 }
             }
-            if (deoptimizeCallDescriptor != null) {
-                if (node instanceof ForeignCallNode foreignCallNode && deoptimizeCallDescriptor.equals(foreignCallNode.getDescriptor())) {
-                    ValueNode speculationReasonArgument = foreignCallNode.getArguments().get(deoptimizeCallSpeculationReasonArgumentIndex);
-                    assert speculationReasonArgument.isJavaConstant() : "Speculation reason argument node is not a JavaConstant";
-                    SpeculationLog.Speculation originalSpeculation = context.getMetaAccess().decodeSpeculation((JavaConstant) ((ConstantNode) speculationReasonArgument).getValue(),
-                                    graph.getSpeculationLog());
-                    if (NO_SPECULATION.equals(originalSpeculation)) {
-                        SpeculationLog.Speculation newSpeculation = createSpeculation(graph, signature, foreignCallNode);
-                        JavaConstant speculationConstant = context.getMetaAccess().encodeSpeculation(newSpeculation);
-                        ConstantNode speculationNode = graph.addOrUnique(ConstantNode.forConstant(speculationConstant, context.getMetaAccess(), graph));
-                        ((ConstantNode) speculationReasonArgument).replace(graph, speculationNode);
-                    }
-                }
-            }
             if (node instanceof ImplicitNullCheckNode implicitNullCheck) {
                 JavaConstant spec = implicitNullCheck.getDeoptSpeculation();
                 SpeculationLog.Speculation speculation = spec != null ? context.getMetaAccess().decodeSpeculation(spec, speculationLog) : NO_SPECULATION;
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierConfiguration.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleTierConfiguration.java
@@ -24,10 +24,8 @@
  */
 package jdk.graal.compiler.truffle;
 
-import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import jdk.graal.compiler.core.target.Backend;
 import jdk.graal.compiler.lir.phases.LIRSuites;
-import jdk.graal.compiler.options.OptionValues;
 import jdk.graal.compiler.phases.tiers.Suites;
 import jdk.graal.compiler.phases.util.Providers;
 import jdk.graal.compiler.truffle.phases.TruffleCompilerPhases;
@@ -39,19 +37,13 @@ public final class TruffleTierConfiguration {
     private final Suites suites;
     private final LIRSuites lirSuites;
 
-    public TruffleTierConfiguration(PartialEvaluatorConfiguration configuration, Backend backend, OptionValues options, KnownTruffleTypes knownTruffleTypes) {
-        this(configuration, backend, backend.getProviders(), backend.getSuites().getDefaultSuites(options, backend.getTarget().arch), backend.getSuites().getDefaultLIRSuites(options),
-                        knownTruffleTypes, null);
-    }
-
-    public TruffleTierConfiguration(PartialEvaluatorConfiguration configuration, Backend backend, Providers providers, Suites suites, LIRSuites lirSuites, KnownTruffleTypes knownTruffleTypes,
-                    ForeignCallDescriptor deoptimizeCallDescriptor) {
+    public TruffleTierConfiguration(PartialEvaluatorConfiguration configuration, Backend backend, Providers providers, Suites suites, LIRSuites lirSuites, KnownTruffleTypes knownTruffleTypes) {
         this.configuration = configuration;
         this.backend = backend;
         this.providers = providers.copyWith(new TruffleStringConstantFieldProvider(providers, knownTruffleTypes));
         this.suites = suites;
         this.lirSuites = lirSuites;
-        TruffleCompilerPhases.register(knownTruffleTypes, providers, suites, deoptimizeCallDescriptor);
+        TruffleCompilerPhases.register(knownTruffleTypes, providers, suites);
         this.suites.setImmutable();
     }
 
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilerImpl.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/hotspot/HotSpotTruffleCompilerImpl.java
@@ -198,7 +198,7 @@ private static TruffleTierConfiguration createTierConfiguration(HotSpotGraalRunt
         Backend backend = createTruffleBackend(hotspotGraalRuntime, options, knownTruffleTypes, forceConfigName);
         Suites suites = backend.getSuites().getDefaultSuites(options, backend.getTarget().arch);
         LIRSuites lirSuites = backend.getSuites().getDefaultLIRSuites(options);
-        return new TruffleTierConfiguration(peConfig, backend, backend.getProviders(), suites, lirSuites, knownTruffleTypes, null);
+        return new TruffleTierConfiguration(peConfig, backend, backend.getProviders(), suites, lirSuites, knownTruffleTypes);
     }
 
     private static String resolveConfigurationName(HotSpotGraalRuntimeProvider hotspotGraalRuntime, OptionValues options, String forceConfigName) {
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleCompilerPhases.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleCompilerPhases.java
@@ -26,7 +26,6 @@
 
 import java.util.ListIterator;
 
-import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import jdk.graal.compiler.loop.phases.LoopSafepointEliminationPhase;
 import jdk.graal.compiler.phases.BasePhase;
 import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase;
@@ -43,7 +42,7 @@ public final class TruffleCompilerPhases {
     private TruffleCompilerPhases() {
     }
 
-    public static void register(KnownTruffleTypes types, Providers providers, Suites suites, ForeignCallDescriptor deoptimizeCallDescriptor) {
+    public static void register(KnownTruffleTypes types, Providers providers, Suites suites) {
         if (suites.isImmutable()) {
             throw new IllegalStateException("Suites are already immutable.");
         }
@@ -64,7 +63,7 @@ public static void register(KnownTruffleTypes types, Providers providers, Suites
         ListIterator<BasePhase<? super LowTierContext>> lowTierPhasesIterator = suites.getLowTier().findPhase(SchedulePhase.FinalSchedulePhase.class);
         if (lowTierPhasesIterator != null) {
             lowTierPhasesIterator.previous();
-            lowTierPhasesIterator.add(new TruffleForceDeoptSpeculationPhase(deoptimizeCallDescriptor));
+            lowTierPhasesIterator.add(new TruffleForceDeoptSpeculationPhase());
         }
     }
 
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleForceDeoptSpeculationPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/phases/TruffleForceDeoptSpeculationPhase.java
@@ -26,7 +26,6 @@
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
-import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import jdk.graal.compiler.debug.GraalError;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.ValueNode;
@@ -37,8 +36,8 @@
 import jdk.graal.compiler.truffle.TruffleCompilerOptions;
 
 public class TruffleForceDeoptSpeculationPhase extends ForceDeoptSpeculationPhase {
-    public TruffleForceDeoptSpeculationPhase(ForeignCallDescriptor deoptimizeCallDescriptor) {
-        super(0, deoptimizeCallDescriptor);
+    public TruffleForceDeoptSpeculationPhase() {
+        super(0);
     }
 
     @Override
diff --git a/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java b/substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64Backend.java
@@ -49,6 +49,8 @@
 import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.aarch64.SubstrateAArch64MacroAssembler;
 import com.oracle.svm.core.config.ConfigurationValues;
+import com.oracle.svm.core.deopt.DeoptimizationRuntime;
+import com.oracle.svm.core.deopt.DeoptimizationSupport;
 import com.oracle.svm.core.deopt.Deoptimizer;
 import com.oracle.svm.core.graal.code.AssignedLocation;
 import com.oracle.svm.core.graal.code.PatchConsumerFactory;
@@ -607,7 +609,13 @@ public void emitUnwind(Value operand) {
 
         @Override
         public void emitDeoptimize(Value actionAndReason, Value failedSpeculation, LIRFrameState state) {
-            throw shouldNotReachHere("Substrate VM does not use deoptimization");
+            if (!SubstrateUtil.HOSTED && DeoptimizationSupport.enabled()) {
+                ForeignCallLinkage linkage = getForeignCalls().lookupForeignCall(DeoptimizationRuntime.DEOPTIMIZE);
+                emitForeignCall(linkage, state, actionAndReason, failedSpeculation);
+                append(new DeadEndOp());
+            } else {
+                throw shouldNotReachHere("Substrate VM does not use deoptimization");
+            }
         }
 
         @Override
diff --git a/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java b/substratevm/src/com.oracle.svm.core.graal.amd64/src/com/oracle/svm/core/graal/amd64/SubstrateAMD64Backend.java
@@ -59,6 +59,8 @@
 import com.oracle.svm.core.amd64.AMD64CPUFeatureAccess;
 import com.oracle.svm.core.config.ConfigurationValues;
 import com.oracle.svm.core.cpufeature.Stubs;
+import com.oracle.svm.core.deopt.DeoptimizationRuntime;
+import com.oracle.svm.core.deopt.DeoptimizationSupport;
 import com.oracle.svm.core.deopt.Deoptimizer;
 import com.oracle.svm.core.graal.RuntimeCompilation;
 import com.oracle.svm.core.graal.code.AssignedLocation;
@@ -753,7 +755,13 @@ public void emitUnwind(Value operand) {
 
         @Override
         public void emitDeoptimize(Value actionAndReason, Value failedSpeculation, LIRFrameState state) {
-            throw shouldNotReachHere("Substrate VM does not use deoptimization");
+            if (!SubstrateUtil.HOSTED && DeoptimizationSupport.enabled()) {
+                ForeignCallLinkage linkage = getForeignCalls().lookupForeignCall(DeoptimizationRuntime.DEOPTIMIZE);
+                emitForeignCall(linkage, state, actionAndReason, failedSpeculation);
+                append(new DeadEndOp());
+            } else {
+                throw shouldNotReachHere("Substrate VM does not use deoptimization");
+            }
         }
 
         @Override
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptRuntimeSnippets.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptRuntimeSnippets.java
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptSnippetsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/snippets/DeoptSnippetsFeature.java
@@ -26,14 +26,14 @@
 
 import java.util.Map;
 
-import jdk.graal.compiler.graph.Node;
-import jdk.graal.compiler.options.OptionValues;
-import jdk.graal.compiler.phases.util.Providers;
-
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
 
+import jdk.graal.compiler.graph.Node;
+import jdk.graal.compiler.options.OptionValues;
+import jdk.graal.compiler.phases.util.Providers;
+
 @AutomaticallyRegisteredFeature
 final class DeoptSnippetsFeature implements InternalFeature {
 
@@ -42,8 +42,6 @@ public void registerLowerings(RuntimeConfiguration runtimeConfig, OptionValues o
                     Map<Class<? extends Node>, NodeLoweringProvider<?>> lowerings, boolean hosted) {
         if (hosted) {
             DeoptHostedSnippets.registerLowerings(options, providers, lowerings);
-        } else {
-            DeoptRuntimeSnippets.registerLowerings(options, providers, lowerings);
         }
     }
 }
diff --git a/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/TruffleSupport.java
@@ -32,7 +32,6 @@
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateUtil;
-import com.oracle.svm.core.deopt.DeoptimizationRuntime;
 import com.oracle.svm.core.graal.code.SubstrateBackend;
 import com.oracle.svm.core.meta.SubstrateObjectConstant;
 import com.oracle.svm.graal.TruffleRuntimeCompilationSupport;
@@ -112,12 +111,12 @@ protected static TruffleCompilerConfiguration createSubstrateTruffleCompilerConf
         SubstrateKnownTruffleTypes types = new SubstrateKnownTruffleTypes(runtime, providers.getMetaAccess(), providers.getConstantReflection());
         final TruffleTierConfiguration firstTier = new TruffleTierConfiguration(new EconomyPartialEvaluatorConfiguration(), substrateBackend,
                         TruffleRuntimeCompilationSupport.getFirstTierProviders(), TruffleRuntimeCompilationSupport.getFirstTierSuites(), TruffleRuntimeCompilationSupport.getFirstTierLirSuites(),
-                        types, DeoptimizationRuntime.DEOPTIMIZE);
+                        types);
 
         PartialEvaluatorConfiguration peConfig = TruffleCompilerImpl.createPartialEvaluatorConfiguration(compilerConfigurationName);
         final TruffleTierConfiguration lastTier = new TruffleTierConfiguration(peConfig, substrateBackend,
                         TruffleRuntimeCompilationSupport.getRuntimeConfig().getProviders(), TruffleRuntimeCompilationSupport.getFullOptSuites(), TruffleRuntimeCompilationSupport.getLIRSuites(),
-                        types, DeoptimizationRuntime.DEOPTIMIZE);
+                        types);
         return new TruffleCompilerConfiguration(runtime, graphBuilderPlugins, runtimeCompilationFeature.getHostedProviders().getSnippetReflection(), firstTier, lastTier, types,
                         TruffleRuntimeCompilationSupport.getFullOptSuites(), null);
     }

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ protected HotSpotCompilationRequestResult performCompilation(DebugContext debug)`
`313`	`313`	`ListIterator<BasePhase<? super LowTierContext>> lowTierPhasesIterator = suites.getLowTier().findPhase(SchedulePhase.FinalSchedulePhase.class);`
`314`	`314`	`if (lowTierPhasesIterator != null) {`
`315`	`315`	`lowTierPhasesIterator.previous();`
`316`		`- lowTierPhasesIterator.add(new ForceDeoptSpeculationPhase(decompileCount, null));`
	`316`	`+ lowTierPhasesIterator.add(new ForceDeoptSpeculationPhase(decompileCount));`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`	`result = compiler.compile(graph, shouldRetainLocalVariables, shouldUsePreciseUnresolvedDeopts, eagerResolving, compilationId, debug, suites);`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ private static TruffleTierConfiguration createTierConfiguration(HotSpotGraalRunt`
`198`	`198`	`Backend backend = createTruffleBackend(hotspotGraalRuntime, options, knownTruffleTypes, forceConfigName);`
`199`	`199`	`Suites suites = backend.getSuites().getDefaultSuites(options, backend.getTarget().arch);`
`200`	`200`	`LIRSuites lirSuites = backend.getSuites().getDefaultLIRSuites(options);`
`201`		`- return new TruffleTierConfiguration(peConfig, backend, backend.getProviders(), suites, lirSuites, knownTruffleTypes, null);`
	`201`	`+ return new TruffleTierConfiguration(peConfig, backend, backend.getProviders(), suites, lirSuites, knownTruffleTypes);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`private static String resolveConfigurationName(HotSpotGraalRuntimeProvider hotspotGraalRuntime, OptionValues options, String forceConfigName) {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`
`27`	`27`	`import java.util.ListIterator;`
`28`	`28`
`29`		`-import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;`
`30`	`29`	`import jdk.graal.compiler.loop.phases.LoopSafepointEliminationPhase;`
`31`	`30`	`import jdk.graal.compiler.phases.BasePhase;`
`32`	`31`	`import jdk.graal.compiler.phases.common.DeoptimizationGroupingPhase;`
`@@ -43,7 +42,7 @@ public final class TruffleCompilerPhases {`
`43`	`42`	`private TruffleCompilerPhases() {`
`44`	`43`	`}`
`45`	`44`
`46`		`- public static void register(KnownTruffleTypes types, Providers providers, Suites suites, ForeignCallDescriptor deoptimizeCallDescriptor) {`
	`45`	`+ public static void register(KnownTruffleTypes types, Providers providers, Suites suites) {`
`47`	`46`	`if (suites.isImmutable()) {`
`48`	`47`	`throw new IllegalStateException("Suites are already immutable.");`
`49`	`48`	`}`
`@@ -64,7 +63,7 @@ public static void register(KnownTruffleTypes types, Providers providers, Suites`
`64`	`63`	`ListIterator<BasePhase<? super LowTierContext>> lowTierPhasesIterator = suites.getLowTier().findPhase(SchedulePhase.FinalSchedulePhase.class);`
`65`	`64`	`if (lowTierPhasesIterator != null) {`
`66`	`65`	`lowTierPhasesIterator.previous();`
`67`		`- lowTierPhasesIterator.add(new TruffleForceDeoptSpeculationPhase(deoptimizeCallDescriptor));`
	`66`	`+ lowTierPhasesIterator.add(new TruffleForceDeoptSpeculationPhase());`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`