[flang-commits] [flang] [flang][fir] Add fir.if -> scf.if and add filecheck test file (PR #142965)
via flang-commits
flang-commits at lists.llvm.org
Mon Jun 9 19:24:32 PDT 2025
https://github.com/StarryCSF updated https://github.com/llvm/llvm-project/pull/142965
>From d6bc837eafe84c6e1bbaa16578aeb763fac67bd3 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <zhiqiang.fan at terapines.com>
Date: Thu, 5 Jun 2025 21:42:37 +0800
Subject: [PATCH 1/3] [flang][fir] Add fir.if -> scf.if and add filecheck test
file
---
flang/lib/Optimizer/Transforms/FIRToSCF.cpp | 58 +++++++++++-
flang/test/Fir/FirToSCF/if.fir | 97 +++++++++++++++++++++
2 files changed, 153 insertions(+), 2 deletions(-)
create mode 100644 flang/test/Fir/FirToSCF/if.fir
diff --git a/flang/lib/Optimizer/Transforms/FIRToSCF.cpp b/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
index f06ad2db90d55..12a6d3aad4c0d 100644
--- a/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
+++ b/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
@@ -87,13 +87,67 @@ struct DoLoopConversion : public OpRewritePattern<fir::DoLoopOp> {
return success();
}
};
+
+struct IfConversion : public OpRewritePattern<fir::IfOp> {
+ using OpRewritePattern<fir::IfOp>::OpRewritePattern;
+ LogicalResult matchAndRewrite(fir::IfOp ifOp,
+ PatternRewriter &rewriter) const override {
+ mlir::Location loc = ifOp.getLoc();
+ mlir::detail::TypedValue<mlir::IntegerType> condition = ifOp.getCondition();
+ ValueTypeRange<ResultRange> resultTypes = ifOp.getResultTypes();
+ bool hasResult = !resultTypes.empty();
+ auto scfIfOp = rewriter.create<scf::IfOp>(loc, resultTypes, condition,
+ !ifOp.getElseRegion().empty());
+ // then region
+ assert(!ifOp.getThenRegion().empty() && "must have then region");
+ auto &firThenBlock = ifOp.getThenRegion().front();
+ auto &scfThenBlock = scfIfOp.getThenRegion().front();
+ auto &firThenOps = firThenBlock.getOperations();
+ mlir::Operation *firThenTerminator = firThenBlock.getTerminator();
+
+ rewriter.setInsertionPointToStart(&scfThenBlock);
+ // not splice terminator
+ scfThenBlock.getOperations().splice(scfThenBlock.begin(), firThenOps,
+ firThenOps.begin(),
+ std::prev(firThenOps.end()));
+ // create terminator scf.yield
+ if (hasResult) {
+ rewriter.setInsertionPointToEnd(&scfThenBlock);
+ mlir::OperandRange thenResults = firThenTerminator->getOperands();
+ rewriter.create<scf::YieldOp>(firThenTerminator->getLoc(), thenResults);
+ }
+
+ // else region
+ if (!ifOp.getElseRegion().empty()) {
+ auto &firElseBlock = ifOp.getElseRegion().front();
+ auto &scfElseBlock = scfIfOp.getElseRegion().front();
+ auto &firElseOps = firElseBlock.getOperations();
+ mlir::Operation *firElseTerminator = firElseBlock.getTerminator();
+
+ rewriter.setInsertionPointToStart(&scfElseBlock);
+ scfElseBlock.getOperations().splice(scfElseBlock.begin(), firElseOps,
+ firElseOps.begin(),
+ std::prev(firElseOps.end()));
+
+ if (hasResult) {
+ rewriter.setInsertionPointToEnd(&scfElseBlock);
+ mlir::OperandRange elseResults = firElseTerminator->getOperands();
+ rewriter.create<scf::YieldOp>(firElseTerminator->getLoc(), elseResults);
+ }
+ }
+
+ scfIfOp->setAttrs(ifOp->getAttrs());
+ rewriter.replaceOp(ifOp, scfIfOp);
+ return success();
+ }
+};
} // namespace
void FIRToSCFPass::runOnOperation() {
RewritePatternSet patterns(&getContext());
- patterns.add<DoLoopConversion>(patterns.getContext());
+ patterns.add<DoLoopConversion, IfConversion>(patterns.getContext());
ConversionTarget target(getContext());
- target.addIllegalOp<fir::DoLoopOp>();
+ target.addIllegalOp<fir::DoLoopOp, fir::IfOp>();
target.markUnknownOpDynamicallyLegal([](Operation *) { return true; });
if (failed(
applyPartialConversion(getOperation(), target, std::move(patterns))))
diff --git a/flang/test/Fir/FirToSCF/if.fir b/flang/test/Fir/FirToSCF/if.fir
new file mode 100644
index 0000000000000..8885b0343095d
--- /dev/null
+++ b/flang/test/Fir/FirToSCF/if.fir
@@ -0,0 +1,97 @@
+
+// RUN: fir-opt %s --fir-to-scf | FileCheck %s
+
+// CHECK: func.func @_QFPtest_only(
+// CHECK: %[[ARG0:.*]]: !fir.ref<tuple<!fir.ref<f32>>>) {
+// CHECK: %[[VAL_0:.*]] = arith.constant 1 : i32
+// CHECK: %[[VAL_1:.*]] = arith.constant false
+// CHECK: %[[VAL_2:.*]] = arith.constant 0 : i32
+// CHECK: scf.if %[[VAL_1:.*]] {
+// CHECK: %[[VAL_3:.*]] = arith.addi %[[VAL_2:.*]], %[[VAL_0:.*]] : i32
+// CHECK: }
+// CHECK: return
+// CHECK: }
+func.func @_QFPtest_only(%arg0: !fir.ref<tuple<!fir.ref<f32>>>) {
+ %c1_i32 = arith.constant 1 : i32
+ %false = arith.constant false
+ %c0_i32 = arith.constant 0 : i32
+ fir.if %false {
+ %0 = arith.addi %c0_i32, %c1_i32 : i32
+ }
+ return
+ }
+
+// CHECK: func.func @_QFPtest_else(
+// CHECK: %[[ARG0:.*]]: !fir.ref<tuple<!fir.ref<f32>>>) {
+// CHECK: %[[VAL_0:.*]] = arith.constant 1 : i32
+// CHECK: %[[VAL_1:.*]] = arith.constant false
+// CHECK: %[[VAL_2:.*]] = arith.constant 0 : i32
+// CHECK: %[[VAL_3:.*]] = fir.dummy_scope : !fir.dscope
+// CHECK: %[[VAL_4:.*]] = fir.coordinate_of %[[ARG0:.*]], %[[VAL_2:.*]] : (!fir.ref<tuple<!fir.ref<f32>>>, i32) -> !fir.llvm_ptr<!fir.ref<f32>>
+// CHECK: %[[VAL_5:.*]] = fir.load %[[VAL_4:.*]] : !fir.llvm_ptr<!fir.ref<f32>>
+// CHECK: %[[VAL_6:.*]] = fir.declare %[[VAL_5:.*]] {fortran_attrs = #fir.var_attrs<host_assoc>, uniq_name = "_QFEx"} : (!fir.ref<f32>) -> !fir.ref<f32>
+// CHECK: %[[VAL_7:.*]] = fir.address_of(@_QFFtest_elseEsum) : !fir.ref<i32>
+// CHECK: %[[VAL_10:.*]] = fir.declare %[[VAL_7:.*]] {uniq_name = "_QFFtest_elseEsum"} : (!fir.ref<i32>) -> !fir.ref<i32>
+// CHECK: scf.if %[[VAL_1:.*]] {
+// CHECK: %[[VAL_8:.*]] = fir.load %[[VAL_10:.*]] : !fir.ref<i32>
+// CHECK: %[[VAL_9:.*]] = arith.addi %[[VAL_8:.*]], %[[VAL_0:.*]] : i32
+// CHECK: fir.store %[[VAL_9:.*]] to %[[VAL_10:.*]] : !fir.ref<i32>
+// CHECK: } else {
+// CHECK: %[[VAL_8:.*]] = fir.load %[[VAL_10:.*]] : !fir.ref<i32>
+// CHECK: %[[VAL_9:.*]] = arith.addi %[[VAL_8:.*]], %c1_i32 : i32
+// CHECK: fir.store %[[VAL_9:.*]] to %[[VAL_10:.*]] : !fir.ref<i32>
+// CHECK: }
+// CHECK: return
+// CHECK: }
+func.func @_QFPtest_else(%arg0: !fir.ref<tuple<!fir.ref<f32>>> {}) attributes {} {
+ %c1_i32 = arith.constant 1 : i32
+ %false = arith.constant false
+ %c0_i32 = arith.constant 0 : i32
+ %0 = fir.dummy_scope : !fir.dscope
+ %1 = fir.coordinate_of %arg0, %c0_i32 : (!fir.ref<tuple<!fir.ref<f32>>>, i32) -> !fir.llvm_ptr<!fir.ref<f32>>
+ %2 = fir.load %1 : !fir.llvm_ptr<!fir.ref<f32>>
+ %3 = fir.declare %2 {fortran_attrs = #fir.var_attrs<host_assoc>, uniq_name = "_QFEx"} : (!fir.ref<f32>) -> !fir.ref<f32>
+ %4 = fir.address_of(@_QFFtest_elseEsum) : !fir.ref<i32>
+ %5 = fir.declare %4 {uniq_name = "_QFFtest_elseEsum"} : (!fir.ref<i32>) -> !fir.ref<i32>
+ fir.if %false {
+ %6 = fir.load %5 : !fir.ref<i32>
+ %7 = arith.addi %6, %c1_i32 : i32
+ fir.store %7 to %5 : !fir.ref<i32>
+ } else {
+ %6 = fir.load %5 : !fir.ref<i32>
+ %7 = arith.addi %6, %c1_i32 : i32
+ fir.store %7 to %5 : !fir.ref<i32>
+ }
+ return
+}
+
+// CHECK-LABEL: func.func @test_two_result() {
+// CHECK: %[[VAL_0:.*]] = arith.constant 10 : i32
+// CHECK: %[[VAL_1:.*]] = arith.constant 5 : i32
+// CHECK: %[[VAL_2:.*]] = arith.cmpi sgt, %[[VAL_0:.*]], %[[VAL_1:.*]] : i32
+// CHECK: %[[VAL_3:.*]] = arith.constant 3.140000e+00 : f32
+// CHECK: %[[VAL_4:.*]] = arith.constant 2.710000e+00 : f32
+// CHECK: %[[VAL_5:.*]] = arith.constant 1.000000e+00 : f32
+// CHECK: %[[VAL_6:.*]] = arith.constant 2.000000e+00 : f32
+// CHECK: %[[RES:[0-9]+]]:2 = scf.if %[[VAL_2:.*]] -> (f32, f32) {
+// CHECK: scf.yield %[[VAL_3:.*]], %[[VAL_4:.*]] : f32, f32
+// CHECK: } else {
+// CHECK: scf.yield %[[VAL_5:.*]], %[[VAL_6:.*]] : f32, f32
+// CHECK: }
+// CHECK: return
+// CHECK: }
+func.func @test_two_result() {
+ %c10_i32 = arith.constant 10 : i32
+ %c5_i32 = arith.constant 5 : i32
+ %cmp = arith.cmpi sgt, %c10_i32, %c5_i32 : i32
+ %c3_14_f32 = arith.constant 3.14 : f32
+ %c2_71_f32 = arith.constant 2.71 : f32
+ %c1_0_f32 = arith.constant 1.0 : f32
+ %c2_0_f32 = arith.constant 2.0 : f32
+ %x, %y = fir.if %cmp -> (f32, f32) {
+ fir.result %c3_14_f32, %c2_71_f32 : f32, f32
+ } else {
+ fir.result %c1_0_f32, %c2_0_f32 : f32, f32
+ }
+ return
+}
>From d2f6685e6dc647a52305cd96d6e333db033abd53 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <zhiqiang.fan at terapines.com>
Date: Mon, 9 Jun 2025 16:27:25 +0800
Subject: [PATCH 2/3] Standardize the format and simplify the code.
---
flang/lib/Optimizer/Transforms/FIRToSCF.cpp | 51 ++++--------
flang/test/Fir/FirToSCF/if.fir | 91 ++++++---------------
2 files changed, 41 insertions(+), 101 deletions(-)
diff --git a/flang/lib/Optimizer/Transforms/FIRToSCF.cpp b/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
index 12a6d3aad4c0d..20fd3c589ff05 100644
--- a/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
+++ b/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
@@ -95,45 +95,26 @@ struct IfConversion : public OpRewritePattern<fir::IfOp> {
mlir::Location loc = ifOp.getLoc();
mlir::detail::TypedValue<mlir::IntegerType> condition = ifOp.getCondition();
ValueTypeRange<ResultRange> resultTypes = ifOp.getResultTypes();
- bool hasResult = !resultTypes.empty();
- auto scfIfOp = rewriter.create<scf::IfOp>(loc, resultTypes, condition,
- !ifOp.getElseRegion().empty());
+ mlir::scf::IfOp scfIfOp = rewriter.create<scf::IfOp>(
+ loc, resultTypes, condition, !ifOp.getElseRegion().empty());
// then region
- assert(!ifOp.getThenRegion().empty() && "must have then region");
- auto &firThenBlock = ifOp.getThenRegion().front();
- auto &scfThenBlock = scfIfOp.getThenRegion().front();
- auto &firThenOps = firThenBlock.getOperations();
- mlir::Operation *firThenTerminator = firThenBlock.getTerminator();
-
- rewriter.setInsertionPointToStart(&scfThenBlock);
- // not splice terminator
- scfThenBlock.getOperations().splice(scfThenBlock.begin(), firThenOps,
- firThenOps.begin(),
- std::prev(firThenOps.end()));
- // create terminator scf.yield
- if (hasResult) {
- rewriter.setInsertionPointToEnd(&scfThenBlock);
- mlir::OperandRange thenResults = firThenTerminator->getOperands();
- rewriter.create<scf::YieldOp>(firThenTerminator->getLoc(), thenResults);
- }
+ scfIfOp.getThenRegion().takeBody(ifOp.getThenRegion());
+ Block &scfthenBlock = scfIfOp.getThenRegion().front();
+ Operation *scfthenTerminator = scfthenBlock.getTerminator();
+ // fir.result->scf.yield
+ rewriter.setInsertionPointToEnd(&scfthenBlock);
+ rewriter.replaceOpWithNewOp<scf::YieldOp>(scfthenTerminator,
+ scfthenTerminator->getOperands());
// else region
if (!ifOp.getElseRegion().empty()) {
- auto &firElseBlock = ifOp.getElseRegion().front();
- auto &scfElseBlock = scfIfOp.getElseRegion().front();
- auto &firElseOps = firElseBlock.getOperations();
- mlir::Operation *firElseTerminator = firElseBlock.getTerminator();
-
- rewriter.setInsertionPointToStart(&scfElseBlock);
- scfElseBlock.getOperations().splice(scfElseBlock.begin(), firElseOps,
- firElseOps.begin(),
- std::prev(firElseOps.end()));
-
- if (hasResult) {
- rewriter.setInsertionPointToEnd(&scfElseBlock);
- mlir::OperandRange elseResults = firElseTerminator->getOperands();
- rewriter.create<scf::YieldOp>(firElseTerminator->getLoc(), elseResults);
- }
+ scfIfOp.getElseRegion().takeBody(ifOp.getElseRegion());
+ mlir::Block &elseBlock = scfIfOp.getElseRegion().front();
+ mlir::Operation *elseTerminator = elseBlock.getTerminator();
+
+ rewriter.setInsertionPointToEnd(&elseBlock);
+ rewriter.replaceOpWithNewOp<scf::YieldOp>(elseTerminator,
+ elseTerminator->getOperands());
}
scfIfOp->setAttrs(ifOp->getAttrs());
diff --git a/flang/test/Fir/FirToSCF/if.fir b/flang/test/Fir/FirToSCF/if.fir
index 8885b0343095d..9e43cf1cd11d0 100644
--- a/flang/test/Fir/FirToSCF/if.fir
+++ b/flang/test/Fir/FirToSCF/if.fir
@@ -1,97 +1,56 @@
-
// RUN: fir-opt %s --fir-to-scf | FileCheck %s
-// CHECK: func.func @_QFPtest_only(
-// CHECK: %[[ARG0:.*]]: !fir.ref<tuple<!fir.ref<f32>>>) {
-// CHECK: %[[VAL_0:.*]] = arith.constant 1 : i32
-// CHECK: %[[VAL_1:.*]] = arith.constant false
-// CHECK: %[[VAL_2:.*]] = arith.constant 0 : i32
-// CHECK: scf.if %[[VAL_1:.*]] {
-// CHECK: %[[VAL_3:.*]] = arith.addi %[[VAL_2:.*]], %[[VAL_0:.*]] : i32
+// CHECK: func.func @test_only(%[[ARG0:.*]]: i1, %[[ARG1:.*]]: i32) {
+// CHECK: scf.if %[[ARG0:.*]] {
+// CHECK: %[[VAL_1:.*]] = arith.addi %[[ARG1:.*]], %[[ARG1:.*]] : i32
// CHECK: }
// CHECK: return
// CHECK: }
-func.func @_QFPtest_only(%arg0: !fir.ref<tuple<!fir.ref<f32>>>) {
- %c1_i32 = arith.constant 1 : i32
- %false = arith.constant false
- %c0_i32 = arith.constant 0 : i32
- fir.if %false {
- %0 = arith.addi %c0_i32, %c1_i32 : i32
- }
- return
+func.func @test_only(%arg0 : i1, %arg1 : i32) {
+ fir.if %arg0 {
+ %0 = arith.addi %arg1, %arg1 : i32
}
+ return
+}
-// CHECK: func.func @_QFPtest_else(
-// CHECK: %[[ARG0:.*]]: !fir.ref<tuple<!fir.ref<f32>>>) {
-// CHECK: %[[VAL_0:.*]] = arith.constant 1 : i32
+// CHECK: func.func @test_else() {
// CHECK: %[[VAL_1:.*]] = arith.constant false
-// CHECK: %[[VAL_2:.*]] = arith.constant 0 : i32
-// CHECK: %[[VAL_3:.*]] = fir.dummy_scope : !fir.dscope
-// CHECK: %[[VAL_4:.*]] = fir.coordinate_of %[[ARG0:.*]], %[[VAL_2:.*]] : (!fir.ref<tuple<!fir.ref<f32>>>, i32) -> !fir.llvm_ptr<!fir.ref<f32>>
-// CHECK: %[[VAL_5:.*]] = fir.load %[[VAL_4:.*]] : !fir.llvm_ptr<!fir.ref<f32>>
-// CHECK: %[[VAL_6:.*]] = fir.declare %[[VAL_5:.*]] {fortran_attrs = #fir.var_attrs<host_assoc>, uniq_name = "_QFEx"} : (!fir.ref<f32>) -> !fir.ref<f32>
-// CHECK: %[[VAL_7:.*]] = fir.address_of(@_QFFtest_elseEsum) : !fir.ref<i32>
-// CHECK: %[[VAL_10:.*]] = fir.declare %[[VAL_7:.*]] {uniq_name = "_QFFtest_elseEsum"} : (!fir.ref<i32>) -> !fir.ref<i32>
+// CHECK: %[[VAL_2:.*]] = arith.constant 2 : i32
// CHECK: scf.if %[[VAL_1:.*]] {
-// CHECK: %[[VAL_8:.*]] = fir.load %[[VAL_10:.*]] : !fir.ref<i32>
-// CHECK: %[[VAL_9:.*]] = arith.addi %[[VAL_8:.*]], %[[VAL_0:.*]] : i32
-// CHECK: fir.store %[[VAL_9:.*]] to %[[VAL_10:.*]] : !fir.ref<i32>
+// CHECK: %[[VAL_3:.*]] = arith.constant 3 : i32
// CHECK: } else {
-// CHECK: %[[VAL_8:.*]] = fir.load %[[VAL_10:.*]] : !fir.ref<i32>
-// CHECK: %[[VAL_9:.*]] = arith.addi %[[VAL_8:.*]], %c1_i32 : i32
-// CHECK: fir.store %[[VAL_9:.*]] to %[[VAL_10:.*]] : !fir.ref<i32>
+// CHECK: %[[VAL_3:.*]] = arith.constant 3 : i32
// CHECK: }
// CHECK: return
// CHECK: }
-func.func @_QFPtest_else(%arg0: !fir.ref<tuple<!fir.ref<f32>>> {}) attributes {} {
- %c1_i32 = arith.constant 1 : i32
+func.func @test_else() {
%false = arith.constant false
- %c0_i32 = arith.constant 0 : i32
- %0 = fir.dummy_scope : !fir.dscope
- %1 = fir.coordinate_of %arg0, %c0_i32 : (!fir.ref<tuple<!fir.ref<f32>>>, i32) -> !fir.llvm_ptr<!fir.ref<f32>>
- %2 = fir.load %1 : !fir.llvm_ptr<!fir.ref<f32>>
- %3 = fir.declare %2 {fortran_attrs = #fir.var_attrs<host_assoc>, uniq_name = "_QFEx"} : (!fir.ref<f32>) -> !fir.ref<f32>
- %4 = fir.address_of(@_QFFtest_elseEsum) : !fir.ref<i32>
- %5 = fir.declare %4 {uniq_name = "_QFFtest_elseEsum"} : (!fir.ref<i32>) -> !fir.ref<i32>
+ %1 = arith.constant 2 : i32
fir.if %false {
- %6 = fir.load %5 : !fir.ref<i32>
- %7 = arith.addi %6, %c1_i32 : i32
- fir.store %7 to %5 : !fir.ref<i32>
+ %2 = arith.constant 3 : i32
} else {
- %6 = fir.load %5 : !fir.ref<i32>
- %7 = arith.addi %6, %c1_i32 : i32
- fir.store %7 to %5 : !fir.ref<i32>
+ %3 = arith.constant 3 : i32
}
return
}
-// CHECK-LABEL: func.func @test_two_result() {
-// CHECK: %[[VAL_0:.*]] = arith.constant 10 : i32
-// CHECK: %[[VAL_1:.*]] = arith.constant 5 : i32
-// CHECK: %[[VAL_2:.*]] = arith.cmpi sgt, %[[VAL_0:.*]], %[[VAL_1:.*]] : i32
-// CHECK: %[[VAL_3:.*]] = arith.constant 3.140000e+00 : f32
-// CHECK: %[[VAL_4:.*]] = arith.constant 2.710000e+00 : f32
-// CHECK: %[[VAL_5:.*]] = arith.constant 1.000000e+00 : f32
-// CHECK: %[[VAL_6:.*]] = arith.constant 2.000000e+00 : f32
+// CHECK-LABEL: func.func @test_two_result() {
+// CHECK: %[[VAL_1:.*]] = arith.constant 2.000000e+00 : f32
+// CHECK: %[[VAL_2:.*]] = arith.constant false
// CHECK: %[[RES:[0-9]+]]:2 = scf.if %[[VAL_2:.*]] -> (f32, f32) {
-// CHECK: scf.yield %[[VAL_3:.*]], %[[VAL_4:.*]] : f32, f32
+// CHECK: scf.yield %[[VAL_1:.*]], %[[VAL_1:.*]] : f32, f32
// CHECK: } else {
-// CHECK: scf.yield %[[VAL_5:.*]], %[[VAL_6:.*]] : f32, f32
+// CHECK: scf.yield %[[VAL_1:.*]], %[[VAL_1:.*]] : f32, f32
// CHECK: }
// CHECK: return
// CHECK: }
func.func @test_two_result() {
- %c10_i32 = arith.constant 10 : i32
- %c5_i32 = arith.constant 5 : i32
- %cmp = arith.cmpi sgt, %c10_i32, %c5_i32 : i32
- %c3_14_f32 = arith.constant 3.14 : f32
- %c2_71_f32 = arith.constant 2.71 : f32
- %c1_0_f32 = arith.constant 1.0 : f32
- %c2_0_f32 = arith.constant 2.0 : f32
+ %1 = arith.constant 2.0 : f32
+ %cmp = arith.constant false
%x, %y = fir.if %cmp -> (f32, f32) {
- fir.result %c3_14_f32, %c2_71_f32 : f32, f32
+ fir.result %1, %1 : f32, f32
} else {
- fir.result %c1_0_f32, %c2_0_f32 : f32, f32
+ fir.result %1, %1 : f32, f32
}
return
}
>From 739437d53c35efd3097432d7498eebf2de4e40b1 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <zhiqiang.fan at terapines.com>
Date: Tue, 10 Jun 2025 10:23:43 +0800
Subject: [PATCH 3/3] Update flang/lib/Optimizer/Transforms/FIRToSCF.cpp
---
flang/lib/Optimizer/Transforms/FIRToSCF.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/flang/lib/Optimizer/Transforms/FIRToSCF.cpp b/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
index 20fd3c589ff05..9a0071a6c6ae6 100644
--- a/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
+++ b/flang/lib/Optimizer/Transforms/FIRToSCF.cpp
@@ -99,12 +99,12 @@ struct IfConversion : public OpRewritePattern<fir::IfOp> {
loc, resultTypes, condition, !ifOp.getElseRegion().empty());
// then region
scfIfOp.getThenRegion().takeBody(ifOp.getThenRegion());
- Block &scfthenBlock = scfIfOp.getThenRegion().front();
- Operation *scfthenTerminator = scfthenBlock.getTerminator();
+ Block &scfThenBlock = scfIfOp.getThenRegion().front();
+ Operation *scfThenTerminator = scfThenBlock.getTerminator();
// fir.result->scf.yield
- rewriter.setInsertionPointToEnd(&scfthenBlock);
- rewriter.replaceOpWithNewOp<scf::YieldOp>(scfthenTerminator,
- scfthenTerminator->getOperands());
+ rewriter.setInsertionPointToEnd(&scfThenBlock);
+ rewriter.replaceOpWithNewOp<scf::YieldOp>(scfThenTerminator,
+ scfThenTerminator->getOperands());
// else region
if (!ifOp.getElseRegion().empty()) {
More information about the flang-commits
mailing list