[MLIR] Fix crash in RemoveDeadValues when terminator lacks RegionBranchTerminatorOpInterface #175300
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…chTerminatorOpInterface The RemoveDeadValues pass was using cast<RegionBranchTerminatorOpInterface> which asserts that the terminator implements this interface. However, some dialects (like CIR) have region terminators that don't implement this interface, causing crashes. This patch changes cast to dyn_cast and skips processing for terminators that don't implement RegionBranchTerminatorOpInterface. Fixes llvm#174502
Member
|
@llvm/pr-subscribers-mlir-core Author: None (nataliakokoromyti) ChangesThe RemoveDeadValues pass was using cast<RegionBranchTerminatorOpInterface> which asserts that the terminator implements this interface. However, some dialects (like CIR) have region terminators that don't implement this interface, causing crashes. This patch changes cast to dyn_cast and skips processing for terminators that don't implement RegionBranchTerminatorOpInterface. Fixes #174502 Full diff: https://github.com/llvm/llvm-project/pull/175300.diff 1 Files Affected:
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index fc2c2acf8afd3..4d20abb415229 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -477,8 +477,10 @@ static void processRegionBranchOp(RegionBranchOpInterface regionBranchOp,
if (region.empty())
continue;
// TODO: this isn't correct in face of multiple terminators.
- auto terminator = cast<RegionBranchTerminatorOpInterface>(
+ auto terminator = dyn_cast<RegionBranchTerminatorOpInterface>(
region.front().getTerminator());
+ if (!terminator)
+ continue;
nonForwardedRets[terminator] =
BitVector(terminator->getNumOperands(), true);
for (const RegionSuccessor &successor : getSuccessors(terminator)) {
@@ -498,11 +500,17 @@ static void processRegionBranchOp(RegionBranchOpInterface regionBranchOp,
DenseMap<Region *, BitVector> &argsToKeep, Region *region = nullptr) {
Operation *terminator =
region ? region->front().getTerminator() : nullptr;
- RegionBranchPoint point =
+ auto terminatorIface =
terminator
- ? RegionBranchPoint(
- cast<RegionBranchTerminatorOpInterface>(terminator))
- : RegionBranchPoint::parent();
+ ? dyn_cast<RegionBranchTerminatorOpInterface>(terminator)
+ : nullptr;
+ // If terminator doesn't implement RegionBranchTerminatorOpInterface,
+ // we can't analyze it, so skip.
+ if (terminator && !terminatorIface)
+ return;
+ RegionBranchPoint point =
+ terminatorIface ? RegionBranchPoint(terminatorIface)
+ : RegionBranchPoint::parent();
for (const RegionSuccessor &successor : getSuccessors(point)) {
Region *successorRegion = successor.getSuccessor();
@@ -566,8 +574,10 @@ static void processRegionBranchOp(RegionBranchOpInterface regionBranchOp,
for (Region ®ion : regionBranchOp->getRegions()) {
if (region.empty())
continue;
- auto terminator = cast<RegionBranchTerminatorOpInterface>(
+ auto terminator = dyn_cast<RegionBranchTerminatorOpInterface>(
region.front().getTerminator());
+ if (!terminator)
+ continue;
for (const RegionSuccessor &successor : getSuccessors(terminator)) {
Region *successorRegion = successor.getSuccessor();
for (auto [opOperand, input] :
|
Member
|
@llvm/pr-subscribers-mlir Author: None (nataliakokoromyti) ChangesThe RemoveDeadValues pass was using cast<RegionBranchTerminatorOpInterface> which asserts that the terminator implements this interface. However, some dialects (like CIR) have region terminators that don't implement this interface, causing crashes. This patch changes cast to dyn_cast and skips processing for terminators that don't implement RegionBranchTerminatorOpInterface. Fixes #174502 Full diff: https://github.com/llvm/llvm-project/pull/175300.diff 1 Files Affected:
diff --git a/mlir/lib/Transforms/RemoveDeadValues.cpp b/mlir/lib/Transforms/RemoveDeadValues.cpp
index fc2c2acf8afd3..4d20abb415229 100644
--- a/mlir/lib/Transforms/RemoveDeadValues.cpp
+++ b/mlir/lib/Transforms/RemoveDeadValues.cpp
@@ -477,8 +477,10 @@ static void processRegionBranchOp(RegionBranchOpInterface regionBranchOp,
if (region.empty())
continue;
// TODO: this isn't correct in face of multiple terminators.
- auto terminator = cast<RegionBranchTerminatorOpInterface>(
+ auto terminator = dyn_cast<RegionBranchTerminatorOpInterface>(
region.front().getTerminator());
+ if (!terminator)
+ continue;
nonForwardedRets[terminator] =
BitVector(terminator->getNumOperands(), true);
for (const RegionSuccessor &successor : getSuccessors(terminator)) {
@@ -498,11 +500,17 @@ static void processRegionBranchOp(RegionBranchOpInterface regionBranchOp,
DenseMap<Region *, BitVector> &argsToKeep, Region *region = nullptr) {
Operation *terminator =
region ? region->front().getTerminator() : nullptr;
- RegionBranchPoint point =
+ auto terminatorIface =
terminator
- ? RegionBranchPoint(
- cast<RegionBranchTerminatorOpInterface>(terminator))
- : RegionBranchPoint::parent();
+ ? dyn_cast<RegionBranchTerminatorOpInterface>(terminator)
+ : nullptr;
+ // If terminator doesn't implement RegionBranchTerminatorOpInterface,
+ // we can't analyze it, so skip.
+ if (terminator && !terminatorIface)
+ return;
+ RegionBranchPoint point =
+ terminatorIface ? RegionBranchPoint(terminatorIface)
+ : RegionBranchPoint::parent();
for (const RegionSuccessor &successor : getSuccessors(point)) {
Region *successorRegion = successor.getSuccessor();
@@ -566,8 +574,10 @@ static void processRegionBranchOp(RegionBranchOpInterface regionBranchOp,
for (Region ®ion : regionBranchOp->getRegions()) {
if (region.empty())
continue;
- auto terminator = cast<RegionBranchTerminatorOpInterface>(
+ auto terminator = dyn_cast<RegionBranchTerminatorOpInterface>(
region.front().getTerminator());
+ if (!terminator)
+ continue;
for (const RegionSuccessor &successor : getSuccessors(terminator)) {
Region *successorRegion = successor.getSuccessor();
for (auto [opOperand, input] :
|
Member
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The RemoveDeadValues pass was using cast which asserts that the terminator implements this interface. However, some dialects (like CIR) have region terminators that don't implement this interface, causing crashes.
This patch changes cast to dyn_cast and skips processing for terminators that don't implement RegionBranchTerminatorOpInterface.
Fixes #174502