Skip to content

[CIR][MLIR][Lowering] Bug Fix: CIRBrOpLowering lost its operands. #2035

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
bcardosolopes merged 1 commit into from
Dec 2, 2025
+21 −5
Merged

[CIR][MLIR][Lowering] Bug Fix: CIRBrOpLowering lost its operands. #2035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,14 +961,15 @@ class CIRCmpOpLowering : public mlir::OpConversionPattern<cir::CmpOp> {
}
};

class CIRBrOpLowering : public mlir::OpRewritePattern<cir::BrOp> {
class CIRBrOpLowering : public mlir::OpConversionPattern<cir::BrOp> {
public:
using OpRewritePattern<cir::BrOp>::OpRewritePattern;
using mlir::OpConversionPattern<cir::BrOp>::OpConversionPattern;

mlir::LogicalResult
matchAndRewrite(cir::BrOp op,
mlir::PatternRewriter &rewriter) const override {
rewriter.replaceOpWithNewOp<mlir::cf::BranchOp>(op, op.getDest());
matchAndRewrite(cir::BrOp op, OpAdaptor adaptor,
mlir::ConversionPatternRewriter &rewriter) const override {
rewriter.replaceOpWithNewOp<mlir::cf::BranchOp>(op, op.getDest(),
adaptor.getDestOperands());
return mlir::LogicalResult::success();
}
};
Expand Down
15 changes: 15 additions & 0 deletions clang/test/CIR/Lowering/ThroughMLIR/br-with-arg.cir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// RUN: cir-opt %s -cir-to-mlir | FileCheck %s -check-prefix=MLIR

!s32i = !cir.int<s, 32>
module {
cir.func @br() -> !s32i {
%0 = cir.const #cir.int<2> : !s32i
cir.br ^bb1(%0 : !s32i)
^bb1(%v1 : !s32i):
cir.return %v1 : !s32i
// MLIR: %[[A:.*]] = arith.constant 2 : i32
// MLIR-NEXT: cf.br ^bb1(%[[A]] : i32)
// MLIR-NEXT:^bb1(%[[V1:.*]]: i32):
// MLIR-NEXT: return %[[V1]] : i32
}
}