[flang-commits] [flang] [flang][NFC] Converted five tests from old lowering to new lowering (part 44) (PR #191926)
via flang-commits
flang-commits at lists.llvm.org
Mon Apr 13 19:56:02 PDT 2026
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-flang-fir-hlfir
Author: Eugene Epshteyn (eugeneepshteyn)
<details>
<summary>Changes</summary>
Tests converted from test/Lower/Intrinsics: verify.f90
Tests converted from test/Lower: io-char-array.f90, io-implied-do-fixes.f90, io-item-list.f90, io-statement-1.f90
---
Patch is 46.52 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/191926.diff
5 Files Affected:
- (modified) flang/test/Lower/Intrinsics/verify.f90 (+87-67)
- (modified) flang/test/Lower/io-char-array.f90 (+18-16)
- (modified) flang/test/Lower/io-implied-do-fixes.f90 (+33-26)
- (modified) flang/test/Lower/io-item-list.f90 (+75-75)
- (modified) flang/test/Lower/io-statement-1.f90 (+51-50)
``````````diff
diff --git a/flang/test/Lower/Intrinsics/verify.f90 b/flang/test/Lower/Intrinsics/verify.f90
index 7d0f97023e63f..ded32d7cf2b8c 100644
--- a/flang/test/Lower/Intrinsics/verify.f90
+++ b/flang/test/Lower/Intrinsics/verify.f90
@@ -1,87 +1,107 @@
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
! CHECK-LABEL: func @_QPverify_test(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1>{{.*}}, %[[VAL_1:.*]]: !fir.boxchar<1>{{.*}}) -> i32 {
+! CHECK-SAME: %[[S1_ARG:.*]]: !fir.boxchar<1>{{.*}}, %[[S2_ARG:.*]]: !fir.boxchar<1>{{.*}}) -> i32 {
integer function verify_test(s1, s2)
-! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.box<!fir.heap<i32>>
-! CHECK: %[[VAL_3:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-! CHECK: %[[VAL_4:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-! CHECK: %[[VAL_5:.*]] = fir.alloca i32 {bindc_name = "verify_test", uniq_name = "_QFverify_testEverify_test"}
-! CHECK: %[[VAL_6:.*]] = arith.constant 4 : i32
-! CHECK: %[[VAL_7:.*]] = fir.absent !fir.box<i1>
-! CHECK: %[[VAL_8:.*]] = fir.embox %[[VAL_3]]#0 typeparams %[[VAL_3]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
-! CHECK: %[[VAL_9:.*]] = fir.embox %[[VAL_4]]#0 typeparams %[[VAL_4]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
-! CHECK: %[[VAL_10:.*]] = fir.zero_bits !fir.heap<i32>
-! CHECK: %[[VAL_11:.*]] = fir.embox %[[VAL_10]] : (!fir.heap<i32>) -> !fir.box<!fir.heap<i32>>
-! CHECK: fir.store %[[VAL_11]] to %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<i32>>>
-! CHECK: %[[VAL_12:.*]] = fir.address_of(@_QQclX{{[0-9a-z]+}}) : !fir.ref<!fir.char<1,{{[0-9]*}}>>
-! CHECK: %[[VAL_13:.*]] = arith.constant {{[0-9]+}} : i32
-! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.box<!fir.heap<i32>>>) -> !fir.ref<!fir.box<none>>
-! CHECK: %[[VAL_15:.*]] = fir.convert %[[VAL_8]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
-! CHECK: %[[VAL_16:.*]] = fir.convert %[[VAL_9]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
-! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_7]] : (!fir.box<i1>) -> !fir.box<none>
-! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_12]] : (!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
-! CHECK: fir.call @_FortranAVerify(%[[VAL_14]], %[[VAL_15]], %[[VAL_16]], %[[VAL_17]], %[[VAL_6]], %[[VAL_18]], %[[VAL_13]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.box<none>, i32, !fir.ref<i8>, i32) -> ()
-! CHECK: %[[VAL_20:.*]] = fir.load %[[VAL_2]] : !fir.ref<!fir.box<!fir.heap<i32>>>
-! CHECK: %[[VAL_21:.*]] = fir.box_addr %[[VAL_20]] : (!fir.box<!fir.heap<i32>>) -> !fir.heap<i32>
-! CHECK: %[[VAL_22:.*]] = fir.load %[[VAL_21]] : !fir.heap<i32>
-! CHECK: fir.freemem %[[VAL_21]]
-! CHECK: fir.store %[[VAL_22]] to %[[VAL_5]] : !fir.ref<i32>
-! CHECK: %[[VAL_23:.*]] = fir.load %[[VAL_5]] : !fir.ref<i32>
-! CHECK: return %[[VAL_23]] : i32
+! CHECK: %[[BOX:.*]] = fir.alloca !fir.box<!fir.heap<i32>>
+! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[S1_UNBOX:.*]]:2 = fir.unboxchar %[[S1_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+! CHECK: %[[S1_DECL:.*]]:2 = hlfir.declare %[[S1_UNBOX]]#0 typeparams %[[S1_UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFverify_testEs1"} : (!fir.ref<!fir.char<1,?>>, index, !fir.dscope) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
+! CHECK: %[[S2_UNBOX:.*]]:2 = fir.unboxchar %[[S2_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+! CHECK: %[[S2_DECL:.*]]:2 = hlfir.declare %[[S2_UNBOX]]#0 typeparams %[[S2_UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 2 {uniq_name = "_QFverify_testEs2"} : (!fir.ref<!fir.char<1,?>>, index, !fir.dscope) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
+! CHECK: %[[RET_VAR:.*]] = fir.alloca i32 {bindc_name = "verify_test", uniq_name = "_QFverify_testEverify_test"}
+! CHECK: %[[RET_DECL:.*]]:2 = hlfir.declare %[[RET_VAR]] {uniq_name = "_QFverify_testEverify_test"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[KIND:.*]] = arith.constant 4 : i32
+! CHECK: %[[ABSENT:.*]] = fir.absent !fir.box<i1>
+! CHECK: %[[S1_EMBOX:.*]] = fir.embox %[[S1_DECL]]#1 typeparams %[[S1_UNBOX]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
+! CHECK: %[[S2_EMBOX:.*]] = fir.embox %[[S2_DECL]]#1 typeparams %[[S2_UNBOX]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
+! CHECK: %[[NULL:.*]] = fir.zero_bits !fir.heap<i32>
+! CHECK: %[[RES_BOX:.*]] = fir.embox %[[NULL]] : (!fir.heap<i32>) -> !fir.box<!fir.heap<i32>>
+! CHECK: fir.store %[[RES_BOX]] to %[[BOX]] : !fir.ref<!fir.box<!fir.heap<i32>>>
+! CHECK: %[[FILE:.*]] = fir.address_of({{.*}}) : !fir.ref<!fir.char<1,{{[0-9]*}}>>
+! CHECK: %[[LINE:.*]] = arith.constant {{[0-9]*}} : i32
+! CHECK: %[[BOX_NONE:.*]] = fir.convert %[[BOX]] : (!fir.ref<!fir.box<!fir.heap<i32>>>) -> !fir.ref<!fir.box<none>>
+! CHECK: %[[S1_NONE:.*]] = fir.convert %[[S1_EMBOX]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
+! CHECK: %[[S2_NONE:.*]] = fir.convert %[[S2_EMBOX]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
+! CHECK: %[[ABSENT_NONE:.*]] = fir.convert %[[ABSENT]] : (!fir.box<i1>) -> !fir.box<none>
+! CHECK: %[[FILE_PTR:.*]] = fir.convert %[[FILE]] : (!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
+! CHECK: fir.call @_FortranAVerify(%[[BOX_NONE]], %[[S1_NONE]], %[[S2_NONE]], %[[ABSENT_NONE]], %[[KIND]], %[[FILE_PTR]], %[[LINE]]) {{.*}}: (!fir.ref<!fir.box<none>>, !fir.box<none>, !fir.box<none>, !fir.box<none>, i32, !fir.ref<i8>, i32) -> ()
+! CHECK: %[[LOAD_BOX:.*]] = fir.load %[[BOX]] : !fir.ref<!fir.box<!fir.heap<i32>>>
+! CHECK: %[[ADDR:.*]] = fir.box_addr %[[LOAD_BOX]] : (!fir.box<!fir.heap<i32>>) -> !fir.heap<i32>
+! CHECK: %[[VAL:.*]] = fir.load %[[ADDR]] : !fir.heap<i32>
+! CHECK: fir.freemem %[[ADDR]] : !fir.heap<i32>
+! CHECK: hlfir.assign %[[VAL]] to %[[RET_DECL]]#0 : i32, !fir.ref<i32>
+! CHECK: %[[RES:.*]] = fir.load %[[RET_DECL]]#0 : !fir.ref<i32>
+! CHECK: return %[[RES]] : i32
character(*) :: s1, s2
verify_test = verify(s1, s2, kind=4)
end function verify_test
! CHECK-LABEL: func @_QPverify_test2(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1>{{.*}}, %[[VAL_1:.*]]: !fir.boxchar<1>{{.*}}) -> i32 {
+! CHECK-SAME: %[[S1_ARG:.*]]: !fir.boxchar<1>{{.*}}, %[[S2_ARG:.*]]: !fir.boxchar<1>{{.*}}) -> i32 {
integer function verify_test2(s1, s2)
-! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-! CHECK: %[[VAL_3:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-! CHECK: %[[VAL_4:.*]] = fir.alloca i32 {bindc_name = "verify_test2", uniq_name = "_QFverify_test2Everify_test2"}
-! CHECK: %[[VAL_5:.*]] = arith.constant true
-! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
-! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_2]]#1 : (index) -> i64
-! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_3]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
-! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_3]]#1 : (index) -> i64
-! CHECK: %[[VAL_10:.*]] = fir.call @_FortranAVerify1(%[[VAL_6]], %[[VAL_7]], %[[VAL_8]], %[[VAL_9]], %[[VAL_5]]) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i8>, i64, i1) -> i64
-! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_10]] : (i64) -> i32
-! CHECK: fir.store %[[VAL_11]] to %[[VAL_4]] : !fir.ref<i32>
-! CHECK: %[[VAL_12:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>
-! CHECK: return %[[VAL_12]] : i32
+! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[S1_UNBOX:.*]]:2 = fir.unboxchar %[[S1_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+! CHECK: %[[S1_DECL:.*]]:2 = hlfir.declare %[[S1_UNBOX]]#0 typeparams %[[S1_UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFverify_test2Es1"} : (!fir.ref<!fir.char<1,?>>, index, !fir.dscope) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
+! CHECK: %[[S2_UNBOX:.*]]:2 = fir.unboxchar %[[S2_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+! CHECK: %[[S2_DECL:.*]]:2 = hlfir.declare %[[S2_UNBOX]]#0 typeparams %[[S2_UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 2 {uniq_name = "_QFverify_test2Es2"} : (!fir.ref<!fir.char<1,?>>, index, !fir.dscope) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
+! CHECK: %[[RET_VAR:.*]] = fir.alloca i32 {bindc_name = "verify_test2", uniq_name = "_QFverify_test2Everify_test2"}
+! CHECK: %[[RET_DECL:.*]]:2 = hlfir.declare %[[RET_VAR]] {uniq_name = "_QFverify_test2Everify_test2"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
+! CHECK: %[[BACK:.*]] = arith.constant true
+! CHECK: %[[S1_PTR:.*]] = fir.convert %[[S1_DECL]]#1 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
+! CHECK: %[[S1_LEN:.*]] = fir.convert %[[S1_UNBOX]]#1 : (index) -> i64
+! CHECK: %[[S2_PTR:.*]] = fir.convert %[[S2_DECL]]#1 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
+! CHECK: %[[S2_LEN:.*]] = fir.convert %[[S2_UNBOX]]#1 : (index) -> i64
+! CHECK: %[[RES_I64:.*]] = fir.call @_FortranAVerify1(%[[S1_PTR]], %[[S1_LEN]], %[[S2_PTR]], %[[S2_LEN]], %[[BACK]]) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i8>, i64, i1) -> i64
+! CHECK: %[[RES_I32:.*]] = fir.convert %[[RES_I64]] : (i64) -> i32
+! CHECK: hlfir.assign %[[RES_I32]] to %[[RET_DECL]]#0 : i32, !fir.ref<i32>
+! CHECK: %[[RES:.*]] = fir.load %[[RET_DECL]]#0 : !fir.ref<i32>
+! CHECK: return %[[RES]] : i32
character(*) :: s1, s2
verify_test2 = verify(s1, s2, .true.)
end function verify_test2
! CHECK-LABEL: func @_QPtest_optional(
-! CHECK-SAME: %[[VAL_0:.*]]: !fir.box<!fir.array<?x!fir.char<1,?>>>
-! CHECK-SAME: %[[VAL_1:.*]]: !fir.boxchar<1>
-! CHECK-SAME: %[[VAL_2:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>
+! CHECK-SAME: %[[STRING_ARG:.*]]: !fir.box<!fir.array<?x!fir.char<1,?>>>
+! CHECK-SAME: %[[SET_ARG:.*]]: !fir.boxchar<1>
+! CHECK-SAME: %[[BACK_ARG:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>
subroutine test_optional(string, set, back)
character (*) :: string(:), set
logical, optional :: back(:)
+! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+! CHECK: %[[BACK_DECL:.*]]:2 = hlfir.declare %[[BACK_ARG]] dummy_scope %[[DSCOPE]] arg 3 {fortran_attrs = #fir.var_attrs<optional>, uniq_name = "_QFtest_optionalEback"} : (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.dscope) -> (!fir.box<!fir.array<?x!fir.logical<4>>>, !fir.box<!fir.array<?x!fir.logical<4>>>)
+! CHECK: %[[SET_UNBOX:.*]]:2 = fir.unboxchar %[[SET_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+! CHECK: %[[SET_DECL:.*]]:2 = hlfir.declare %[[SET_UNBOX]]#0 typeparams %[[SET_UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 2 {uniq_name = "_QFtest_optionalEset"} : (!fir.ref<!fir.char<1,?>>, index, !fir.dscope) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
+! CHECK: %[[STRING_DECL:.*]]:2 = hlfir.declare %[[STRING_ARG]] dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFtest_optionalEstring"} : (!fir.box<!fir.array<?x!fir.char<1,?>>>, !fir.dscope) -> (!fir.box<!fir.array<?x!fir.char<1,?>>>, !fir.box<!fir.array<?x!fir.char<1,?>>>)
print *, verify(string, set, back)
-! CHECK: %[[VAL_11:.*]] = fir.is_present %[[VAL_2]] : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> i1
-! CHECK: %[[VAL_12:.*]] = fir.zero_bits !fir.ref<!fir.array<?x!fir.logical<4>>>
-! CHECK: %[[VAL_13:.*]] = arith.constant 0 : index
-! CHECK: %[[VAL_14:.*]] = fir.shape %[[VAL_13]] : (index) -> !fir.shape<1>
-! CHECK: %[[VAL_15:.*]] = fir.embox %[[VAL_12]](%[[VAL_14]]) : (!fir.ref<!fir.array<?x!fir.logical<4>>>, !fir.shape<1>) -> !fir.box<!fir.array<?x!fir.logical<4>>>
-! CHECK: %[[VAL_16:.*]] = arith.select %[[VAL_11]], %[[VAL_2]], %[[VAL_15]] : !fir.box<!fir.array<?x!fir.logical<4>>>
-! CHECK: %[[VAL_17:.*]] = fir.array_load %[[VAL_16]] {fir.optional} : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> !fir.array<?x!fir.logical<4>>
-! CHECK: %[[VAL_24:.*]] = fir.do_loop %[[VAL_25:.*]] = %{{.*}} to %{{.*}} step %{{.*}} unordered iter_args(%[[VAL_26:.*]] = %{{.*}}) -> (!fir.array<?xi32>) {
- ! CHECK: %[[VAL_31:.*]] = fir.if %[[VAL_11]] -> (!fir.logical<4>) {
- ! CHECK: %[[VAL_32:.*]] = fir.array_fetch %[[VAL_17]], %[[VAL_25]] : (!fir.array<?x!fir.logical<4>>, index) -> !fir.logical<4>
- ! CHECK: fir.result %[[VAL_32]] : !fir.logical<4>
- ! CHECK: } else {
- ! CHECK: %[[VAL_33:.*]] = arith.constant false
- ! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_33]] : (i1) -> !fir.logical<4>
- ! CHECK: fir.result %[[VAL_34]] : !fir.logical<4>
- ! CHECK: }
- ! CHECK: %[[VAL_39:.*]] = fir.convert %[[VAL_31]] : (!fir.logical<4>) -> i1
- ! CHECK: fir.call @_FortranAVerify1(%{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %[[VAL_39]]) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i8>, i64, i1) -> i64
-! CHECK: }
-! CHECK: fir.array_merge_store
+! CHECK: %[[PRESENT:.*]] = fir.is_present %[[BACK_DECL]]#0 : (!fir.box<!fir.array<?x!fir.logical<4>>>) -> i1
+! CHECK: %[[C0:.*]] = arith.constant 0 : index
+! CHECK: %[[DIMS:.*]]:3 = fir.box_dims %[[STRING_DECL]]#0, %[[C0]] : (!fir.box<!fir.array<?x!fir.char<1,?>>>, index) -> (index, index, index)
+! CHECK: %[[SHAPE:.*]] = fir.shape %[[DIMS]]#1 : (index) -> !fir.shape<1>
+! CHECK: %[[ELEMENTAL:.*]] = hlfir.elemental %[[SHAPE]] unordered : (!fir.shape<1>) -> !hlfir.expr<?xi32> {
+! CHECK: ^bb0(%[[I:.*]]: index):
+! CHECK: %[[CHAR_LEN:.*]] = fir.box_elesize %[[STRING_DECL]]#1 : (!fir.box<!fir.array<?x!fir.char<1,?>>>) -> index
+! CHECK: %[[STRING_I:.*]] = hlfir.designate %[[STRING_DECL]]#0 (%[[I]]) typeparams %[[CHAR_LEN]] : (!fir.box<!fir.array<?x!fir.char<1,?>>>, index, index) -> !fir.boxchar<1>
+! CHECK: %[[UNBOX_I:.*]]:2 = fir.unboxchar %[[STRING_I]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+! CHECK: %[[BACK_I_VAL:.*]] = fir.if %[[PRESENT]] -> (!fir.logical<4>) {
+! CHECK: %[[BACK_I_REF:.*]] = hlfir.designate %[[BACK_DECL]]#0 (%[[I]]) : (!fir.box<!fir.array<?x!fir.logical<4>>>, index) -> !fir.ref<!fir.logical<4>>
+! CHECK: %[[VAL:.*]] = fir.load %[[BACK_I_REF]] : !fir.ref<!fir.logical<4>>
+! CHECK: fir.result %[[VAL]] : !fir.logical<4>
+! CHECK: } else {
+! CHECK: %[[FALSE:.*]] = arith.constant false
+! CHECK: %[[FALSE_LOG:.*]] = fir.convert %[[FALSE]] : (i1) -> !fir.logical<4>
+! CHECK: fir.result %[[FALSE_LOG]] : !fir.logical<4>
+! CHECK: }
+! CHECK: %[[S1_PTR:.*]] = fir.convert %[[UNBOX_I]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
+! CHECK: %[[S1_LEN:.*]] = fir.convert %[[CHAR_LEN]] : (index) -> i64
+! CHECK: %[[S2_PTR:.*]] = fir.convert %[[SET_DECL]]#1 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<i8>
+! CHECK: %[[S2_LEN:.*]] = fir.convert %[[SET_UNBOX]]#1 : (index) -> i64
+! CHECK: %[[BACK_I_BOOL:.*]] = fir.convert %[[BACK_I_VAL]] : (!fir.logical<4>) -> i1
+! CHECK: %[[RES_I64:.*]] = fir.call @_FortranAVerify1(%[[S1_PTR]], %[[S1_LEN]], %[[S2_PTR]], %[[S2_LEN]], %[[BACK_I_BOOL]]) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i8>, i64, i1) -> i64
+! CHECK: %[[RES_I32:.*]] = fir.convert %[[RES_I64]] : (i64) -> i32
+! CHECK: hlfir.yield_element %[[RES_I32]] : i32
+! CHECK: }
end subroutine
-! CHECK: func private @{{.*}}Verify(
-! CHECK: func private @{{.*}}Verify1(
+! CHECK: func private @_FortranAVerify(
+! CHECK: func private @_FortranAVerify1(
diff --git a/flang/test/Lower/io-char-array.f90 b/flang/test/Lower/io-char-array.f90
index b3b9d240f583d..0334339e41b32 100644
--- a/flang/test/Lower/io-char-array.f90
+++ b/flang/test/Lower/io-char-array.f90
@@ -1,5 +1,5 @@
! Check that a box is created instead of a temp to write to a char array.
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
subroutine io_char_array
character(12) :: r(2) = 'badbadbadbad'
@@ -10,18 +10,20 @@ subroutine io_char_array
end subroutine
! CHECK-LABEL: func.func @_QPio_char_array()
-! CHECK: %[[R:.*]] = fir.address_of(@_QFio_char_arrayEr) : !fir.ref<!fir.array<2x!fir.char<1,12>>>
-! CHECK: %[[C2_SHAPE:.*]] = arith.constant 2 : index
-! CHECK: %[[C1_I64_0:.*]] = arith.constant 1 : i64
-! CHECK: %[[C1_IDX_0:.*]] = fir.convert %[[C1_I64_0]] : (i64) -> index
-! CHECK: %[[C1_I64_1:.*]] = arith.constant 1 : i64
-! CHECK: %[[C1_IDX_1:.*]] = fir.convert %[[C1_I64_1]] : (i64) -> index
-! CHECK: %[[C2_I64:.*]] = arith.constant 2 : i64
-! CHECK: %[[C2_IDX:.*]] = fir.convert %[[C2_I64]] : (i64) -> index
-! CHECK: %[[SHAPE:.*]] = fir.shape %[[C2_SHAPE]] : (index) -> !fir.shape<1>
-! CHECK: %[[SLICE:.*]] = fir.slice %[[C1_IDX_0]], %[[C2_IDX]], %[[C1_IDX_1]] : (index, index, index) -> !fir.slice<1>
-! CHECK: %[[BOX_R:.*]] = fir.embox %[[R]](%[[SHAPE]]) [%[[SLICE]]] : (!fir.ref<!fir.array<2x!fir.char<1,12>>>, !fir.shape<1>, !fir.slice<1>) -> !fir.box<!fir.array<2x!fir.char<1,12>>>
-! CHECK: %[[BOX_R_NONE:.*]] = fir.convert %[[BOX_R]] : (!fir.box<!fir.array<2x!fir.char<1,12>>>) -> !fir.box<none>
-! CHECK: %[[DATA:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,14>>
-! CHECK: %[[DATA_PTR:.*]] = fir.convert %8 : (!fir.ref<!fir.char<1,14>>) -> !fir.ref<i8>
-! CHECK: %{{.*}} = fir.call @_FortranAioBeginInternalArrayFormattedOutput(%[[BOX_R_NONE]], %[[DATA_PTR]], %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}, %{{.*}}) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i64, !fir.box<none>, !fir.ref<!fir.llvm_ptr<i8>>, i64, !fir.ref<i8>, i32) -> !fir.ref<i8>
+! CHECK: %[[R_ADDR:.*]] = fir.address_of(@_QFio_char_arrayEr) : !fir.ref<!fir.array<2x!fir.char<1,12>>>
+! CHECK: %[[C12:.*]] = arith.constant 12 : index
+! CHECK: %[[C2:.*]] = arith.constant 2 : index
+! CHECK: %[[SHAPE:.*]] = fir.shape %[[C2]] : (index) -> !fir.shape<1>
+! CHECK: %[[R_DECL:.*]]:2 = hlfir.declare %[[R_ADDR]](%[[SHAPE]]) typeparams %[[C12]] {uniq_name = "_QFio_char_arrayEr"} : (!fir.ref<!fir.array<2x!fir.char<1,12>>>, !fir.shape<1>, index) -> (!fir.ref<!fir.array<2x!fir.char<1,12>>>, !fir.ref<!fir.array<2x!fir.char<1,12>>>)
+! CHECK: %[[C1_1:.*]] = arith.constant 1 : index
+! CHECK: %[[C2_1:.*]] = arith.constant 2 : index
+! CHECK: %[[C1_2:.*]] = arith.constant 1 : index
+! CHECK: %[[C2_2:.*]] = arith.constant 2 : index
+! CHECK: %[[SHAPE2:.*]] = fir.shape %[[C2_2]] : (index) -> !fir.shape<1>
+! CHECK: %[[DESIGNATE:.*]] = hlfir.designate %[[R_DECL]]#0 (%[[C1_1]]:%[[C2_1]]:%[[C1_2]]) shape %[[SHAPE2]] typeparams %[[C12]] : (!fir.ref<!fir.array<2x!fir.char<1,12>>>, index, index, index, !fir.shape<1>, index) -> !fir.ref<!fir.array<2x!fir.char<1,12>>>
+! CHECK: %[[SHAPE3:.*]] = fir.shape %[[C2_2]] : (index) -> !fir.shape<1>
+! CHECK: %[[EMBOX:.*]] = fir.embox %[[DESIGNATE]](%[[SHAPE3]]) : (!fir.ref<!fir.array<2x!fir.char<1,12>>>, !fir.shape<1>) -> !fir.box<!fir.array<2x!fir.char<1,12>>>
+! CHECK: %[[EMBOX_NONE:.*]] = fir.convert %[[EMBOX]] : (!fir.box<!fir.array<2x!fir.char<1,12>>>) -> !fir.box<none>
+! CHECK: %[[FORMAT:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,{{[0-9]*}}>>
+! CHECK: %[[FORMAT_PTR:.*]] = fir.convert %[[FORMAT]] : (!fir.ref<!fir.char<1,{{[0-9]*}}>>) -> !fir.ref<i8>
+! CHECK: %{{.*}} = fir.call @_FortranAioBeginInternalArrayFormattedOutput(%[[EMBOX_NONE]], %[[FORMAT_PTR]], {{.*}}) {{.*}}: (!fir.box<none>, !fir.ref<i8>, i64, !fir.box<none>, !fir.ref<!fir.llvm_ptr<i8>>, i64, !fir.ref<i8>, i32) -> !fir.ref<i8>
diff --git a/flang/test/Lower/io-implied-do-fixes.f90 b/flang/test/Lower/io-implied-do-fixes.f90
index 91e8cbc9868ff..97647b0ef3f3c 100644
--- a/flang/test/Lower/io-implied-do-fixes.f90
+++ b/flang/test/Lower/io-implied-do-fixes.f90
@@ -1,19 +1,18 @@
-! RUN: bbc --use-desc-for-alloc=false -emit-fir -hlfir=false %s -o - | FileCheck %s
-! RUN: bbc --use-desc-for-alloc=false -emit-fir -hlfir=false -fwrapv %s -o - | FileCheck %s --check-prefix=NO-NSW
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
! UNSUPPORTED: system-windows
-! NO-NSW-NOT: overflow<nsw>
-
! CHECK-LABEL: func @_QPido1
-! CHECK: %[[J_REF_ADDR:.*]] = fir.alloca !fir.ptr<i32> {uniq_name = "_QFido1Eiptr.addr"}
-! CHECK: %[[J_ADDR:.*]] = fir.load %[[J_REF_ADDR]] : !fir.ref<!fir.ptr<i32>>
+! CHECK: %[[IPTR_BOX_ADDR:.*]] = fir.alloca !fir.box<!fir.ptr<i32>> {bindc_name = "iptr", uniq_name = "_QFido1Eiptr"}
+! CHECK: %[[IPTR_DECL:.*]]:2 = hlfir.declare %[[IPTR_BOX_ADDR]] {fortran_attrs = #fir.var_attrs<pointer>, uniq_name = "_QFido1Eiptr"} : (!fir.ref<!fir.box<!fir.ptr<i32>>>) -> (!fir.ref<!fir.box<!fir.ptr<i32>>>, !fir.ref<!fir.box<!fir.ptr<i32>>>)
+! CHECK: %[[IPTR_BOX:.*]] = fir.load %[[IPTR_DECL]]#0 : !fir.ref<!fir.box<!fir.ptr<i32>>>
+! CHECK: %[[IPTR_ADDR:.*]] = fir.box_addr %[[IPTR_BOX]] : (!fir.box<!fir.ptr...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/191926
More information about the flang-commits
mailing list