diff --git a/flang/lib/Lower/ConvertVariable.cpp b/flang/lib/Lower/ConvertVariable.cpp --- a/flang/lib/Lower/ConvertVariable.cpp +++ b/flang/lib/Lower/ConvertVariable.cpp @@ -1840,14 +1840,15 @@ } } + if (addr && addr.getDefiningOp()) { + // Ensure proper type is given to array/scalar that transited via + // fir.boxchar arg. + mlir::Type castTy = builder.getRefType(converter.genType(var)); + addr = builder.createConvert(loc, castTy, addr); + } + // Compute array extents and lower bounds. if (ba.isArray()) { - if (addr && addr.getDefiningOp()) { - // Ensure proper type is given to array that transited via fir.boxchar - // arg. - mlir::Type castTy = builder.getRefType(converter.genType(var)); - addr = builder.createConvert(loc, castTy, addr); - } if (ba.isStaticArray()) { if (ba.lboundIsAllOnes()) { for (std::int64_t extent : diff --git a/flang/lib/Optimizer/Builder/Character.cpp b/flang/lib/Optimizer/Builder/Character.cpp --- a/flang/lib/Optimizer/Builder/Character.cpp +++ b/flang/lib/Optimizer/Builder/Character.cpp @@ -400,10 +400,19 @@ auto addr = lhs.getBuffer(); auto toTy = fir::unwrapRefType(addr.getType()); mlir::Value val = rhs.getBuffer(); - if (fir::isa_ref_type(val.getType())) - val = builder.create(loc, val); - val = builder.createConvert(loc, toTy, val); - builder.create(loc, val, addr); + if (fir::isa_ref_type(val.getType())) { + auto fromCharLen1RefTy = builder.getRefType(getSingletonCharType( + builder.getContext(), + getCharacterKind(fir::unwrapRefType(val.getType())))); + val = builder.create( + loc, builder.createConvert(loc, fromCharLen1RefTy, val)); + } + auto toCharLen1Ty = + getSingletonCharType(builder.getContext(), getCharacterKind(toTy)); + val = builder.createConvert(loc, toCharLen1Ty, val); + builder.create( + loc, val, + builder.createConvert(loc, builder.getRefType(toCharLen1Ty), addr)); } /// Returns the minimum of integer mlir::Value \p a and \b. @@ -418,11 +427,29 @@ const fir::CharBoxValue &lhs, const fir::CharBoxValue &rhs) { auto rhsCstLen = getCompileTimeLength(rhs); auto lhsCstLen = getCompileTimeLength(lhs); - bool compileTimeSameLength = - (lhsCstLen && rhsCstLen && *lhsCstLen == *rhsCstLen) || - (rhs.getLen() == lhs.getLen()); - - if (compileTimeSameLength && lhsCstLen && *lhsCstLen == 1) { + bool compileTimeSameLength = false; + bool isLengthOneAssign = false; + + if (lhsCstLen && rhsCstLen && *lhsCstLen == *rhsCstLen) { + compileTimeSameLength = true; + if (*lhsCstLen == 1) + isLengthOneAssign = true; + } else if (rhs.getLen() == lhs.getLen()) { + compileTimeSameLength = true; + + // If the length values are the same for LHS and RHS, + // then we can rely on the constant length deduced from + // any of the two types. + if (lhsCstLen && *lhsCstLen == 1) + isLengthOneAssign = true; + if (rhsCstLen && *rhsCstLen == 1) + isLengthOneAssign = true; + + // We could have recognized constant operations here (e.g. + // two different arith.constant ops may produce the same value), + // but for now leave it to CSE to get rid of the duplicates. + } + if (isLengthOneAssign) { createLengthOneAssign(lhs, rhs); return; } diff --git a/flang/test/HLFIR/char_assign.fir b/flang/test/HLFIR/char_assign.fir new file mode 100644 --- /dev/null +++ b/flang/test/HLFIR/char_assign.fir @@ -0,0 +1,44 @@ +// RUN: fir-opt --split-input-file %s -convert-hlfir-to-fir | FileCheck %s + +// Verify that the special case of length-one character assignment +// is using valid fir.converts. + +// ----- + +// CHECK-LABEL: func.func @_QPtest1 +// CHECK: [[C_DECL:%[0-9]*]] = fir.declare{{.*}}{uniq_name = "_QFtest1Ec"} : (!fir.ref>, index) -> !fir.ref> +// CHECK: [[LOCAL_DECL:%[0-9]*]] = fir.declare{{.*}}{uniq_name = "_QFtest1Elocal"} : (!fir.ref>, index) -> !fir.ref> +// CHECK: [[CVT:%[0-9]*]] = fir.convert [[C_DECL]] : (!fir.ref>) -> !fir.ref> +// CHECK: [[LD:%[0-9]*]] = fir.load [[CVT]] : !fir.ref> +// CHECK: fir.store [[LD]] to [[LOCAL_DECL]] : !fir.ref> +module { + func.func @_QPtest1(%arg0: !fir.boxchar<1> {fir.bindc_name = "c"}) { + %c1 = arith.constant 1 : index + %0:2 = fir.unboxchar %arg0 : (!fir.boxchar<1>) -> (!fir.ref>, index) + %1:2 = hlfir.declare %0#0 typeparams %c1 {uniq_name = "_QFtest1Ec"} : (!fir.ref>, index) -> (!fir.boxchar<1>, !fir.ref>) + %2 = fir.alloca !fir.char<1> {bindc_name = "local", uniq_name = "_QFtest1Elocal"} + %3:2 = hlfir.declare %2 typeparams %c1 {uniq_name = "_QFtest1Elocal"} : (!fir.ref>, index) -> (!fir.ref>, !fir.ref>) + hlfir.assign %1#0 to %3#0 : !fir.boxchar<1>, !fir.ref> + return + } +} + +// ----- + +// CHECK-LABEL: func.func @_QPtest2 +// CHECK: [[C_DECL:%[0-9]*]] = fir.declare{{.*}}{uniq_name = "_QFtest2Ec"} : (!fir.ref>, index) -> !fir.ref> +// CHECK: [[LOCAL_DECL:%[0-9]*]] = fir.declare{{.*}}{uniq_name = "_QFtest2Elocal"} : (!fir.ref>, index) -> !fir.ref> +// CHECK: [[LD:%[0-9]*]] = fir.load [[LOCAL_DECL]] : !fir.ref> +// CHECK: [[CVT:%[0-9]*]] = fir.convert [[C_DECL]] : (!fir.ref>) -> !fir.ref> +// CHECK: fir.store [[LD]] to [[CVT]] : !fir.ref> +module { + func.func @_QPtest2(%arg0: !fir.boxchar<1> {fir.bindc_name = "c"}) { + %c1 = arith.constant 1 : index + %0:2 = fir.unboxchar %arg0 : (!fir.boxchar<1>) -> (!fir.ref>, index) + %1:2 = hlfir.declare %0#0 typeparams %c1 {uniq_name = "_QFtest2Ec"} : (!fir.ref>, index) -> (!fir.boxchar<1>, !fir.ref>) + %2 = fir.alloca !fir.char<1> {bindc_name = "local", uniq_name = "_QFtest2Elocal"} + %3:2 = hlfir.declare %2 typeparams %c1 {uniq_name = "_QFtest2Elocal"} : (!fir.ref>, index) -> (!fir.ref>, !fir.ref>) + hlfir.assign %3#0 to %1#0 : !fir.ref>, !fir.boxchar<1> + return + } +} diff --git a/flang/test/Lower/HLFIR/calls-character-singleton-result.f90 b/flang/test/Lower/HLFIR/calls-character-singleton-result.f90 --- a/flang/test/Lower/HLFIR/calls-character-singleton-result.f90 +++ b/flang/test/Lower/HLFIR/calls-character-singleton-result.f90 @@ -11,7 +11,8 @@ end subroutine ! CHECK-LABEL: func.func @_QPscalar_char( ! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.char<1> -! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %{{.*}}#0 typeparams %{{.*}} {{.*}}Ec +! CHECK: %[[VAL_4:.*]] = fir.convert %{{.*}}#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %[[VAL_4]] typeparams %{{.*}} {{.*}}Ec ! CHECK: %[[VAL_6:.*]]:2 = hlfir.declare %{{.*}} {{.*}}Ei ! CHECK: %[[VAL_7:.*]] = fir.load %[[VAL_6]]#1 : !fir.ref ! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_7]] : (i64) -> i8 @@ -20,7 +21,7 @@ ! CHECK: fir.store %[[VAL_10]] to %[[VAL_2]] : !fir.ref> ! CHECK: %[[VAL_11:.*]] = arith.constant false ! CHECK: %[[VAL_12:.*]] = hlfir.as_expr %[[VAL_2]] move %[[VAL_11]] : (!fir.ref>, i1) -> !hlfir.expr> -! CHECK: hlfir.assign %[[VAL_12]] to %[[VAL_5]]#0 : !hlfir.expr>, !fir.boxchar<1> +! CHECK: hlfir.assign %[[VAL_12]] to %[[VAL_5]]#0 : !hlfir.expr>, !fir.ref> subroutine scalar_bindc(c) character(1) :: c @@ -32,12 +33,13 @@ end subroutine ! CHECK-LABEL: func.func @_QPscalar_bindc( ! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.char<1> -! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %{{.*}}#0 typeparams %{{.*}} {{.*}}Ec +! CHECK: %[[VAL_3:.*]] = fir.convert %{{.*}}#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_4:.*]]:2 = hlfir.declare %[[VAL_3]] typeparams %{{.*}} {{.*}}Ec ! CHECK: %[[VAL_5:.*]] = fir.call @bar() fastmath : () -> !fir.char<1> ! CHECK: fir.store %[[VAL_5]] to %[[VAL_1]] : !fir.ref> ! CHECK: %[[VAL_6:.*]] = arith.constant false ! CHECK: %[[VAL_7:.*]] = hlfir.as_expr %[[VAL_1]] move %[[VAL_6]] : (!fir.ref>, i1) -> !hlfir.expr> -! CHECK: hlfir.assign %[[VAL_7]] to %[[VAL_4]]#0 : !hlfir.expr>, !fir.boxchar<1> +! CHECK: hlfir.assign %[[VAL_7]] to %[[VAL_4]]#0 : !hlfir.expr>, !fir.ref> subroutine array_char(c, i) character(1) :: c(100) diff --git a/flang/test/Lower/HLFIR/convert-variable.f90 b/flang/test/Lower/HLFIR/convert-variable.f90 --- a/flang/test/Lower/HLFIR/convert-variable.f90 +++ b/flang/test/Lower/HLFIR/convert-variable.f90 @@ -23,7 +23,8 @@ ! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1> ! CHECK: %[[VAL_1:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) ! CHECK: %[[VAL_2:.*]] = arith.constant 10 : index -! CHECK: %[[VAL_3:.*]] = hlfir.declare %[[VAL_1]]#0 typeparams %[[VAL_2]] {uniq_name = "_QFscalar_character_cst_lenEc"} : (!fir.ref>, index) -> (!fir.boxchar<1>, !fir.ref>) +! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_1]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_4:.*]] = hlfir.declare %[[VAL_3]] typeparams %[[VAL_2]] {uniq_name = "_QFscalar_character_cst_lenEc"} : (!fir.ref>, index) -> (!fir.ref>, !fir.ref>) subroutine array_numeric(x) integer :: x(10, 20) diff --git a/flang/test/Lower/HLFIR/implicit-call-mismatch.f90 b/flang/test/Lower/HLFIR/implicit-call-mismatch.f90 --- a/flang/test/Lower/HLFIR/implicit-call-mismatch.f90 +++ b/flang/test/Lower/HLFIR/implicit-call-mismatch.f90 @@ -37,10 +37,11 @@ call takes_char(c) end subroutine ! CHECK-LABEL: func.func @_QPpass_kind2_char_to_char( -! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare {{.*}}Ec +! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare {{.*}}Ec +! CHECK: %[[VAL_3:.*]] = fir.emboxchar %[[VAL_2]]#1, %{{.*}} : (!fir.ref>, index) -> !fir.boxchar<2> ! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QPtakes_char) : (!fir.boxchar<1>) -> () ! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]] : ((!fir.boxchar<1>) -> ()) -> ((!fir.boxchar<2>) -> ()) -! CHECK: fir.call %[[VAL_5]](%[[VAL_3]]#0) {{.*}}: (!fir.boxchar<2>) -> () +! CHECK: fir.call %[[VAL_5]](%[[VAL_3]]) {{.*}}: (!fir.boxchar<2>) -> () subroutine takes_real(r) real(8) :: r @@ -60,10 +61,11 @@ call takes_real(c) end subroutine ! CHECK-LABEL: func.func @_QPpass_char_to_real( -! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare {{.*}}Ec +! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare {{.*}}Ec +! CHECK: %[[VAL_3:.*]] = fir.emboxchar %[[VAL_2]]#1, %{{.*}} : (!fir.ref>, index) -> !fir.boxchar<1> ! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QPtakes_real) : (!fir.ref) -> () ! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]] : ((!fir.ref) -> ()) -> ((!fir.boxchar<1>) -> ()) -! CHECK: fir.call %[[VAL_5]](%[[VAL_3]]#0) {{.*}}: (!fir.boxchar<1>) -> () +! CHECK: fir.call %[[VAL_5]](%[[VAL_3]]) {{.*}}: (!fir.boxchar<1>) -> () subroutine pass_proc_to_real() real(8), external :: proc @@ -105,10 +107,11 @@ call takes_char_proc(c) end subroutine ! CHECK-LABEL: func.func @_QPpass_char_to_char_proc( -! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare {{.*}}Ec +! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare {{.*}}Ec +! CHECK: %[[VAL_3:.*]] = fir.emboxchar %[[VAL_2]]#1, %{{.*}} : (!fir.ref>, index) -> !fir.boxchar<1> ! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QPtakes_char_proc) : (tuple ()>, i64>) -> () ! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]] : ((tuple ()>, i64>) -> ()) -> ((!fir.boxchar<1>) -> ()) -! CHECK: fir.call %[[VAL_5]](%[[VAL_3]]#0) {{.*}}: (!fir.boxchar<1>) -> () +! CHECK: fir.call %[[VAL_5]](%[[VAL_3]]) {{.*}}: (!fir.boxchar<1>) -> () subroutine takes_proc(proc) real(8), external :: proc diff --git a/flang/test/Lower/HLFIR/substrings.f90 b/flang/test/Lower/HLFIR/substrings.f90 --- a/flang/test/Lower/HLFIR/substrings.f90 +++ b/flang/test/Lower/HLFIR/substrings.f90 @@ -24,7 +24,7 @@ ! CHECK: %[[VAL_34:.*]] = hlfir.designate %[[VAL_7]]#0 (%[[VAL_15]]:%[[VAL_5]]:%[[VAL_15]]) substr %[[VAL_16]], %[[VAL_3]] shape %[[VAL_6]] typeparams %[[VAL_33]] : (!fir.ref>>, index, index, index, index, index, !fir.shape<1>, index) -> !fir.box>> print *, scalar(2:5) -! CHECK: %[[VAL_40:.*]] = hlfir.designate %[[VAL_9]]#0 substr %[[VAL_16]], %[[VAL_17]] typeparams %[[VAL_18]] : (!fir.boxchar<1>, index, index, index) -> !fir.ref> +! CHECK: %[[VAL_40:.*]] = hlfir.designate %[[VAL_9]]#0 substr %[[VAL_16]], %[[VAL_17]] typeparams %[[VAL_18]] : (!fir.ref>, index, index, index) -> !fir.ref> end subroutine ! CHECK-LABEL: func.func @_QPdyn_len( diff --git a/flang/test/Lower/Intrinsics/achar.f90 b/flang/test/Lower/Intrinsics/achar.f90 --- a/flang/test/Lower/Intrinsics/achar.f90 +++ b/flang/test/Lower/Intrinsics/achar.f90 @@ -1,21 +1,22 @@ ! RUN: bbc -emit-fir %s -o - | fir-opt --canonicalize | FileCheck %s ! RUN: %flang_fc1 -emit-fir %s -o - | fir-opt --canonicalize | FileCheck %s -! CHECK-LABEL: test1 -! CHECK-SAME: (%[[XREF:.*]]: !fir.ref {{.*}}, %[[CBOX:.*]]: !fir.boxchar<1> {{.*}}) -! CHECK-DAG: %[[C1:.*]] = arith.constant 1 : index -! CHECK-DAG: %[[FALSE:.*]] = arith.constant false -! CHECK: %[[TEMP:.*]] = fir.alloca !fir.char<1> {adapt.valuebyref} -! CHECK: %[[C:.*]]:2 = fir.unboxchar %[[CBOX]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK: %[[X:.*]] = fir.load %[[XREF]] : !fir.ref -! CHECK: %[[X_I8:.*]] = fir.convert %[[X]] : (i32) -> i8 -! CHECK: %[[UNDEF:.*]] = fir.undefined !fir.char<1> -! CHECK: %[[XCHAR:.*]] = fir.insert_value %[[UNDEF]], %[[X_I8]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1> -! CHECK: fir.store %[[XCHAR]] to %[[TEMP]] : !fir.ref> -! CHECK: %[[C1_I64:.*]] = fir.convert %[[C1]] : (index) -> i64 -! CHECK: %[[C_CVT:.*]] = fir.convert %[[C]]#0 : (!fir.ref>) -> !fir.ref -! CHECK: %[[TEMP_WITH_XCHAR:.*]] = fir.convert %[[TEMP]] : (!fir.ref>) -> !fir.ref -! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[C_CVT]], %[[TEMP_WITH_XCHAR]], %[[C1_I64]], %[[FALSE]]) {{.*}}: (!fir.ref, !fir.ref, i64, i1) -> () + +! CHECK-LABEL: func.func @_QPtest1( +! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref {fir.bindc_name = "x"}, +! CHECK-SAME: %[[VAL_1:.*]]: !fir.boxchar<1> {fir.bindc_name = "c"}) { +! CHECK: %[[VAL_2:.*]] = fir.alloca !fir.char<1> {adapt.valuebyref} +! CHECK: %[[VAL_3:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_4:.*]] = fir.convert %[[VAL_3]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_5:.*]] = fir.load %[[VAL_0]] : !fir.ref +! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_5]] : (i32) -> i8 +! CHECK: %[[VAL_7:.*]] = fir.undefined !fir.char<1> +! CHECK: %[[VAL_8:.*]] = fir.insert_value %[[VAL_7]], %[[VAL_6]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1> +! CHECK: fir.store %[[VAL_8]] to %[[VAL_2]] : !fir.ref> +! CHECK: %[[VAL_9:.*]] = fir.load %[[VAL_2]] : !fir.ref> +! CHECK: fir.store %[[VAL_9]] to %[[VAL_4]] : !fir.ref> +! CHECK: return +! CHECK: } subroutine test1(x, c) integer :: x character :: c diff --git a/flang/test/Lower/Intrinsics/get_command_argument.f90 b/flang/test/Lower/Intrinsics/get_command_argument.f90 --- a/flang/test/Lower/Intrinsics/get_command_argument.f90 +++ b/flang/test/Lower/Intrinsics/get_command_argument.f90 @@ -17,15 +17,15 @@ character(len=32) :: value call get_command_argument(num, value) ! CHECK: %[[valueUnboxed:.*]]:2 = fir.unboxchar %[[value]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[valueLength:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[valueCast:.*]] = fir.convert %[[valueUnboxed]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[numUnbox:.*]] = fir.load %[[num]] : !fir.ref -! CHECK-NEXT: %[[valueBoxed:.*]] = fir.embox %[[valueUnboxed]]#0 typeparams %[[valueLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[valueBoxed:.*]] = fir.embox %[[valueCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %[[length:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[errmsg:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[sourceFileString:.*]] = fir.address_of(@_QQcl{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 8]] : i32 ! CHECK-64-NEXT: %[[numCast:.*]] = fir.convert %[[numUnbox]] : (i64) -> i32 -! CHECK-NEXT: %[[valueCast:.*]] = fir.convert %[[valueBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[valueCast:.*]] = fir.convert %[[valueBoxed]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-32-NEXT: %{{[0-9]+}} = fir.call @_FortranAGetCommandArgument(%[[numUnbox]], %[[valueCast]], %[[length]], %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (i32, !fir.box, !fir.box, !fir.box, !fir.ref, i32) -> i32 ! CHECK-64-NEXT: %{{[0-9]+}} = fir.call @_FortranAGetCommandArgument(%[[numCast]], %[[valueCast]], %[[length]], %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (i32, !fir.box, !fir.box, !fir.box, !fir.ref, i32) -> i32 @@ -38,19 +38,19 @@ character(len=32) :: value, errmsg call get_command_argument(num, value, length, status, errmsg) ! CHECK: %[[errmsgUnboxed:.*]]:2 = fir.unboxchar %[[errmsg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[errmsgLen:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[errmsgCast:.*]] = fir.convert %[[errmsgUnboxed]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[valueUnboxed:.*]]:2 = fir.unboxchar %[[value]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[valueLen:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[valueCast:.*]] = fir.convert %[[valueUnboxed]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[numUnboxed:.*]] = fir.load %[[num]] : !fir.ref -! CHECK-NEXT: %[[valueBoxed:.*]] = fir.embox %[[valueUnboxed]]#0 typeparams %[[valueLen]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[valueBoxed:.*]] = fir.embox %[[valueCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %[[lengthBoxed:.*]] = fir.embox %[[length]] : (!fir.ref) -> !fir.box -! CHECK-NEXT: %[[errmsgBoxed:.*]] = fir.embox %[[errmsgUnboxed]]#0 typeparams %[[errmsgLen]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[errmsgBoxed:.*]] = fir.embox %[[errmsgCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %[[sourceFileString:.*]] = fir.address_of(@_QQcl{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 10]] : i32 ! CHECK-64-NEXT: %[[numCast:.*]] = fir.convert %[[numUnboxed]] : (i64) -> i32 -! CHECK-NEXT: %[[valueBuffer:.*]] = fir.convert %[[valueBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[valueBuffer:.*]] = fir.convert %[[valueBoxed]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[lengthBuffer:.*]] = fir.convert %[[lengthBoxed]] : (!fir.box) -> !fir.box -! CHECK-NEXT: %[[errmsgBuffer:.*]] = fir.convert %[[errmsgBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[errmsgBuffer:.*]] = fir.convert %[[errmsgBoxed]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-32-NEXT: %[[statusResult:.*]] = fir.call @_FortranAGetCommandArgument(%[[numUnboxed]], %[[valueBuffer]], %[[lengthBuffer]], %[[errmsgBuffer]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (i32, !fir.box, !fir.box, !fir.box, !fir.ref, i32) -> i32 ! CHECK-64-NEXT: %[[statusResult32:.*]] = fir.call @_FortranAGetCommandArgument(%[[numCast]], %[[valueBuffer]], %[[lengthBuffer]], %[[errmsgBuffer]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (i32, !fir.box, !fir.box, !fir.box, !fir.ref, i32) -> i32 @@ -102,15 +102,15 @@ character(len=32) :: errmsg call get_command_argument(num, ERRMSG=errmsg) ! CHECK: %[[errmsgUnboxed:.*]]:2 = fir.unboxchar %[[errmsg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[errmsgLength:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[errmsgCast:.*]] = fir.convert %[[errmsgUnboxed]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[numUnboxed:.*]] = fir.load %[[num]] : !fir.ref -! CHECK-NEXT: %[[errmsgBoxed:.*]] = fir.embox %[[errmsgUnboxed]]#0 typeparams %[[errmsgLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[errmsgBoxed:.*]] = fir.embox %[[errmsgCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %[[value:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[length:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[sourceFileString:.*]] = fir.address_of(@_QQcl{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 8]] : i32 ! CHECK-64: %[[numCast:.*]] = fir.convert %[[numUnboxed]] : (i64) -> i32 -! CHECK-NEXT: %[[errmsg:.*]] = fir.convert %[[errmsgBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[errmsg:.*]] = fir.convert %[[errmsgBoxed]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-32-NEXT: %{{[0-9]+}} = fir.call @_FortranAGetCommandArgument(%[[numUnboxed]], %[[value]], %[[length]], %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (i32, !fir.box, !fir.box, !fir.box, !fir.ref, i32) -> i32 ! CHECK-64-NEXT: %{{[0-9]+}} = fir.call @_FortranAGetCommandArgument(%[[numCast]], %[[value]], %[[length]], %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (i32, !fir.box, !fir.box, !fir.box, !fir.ref, i32) -> i32 diff --git a/flang/test/Lower/Intrinsics/get_environment_variable.f90 b/flang/test/Lower/Intrinsics/get_environment_variable.f90 --- a/flang/test/Lower/Intrinsics/get_environment_variable.f90 +++ b/flang/test/Lower/Intrinsics/get_environment_variable.f90 @@ -17,18 +17,18 @@ character(len=32) :: name, value call get_environment_variable(name, value) ! CHECK: %[[nameUnbox:.*]]:2 = fir.unboxchar %[[nameArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[nameLength:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[nameCast:.*]] = fir.convert %[[nameUnbox]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[valueUnbox:.*]]:2 = fir.unboxchar %[[valueArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[valueLength:.*]] = arith.constant 32 : index -! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameUnbox]]#0 typeparams %[[nameLength]] : (!fir.ref>, index) -> !fir.box> -! CHECK-NEXT: %[[valueBox:.*]] = fir.embox %[[valueUnbox]]#0 typeparams %[[valueLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[valueCast:.*]] = fir.convert %[[valueUnbox]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameCast]] : (!fir.ref>) -> !fir.box> +! CHECK-NEXT: %[[valueBox:.*]] = fir.embox %[[valueCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %true = arith.constant true ! CHECK-NEXT: %[[length:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[errmsg:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[sourceFileString:.*]] = fir.address_of(@_QQcl{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 11]] : i32 -! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box -! CHECK-NEXT: %[[value:.*]] = fir.convert %[[valueBox]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[value:.*]] = fir.convert %[[valueBox]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-NEXT: %{{[0-9]+}} = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %true, %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 ! CHECK-NEXT: return @@ -42,15 +42,15 @@ integer :: length call get_environment_variable(name, LENGTH=length) ! CHECK: %[[nameUnbox:.*]]:2 = fir.unboxchar %[[nameArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[nameLength:.*]] = arith.constant 32 : index -! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %0#0 typeparams %[[nameLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[nameCast:.*]] = fir.convert %[[nameUnbox]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %[[lengthBox:.*]] = fir.embox %arg1 : (!fir.ref) -> !fir.box ! CHECK-NEXT: %true = arith.constant true ! CHECK-NEXT: %[[value:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[errmsg:.*]] = fir.absent !fir.box ! CHECK: %[[sourceFileString:.*]] = fir.address_of(@_QQcl.{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 9]] : i32 -! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[length:.*]] = fir.convert %[[lengthBox]] : (!fir.box) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-NEXT: %{{.*}} = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %true, %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 @@ -64,15 +64,15 @@ integer :: status call get_environment_variable(name, STATUS=status) ! CHECK: %[[nameUnbox:.*]]:2 = fir.unboxchar %[[nameArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[nameLength:.*]] = arith.constant 32 : index -! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameUnbox]]#0 typeparams %[[nameLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[nameCast:.*]] = fir.convert %[[nameUnbox]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %true = arith.constant true ! CHECK-NEXT: %[[value:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[length:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[errmsg:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[sourceFileString:.*]] = fir.address_of(@_QQcl.{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 9]] : i32 -! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-32-NEXT: %[[status:.*]] = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %true, %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 ! CHECK-64-NEXT: %[[status32:.*]] = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %true, %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 @@ -98,18 +98,18 @@ character(len=32) :: name, errmsg call get_environment_variable(name, ERRMSG=errmsg) ! CHECK: %[[errmsgUnbox:.*]]:2 = fir.unboxchar %[[errmsgArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[errmsgLength:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[errmsgCast:.*]] = fir.convert %[[errmsgUnbox]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[nameUnbox:.*]]:2 = fir.unboxchar %[[nameArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[nameLength:.*]] = arith.constant 32 : index -! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameUnbox]]#0 typeparams %[[nameLength]] : (!fir.ref>, index) -> !fir.box> -! CHECK-NEXT: %[[errmsgBox:.*]] = fir.embox %[[errmsgUnbox]]#0 typeparams %c32 : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[nameCast:.*]] = fir.convert %[[nameUnbox]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK-NEXT: %[[nameBox:.*]] = fir.embox %[[nameCast]] : (!fir.ref>) -> !fir.box> +! CHECK-NEXT: %[[errmsgBox:.*]] = fir.embox %[[errmsgCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %true = arith.constant true ! CHECK-NEXT: %[[value:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[length:.*]] = fir.absent !fir.box ! CHECK-NEXT: %[[sourceFileString:.*]] = fir.address_of(@_QQcl.{{.*}}) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 11]] : i32 -! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box -! CHECK-NEXT: %[[errmsg:.*]] = fir.convert %[[errmsgBox]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBox]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[errmsg:.*]] = fir.convert %[[errmsgBox]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-NEXT: %{{[0-9]+}} = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %true, %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 ! CHECK-NEXT: return @@ -128,15 +128,15 @@ logical :: trim_name call get_environment_variable(name, value, length, status, trim_name, errmsg) ! CHECK: %[[errmsgUnbox:.*]]:2 = fir.unboxchar %[[errmsgArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[errmsgLength:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[errmsgCast:.*]] = fir.convert %[[errmsgUnbox]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[nameUnbox:.*]]:2 = fir.unboxchar %[[nameArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[nameLength:.*]] = arith.constant 32 : index +! CHECK-NEXT: %[[nameCast:.*]] = fir.convert %[[nameUnbox]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-NEXT: %[[valueUnbox:.*]]:2 = fir.unboxchar %[[valueArg]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-NEXT: %[[valueLength:.*]] = arith.constant 32 : index -! CHECK-NEXT: %[[nameBoxed:.*]] = fir.embox %[[nameUnbox]]#0 typeparams %[[nameLength]] : (!fir.ref>, index) -> !fir.box> -! CHECK-NEXT: %[[valueBoxed:.*]] = fir.embox %[[valueUnbox]]#0 typeparams %[[valueLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[valueCast:.*]] = fir.convert %[[valueUnbox]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK-NEXT: %[[nameBoxed:.*]] = fir.embox %[[nameCast]] : (!fir.ref>) -> !fir.box> +! CHECK-NEXT: %[[valueBoxed:.*]] = fir.embox %[[valueCast]] : (!fir.ref>) -> !fir.box> ! CHECK-NEXT: %[[lengthBoxed:.*]] = fir.embox %[[lengthArg]] : (!fir.ref) -> !fir.box -! CHECK-NEXT: %[[errmsgBoxed:.*]] = fir.embox %[[errmsgUnbox]]#0 typeparams %[[errmsgLength]] : (!fir.ref>, index) -> !fir.box> +! CHECK-NEXT: %[[errmsgBoxed:.*]] = fir.embox %[[errmsgCast]] : (!fir.ref>) -> !fir.box> ! CHECK: %[[trimName:.*]] = fir.if %{{.*}} -> (i1) { ! CHECK-NEXT: %[[trimNameLoaded:.*]] = fir.load %[[trimNameArg]] : !fir.ref> ! CHECK-NEXT: %[[trimCast:.*]] = fir.convert %[[trimNameLoaded]] : (!fir.logical<4>) -> i1 @@ -147,10 +147,10 @@ ! CHECK-NEXT: } ! CHECK: %[[sourceFileString:.*]] = fir.address_of(@_QQcl.[[fileString:.*]]) : !fir.ref> ! CHECK-NEXT: %[[sourceLine:.*]] = arith.constant [[# @LINE - 20]] : i32 -! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBoxed]] : (!fir.box>) -> !fir.box -! CHECK-NEXT: %[[value:.*]] = fir.convert %[[valueBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[name:.*]] = fir.convert %[[nameBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[value:.*]] = fir.convert %[[valueBoxed]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[length:.*]] = fir.convert %[[lengthBoxed]] : (!fir.box) -> !fir.box -! CHECK-NEXT: %[[errmsg:.*]] = fir.convert %[[errmsgBoxed]] : (!fir.box>) -> !fir.box +! CHECK-NEXT: %[[errmsg:.*]] = fir.convert %[[errmsgBoxed]] : (!fir.box>) -> !fir.box ! CHECK-NEXT: %[[sourceFile:.*]] = fir.convert %[[sourceFileString]] : (!fir.ref>) -> !fir.ref ! CHECK-32-NEXT: %[[status:.*]] = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %[[trimName]], %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 ! CHECK-64-NEXT: %[[status32:.*]] = fir.call @_FortranAGetEnvVariable(%[[name]], %[[value]], %[[length]], %[[trimName]], %[[errmsg]], %[[sourceFile]], %[[sourceLine]]) {{.*}}: (!fir.box, !fir.box, !fir.box, i1, !fir.box, !fir.ref, i32) -> i32 diff --git a/flang/test/Lower/Intrinsics/ichar.f90 b/flang/test/Lower/Intrinsics/ichar.f90 --- a/flang/test/Lower/Intrinsics/ichar.f90 +++ b/flang/test/Lower/Intrinsics/ichar.f90 @@ -6,9 +6,9 @@ character(1) :: c character :: str(10) ! CHECK-DAG: %[[unbox:.*]]:2 = fir.unboxchar + ! CHECK-DAG: %[[BOX:.*]] = fir.convert %[[unbox]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-DAG: %[[J:.*]] = fir.alloca i32 {{{.*}}uniq_name = "{{.*}}Ej"} ! CHECK-DAG: %[[STR:.*]] = fir.alloca !fir.array{{.*}} {{{.*}}uniq_name = "{{.*}}Estr"} - ! CHECK: %[[BOX:.*]] = fir.convert %[[unbox]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK: %[[PTR:.*]] = fir.load %[[BOX]] : !fir.ref> ! CHECK: %[[CHAR:.*]] = fir.extract_value %[[PTR]], [0 : index] : ! CHECK: %[[ARG:.*]] = arith.extui %[[CHAR]] : i8 to i32 diff --git a/flang/test/Lower/Intrinsics/merge.f90 b/flang/test/Lower/Intrinsics/merge.f90 --- a/flang/test/Lower/Intrinsics/merge.f90 +++ b/flang/test/Lower/Intrinsics/merge.f90 @@ -8,11 +8,13 @@ logical :: mask merge_test = merge(o1, o2, mask) ! CHECK: %[[a0:.*]]:2 = fir.unboxchar %[[arg2]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK-DAG: %[[a1:.*]]:2 = fir.unboxchar %[[arg3]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[a0_cast:.*]] = fir.convert %[[a0]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[a1:.*]]:2 = fir.unboxchar %[[arg3]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[a1_cast:.*]] = fir.convert %[[a1]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK: %[[a2:.*]] = fir.load %[[arg4]] : !fir.ref> ! CHECK: %[[a3:.*]] = fir.convert %[[a2]] : (!fir.logical<4>) -> i1 -! CHECK: %[[a4:.*]] = arith.select %[[a3]], %[[a0]]#0, %[[a1]]#0 : !fir.ref> -! CHECK-DAG: %{{.*}} = fir.convert %[[a4]] : (!fir.ref>) -> !fir.ref +! CHECK: %[[a4:.*]] = arith.select %[[a3]], %[[a0_cast]], %[[a1_cast]] : !fir.ref> +! CHECK: %{{.*}} = fir.convert %[[a4]] : (!fir.ref>) -> !fir.ref end ! CHECK-LABEL: func @_QPmerge_test2( diff --git a/flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90 b/flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90 --- a/flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90 +++ b/flang/test/Lower/OpenMP/parallel-lastprivate-clause-scalar.f90 @@ -6,6 +6,7 @@ !CHECK: func @_QPlastprivate_character(%[[ARG1:.*]]: !fir.boxchar<1>{{.*}}) { !CHECK-DAG: %[[ARG1_UNBOX:.*]]:2 = fir.unboxchar !CHECK-DAG: %[[FIVE:.*]] = arith.constant 5 : index +!CHECK-DAG: %[[ARG1_REF:.*]] = fir.convert %[[ARG1_UNBOX]]#0 : (!fir.ref>) -> !fir.ref> !CHECK: omp.parallel { !CHECK-DAG: %[[ARG1_PVT:.*]] = fir.alloca !fir.char<1,5> {bindc_name = "arg1", @@ -27,7 +28,7 @@ !CHECK: scf.if %[[IV_CMP]] { ! Testing lastprivate val update -!CHECK-DAG: %[[CVT:.*]] = fir.convert %[[ARG1_UNBOX]]#0 : (!fir.ref>) -> !fir.ref +!CHECK-DAG: %[[CVT:.*]] = fir.convert %[[ARG1_REF]] : (!fir.ref>) -> !fir.ref !CHECK-DAG: %[[CVT1:.*]] = fir.convert %[[ARG1_PVT]] : (!fir.ref>) -> !fir.ref !CHECK-DAG: fir.call @llvm.memmove.p0.p0.i64(%[[CVT]], %[[CVT1]]{{.*}}) !CHECK-DAG: } diff --git a/flang/test/Lower/array-elemental-calls-char.f90 b/flang/test/Lower/array-elemental-calls-char.f90 --- a/flang/test/Lower/array-elemental-calls-char.f90 +++ b/flang/test/Lower/array-elemental-calls-char.f90 @@ -105,31 +105,34 @@ i = elem2(c, j) end subroutine -! CHECK-LABEL: func @_QMchar_elemPfoo2b( -! CHECK-SAME: %[[VAL_67:[^:]+]]: !fir.ref>{{.*}}, %[[VAL_64:[^:]+]]: !fir.ref>{{.*}}, %[[VAL_56:.*]]: !fir.boxchar<1>{{.*}}) { +! CHECK-LABEL: func.func @_QMchar_elemPfoo2b( +! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref>{{.*}}, %[[VAL_1:.*]]: !fir.ref>{{.*}}, %[[VAL_2:.*]]: !fir.boxchar<1>{{.*}}) { subroutine foo2b(i, j, c) integer :: i(10), j(10) character(10) :: c -! CHECK-DAG: %[[VAL_52:.*]] = arith.constant 10 : index -! CHECK-DAG: %[[VAL_53:.*]] = arith.constant 0 : index -! CHECK-DAG: %[[VAL_54:.*]] = arith.constant 1 : index -! CHECK: %[[VAL_55:.*]]:2 = fir.unboxchar %[[VAL_56]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK: %[[VAL_57:.*]] = fir.shape %[[VAL_52]] : (index) -> !fir.shape<1> -! CHECK: br ^bb1(%[[VAL_53]], %[[VAL_52]] : index, index) -! CHECK: ^bb1(%[[VAL_58:.*]]: index, %[[VAL_59:.*]]: index): -! CHECK: %[[VAL_60:.*]] = arith.cmpi sgt, %[[VAL_59]], %[[VAL_53]] : index -! CHECK: cond_br %[[VAL_60]], ^bb2, ^bb3 -! CHECK: ^bb2: -! CHECK: %[[VAL_61:.*]] = fir.emboxchar %[[VAL_55]]#0, %[[VAL_52]] : (!fir.ref>, index) -> !fir.boxchar<1> -! CHECK: %[[VAL_62:.*]] = arith.addi %[[VAL_58]], %[[VAL_54]] : index -! CHECK: %[[VAL_63:.*]] = fir.array_coor %[[VAL_64]](%[[VAL_57]]) %[[VAL_62]] : (!fir.ref>, !fir.shape<1>, index) -> !fir.ref -! CHECK: %[[VAL_65:.*]] = fir.call @_QPelem2(%[[VAL_61]], %[[VAL_63]]) {{.*}}: (!fir.boxchar<1>, !fir.ref) -> i32 -! CHECK: %[[VAL_66:.*]] = fir.array_coor %[[VAL_67]](%[[VAL_57]]) %[[VAL_62]] : (!fir.ref>, !fir.shape<1>, index) -> !fir.ref -! CHECK: fir.store %[[VAL_65]] to %[[VAL_66]] : !fir.ref -! CHECK: %[[VAL_68:.*]] = arith.subi %[[VAL_59]], %[[VAL_54]] : index -! CHECK: br ^bb1(%[[VAL_62]], %[[VAL_68]] : index, index) -! CHECK: ^bb3: -! CHECK: return +! CHECK-DAG: %[[VAL_3:.*]] = arith.constant 10 : index +! CHECK-DAG: %[[VAL_4:.*]] = arith.constant 0 : index +! CHECK-DAG: %[[VAL_5:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_6:.*]]:2 = fir.unboxchar %[[VAL_2]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_6]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_8:.*]] = fir.shape %[[VAL_3]] : (index) -> !fir.shape<1> +! CHECK: cf.br ^bb1(%[[VAL_4]], %[[VAL_3]] : index, index) +! CHECK: ^bb1(%[[VAL_9:.*]]: index, %[[VAL_10:.*]]: index): +! CHECK: %[[VAL_11:.*]] = arith.cmpi sgt, %[[VAL_10]], %[[VAL_4]] : index +! CHECK: cf.cond_br %[[VAL_11]], ^bb2, ^bb3 +! CHECK: ^bb2: +! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_7]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_13:.*]] = fir.emboxchar %[[VAL_12]], %[[VAL_3]] : (!fir.ref>, index) -> !fir.boxchar<1> +! CHECK: %[[VAL_14:.*]] = arith.addi %[[VAL_9]], %[[VAL_5]] : index +! CHECK: %[[VAL_15:.*]] = fir.array_coor %[[VAL_1]](%[[VAL_8]]) %[[VAL_14]] : (!fir.ref>, !fir.shape<1>, index) -> !fir.ref +! CHECK: %[[VAL_16:.*]] = fir.call @_QPelem2(%[[VAL_13]], %[[VAL_15]]) fastmath : (!fir.boxchar<1>, !fir.ref) -> i32 +! CHECK: %[[VAL_17:.*]] = fir.array_coor %[[VAL_0]](%[[VAL_8]]) %[[VAL_14]] : (!fir.ref>, !fir.shape<1>, index) -> !fir.ref +! CHECK: fir.store %[[VAL_16]] to %[[VAL_17]] : !fir.ref +! CHECK: %[[VAL_18:.*]] = arith.subi %[[VAL_10]], %[[VAL_5]] : index +! CHECK: cf.br ^bb1(%[[VAL_14]], %[[VAL_18]] : index, index) +! CHECK: ^bb3: +! CHECK: return +! CHECK: } i = elem2(c, j) end subroutine diff --git a/flang/test/Lower/call-by-value.f90 b/flang/test/Lower/call-by-value.f90 --- a/flang/test/Lower/call-by-value.f90 +++ b/flang/test/Lower/call-by-value.f90 @@ -62,14 +62,16 @@ call internal_call3(x) end -! CHECK-LABEL: func.func @test_char_value( -! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1> {fir.bindc_name = "x"}) attributes {fir.bindc_name = "test_char_value"} { -! CHECK: %[[VAL_1:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK: %[[VAL_2:.*]] = arith.constant 1 : index -! CHECK: %[[VAL_3:.*]] = fir.emboxchar %[[VAL_1]]#0, %[[VAL_2]] : (!fir.ref>, index) -> !fir.boxchar<1> -! CHECK: fir.call @_QPinternal_call4(%[[VAL_3]]) {{.*}}: (!fir.boxchar<1>) -> () -! CHECK: return -! CHECK: } +! CHECK-LABEL: func.func @test_char_value( +! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1> {fir.bindc_name = "x"}) attributes {fir.bindc_name = "test_char_value"} { +! CHECK: %[[VAL_1:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_2:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_1]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_4:.*]] = fir.convert %[[VAL_3]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_5:.*]] = fir.emboxchar %[[VAL_4]], %[[VAL_2]] : (!fir.ref>, index) -> !fir.boxchar<1> +! CHECK: fir.call @_QPinternal_call4(%[[VAL_5]]) fastmath : (!fir.boxchar<1>) -> () +! CHECK: return +! CHECK: } subroutine test_char_value(x) bind(c) character(1), value :: x diff --git a/flang/test/Lower/call-parenthesized-arg.f90 b/flang/test/Lower/call-parenthesized-arg.f90 --- a/flang/test/Lower/call-parenthesized-arg.f90 +++ b/flang/test/Lower/call-parenthesized-arg.f90 @@ -22,25 +22,27 @@ ! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1>{{.*}}) { subroutine foo_char_scalar(x) character(5) :: x -! CHECK: %[[VAL_1:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK: %[[VAL_2:.*]] = arith.constant 5 : index -! CHECK: %[[VAL_3:.*]] = fir.emboxchar %[[VAL_1]]#0, %[[VAL_2]] : (!fir.ref>, index) -> !fir.boxchar<1> -! CHECK: fir.call @_QPbar_char_scalar(%[[VAL_3]]) {{.*}}: (!fir.boxchar<1>) -> () +! CHECK: %[[VAL_1:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_2:.*]] = arith.constant 5 : index +! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_1]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_4:.*]] = fir.convert %[[VAL_3]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_5:.*]] = fir.emboxchar %[[VAL_4]], %[[VAL_2]] : (!fir.ref>, index) -> !fir.boxchar<1> +! CHECK: fir.call @_QPbar_char_scalar(%[[VAL_5]]) fastmath : (!fir.boxchar<1>) -> () call bar_char_scalar(x) -! CHECK: %[[VAL_4:.*]] = fir.no_reassoc %[[VAL_1]]#0 : !fir.ref> -! CHECK: %[[VAL_5:.*]] = fir.alloca !fir.char<1,5> {bindc_name = ".chrtmp"} -! CHECK: %[[VAL_6:.*]] = arith.constant 1 : i64 -! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_2]] : (index) -> i64 -! CHECK: %[[VAL_8:.*]] = arith.muli %[[VAL_6]], %[[VAL_7]] : i64 -! CHECK: %[[VAL_9:.*]] = arith.constant false -! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_5]] : (!fir.ref>) -> !fir.ref -! CHECK: %[[VAL_11:.*]] = fir.convert %[[VAL_4]] : (!fir.ref>) -> !fir.ref -! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_10]], %[[VAL_11]], %[[VAL_8]], %[[VAL_9]]) {{.*}}: (!fir.ref, !fir.ref, i64, i1) -> () -! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_5]] : (!fir.ref>) -> !fir.ref> -! CHECK: %[[VAL_13:.*]] = fir.emboxchar %[[VAL_12]], %[[VAL_2]] : (!fir.ref>, index) -> !fir.boxchar<1> -! CHECK: fir.call @_QPbar_char_scalar(%[[VAL_13]]) {{.*}}: (!fir.boxchar<1>) -> () -! CHECK: return -! CHECK: } +! CHECK: %[[VAL_6:.*]] = fir.no_reassoc %[[VAL_3]] : !fir.ref> +! CHECK: %[[VAL_7:.*]] = fir.alloca !fir.char<1,5> {bindc_name = ".chrtmp"} +! CHECK: %[[VAL_8:.*]] = arith.constant 1 : i64 +! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_2]] : (index) -> i64 +! CHECK: %[[VAL_10:.*]] = arith.muli %[[VAL_8]], %[[VAL_9]] : i64 +! CHECK: %[[VAL_11:.*]] = arith.constant false +! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_7]] : (!fir.ref>) -> !fir.ref +! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_6]] : (!fir.ref>) -> !fir.ref +! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_12]], %[[VAL_13]], %[[VAL_10]], %[[VAL_11]]) fastmath : (!fir.ref, !fir.ref, i64, i1) -> () +! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_7]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_15:.*]] = fir.emboxchar %[[VAL_14]], %[[VAL_2]] : (!fir.ref>, index) -> !fir.boxchar<1> +! CHECK: fir.call @_QPbar_char_scalar(%[[VAL_15]]) fastmath : (!fir.boxchar<1>) -> () +! CHECK: return +! CHECK: } call bar_char_scalar((x)) end subroutine diff --git a/flang/test/Lower/character-substrings.f90 b/flang/test/Lower/character-substrings.f90 --- a/flang/test/Lower/character-substrings.f90 +++ b/flang/test/Lower/character-substrings.f90 @@ -69,61 +69,63 @@ ! CHECK-LABEL: func @_QPsubstring_assignment( ! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1>{{.*}}, %[[VAL_1:.*]]: !fir.boxchar<1>{{.*}}) { subroutine substring_assignment(a,b) - ! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) - ! CHECK: %[[VAL_3:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref>, index) - ! CHECK: %[[VAL_4:.*]] = arith.constant 3 : i64 - ! CHECK: %[[VAL_5:.*]] = arith.constant 4 : i64 - ! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_4]] : (i64) -> index - ! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_5]] : (i64) -> index - ! CHECK: %[[VAL_8:.*]] = arith.constant 1 : index - ! CHECK: %[[VAL_9:.*]] = arith.subi %[[VAL_6]], %[[VAL_8]] : index - ! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_3]]#0 : (!fir.ref>) -> !fir.ref>> - ! CHECK: %[[VAL_11:.*]] = fir.coordinate_of %[[VAL_10]], %[[VAL_9]] : (!fir.ref>>, index) -> !fir.ref> - ! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_11]] : (!fir.ref>) -> !fir.ref> - ! CHECK: %[[VAL_13:.*]] = arith.subi %[[VAL_7]], %[[VAL_6]] : index - ! CHECK: %[[VAL_14:.*]] = arith.addi %[[VAL_13]], %[[VAL_8]] : index - ! CHECK: %[[VAL_15:.*]] = arith.constant 0 : index - ! CHECK: %[[VAL_16:.*]] = arith.cmpi slt, %[[VAL_14]], %[[VAL_15]] : index - ! CHECK: %[[VAL_17:.*]] = arith.select %[[VAL_16]], %[[VAL_15]], %[[VAL_14]] : index - ! CHECK: %[[VAL_18:.*]] = arith.constant 1 : i64 - ! CHECK: %[[VAL_19:.*]] = arith.constant 2 : i64 - ! CHECK: %[[VAL_20:.*]] = fir.convert %[[VAL_18]] : (i64) -> index - ! CHECK: %[[VAL_21:.*]] = fir.convert %[[VAL_19]] : (i64) -> index - ! CHECK: %[[VAL_22:.*]] = arith.constant 1 : index - ! CHECK: %[[VAL_23:.*]] = arith.subi %[[VAL_20]], %[[VAL_22]] : index - ! CHECK: %[[VAL_24:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref>) -> !fir.ref>> - ! CHECK: %[[VAL_25:.*]] = fir.coordinate_of %[[VAL_24]], %[[VAL_23]] : (!fir.ref>>, index) -> !fir.ref> - ! CHECK: %[[VAL_26:.*]] = fir.convert %[[VAL_25]] : (!fir.ref>) -> !fir.ref> - ! CHECK: %[[VAL_27:.*]] = arith.subi %[[VAL_21]], %[[VAL_20]] : index - ! CHECK: %[[VAL_28:.*]] = arith.addi %[[VAL_27]], %[[VAL_22]] : index - ! CHECK: %[[VAL_29:.*]] = arith.constant 0 : index - ! CHECK: %[[VAL_30:.*]] = arith.cmpi slt, %[[VAL_28]], %[[VAL_29]] : index - ! CHECK: %[[VAL_31:.*]] = arith.select %[[VAL_30]], %[[VAL_29]], %[[VAL_28]] : index - ! CHECK: %[[VAL_32:.*]] = arith.cmpi slt, %[[VAL_31]], %[[VAL_17]] : index - ! CHECK: %[[VAL_33:.*]] = arith.select %[[VAL_32]], %[[VAL_31]], %[[VAL_17]] : index - ! CHECK: %[[VAL_34:.*]] = arith.constant 1 : i64 - ! CHECK: %[[VAL_35:.*]] = fir.convert %[[VAL_33]] : (index) -> i64 - ! CHECK: %[[VAL_36:.*]] = arith.muli %[[VAL_34]], %[[VAL_35]] : i64 - ! CHECK: %[[VAL_37:.*]] = arith.constant false - ! CHECK: %[[VAL_38:.*]] = fir.convert %[[VAL_26]] : (!fir.ref>) -> !fir.ref - ! CHECK: %[[VAL_39:.*]] = fir.convert %[[VAL_12]] : (!fir.ref>) -> !fir.ref - ! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_38]], %[[VAL_39]], %[[VAL_36]], %[[VAL_37]]) {{.*}}: (!fir.ref, !fir.ref, i64, i1) -> () - ! CHECK: %[[VAL_40:.*]] = arith.constant 1 : index - ! CHECK: %[[VAL_41:.*]] = arith.subi %[[VAL_31]], %[[VAL_40]] : index - ! CHECK: %[[VAL_42:.*]] = arith.constant 32 : i8 - ! CHECK: %[[VAL_43:.*]] = fir.undefined !fir.char<1> - ! CHECK: %[[VAL_44:.*]] = fir.insert_value %[[VAL_43]], %[[VAL_42]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1> - ! CHECK: %[[VAL_45:.*]] = arith.constant 1 : index - ! CHECK: fir.do_loop %[[VAL_46:.*]] = %[[VAL_33]] to %[[VAL_41]] step %[[VAL_45]] { - ! CHECK: %[[VAL_47:.*]] = fir.convert %[[VAL_26]] : (!fir.ref>) -> !fir.ref>> - ! CHECK: %[[VAL_48:.*]] = fir.coordinate_of %[[VAL_47]], %[[VAL_46]] : (!fir.ref>>, index) -> !fir.ref> - ! CHECK: fir.store %[[VAL_44]] to %[[VAL_48]] : !fir.ref> - ! CHECK: } +! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_4:.*]]:2 = fir.unboxchar %[[VAL_1]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_6:.*]] = arith.constant 3 : i64 +! CHECK: %[[VAL_7:.*]] = arith.constant 4 : i64 +! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_6]] : (i64) -> index +! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_7]] : (i64) -> index +! CHECK: %[[VAL_10:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_11:.*]] = arith.subi %[[VAL_8]], %[[VAL_10]] : index +! CHECK: %[[VAL_12:.*]] = fir.convert %[[VAL_5]] : (!fir.ref>) -> !fir.ref>> +! CHECK: %[[VAL_13:.*]] = fir.coordinate_of %[[VAL_12]], %[[VAL_11]] : (!fir.ref>>, index) -> !fir.ref> +! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_15:.*]] = arith.subi %[[VAL_9]], %[[VAL_8]] : index +! CHECK: %[[VAL_16:.*]] = arith.addi %[[VAL_15]], %[[VAL_10]] : index +! CHECK: %[[VAL_17:.*]] = arith.constant 0 : index +! CHECK: %[[VAL_18:.*]] = arith.cmpi slt, %[[VAL_16]], %[[VAL_17]] : index +! CHECK: %[[VAL_19:.*]] = arith.select %[[VAL_18]], %[[VAL_17]], %[[VAL_16]] : index +! CHECK: %[[VAL_20:.*]] = arith.constant 1 : i64 +! CHECK: %[[VAL_21:.*]] = arith.constant 2 : i64 +! CHECK: %[[VAL_22:.*]] = fir.convert %[[VAL_20]] : (i64) -> index +! CHECK: %[[VAL_23:.*]] = fir.convert %[[VAL_21]] : (i64) -> index +! CHECK: %[[VAL_24:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_25:.*]] = arith.subi %[[VAL_22]], %[[VAL_24]] : index +! CHECK: %[[VAL_26:.*]] = fir.convert %[[VAL_3]] : (!fir.ref>) -> !fir.ref>> +! CHECK: %[[VAL_27:.*]] = fir.coordinate_of %[[VAL_26]], %[[VAL_25]] : (!fir.ref>>, index) -> !fir.ref> +! CHECK: %[[VAL_28:.*]] = fir.convert %[[VAL_27]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_29:.*]] = arith.subi %[[VAL_23]], %[[VAL_22]] : index +! CHECK: %[[VAL_30:.*]] = arith.addi %[[VAL_29]], %[[VAL_24]] : index +! CHECK: %[[VAL_31:.*]] = arith.constant 0 : index +! CHECK: %[[VAL_32:.*]] = arith.cmpi slt, %[[VAL_30]], %[[VAL_31]] : index +! CHECK: %[[VAL_33:.*]] = arith.select %[[VAL_32]], %[[VAL_31]], %[[VAL_30]] : index +! CHECK: %[[VAL_34:.*]] = arith.cmpi slt, %[[VAL_33]], %[[VAL_19]] : index +! CHECK: %[[VAL_35:.*]] = arith.select %[[VAL_34]], %[[VAL_33]], %[[VAL_19]] : index +! CHECK: %[[VAL_36:.*]] = arith.constant 1 : i64 +! CHECK: %[[VAL_37:.*]] = fir.convert %[[VAL_35]] : (index) -> i64 +! CHECK: %[[VAL_38:.*]] = arith.muli %[[VAL_36]], %[[VAL_37]] : i64 +! CHECK: %[[VAL_39:.*]] = arith.constant false +! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_28]] : (!fir.ref>) -> !fir.ref +! CHECK: %[[VAL_41:.*]] = fir.convert %[[VAL_14]] : (!fir.ref>) -> !fir.ref +! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_40]], %[[VAL_41]], %[[VAL_38]], %[[VAL_39]]) fastmath : (!fir.ref, !fir.ref, i64, i1) -> () +! CHECK: %[[VAL_42:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_43:.*]] = arith.subi %[[VAL_33]], %[[VAL_42]] : index +! CHECK: %[[VAL_44:.*]] = arith.constant 32 : i8 +! CHECK: %[[VAL_45:.*]] = fir.undefined !fir.char<1> +! CHECK: %[[VAL_46:.*]] = fir.insert_value %[[VAL_45]], %[[VAL_44]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1> +! CHECK: %[[VAL_47:.*]] = arith.constant 1 : index +! CHECK: fir.do_loop %[[VAL_48:.*]] = %[[VAL_35]] to %[[VAL_43]] step %[[VAL_47]] { +! CHECK: %[[VAL_49:.*]] = fir.convert %[[VAL_28]] : (!fir.ref>) -> !fir.ref>> +! CHECK: %[[VAL_50:.*]] = fir.coordinate_of %[[VAL_49]], %[[VAL_48]] : (!fir.ref>>, index) -> !fir.ref> +! CHECK: fir.store %[[VAL_46]] to %[[VAL_50]] : !fir.ref> +! CHECK: } +! CHECK: return +! CHECK: } character(4) :: a, b a(1:2) = b(3:4) - ! CHECK: return - ! CHECK: } end subroutine substring_assignment ! CHECK-LABEL: func @_QParray_substring_assignment( diff --git a/flang/test/Lower/dummy-argument-optional.f90 b/flang/test/Lower/dummy-argument-optional.f90 --- a/flang/test/Lower/dummy-argument-optional.f90 +++ b/flang/test/Lower/dummy-argument-optional.f90 @@ -52,8 +52,9 @@ ! CHECK-SAME: %[[arg0:.*]]: !fir.boxchar<1> {fir.bindc_name = "x", fir.optional}) { subroutine character_scalar(x) ! CHECK: %[[unboxed:.*]]:2 = fir.unboxchar %[[arg0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) + ! CHECK: %[[ref:.*]] = fir.convert %[[unboxed]]#0 : (!fir.ref>) -> !fir.ref> character(10), optional :: x - ! CHECK: fir.is_present %[[unboxed]]#0 : (!fir.ref>) -> i1 + ! CHECK: fir.is_present %[[ref]] : (!fir.ref>) -> i1 print *, present(x) end subroutine ! CHECK-LABEL: func @_QMoptPcall_character_scalar() diff --git a/flang/test/Lower/forall/scalar-substring.f90 b/flang/test/Lower/forall/scalar-substring.f90 --- a/flang/test/Lower/forall/scalar-substring.f90 +++ b/flang/test/Lower/forall/scalar-substring.f90 @@ -7,75 +7,75 @@ end forall end subroutine s -! CHECK-LABEL: func @_QPs( -! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1> {fir.bindc_name = "ch"}) { -! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"} -! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK: %[[VAL_3:.*]] = arith.constant 1 : i32 -! CHECK: %[[VAL_4:.*]] = fir.convert %[[VAL_3]] : (i32) -> index -! CHECK: %[[VAL_5:.*]] = arith.constant 4 : i32 -! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_5]] : (i32) -> index -! CHECK: %[[VAL_7:.*]] = arith.constant 1 : index -! CHECK: fir.do_loop %[[VAL_8:.*]] = %[[VAL_4]] to %[[VAL_6]] step %[[VAL_7]] unordered { -! CHECK: %[[VAL_9:.*]] = fir.convert %[[VAL_8]] : (index) -> i32 -! CHECK: fir.store %[[VAL_9]] to %[[VAL_1]] : !fir.ref -! CHECK: %[[VAL_10:.*]] = fir.load %[[VAL_1]] : !fir.ref -! CHECK: %[[VAL_11:.*]] = arith.constant 1 : i32 -! CHECK: %[[VAL_12:.*]] = arith.addi %[[VAL_10]], %[[VAL_11]] : i32 -! CHECK: %[[VAL_13:.*]] = fir.convert %[[VAL_12]] : (i32) -> i64 -! CHECK: %[[VAL_14:.*]] = fir.load %[[VAL_1]] : !fir.ref -! CHECK: %[[VAL_15:.*]] = arith.constant 1 : i32 -! CHECK: %[[VAL_16:.*]] = arith.addi %[[VAL_14]], %[[VAL_15]] : i32 -! CHECK: %[[VAL_17:.*]] = fir.convert %[[VAL_16]] : (i32) -> i64 -! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_13]] : (i64) -> index -! CHECK: %[[VAL_19:.*]] = fir.convert %[[VAL_17]] : (i64) -> index -! CHECK: %[[VAL_20:.*]] = arith.constant 1 : index -! CHECK: %[[VAL_21:.*]] = arith.subi %[[VAL_18]], %[[VAL_20]] : index -! CHECK: %[[VAL_22:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref>) -> !fir.ref>> -! CHECK: %[[VAL_23:.*]] = fir.coordinate_of %[[VAL_22]], %[[VAL_21]] : (!fir.ref>>, index) -> !fir.ref> -! CHECK: %[[VAL_24:.*]] = fir.convert %[[VAL_23]] : (!fir.ref>) -> !fir.ref> -! CHECK: %[[VAL_25:.*]] = arith.subi %[[VAL_19]], %[[VAL_18]] : index -! CHECK: %[[VAL_26:.*]] = arith.addi %[[VAL_25]], %[[VAL_20]] : index -! CHECK: %[[VAL_27:.*]] = arith.constant 0 : index -! CHECK: %[[VAL_28:.*]] = arith.cmpi slt, %[[VAL_26]], %[[VAL_27]] : index -! CHECK: %[[VAL_29:.*]] = arith.select %[[VAL_28]], %[[VAL_27]], %[[VAL_26]] : index -! CHECK: %[[VAL_30:.*]] = fir.load %[[VAL_1]] : !fir.ref -! CHECK: %[[VAL_31:.*]] = fir.convert %[[VAL_30]] : (i32) -> i64 -! CHECK: %[[VAL_32:.*]] = fir.load %[[VAL_1]] : !fir.ref -! CHECK: %[[VAL_33:.*]] = fir.convert %[[VAL_32]] : (i32) -> i64 -! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_31]] : (i64) -> index -! CHECK: %[[VAL_35:.*]] = fir.convert %[[VAL_33]] : (i64) -> index -! CHECK: %[[VAL_36:.*]] = arith.constant 1 : index -! CHECK: %[[VAL_37:.*]] = arith.subi %[[VAL_34]], %[[VAL_36]] : index -! CHECK: %[[VAL_38:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref>) -> !fir.ref>> -! CHECK: %[[VAL_39:.*]] = fir.coordinate_of %[[VAL_38]], %[[VAL_37]] : (!fir.ref>>, index) -> !fir.ref> -! CHECK: %[[VAL_40:.*]] = fir.convert %[[VAL_39]] : (!fir.ref>) -> !fir.ref> -! CHECK: %[[VAL_41:.*]] = arith.subi %[[VAL_35]], %[[VAL_34]] : index -! CHECK: %[[VAL_42:.*]] = arith.addi %[[VAL_41]], %[[VAL_36]] : index -! CHECK: %[[VAL_43:.*]] = arith.constant 0 : index -! CHECK: %[[VAL_44:.*]] = arith.cmpi slt, %[[VAL_42]], %[[VAL_43]] : index -! CHECK: %[[VAL_45:.*]] = arith.select %[[VAL_44]], %[[VAL_43]], %[[VAL_42]] : index -! CHECK: %[[VAL_46:.*]] = arith.cmpi slt, %[[VAL_45]], %[[VAL_29]] : index -! CHECK: %[[VAL_47:.*]] = arith.select %[[VAL_46]], %[[VAL_45]], %[[VAL_29]] : index -! CHECK: %[[VAL_48:.*]] = arith.constant 1 : i64 -! CHECK: %[[VAL_49:.*]] = fir.convert %[[VAL_47]] : (index) -> i64 -! CHECK: %[[VAL_50:.*]] = arith.muli %[[VAL_48]], %[[VAL_49]] : i64 -! CHECK: %[[VAL_51:.*]] = arith.constant false -! CHECK: %[[VAL_52:.*]] = fir.convert %[[VAL_40]] : (!fir.ref>) -> !fir.ref -! CHECK: %[[VAL_53:.*]] = fir.convert %[[VAL_24]] : (!fir.ref>) -> !fir.ref -! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_52]], %[[VAL_53]], %[[VAL_50]], %[[VAL_51]]) {{.*}}: (!fir.ref, !fir.ref, i64, i1) -> () -! CHECK: %[[VAL_54:.*]] = arith.constant 1 : index -! CHECK: %[[VAL_55:.*]] = arith.subi %[[VAL_45]], %[[VAL_54]] : index -! CHECK: %[[VAL_56:.*]] = arith.constant 32 : i8 -! CHECK: %[[VAL_57:.*]] = fir.undefined !fir.char<1> -! CHECK: %[[VAL_58:.*]] = fir.insert_value %[[VAL_57]], %[[VAL_56]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1> -! CHECK: %[[VAL_59:.*]] = arith.constant 1 : index -! CHECK: fir.do_loop %[[VAL_60:.*]] = %[[VAL_47]] to %[[VAL_55]] step %[[VAL_59]] { -! CHECK: %[[VAL_61:.*]] = fir.convert %[[VAL_40]] : (!fir.ref>) -> !fir.ref>> -! CHECK: %[[VAL_62:.*]] = fir.coordinate_of %[[VAL_61]], %[[VAL_60]] : (!fir.ref>>, index) -> !fir.ref> -! CHECK: fir.store %[[VAL_58]] to %[[VAL_62]] : !fir.ref> +! CHECK-LABEL: func.func @_QPs( +! CHECK-SAME: %[[VAL_0:.*]]: !fir.boxchar<1> {fir.bindc_name = "ch"}) { +! CHECK: %[[VAL_1:.*]] = fir.alloca i32 {adapt.valuebyref, bindc_name = "i"} +! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[VAL_0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) +! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_2]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_4:.*]] = arith.constant 1 : i32 +! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]] : (i32) -> index +! CHECK: %[[VAL_6:.*]] = arith.constant 4 : i32 +! CHECK: %[[VAL_7:.*]] = fir.convert %[[VAL_6]] : (i32) -> index +! CHECK: %[[VAL_8:.*]] = arith.constant 1 : index +! CHECK: fir.do_loop %[[VAL_9:.*]] = %[[VAL_5]] to %[[VAL_7]] step %[[VAL_8]] unordered { +! CHECK: %[[VAL_10:.*]] = fir.convert %[[VAL_9]] : (index) -> i32 +! CHECK: fir.store %[[VAL_10]] to %[[VAL_1]] : !fir.ref +! CHECK: %[[VAL_11:.*]] = fir.load %[[VAL_1]] : !fir.ref +! CHECK: %[[VAL_12:.*]] = arith.constant 1 : i32 +! CHECK: %[[VAL_13:.*]] = arith.addi %[[VAL_11]], %[[VAL_12]] : i32 +! CHECK: %[[VAL_14:.*]] = fir.convert %[[VAL_13]] : (i32) -> i64 +! CHECK: %[[VAL_15:.*]] = fir.load %[[VAL_1]] : !fir.ref +! CHECK: %[[VAL_16:.*]] = arith.constant 1 : i32 +! CHECK: %[[VAL_17:.*]] = arith.addi %[[VAL_15]], %[[VAL_16]] : i32 +! CHECK: %[[VAL_18:.*]] = fir.convert %[[VAL_17]] : (i32) -> i64 +! CHECK: %[[VAL_19:.*]] = fir.convert %[[VAL_14]] : (i64) -> index +! CHECK: %[[VAL_20:.*]] = fir.convert %[[VAL_18]] : (i64) -> index +! CHECK: %[[VAL_21:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_22:.*]] = arith.subi %[[VAL_19]], %[[VAL_21]] : index +! CHECK: %[[VAL_23:.*]] = fir.convert %[[VAL_3]] : (!fir.ref>) -> !fir.ref>> +! CHECK: %[[VAL_24:.*]] = fir.coordinate_of %[[VAL_23]], %[[VAL_22]] : (!fir.ref>>, index) -> !fir.ref> +! CHECK: %[[VAL_25:.*]] = fir.convert %[[VAL_24]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_26:.*]] = arith.subi %[[VAL_20]], %[[VAL_19]] : index +! CHECK: %[[VAL_27:.*]] = arith.addi %[[VAL_26]], %[[VAL_21]] : index +! CHECK: %[[VAL_28:.*]] = arith.constant 0 : index +! CHECK: %[[VAL_29:.*]] = arith.cmpi slt, %[[VAL_27]], %[[VAL_28]] : index +! CHECK: %[[VAL_30:.*]] = arith.select %[[VAL_29]], %[[VAL_28]], %[[VAL_27]] : index +! CHECK: %[[VAL_31:.*]] = fir.load %[[VAL_1]] : !fir.ref +! CHECK: %[[VAL_32:.*]] = fir.convert %[[VAL_31]] : (i32) -> i64 +! CHECK: %[[VAL_33:.*]] = fir.load %[[VAL_1]] : !fir.ref +! CHECK: %[[VAL_34:.*]] = fir.convert %[[VAL_33]] : (i32) -> i64 +! CHECK: %[[VAL_35:.*]] = fir.convert %[[VAL_32]] : (i64) -> index +! CHECK: %[[VAL_36:.*]] = fir.convert %[[VAL_34]] : (i64) -> index +! CHECK: %[[VAL_37:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_38:.*]] = arith.subi %[[VAL_35]], %[[VAL_37]] : index +! CHECK: %[[VAL_39:.*]] = fir.convert %[[VAL_3]] : (!fir.ref>) -> !fir.ref>> +! CHECK: %[[VAL_40:.*]] = fir.coordinate_of %[[VAL_39]], %[[VAL_38]] : (!fir.ref>>, index) -> !fir.ref> +! CHECK: %[[VAL_41:.*]] = fir.convert %[[VAL_40]] : (!fir.ref>) -> !fir.ref> +! CHECK: %[[VAL_42:.*]] = arith.subi %[[VAL_36]], %[[VAL_35]] : index +! CHECK: %[[VAL_43:.*]] = arith.addi %[[VAL_42]], %[[VAL_37]] : index +! CHECK: %[[VAL_44:.*]] = arith.constant 0 : index +! CHECK: %[[VAL_45:.*]] = arith.cmpi slt, %[[VAL_43]], %[[VAL_44]] : index +! CHECK: %[[VAL_46:.*]] = arith.select %[[VAL_45]], %[[VAL_44]], %[[VAL_43]] : index +! CHECK: %[[VAL_47:.*]] = arith.cmpi slt, %[[VAL_46]], %[[VAL_30]] : index +! CHECK: %[[VAL_48:.*]] = arith.select %[[VAL_47]], %[[VAL_46]], %[[VAL_30]] : index +! CHECK: %[[VAL_49:.*]] = arith.constant 1 : i64 +! CHECK: %[[VAL_50:.*]] = fir.convert %[[VAL_48]] : (index) -> i64 +! CHECK: %[[VAL_51:.*]] = arith.muli %[[VAL_49]], %[[VAL_50]] : i64 +! CHECK: %[[VAL_52:.*]] = arith.constant false +! CHECK: %[[VAL_53:.*]] = fir.convert %[[VAL_41]] : (!fir.ref>) -> !fir.ref +! CHECK: %[[VAL_54:.*]] = fir.convert %[[VAL_25]] : (!fir.ref>) -> !fir.ref +! CHECK: fir.call @llvm.memmove.p0.p0.i64(%[[VAL_53]], %[[VAL_54]], %[[VAL_51]], %[[VAL_52]]) fastmath : (!fir.ref, !fir.ref, i64, i1) -> () +! CHECK: %[[VAL_55:.*]] = arith.constant 1 : index +! CHECK: %[[VAL_56:.*]] = arith.subi %[[VAL_46]], %[[VAL_55]] : index +! CHECK: %[[VAL_57:.*]] = arith.constant 32 : i8 +! CHECK: %[[VAL_58:.*]] = fir.undefined !fir.char<1> +! CHECK: %[[VAL_59:.*]] = fir.insert_value %[[VAL_58]], %[[VAL_57]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1> +! CHECK: %[[VAL_60:.*]] = arith.constant 1 : index +! CHECK: fir.do_loop %[[VAL_61:.*]] = %[[VAL_48]] to %[[VAL_56]] step %[[VAL_60]] { +! CHECK: %[[VAL_62:.*]] = fir.convert %[[VAL_41]] : (!fir.ref>) -> !fir.ref>> +! CHECK: %[[VAL_63:.*]] = fir.coordinate_of %[[VAL_62]], %[[VAL_61]] : (!fir.ref>>, index) -> !fir.ref> +! CHECK: fir.store %[[VAL_59]] to %[[VAL_63]] : !fir.ref> +! CHECK: } ! CHECK: } +! CHECK: return ! CHECK: } -! CHECK: return -! CHECK: } - diff --git a/flang/test/Lower/implicit-call-mismatch.f90 b/flang/test/Lower/implicit-call-mismatch.f90 --- a/flang/test/Lower/implicit-call-mismatch.f90 +++ b/flang/test/Lower/implicit-call-mismatch.f90 @@ -57,7 +57,8 @@ ! CHECK-LABEL: func.func @_QPpass_char_to_proc( ! CHECK-SAME: %[[arg0:.*]]: !fir.boxchar<1> ! CHECK: %[[charAndLen:.*]]:2 = fir.unboxchar %[[arg0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) -! CHECK: %[[procAddr:.*]] = fir.convert %[[charAndLen]]#0 : (!fir.ref>) -> (() -> ()) +! CHECK: %[[charRef:.*]] = fir.convert %[[charAndLen]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[procAddr:.*]] = fir.convert %[[charRef]] : (!fir.ref>) -> (() -> ()) ! CHECK: %[[boxProc:.*]] = fir.emboxproc %[[procAddr]] : (() -> ()) -> !fir.boxproc<() -> ()> ! CHECK: fir.call @_QPtakes_proc(%[[boxProc]]) {{.*}}: (!fir.boxproc<() -> ()>) -> () @@ -234,7 +235,8 @@ ! CHECK-SAME: %[[arg0:.*]]: !fir.boxchar<1> ! CHECK: %[[charRefAndLen:.*]]:2 = fir.unboxchar %[[arg0]] : (!fir.boxchar<1>) -> (!fir.ref>, index) ! CHECK: %[[charLen:.*]] = arith.constant 8 : index -! CHECK: %[[procAddr:.*]] = fir.convert %[[charRefAndLen]]#0 : (!fir.ref>) -> (() -> ()) +! CHECK: %[[charRef:.*]] = fir.convert %[[charRefAndLen]]#0 : (!fir.ref>) -> !fir.ref> +! CHECK: %[[procAddr:.*]] = fir.convert %[[charRef]] : (!fir.ref>) -> (() -> ()) ! CHECK: %[[boxProc:.*]] = fir.emboxproc %[[procAddr]] : (() -> ()) -> !fir.boxproc<() -> ()> ! CHECK: %[[charLen2:.*]] = fir.convert %[[charLen]] : (index) -> i64 ! CHECK: %[[tuple:.*]] = fir.undefined tuple ()>, i64> diff --git a/flang/test/Lower/statement-function.f90 b/flang/test/Lower/statement-function.f90 --- a/flang/test/Lower/statement-function.f90 +++ b/flang/test/Lower/statement-function.f90 @@ -92,9 +92,11 @@ integer :: i, j, func, argj character(10) :: c, argc ! CHECK-DAG: %[[unboxed:.*]]:2 = fir.unboxchar %arg0 : + ! CHECK-DAG: %[[ref:.*]] = fir.convert %[[unboxed]]#0 : (!fir.ref>) -> !fir.ref> ! CHECK-DAG: %[[c10:.*]] = arith.constant 10 : + ! CHECK-DAG: %[[ref_cast:.*]] = fir.convert %[[ref]] : (!fir.ref>) -> !fir.ref> ! CHECK: %[[c10_cast:.*]] = fir.convert %[[c10]] : (i32) -> index - ! CHECK: %[[c:.*]] = fir.emboxchar %[[unboxed]]#0, %[[c10_cast]] + ! CHECK: %[[c:.*]] = fir.emboxchar %[[ref_cast]], %[[c10_cast]] func(argc, argj) = len_trim(argc, 4) + argj ! CHECK: addi %{{.*}}, %{{.*}} : i