[flang][NFC] Converted five tests from old lowering to new lowering (part 44) (#191926)

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
diff --git a/flang/test/Lower/Intrinsics/verify.f90 b/flang/test/Lower/Intrinsics/verify.f90
index 7d0f970..ded32d7 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 b3b9d24..0334339 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 @@
 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 91e8cbc..97647b0 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<i32>>) -> !fir.ptr<i32>
 ! CHECK: %[[J_VAL_FINAL:.*]] = fir.do_loop %[[J_VAL:.*]] = %{{.*}} to %{{.*}} step %{{.*}} -> index {
 ! CHECK:   %[[J_VAL_CVT1:.*]] = fir.convert %[[J_VAL]] : (index) -> i32
-! CHECK:   fir.store %[[J_VAL_CVT1]] to %[[J_ADDR]] : !fir.ptr<i32>
+! CHECK:   fir.store %[[J_VAL_CVT1]] to %[[IPTR_ADDR]] : !fir.ptr<i32>
 ! CHECK:   fir.result %[[J_VAL]] : index
 ! CHECK: }
 ! CHECK: %[[J_VAL_CVT2:.*]] = fir.convert %[[J_VAL_FINAL]] : (index) -> i32
-! CHECK: fir.store %[[J_VAL_CVT2]] to %[[J_ADDR]] : !fir.ptr<i32>
+! CHECK: fir.store %[[J_VAL_CVT2]] to %[[IPTR_ADDR]] : !fir.ptr<i32>
 subroutine ido1
   integer, pointer :: iptr
   integer, target :: itgt
@@ -22,15 +21,17 @@
 end subroutine
 
 ! CHECK-LABEL: func @_QPido2
