[GR-53717] PostRunCanonicalization phases must call super.notApplicab…

…leTo() PullRequest: graal/17629
roberttoyonaga · Apr 29, 2024 · ee40fc1 · ee40fc1
2 parents 50eaae7 + b522b2b
commit ee40fc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...ompiler/src/jdk/graal/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java b/...ompiler/src/jdk/graal/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -134,7 +134,7 @@ public DominatorBasedGlobalValueNumberingPhase(CanonicalizerPhase canonicalizer)
 
     @Override
     public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
-        return ALWAYS_APPLICABLE;
+        return super.notApplicableTo(graphState);
     }
 
     @Override

diff --git a/...c/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeOffsetAddressPhase.java b/...c/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/OptimizeOffsetAddressPhase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -106,7 +106,9 @@ public OptimizeOffsetAddressPhase(CanonicalizerPhase canonicalizer) {
 
     @Override
     public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
-        return NotApplicable.unlessRunBefore(this, StageFlag.FIXED_READS, graphState);
+        return NotApplicable.ifAny(
+                        super.notApplicableTo(graphState),
+                        NotApplicable.unlessRunBefore(this, StageFlag.FIXED_READS, graphState));
     }
 
     @Override