Skip to content

[mlir][cf] Do not access erased operation in cf.cond_br lowering #148358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthias-springer merged 2 commits into from
Jul 12, 2025
Merged

[mlir][cf] Do not access erased operation in cf.cond_br lowering #148358

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
409723b
[mlir][cf] Do not access erased operation in `cf.cond_br` lowering
matthias-springer Jul 12, 2025
6ad7cef
Apply suggestions from code review
matthias-springer Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions mlir/lib/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,12 @@ struct BranchOpLowering : public ConvertOpToLLVMPattern<cf::BranchOp> {
TypeRange(adaptor.getOperands()));
if (failed(convertedBlock))
return failure();
auto attrs = op->getAttrDictionary();
Operation *newOp = rewriter.replaceOpWithNewOp<LLVM::BrOp>(
op, adaptor.getOperands(), *convertedBlock);
// TODO: We should not just forward all attributes like that. But there are
// existing Flang tests that depend on this behavior.
newOp->setAttrs(op->getAttrDictionary());
newOp->setAttrs(attrs);
return success();
}
};
Expand All @@ -166,18 +167,14 @@ struct CondBranchOpLowering : public ConvertOpToLLVMPattern<cf::CondBranchOp> {
TypeRange(adaptor.getFalseDestOperands()));
if (failed(convertedFalseBlock))
return failure();
auto attrs = op->getAttrDictionary();
auto newOp = rewriter.replaceOpWithNewOp<LLVM::CondBrOp>(
op, adaptor.getCondition(), *convertedTrueBlock,
adaptor.getTrueDestOperands(), *convertedFalseBlock,
adaptor.getFalseDestOperands());
ArrayRef<int32_t> weights = op.getWeights();
if (!weights.empty()) {
newOp.setWeights(weights);
op.removeBranchWeightsAttr();
}
op, adaptor.getCondition(), adaptor.getTrueDestOperands(),
adaptor.getFalseDestOperands(), op.getBranchWeightsAttr(),
*convertedTrueBlock, *convertedFalseBlock);
// TODO: We should not just forward all attributes like that. But there are
// existing Flang tests that depend on this behavior.
newOp->setAttrs(op->getAttrDictionary());
newOp->setAttrs(attrs);
return success();
}
};
Expand Down
Loading