-! CHECK: %[[J_REF_ADDR:.*]] = fir.alloca !fir.heap<i32> {uniq_name = "_QFido2Eiptr.addr"}
-! CHECK: %[[J_ADDR:.*]] = fir.load %[[J_REF_ADDR]] : !fir.ref<!fir.heap<i32>>
+! CHECK: %[[IPTR_BOX_ADDR:.*]] = fir.alloca !fir.box<!fir.heap<i32>> {bindc_name = "iptr", uniq_name = "_QFido2Eiptr"}
+! CHECK: %[[IPTR_DECL:.*]]:2 = hlfir.declare %[[IPTR_BOX_ADDR]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFido2Eiptr"} : (!fir.ref<!fir.box<!fir.heap<i32>>>) -> (!fir.ref<!fir.box<!fir.heap<i32>>>, !fir.ref<!fir.box<!fir.heap<i32>>>)
+! CHECK: %[[IPTR_BOX:.*]] = fir.load %[[IPTR_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<i32>>>
+! CHECK: %[[IPTR_ADDR:.*]] = fir.box_addr %[[IPTR_BOX]] : (!fir.box<!fir.heap<i32>>) -> !fir.heap<i32>
 ! CHECK: %[[J_VAL_FINAL:.*]] = fir.do_loop %[[J_VAL:.*]] = %{{.*}} to %{{.*}} step %{{.*}} -> index {
-! CHECK: %[[J_VAL_CVT1:.*]] = fir.convert %[[J_VAL]] : (index) -> i32
-! CHECK: fir.store %[[J_VAL_CVT1]] to %[[J_ADDR]] : !fir.heap<i32>
-! CHECK: fir.result %[[J_VAL]] : index
+! CHECK:   %[[J_VAL_CVT1:.*]] = fir.convert %[[J_VAL]] : (index) -> i32
+! CHECK:   fir.store %[[J_VAL_CVT1]] to %[[IPTR_ADDR]] : !fir.heap<i32>
+! CHECK:   fir.result %[[J_VAL]] : index
 ! CHECK: }
 ! CHECK: %[[J_VAL_CVT2:.*]] = fir.convert %[[J_VAL_FINAL]] : (index) -> i32
-! CHECK: fir.store %[[J_VAL_CVT2]] to %[[J_ADDR]] : !fir.heap<i32>
+! CHECK: fir.store %[[J_VAL_CVT2]] to %[[IPTR_ADDR]] : !fir.heap<i32>
 subroutine ido2
   integer, allocatable :: iptr
   allocate(iptr)
@@ -38,19 +39,25 @@
 end subroutine
 
 ! CHECK-LABEL: func @_QPido3
-! CHECK:  %[[J_REF_ADDR:.*]] = fir.alloca !fir.heap<i32> {uniq_name = "_QFido3Ej.addr"}
-! CHECK:  %[[J_ADDR:.*]] = fir.load %[[J_REF_ADDR]] : !fir.ref<!fir.heap<i32>>
-! CHECK:  %[[J_VAL_FINAL:.*]]:2 = fir.iterate_while (%[[J_VAL:.*]] = %{{.*}} to %{{.*}} step %{{.*}}) and (%[[OK:.*]] = {{.*}}) -> (index, i1) {
-! CHECK:    %[[J_VAL_CVT1:.*]] = fir.convert %[[J_VAL]] : (index) -> i32
-! CHECK:    fir.store %[[J_VAL_CVT1]] to %[[J_ADDR]] : !fir.heap<i32>
-! CHECK:    %[[RES:.*]] = fir.if %[[OK]] -> (i1) {
-! CHECK:    }
+! CHECK: %[[J_BOX_ADDR:.*]] = fir.alloca !fir.box<!fir.heap<i32>> {bindc_name = "j", uniq_name = "_QFido3Ej"}
+! CHECK: %[[J_DECL:.*]]:2 = hlfir.declare %[[J_BOX_ADDR]] {fortran_attrs = #fir.var_attrs<allocatable>, uniq_name = "_QFido3Ej"} : (!fir.ref<!fir.box<!fir.heap<i32>>>) -> (!fir.ref<!fir.box<!fir.heap<i32>>>, !fir.ref<!fir.box<!fir.heap<i32>>>)
+! CHECK: %[[J_BOX:.*]] = fir.load %[[J_DECL]]#0 : !fir.ref<!fir.box<!fir.heap<i32>>>
+! CHECK: %[[J_ADDR:.*]] = fir.box_addr %[[J_BOX]] : (!fir.box<!fir.heap<i32>>) -> !fir.heap<i32>
+! CHECK: %[[J_VAL_FINAL:.*]]:2 = fir.iterate_while (%[[J_VAL:.*]] = %{{.*}} to %{{.*}} step %{{.*}}) and (%[[OK:.*]] = {{.*}}) -> (index, i1) {
+! CHECK:   %[[J_VAL_CVT1:.*]] = fir.convert %[[J_VAL]] : (index) -> i32
+! CHECK:   fir.store %[[J_VAL_CVT1]] to %[[J_ADDR]] : !fir.heap<i32>
+! CHECK:   %{{.*}} = fir.if %[[OK]] -> (i1) {
+! CHECK:     %[[RES:.*]] = fir.call @_FortranAioOutputInteger32({{.*}}) {{.*}}: (!fir.ref<i8>, i32) -> i1
+! CHECK:     fir.result %[[RES]] : i1
+! CHECK:   } else {
+! CHECK:     fir.result %{{.*}} : i1
+! CHECK:   }
 ! CHECK:   %[[J_VAL_INC:.*]] = arith.addi %[[J_VAL]], %{{[^ ]*}} overflow<nsw> : index
-! CHECK:   %[[J_VAL_NEXT:.*]] = arith.select %[[RES]], %[[J_VAL_INC]], %[[J_VAL]] : index
-! CHECK:   fir.result %[[J_VAL_NEXT]], %[[RES]] : index, i1
-! CHECK:  }
-! CHECK:  %[[J_VAL_CVT2:.*]] = fir.convert %[[J_VAL_FINAL]]#0 : (index) -> i32
-! CHECK:  fir.store %[[J_VAL_CVT2]] to %[[J_ADDR]] : !fir.heap<i32
+! CHECK:   %[[J_VAL_NEXT:.*]] = arith.select %{{.*}}, %[[J_VAL_INC]], %[[J_VAL]] : index
+! CHECK:   fir.result %[[J_VAL_NEXT]], %{{.*}} : index, i1
+! CHECK: }
+! CHECK: %[[J_VAL_CVT2:.*]] = fir.convert %[[J_VAL_FINAL]]#0 : (index) -> i32
+! CHECK: fir.store %[[J_VAL_CVT2]] to %[[J_ADDR]] : !fir.heap<i32>
 subroutine ido3
   integer, allocatable :: j
   allocate(j)
diff --git a/flang/test/Lower/io-item-list.f90 b/flang/test/Lower/io-item-list.f90
index c93bd72..62ec9c6 100644
--- a/flang/test/Lower/io-item-list.f90
+++ b/flang/test/Lower/io-item-list.f90
@@ -1,109 +1,109 @@
-! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
 
 ! Test that IO item list are lowered and passed correctly
 
-! CHECK-LABEL: func @_QPpass_assumed_len_char_unformatted_io
+! CHECK-LABEL: func @_QPpass_assumed_len_char_unformatted_io(
+! CHECK-SAME: %[[C_ARG:.*]]: !fir.boxchar<1>{{.*}}) {
 subroutine pass_assumed_len_char_unformatted_io(c)
   character(*) :: c
-  ! CHECK: %[[unbox:.*]]:2 = fir.unboxchar %arg0 : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+  ! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+  ! CHECK: %[[UNBOX:.*]]:2 = fir.unboxchar %[[C_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+  ! CHECK: %[[C_DECL:.*]]:2 = hlfir.declare %[[UNBOX]]#0 typeparams %[[UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFpass_assumed_len_char_unformatted_ioEc"} : (!fir.ref<!fir.char<1,?>>, index, !fir.dscope) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
   write(1, rec=1) c
-  ! CHECK: %[[box:.*]] = fir.embox %[[unbox]]#0 typeparams %[[unbox]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
-  ! CHECK: %[[castedBox:.*]] = fir.convert %[[box]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
-  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[castedBox]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
+  ! CHECK: %[[EMBOX:.*]] = fir.embox %[[C_DECL]]#1 typeparams %[[UNBOX]]#1 : (!fir.ref<!fir.char<1,?>>, index) -> !fir.box<!fir.char<1,?>>
+  ! CHECK: %[[BOX_NONE:.*]] = fir.convert %[[EMBOX]] : (!fir.box<!fir.char<1,?>>) -> !fir.box<none>
+  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[BOX_NONE]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
 end
 
-! CHECK-LABEL: func @_QPpass_assumed_len_char_array
+! CHECK-LABEL: func @_QPpass_assumed_len_char_array(
+! CHECK-SAME: %[[CARRAY_ARG:.*]]: !fir.boxchar<1>{{.*}}) {
 subroutine pass_assumed_len_char_array(carray)
   character(*) :: carray(2, 3)
-  ! CHECK-DAG: %[[unboxed:.*]]:2 = fir.unboxchar %arg0 : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
-  ! CHECK-DAG: %[[buffer:.*]] = fir.convert %[[unboxed]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<2x3x!fir.char<1,?>>>
-  ! CHECK-DAG: %[[c2:.*]] = arith.constant 2 : index
-  ! CHECK-DAG: %[[c3:.*]] = arith.constant 3 : index
-  ! CHECK-DAG: %[[shape:.*]] = fir.shape %[[c2]], %[[c3]] : (index, index) -> !fir.shape<2>
-  ! CHECK: %[[box:.*]] = fir.embox %[[buffer]](%[[shape]]) typeparams %[[unboxed]]#1 : (!fir.ref<!fir.array<2x3x!fir.char<1,?>>>, !fir.shape<2>, index) -> !fir.box<!fir.array<2x3x!fir.char<1,?>>>
-  ! CHECK: %[[descriptor:.*]] = fir.convert %[[box]] : (!fir.box<!fir.array<2x3x!fir.char<1,?>>>) -> !fir.box<none>
-  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[descriptor]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
+  ! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+  ! CHECK: %[[UNBOX:.*]]:2 = fir.unboxchar %[[CARRAY_ARG]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
+  ! CHECK: %[[CONV:.*]] = fir.convert %[[UNBOX]]#0 : (!fir.ref<!fir.char<1,?>>) -> !fir.ref<!fir.array<2x3x!fir.char<1,?>>>
+  ! CHECK: %[[C2:.*]] = arith.constant 2 : index
+  ! CHECK: %[[C3:.*]] = arith.constant 3 : index
+  ! CHECK: %[[SHAPE:.*]] = fir.shape %[[C2]], %[[C3]] : (index, index) -> !fir.shape<2>
+  ! CHECK: %[[CARRAY_DECL:.*]]:2 = hlfir.declare %[[CONV]](%[[SHAPE]]) typeparams %[[UNBOX]]#1 dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFpass_assumed_len_char_arrayEcarray"} : (!fir.ref<!fir.array<2x3x!fir.char<1,?>>>, !fir.shape<2>, index, !fir.dscope) -> (!fir.box<!fir.array<2x3x!fir.char<1,?>>>, !fir.ref<!fir.array<2x3x!fir.char<1,?>>>)
   print *, carray
+  ! CHECK: %{{.*}} = fir.call @_FortranAioBeginExternalListOutput({{.*}})
+  ! CHECK: %[[SHAPE2:.*]] = fir.shape %[[C2]], %[[C3]] : (index, index) -> !fir.shape<2>
+  ! CHECK: %[[EMBOX:.*]] = fir.embox %[[CARRAY_DECL]]#1(%[[SHAPE2]]) typeparams %[[UNBOX]]#1 : (!fir.ref<!fir.array<2x3x!fir.char<1,?>>>, !fir.shape<2>, index) -> !fir.box<!fir.array<2x3x!fir.char<1,?>>>
+  ! CHECK: %[[BOX_NONE:.*]] = fir.convert %[[EMBOX]] : (!fir.box<!fir.array<2x3x!fir.char<1,?>>>) -> !fir.box<none>
+  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[BOX_NONE]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
 end
 
 ! CHECK-LABEL: func @_QPpass_array_slice_read(
-! CHECK-SAME:            %[[VAL_0:.*]]: !fir.box<!fir.array<?xf32>>{{.*}}) {
-! CHECK:         %[[VAL_1:.*]] = arith.constant 5 : i32
-! CHECK:         %[[VAL_2:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,
-! CHECK:         %[[VAL_3:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.char<1,{{[0-9]+}}>>) -> !fir.ref<i8>
-! CHECK:         %[[VAL_4:.*]] = arith.constant {{[0-9]+}} : i32
-! CHECK:         %[[VAL_5:.*]] = fir.call @_FortranAioBeginExternalListInput(%[[VAL_1]], %[[VAL_3]], %[[VAL_4]]) {{.*}}: (i32, !fir.ref<i8>, i32) -> !fir.ref<i8>
-! CHECK:         %[[VAL_6:.*]] = arith.constant 101 : i64
-! CHECK:         %[[VAL_7:.*]] = fir.convert %[[VAL_6]] : (i64) -> index
-! CHECK:         %[[VAL_8:.*]] = arith.constant 2 : i64
-! CHECK:         %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (i64) -> index
-! CHECK:         %[[VAL_10:.*]] = arith.constant 200 : i64
-! CHECK:         %[[VAL_11:.*]] = fir.convert %[[VAL_10]] : (i64) -> index
-! CHECK:         %[[VAL_12:.*]] = fir.slice %[[VAL_7]], %[[VAL_11]], %[[VAL_9]] : (index, index, index) -> !fir.slice<1>
-! CHECK:         %[[VAL_13:.*]] = fir.rebox %[[VAL_0]] {{\[}}%[[VAL_12]]] : (!fir.box<!fir.array<?xf32>>, !fir.slice<1>) -> !fir.box<!fir.array<50xf32>>
-! CHECK:         %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (!fir.box<!fir.array<50xf32>>) -> !fir.box<none>
-! CHECK:         %[[VAL_15:.*]] = fir.call @_FortranAioInputDescriptor(%[[VAL_5]], %[[VAL_14]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
-! CHECK:         %[[VAL_16:.*]] = fir.call @_FortranAioEndIoStatement(%[[VAL_5]]) {{.*}}: (!fir.ref<i8>) -> i32
-! CHECK:         return
-! CHECK:       }
-
+! CHECK-SAME: %[[X_ARG:.*]]: !fir.box<!fir.array<?xf32>>{{.*}}) {
 subroutine pass_array_slice_read(x)
   real :: x(:)
+  ! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+  ! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X_ARG]] dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFpass_array_slice_readEx"} : (!fir.box<!fir.array<?xf32>>, !fir.dscope) -> (!fir.box<!fir.array<?xf32>>, !fir.box<!fir.array<?xf32>>)
   read(5, *) x(101:200:2)
+  ! CHECK: %[[C101:.*]] = arith.constant 101 : index
+  ! CHECK: %[[C200:.*]] = arith.constant 200 : index
+  ! CHECK: %[[C2:.*]] = arith.constant 2 : index
+  ! CHECK: %[[C50:.*]] = arith.constant 50 : index
+  ! CHECK: %[[SHAPE:.*]] = fir.shape %[[C50]] : (index) -> !fir.shape<1>
+  ! CHECK: %[[DESIGNATE:.*]] = hlfir.designate %[[X_DECL]]#0 (%[[C101]]:%[[C200]]:%[[C2]])  shape %[[SHAPE]] : (!fir.box<!fir.array<?xf32>>, index, index, index, !fir.shape<1>) -> !fir.box<!fir.array<50xf32>>
+  ! CHECK: %[[BOX_NONE:.*]] = fir.convert %[[DESIGNATE]] : (!fir.box<!fir.array<50xf32>>) -> !fir.box<none>
+  ! CHECK: fir.call @_FortranAioInputDescriptor(%{{.*}}, %[[BOX_NONE]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
 end
 
 ! CHECK-LABEL: func @_QPpass_array_slice_write(
-! CHECK-SAME:                   %[[VAL_0:.*]]: !fir.box<!fir.array<?xf32>>{{.*}}) {
-! CHECK:         %[[VAL_1:.*]] = arith.constant 1 : i32
-! CHECK:         %[[VAL_2:.*]] = fir.address_of(@_QQclX{{.*}}) : !fir.ref<!fir.char<1,
-! CHECK:         %[[VAL_3:.*]] = fir.convert %[[VAL_2]] : (!fir.ref<!fir.char<1,{{[0-9]+}}>>) -> !fir.ref<i8>
-! CHECK:         %[[VAL_4:.*]] = arith.constant {{[0-9]+}} : i32
-! CHECK:         %[[VAL_5:.*]] = fir.call @_FortranAioBeginUnformattedOutput(%[[VAL_1]], %[[VAL_3]], %[[VAL_4]]) {{.*}}: (i32, !fir.ref<i8>, i32) -> !fir.ref<i8>
-! CHECK:         %[[VAL_6:.*]] = arith.constant 1 : i32
-! CHECK:         %[[VAL_7:.*]] = fir.convert %[[VAL_6]] : (i32) -> i64
-! CHECK:         %[[VAL_8:.*]] = fir.call @_FortranAioSetRec(%[[VAL_5]], %[[VAL_7]]) {{.*}}: (!fir.ref<i8>, i64) -> i1
-! CHECK:         %[[VAL_9:.*]] = arith.constant 101 : i64
-! CHECK:         %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (i64) -> index
-! CHECK:         %[[VAL_11:.*]] = arith.constant 2 : i64
-! CHECK:         %[[VAL_12:.*]] = fir.convert %[[VAL_11]] : (i64) -> index
-! CHECK:         %[[VAL_13:.*]] = arith.constant 200 : i64
-! CHECK:         %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (i64) -> index
-! CHECK:         %[[VAL_15:.*]] = fir.slice %[[VAL_10]], %[[VAL_14]], %[[VAL_12]] : (index, index, index) -> !fir.slice<1>
-! CHECK:         %[[VAL_16:.*]] = fir.rebox %[[VAL_0]] {{\[}}%[[VAL_15]]] : (!fir.box<!fir.array<?xf32>>, !fir.slice<1>) -> !fir.box<!fir.array<50xf32>>
-! CHECK:         %[[VAL_17:.*]] = fir.convert %[[VAL_16]] : (!fir.box<!fir.array<50xf32>>) -> !fir.box<none>
-! CHECK:         %[[VAL_18:.*]] = fir.call @_FortranAioOutputDescriptor(%[[VAL_5]], %[[VAL_17]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
-! CHECK:         %[[VAL_19:.*]] = fir.call @_FortranAioEndIoStatement(%[[VAL_5]]) {{.*}}: (!fir.ref<i8>) -> i32
-! CHECK:         return
-! CHECK:       }
-
+! CHECK-SAME: %[[X_ARG:.*]]: !fir.box<!fir.array<?xf32>>{{.*}}) {
 subroutine pass_array_slice_write(x)
   real :: x(:)
+  ! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+  ! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X_ARG]] dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFpass_array_slice_writeEx"} : (!fir.box<!fir.array<?xf32>>, !fir.dscope) -> (!fir.box<!fir.array<?xf32>>, !fir.box<!fir.array<?xf32>>)
   write(1, rec=1) x(101:200:2)
+  ! CHECK: %[[C101:.*]] = arith.constant 101 : index
+  ! CHECK: %[[C200:.*]] = arith.constant 200 : index
+  ! CHECK: %[[C2:.*]] = arith.constant 2 : index
+  ! CHECK: %[[C50:.*]] = arith.constant 50 : index
+  ! CHECK: %[[SHAPE:.*]] = fir.shape %[[C50]] : (index) -> !fir.shape<1>
+  ! CHECK: %[[DESIGNATE:.*]] = hlfir.designate %[[X_DECL]]#0 (%[[C101]]:%[[C200]]:%[[C2]])  shape %[[SHAPE]] : (!fir.box<!fir.array<?xf32>>, index, index, index, !fir.shape<1>) -> !fir.box<!fir.array<50xf32>>
+  ! CHECK: %[[BOX_NONE:.*]] = fir.convert %[[DESIGNATE]] : (!fir.box<!fir.array<50xf32>>) -> !fir.box<none>
+  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[BOX_NONE]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
 end
 
 
 ! CHECK-LABEL: func @_QPpass_vector_subscript_write(
-! CHECK-SAME: %[[x:.*]]: !fir.ref<!fir.array<100xf32>>{{.*}}, %[[j:.*]]: !fir.ref<!fir.array<10xi32>>{{.*}})
+! CHECK-SAME: %[[X_ARG:.*]]: !fir.ref<!fir.array<100xf32>>{{.*}}, %[[J_ARG:.*]]: !fir.ref<!fir.array<10xi32>>{{.*}})
 subroutine pass_vector_subscript_write(x, j)
   ! Check that a temp is made for array with vector subscript in output IO.
   integer :: j(10)
   real :: x(100)
-  ! CHECK: %[[jload:.*]] = fir.array_load %[[j]](%{{.*}}) : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>) -> !fir.array<10xi32>
-  ! CHECK: %[[xload:.*]] = fir.array_load %[[x]](%{{.*}}) : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>) -> !fir.array<100xf32>
-  ! CHECK: %[[temp:.*]] = fir.allocmem !fir.array<10xf32>
-  ! CHECK: %[[tempload:.*]] = fir.array_load %[[temp]](%{{.*}}) : (!fir.heap<!fir.array<10xf32>>, !fir.shape<1>) -> !fir.array<10xf32>
-  ! CHECK: %[[copy:.*]] = fir.do_loop
-  ! CHECK:   %[[jfetch:.*]] = fir.array_fetch %[[jload]], %{{.*}} : (!fir.array<10xi32>, index) -> i32
-  ! CHECK:   %[[jcast:.*]] = fir.convert %[[jfetch]] : (i32) -> index
-  ! CHECK:   %[[jindex:.*]] = arith.subi %[[jcast]], %c1{{.*}} : index
-  ! CHECK:   %[[xfetch:.*]] = fir.array_fetch %[[xload]], %[[jindex]] : (!fir.array<100xf32>, index) -> f32
-  ! CHECK:   %[[update:.*]] = fir.array_update %{{.*}}, %[[xfetch]], %{{.*}} : (!fir.array<10xf32>, f32, index) -> !fir.array<10xf32>
-  ! CHECK:   fir.result %[[update]] : !fir.array<10xf32>
+  ! CHECK: %[[DSCOPE:.*]] = fir.dummy_scope : !fir.dscope
+  ! CHECK: %[[C10:.*]] = arith.constant 10 : index
+  ! CHECK: %[[J_SHAPE:.*]] = fir.shape %[[C10]] : (index) -> !fir.shape<1>
+  ! CHECK: %[[J_DECL:.*]]:2 = hlfir.declare %[[J_ARG]](%[[J_SHAPE]]) dummy_scope %[[DSCOPE]] arg 2 {uniq_name = "_QFpass_vector_subscript_writeEj"} : (!fir.ref<!fir.array<10xi32>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<10xi32>>, !fir.ref<!fir.array<10xi32>>)
+  ! CHECK: %[[C100:.*]] = arith.constant 100 : index
+  ! CHECK: %[[X_SHAPE:.*]] = fir.shape %[[C100]] : (index) -> !fir.shape<1>
+  ! CHECK: %[[X_DECL:.*]]:2 = hlfir.declare %[[X_ARG]](%[[X_SHAPE]]) dummy_scope %[[DSCOPE]] arg 1 {uniq_name = "_QFpass_vector_subscript_writeEx"} : (!fir.ref<!fir.array<100xf32>>, !fir.shape<1>, !fir.dscope) -> (!fir.ref<!fir.array<100xf32>>, !fir.ref<!fir.array<100xf32>>)
+  ! CHECK: %[[VECTOR_I64:.*]] = hlfir.elemental %[[J_SHAPE]] {{.*}} -> !hlfir.expr<10xi64> {
+  ! CHECK: ^bb0(%[[I:.*]]: index):
+  ! CHECK:   %[[J_I_ADDR:.*]] = hlfir.designate %[[J_DECL]]#0 (%[[I]])  : (!fir.ref<!fir.array<10xi32>>, index) -> !fir.ref<i32>
+  ! CHECK:   %[[J_I:.*]] = fir.load %[[J_I_ADDR]] : !fir.ref<i32>
+  ! CHECK:   %[[J_I_I64:.*]] = fir.convert %[[J_I]] : (i32) -> i64
+  ! CHECK:   hlfir.yield_element %[[J_I_I64]] : i64
   ! CHECK: }
-  ! CHECK: fir.array_merge_store %[[tempload]], %[[copy]] to %[[temp]] : !fir.array<10xf32>, !fir.array<10xf32>, !fir.heap<!fir.array<10xf32>>
-  ! CHECK: %[[embox:.*]] = fir.embox %[[temp]](%{{.*}}) : (!fir.heap<!fir.array<10xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<10xf32>>
-  ! CHECK: %[[boxCast:.*]] = fir.convert %[[embox]] : (!fir.box<!fir.array<10xf32>>) -> !fir.box<none>
-  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[boxCast]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
-  ! CHECK: fir.freemem %[[temp]] : !fir.heap<!fir.array<10xf32>>
+  ! CHECK: %[[J_SHAPE2:.*]] = fir.shape %{{.*}} : (index) -> !fir.shape<1>
+  ! CHECK: %[[VECTOR_F32:.*]] = hlfir.elemental %[[J_SHAPE2]] {{.*}} -> !hlfir.expr<10xf32> {
+  ! CHECK: ^bb0(%[[I:.*]]: index):
+  ! CHECK:   %[[IDX:.*]] = hlfir.apply %[[VECTOR_I64]], %[[I]] : (!hlfir.expr<10xi64>, index) -> i64
+  ! CHECK:   %[[X_I_ADDR:.*]] = hlfir.designate %[[X_DECL]]#0 (%[[IDX]])  : (!fir.ref<!fir.array<100xf32>>, i64) -> !fir.ref<f32>
+  ! CHECK:   %[[X_I:.*]] = fir.load %[[X_I_ADDR]] : !fir.ref<f32>
+  ! CHECK:   hlfir.yield_element %[[X_I]] : f32
+  ! CHECK: }
+  ! CHECK: %[[ASSOC:.*]]:3 = hlfir.associate %[[VECTOR_F32]](%[[J_SHAPE2]]) {{.*}} : (!hlfir.expr<10xf32>, !fir.shape<1>) -> (!fir.ref<!fir.array<10xf32>>, !fir.ref<!fir.array<10xf32>>, i1)
+  ! CHECK: %[[J_SHAPE3:.*]] = fir.shape %{{.*}} : (index) -> !fir.shape<1>
+  ! CHECK: %[[EMBOX:.*]] = fir.embox %[[ASSOC]]#0(%[[J_SHAPE3]]) : (!fir.ref<!fir.array<10xf32>>, !fir.shape<1>) -> !fir.box<!fir.array<10xf32>>
+  ! CHECK: %[[BOX_NONE:.*]] = fir.convert %[[EMBOX]] : (!fir.box<!fir.array<10xf32>>) -> !fir.box<none>
+  ! CHECK: fir.call @_FortranAioOutputDescriptor(%{{.*}}, %[[BOX_NONE]]) {{.*}}: (!fir.ref<i8>, !fir.box<none>) -> i1
+  ! CHECK: hlfir.end_associate %[[ASSOC]]#1, %[[ASSOC]]#2 : !fir.ref<!fir.array<10xf32>>, i1
+  ! CHECK: hlfir.destroy %[[VECTOR_F32]] : !hlfir.expr<10xf32>
+  ! CHECK: hlfir.destroy %[[VECTOR_I64]] : !hlfir.expr<10xi64>
   write(1, rec=1) x(j)
 end
diff --git a/flang/test/Lower/io-statement-1.f90 b/flang/test/Lower/io-statement-1.f90
index ecf2e2d..001d80c 100644
--- a/flang/test/Lower/io-statement-1.f90
+++ b/flang/test/Lower/io-statement-1.f90
@@ -1,4 +1,4 @@
-! RUN: bbc %s -emit-fir -hlfir=false -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-hlfir %s -o - | FileCheck %s
 ! UNSUPPORTED: system-windows
 
  logical :: existsvar
@@ -6,75 +6,76 @@
  real :: a(100)
 
   ! CHECK-LABEL: _QQmain
-  ! CHECK: call {{.*}}BeginOpenUnit
-  ! CHECK-DAG: call {{.*}}SetFile
-  ! CHECK-DAG: call {{.*}}SetAccess
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginOpenUnit
+  ! CHECK-DAG: fir.call @_FortranAioSetFile
+  ! CHECK-DAG: fir.call @_FortranAioSetAccess
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   open(8, file="foo", access="sequential")
 
-  ! CHECK: call {{.*}}BeginBackspace
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginBackspace
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   backspace(8)
 
-  ! CHECK: call {{.*}}BeginFlush
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginFlush
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   flush(8)
 
-  ! CHECK: call {{.*}}BeginRewind
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginRewind
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   rewind(8)
 
-  ! CHECK: call {{.*}}BeginEndfile
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginEndfile
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   endfile(8)
 
-  ! CHECK: call {{.*}}BeginWaitAll(%{{.*}}, %{{.*}}, %{{.*}})
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginWaitAll(%{{.*}}, %{{.*}}, %{{.*}})
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   wait(unit=8)
 
-  ! CHECK: call {{.*}}BeginExternalListInput
-  ! CHECK: call {{.*}}InputInteger
-  ! CHECK: call {{.*}}InputReal32
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginExternalListInput
+  ! CHECK: fir.call @_FortranAioInputInteger
+  ! CHECK: fir.call @_FortranAioInputReal32
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   read (8,*) i, f
 
-  ! CHECK: call {{.*}}BeginExternalListOutput
-  ! CHECK: call {{.*}}OutputInteger32
-  ! CHECK: call {{.*}}OutputReal32
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginExternalListOutput
+  ! CHECK: fir.call @_FortranAioOutputInteger32
+  ! CHECK: fir.call @_FortranAioOutputReal32
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   write (8,*) i, f
 
-  ! CHECK: call {{.*}}BeginClose
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginClose
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   close(8)
 
-  ! CHECK: call {{.*}}BeginExternalListOutput
-  ! CHECK: call {{.*}}OutputAscii
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginExternalListOutput
+  ! CHECK: fir.call @_FortranAioOutputAscii
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   print *, "A literal string"
 
-  ! CHECK: call {{.*}}BeginInquireUnit
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginInquireUnit
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire(4, EXIST=existsvar)
 
-  ! CHECK: call {{.*}}BeginInquireFile
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginInquireFile
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire(FILE="fail.f90", EXIST=existsvar)
 
-  ! CHECK: call {{.*}}BeginInquireIoLength
-  ! CHECK-COUNT-3: call {{.*}}OutputDescriptor
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioBeginInquireIoLength
+  ! CHECK-COUNT-3: fir.call @_FortranAioOutputDescriptor
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire (iolength=length) existsvar, length, a
 end
 
 ! CHECK-LABEL: internalnamelistio
 subroutine internalNamelistIO()
-  ! CHECK: %[[internal:[0-9]+]] = fir.alloca !fir.char<1,12> {bindc_name = "internal"
+  ! CHECK: %[[internal_var:.*]] = fir.alloca !fir.char<1,12> {bindc_name = "internal"
+  ! CHECK: %[[internal_decl:.*]]:2 = hlfir.declare %[[internal_var]]
   character(12) :: internal
   integer :: x = 123
   namelist /nml/x
-  ! CHECK: %[[internal_:[0-9]+]] = fir.convert %[[internal]] : (!fir.ref<!fir.char<1,12>>) -> !fir.ref<i8>
-  ! CHECK: %[[cookie:[0-9]+]] = fir.call @_FortranAioBeginInternalListOutput(%[[internal_]]
+  ! CHECK: %[[internal_ptr:.*]] = fir.convert %[[internal_decl]]#0 : (!fir.ref<!fir.char<1,12>>) -> !fir.ref<i8>
+  ! CHECK: %[[cookie:.*]] = fir.call @_FortranAioBeginInternalListOutput(%[[internal_ptr]]
   ! CHECK: fir.call @_FortranAioOutputNamelist(%[[cookie]]
   ! CHECK: fir.call @_FortranAioEndIoStatement(%[[cookie]]
   write(internal,nml=nml)
@@ -89,28 +90,28 @@
   integer :: id_func
 
   ! CHARACTER
-  ! CHECK: %[[sugar:.*]] = fir.call {{.*}}BeginInquireUnit
-  ! CHECK: call {{.*}}InquireCharacter(%[[sugar]], %c{{.*}}, %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i8>, i64) -> i1
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: %[[sugar:.*]] = fir.call @_FortranAioBeginInquireUnit
+  ! CHECK: fir.call @_FortranAioInquireCharacter(%[[sugar]], %c{{.*}}, %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i8>, i64) -> i1
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire(88, name=ch)
 
   ! INTEGER
-  ! CHECK: %[[oatmeal:.*]] = fir.call {{.*}}BeginInquireUnit
-  ! CHECK: call @_FortranAioInquireInteger64(%[[oatmeal]], %c{{.*}}, %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i64>, i32) -> i1
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: %[[oatmeal:.*]] = fir.call @_FortranAioBeginInquireUnit
+  ! CHECK: fir.call @_FortranAioInquireInteger64(%[[oatmeal]], %{{.*}}, %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i64>, i32) -> i1
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire(89, pos=i)
 
   ! LOGICAL
-  ! CHECK: %[[snicker:.*]] = fir.call {{.*}}BeginInquireUnit
-  ! CHECK: call @_FortranAioInquireLogical(%[[snicker]], %c{{.*}}, %[[b:.*]]) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i1>) -> i1
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: %[[snicker:.*]] = fir.call @_FortranAioBeginInquireUnit
+  ! CHECK: fir.call @_FortranAioInquireLogical(%[[snicker]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i64, !fir.ref<i1>) -> i1
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire(90, opened=b)
 
   ! PENDING with ID
-  ! CHECK-DAG: %[[chip:.*]] = fir.call {{.*}}BeginInquireUnit
+  ! CHECK-DAG: %[[chip:.*]] = fir.call @_FortranAioBeginInquireUnit
   ! CHECK-DAG: fir.call @_QPid_func
-  ! CHECK: call @_FortranAioInquirePendingId(%[[chip]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i32, !fir.ref<i1>) -> i1
-  ! CHECK: call {{.*}}EndIoStatement
+  ! CHECK: fir.call @_FortranAioInquirePendingId(%[[chip]], %{{.*}}, %{{.*}}) {{.*}}: (!fir.ref<i8>, i32, !fir.ref<i1>) -> i1
+  ! CHECK: fir.call @_FortranAioEndIoStatement
   inquire(91, id=id_func(), pending=b)
 end subroutine inquire_test