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

Author: terapines-osc-cir

clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp

@@ -966,14 +966,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();
   }
 };

clang/test/CIR/Lowering/ThroughMLIR/br-with-arg.cir

@@ -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
+  }
+}