Use graph.checkCancellation instead of task.isCancelled.

jerboaa · Mar 17, 2022 · 0836e30 · 0836e30
1 parent a985b76
commit 0836e30
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 18 deletions.
diff --git a/...piler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java b/...piler.truffle.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
@@ -505,9 +505,7 @@ private void compileAST(TruffleCompilationWrapper wrapper, DebugContext debug) {
         StructuredGraph graph = null;
         try (CompilationAlarm alarm = CompilationAlarm.trackCompilationPeriod(debug.getOptions())) {
             graph = truffleTier(wrapper, debug);
-            if (wrapper.task.isCancelled()) {
-                return;
-            }
+            graph.checkCancellation();
             // The Truffle compiler owns the last 2 characters of the compilation name, and uses
             // them to encode the compilation tier, so escaping the target name is not necessary.
             String compilationName = wrapper.compilable.toString() + (wrapper.task.isFirstTier() ? TruffleCompiler.FIRST_TIER_COMPILATION_SUFFIX : TruffleCompiler.SECOND_TIER_COMPILATION_SUFFIX);

diff --git a/.../src/org/graalvm/compiler/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java b/.../src/org/graalvm/compiler/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
@@ -33,9 +33,7 @@
 public final class InliningAcrossTruffleBoundaryPhase extends BasePhase<TruffleTierContext> {
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
-        if (context.task.isCancelled()) {
-            return;
-        }
+        graph.checkCancellation();
         TruffleCompilerRuntime rt = TruffleCompilerRuntime.getRuntime();
         for (MethodCallTargetNode mct : graph.getNodes(MethodCallTargetNode.TYPE)) {
             TruffleCompilerRuntime.InlineKind inlineKind = rt.getInlineKind(mct.targetMethod(), false);

diff --git a/...fle.compiler/src/org/graalvm/compiler/truffle/compiler/phases/MaterializeFramesPhase.java b/...fle.compiler/src/org/graalvm/compiler/truffle/compiler/phases/MaterializeFramesPhase.java
@@ -32,9 +32,7 @@
 public final class MaterializeFramesPhase extends BasePhase<TruffleTierContext> {
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
-        if (context.task.isCancelled()) {
-            return;
-        }
+        graph.checkCancellation();
         for (AllowMaterializeNode materializeNode : graph.getNodes(AllowMaterializeNode.TYPE).snapshot()) {
             materializeNode.replaceAtUsages(materializeNode.getFrame());
             graph.removeFixed(materializeNode);

diff --git a/...ompiler/src/org/graalvm/compiler/truffle/compiler/phases/NeverPartOfCompilationPhase.java b/...ompiler/src/org/graalvm/compiler/truffle/compiler/phases/NeverPartOfCompilationPhase.java
@@ -34,9 +34,7 @@
 public final class NeverPartOfCompilationPhase extends BasePhase<TruffleTierContext> {
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
-        if (context.task.isCancelled()) {
-            return;
-        }
+        graph.checkCancellation();
         for (NeverPartOfCompilationNode neverPartOfCompilationNode : graph.getNodes(NeverPartOfCompilationNode.TYPE)) {
             final NeverPartOfCompilationException neverPartOfCompilationException = new NeverPartOfCompilationException(neverPartOfCompilationNode.getMessage());
             neverPartOfCompilationException.setStackTrace(GraphUtil.approxSourceStackTraceElement(neverPartOfCompilationNode));

diff --git a/...piler/src/org/graalvm/compiler/truffle/compiler/phases/SetIdentityForValueTypesPhase.java b/...piler/src/org/graalvm/compiler/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
@@ -36,9 +36,7 @@
 public final class SetIdentityForValueTypesPhase extends BasePhase<TruffleTierContext> {
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
-        if (context.task.isCancelled()) {
-            return;
-        }
+        graph.checkCancellation();
         TruffleCompilerRuntime rt = TruffleCompilerRuntime.getRuntime();
         for (VirtualObjectNode virtualObjectNode : graph.getNodes(VirtualObjectNode.TYPE)) {
             if (virtualObjectNode instanceof VirtualInstanceNode) {

diff --git a/...piler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java b/...piler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
@@ -39,9 +39,7 @@
 public class VerifyFrameDoesNotEscapePhase extends BasePhase<TruffleTierContext> {
     @Override
     protected void run(StructuredGraph graph, TruffleTierContext context) {
-        if (context.task.isCancelled()) {
-            return;
-        }
+        graph.checkCancellation();
         for (NewFrameNode virtualFrame : graph.getNodes(NewFrameNode.TYPE)) {
             for (MethodCallTargetNode callTarget : virtualFrame.usages().filter(MethodCallTargetNode.class)) {
                 if (callTarget.invoke() != null) {