Skip to content

Commit 07be72d

Browse files
cabreraamcabreraam
committed
[flang][hlfir] address char_convert issues as
mentioned in #64315
1 parent 1a7e8b9 commit 07be72d

File tree

3 files changed

+78
-11
lines changed

3 files changed

+78
-11
lines changed

‎flang/lib/Lower/ConvertExprToHLFIR.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,6 @@ struct UnaryOp<
14141414
hlfir::Entity lhs) {
14151415
if constexpr (TC1 == Fortran::common::TypeCategory::Character &&
14161416
TC2 == TC1) {
1417-
// TODO(loc, "character conversion in HLFIR");
14181417
auto kindMap = builder.getKindMap();
14191418
mlir::Type fromTy = lhs.getFortranElementType();
14201419
mlir::Value origBufferSize = genCharLength(loc, builder, lhs);
@@ -1435,8 +1434,12 @@ struct UnaryOp<
14351434
// allocate space on the stack for toBuffer
14361435
auto dest = builder.create<fir::AllocaOp>(loc, toTy,
14371436
mlir::ValueRange{bufferSize});
1438-
builder.create<fir::CharConvertOp>(loc, lhs.getFirBase(), origBufferSize,
1439-
dest);
1437+
auto src = hlfir::convertToAddress(loc, builder, lhs,
1438+
lhs.getFortranElementType());
1439+
builder.create<fir::CharConvertOp>(loc, src.first.getCharBox()->getAddr(),
1440+
origBufferSize, dest);
1441+
if (src.second.has_value())
1442+
src.second.value()();
14401443

14411444
return hlfir::EntityWithAttributes{builder.create<hlfir::DeclareOp>(
14421445
loc, dest, "ctor.temp", /*shape=*/nullptr,

‎flang/test/Lower/HLFIR/charconvert.f90

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
! Test lowering of character concatenation to HLFIR
2+
! RUN: bbc -emit-hlfir -o - %s 2>&1 | FileCheck %s
3+
4+
subroutine charconvert1(c,n)
5+
character(*,4),intent(in) :: c(:)
6+
integer,intent(in) :: n
7+
interface
8+
subroutine callee(c)
9+
character(*),intent(in) :: c(:)
10+
end subroutine callee
11+
end interface
12+
call show([character(n)::c])
13+
end subroutine charconvert1
14+
15+
! CHECK-LABEL: func.func @_QPcharconvert1
16+
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %{{.*}} {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name = "_QFcharconvert1Ec"} : (!fir.box<!fir.array<?x!fir.char<4,?>>>) -> (!fir.box<!fir.array<?x!fir.char<4,?>>>, !fir.box<!fir.array<?x!fir.char<4,?>>>)
17+
! CHECK: ^bb0(%[[ARG2:.*]]: index):
18+
! CHECK: %[[VAL_37:.*]] = fir.box_elesize %[[VAL_2]]#1 : (!fir.box<!fir.array<?x!fir.char<4,?>>>) -> index
19+
! CHECK: %[[C4_4:.*]] = arith.constant 4 : index
20+
! CHECK: %[[VAL_38:.*]] = arith.divsi %[[VAL_37]], %[[C4_4]] : index
21+
! CHECK: %[[VAL_39:.*]] = hlfir.designate %[[VAL_2]]#0 (%[[ARG2]]) typeparams %[[VAL_38]] : (!fir.box<!fir.array<?x!fir.char<4,?>>>, index, index) -> !fir.boxchar<4>
22+
! CHECK: %[[C4_5:.*]] = arith.constant 4 : index
23+
! CHECK: %[[VAL_40:.*]] = arith.muli %[[VAL_38]], %[[C4_5]] : index
24+
! CHECK: %[[VAL_41:.*]] = fir.alloca !fir.char<1,?>(%[[VAL_40]] : index)
25+
! CHECK: %[[VAL_42:.*]]:2 = fir.unboxchar %[[VAL_39]] : (!fir.boxchar<4>) -> (!fir.ref<!fir.char<4,?>>, index)
26+
! CHECK: fir.char_convert %[[VAL_42]]#0 for %[[VAL_38:.*]] to %[[VAL_41]] : !fir.ref<!fir.char<4,?>>, index, !fir.ref<!fir.char<1,?>>
27+
28+
subroutine charconvert2(x)
29+
integer,intent(in) :: x
30+
character(kind=4) :: cx
31+
cx = achar(x)
32+
end subroutine charconvert2
33+
! CHECK-LABEL: func.func @_QPcharconvert2
34+
! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<i32>
35+
! CHECK: %[[VAL_0:.*]] = fir.alloca !fir.char<1>
36+
! CHECK: %[[C1:.*]] = arith.constant 1 : index
37+
! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.char<4> {bindc_name = "cx", uniq_name = "_QFcharconvert2Ecx"}
38+
! CHECK: %[[VAL_2:.*]]:2 = hlfir.declare %[[VAL_1]] typeparams %[[C1]] {uniq_name = "_QFcharconvert2Ecx"} : (!fir.ref<!fir.char<4>>, index) -> (!fir.ref<!fir.char<4>>, !fir.ref<!fir.char<4>>)
39+
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[ARG0]] {fortran_attrs = #fir.var_attrs<intent_in>, uniq_name = "_QFcharconvert2Ex"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
40+
! CHECK: %[[VAL_4:.*]] = fir.load %[[VAL_3]]#0 : !fir.ref<i32>
41+
! CHECK: %[[VAL_5:.*]] = fir.convert %[[VAL_4]] : (i32) -> i64
42+
! CHECK: %[[VAL_6:.*]] = fir.convert %[[VAL_5]] : (i64) -> i8
43+
! CHECK: %[[VAL_7:.*]] = fir.undefined !fir.char<1>
44+
! CHECK: %[[VAL_8:.*]] = fir.insert_value %[[VAL_7]], %[[VAL_6]], [0 : index] : (!fir.char<1>, i8) -> !fir.char<1>
45+
! CHECK: fir.store %[[VAL_8:.*]] to %[[VAL_0]] : !fir.ref<!fir.char<1>>
46+
! CHECK: %[[FALSE:.*]] = arith.constant false
47+
! CHECK: %[[VAL_9:.*]] = hlfir.as_expr %[[VAL_0]] move %[[FALSE]] : (!fir.ref<!fir.char<1>>, i1) -> !hlfir.expr<!fir.char<1>>
48+
! CHECK: %[[C1_0:.*]] = arith.constant 1 : index
49+
! CHECK: %[[VAL_10:.*]] = fir.alloca !fir.char<4,?>(%[[C1_0]] : index)
50+
! CHECK: fir.char_convert %[[VAL_0:.*]] for %[[C1_0]] to %[[VAL_10]] : !fir.ref<!fir.char<1>>, index, !fir.ref<!fir.char<4,?>>
51+
52+
subroutine charconvert3(c, c4)
53+
character(kind=1, len=*) :: c
54+
character(kind=4, len=*) :: c4
55+
c4 = c // c
56+
end subroutine
57+
58+
! CHECK-LABEL: func.func @_QPcharconvert3
59+
! CHECK-SAME: %[[ARG0:.*]]: !fir.boxchar<1> {{.*}}, %[[ARG1:.*]]: !fir.boxchar<4>
60+
! CHECK: %[[VAL_0:.*]]:2 = fir.unboxchar %[[ARG0]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
61+
! CHECK: %[[VAL_1:.*]]:2 = hlfir.declare %[[VAL_0]]#0 typeparams %[[VAL_0]]#1 {uniq_name = "_QFcharconvert3Ec"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
62+
! CHECK: %[[VAL_2:.*]]:2 = fir.unboxchar %[[ARG1]] : (!fir.boxchar<4>) -> (!fir.ref<!fir.char<4,?>>, index)
63+
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]]#0 typeparams %[[VAL_2]]#1 {uniq_name = "_QFcharconvert3Ec4"} : (!fir.ref<!fir.char<4,?>>, index) -> (!fir.boxchar<4>, !fir.ref<!fir.char<4,?>>)
64+
! CHECK: %[[VAL_4:.*]] = arith.addi %[[VAL_0]]#1, %[[VAL_0]]#1 : index
65+
! CHECK: %[[VAL_5:.*]] = hlfir.concat %[[VAL_1]]#0, %[[VAL_1]]#0 len %[[VAL_4]] : (!fir.boxchar<1>, !fir.boxchar<1>, index) -> !hlfir.expr<!fir.char<1,?>>
66+
! CHECK: %[[VAL_6:.*]] = fir.alloca !fir.char<4,?>(%[[VAL_4]] : index)
67+
! CHECK: %[[VAL_7:.*]]:3 = hlfir.associate %[[VAL_5]] typeparams %[[VAL_4]] {uniq_name = "adapt.valuebyref"} : (!hlfir.expr<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>, i1)
68+
! CHECK: fir.char_convert %[[VAL_7]]#1 for %[[VAL_4:.*]] to %[[VAL_6]] : !fir.ref<!fir.char<1,?>>, index, !fir.ref<!fir.char<4,?>>
69+
! CHECK: hlfir.end_associate %[[VAL_7]]#1, %[[VAL_7]]#2 : !fir.ref<!fir.char<1,?>>, i1
70+
! CHECK: %[[VAL_8:.*]]:2 = hlfir.declare %[[VAL_6]] typeparams %[[VAL_4]] {uniq_name = "ctor.temp"} : (!fir.ref<!fir.char<4,?>>, index) -> (!fir.boxchar<4>, !fir.ref<!fir.char<4,?>>)
71+
! CHECK: hlfir.assign %[[VAL_8]]#0 to %[[VAL_3]]#0 : !fir.boxchar<4>, !fir.boxchar<4>

‎flang/test/Lower/charconvert.f90

+1-8
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ subroutine test_c4_to_c1(c4, c1)
1919
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_2]]#0 typeparams %[[VAL_2]]#1 {uniq_name = "_QFtest_c1_to_c4Ec4"} : (!fir.ref<!fir.char<4,?>>, index) -> (!fir.boxchar<4>, !fir.ref<!fir.char<4,?>>)
2020
! CHECK: %[[VAL_4:.*]] = fir.alloca !fir.char<4,?>(%[[VAL_0]]#1 : index)
2121
! CHECK: fir.char_convert %[[VAL_1]]#1 for %[[VAL_0]]#1 to %[[VAL_4:.*]] : !fir.ref<!fir.char<1,?>>, index, !fir.ref<!fir.char<4,?>>
22-
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %[[VAL_4]] typeparams %[[VAL_0]]#1 {uniq_name = "ctor.temp"} : (!fir.ref<!fir.char<4,?>>, index) -> (!fir.boxchar<4>, !fir.ref<!fir.char<4,?>>)
23-
! CHECK: hlfir.assign %[[VAL_5]]#0 to %[[VAL_3]]#0 : !fir.boxchar<4>, !fir.boxchar<4>
24-
! CHECK: return
25-
! CHECK: }
2622

2723
! CHECK: func.func @_QPtest_c4_to_c1(%[[ARG0:.*]]: !fir.boxchar<4> {fir.bindc_name = "c4"}, %[[ARG1:.*]]: !fir.boxchar<1> {fir.bindc_name = "c1"}) {
2824
! CHECK: %[[VAL_0:.*]]:2 = fir.unboxchar %[[ARG1]] : (!fir.boxchar<1>) -> (!fir.ref<!fir.char<1,?>>, index)
@@ -33,7 +29,4 @@ subroutine test_c4_to_c1(c4, c1)
3329
! CHECK: %[[VAL_4:.*]] = arith.muli %[[VAL_2]]#1, %[[C4]] : index
3430
! CHECK: %[[VAL_5:.*]] = fir.alloca !fir.char<1,?>(%[[VAL_4]] : index)
3531
! CHECK: fir.char_convert %[[VAL_3]]#1 for %[[VAL_2]]#1 to %[[VAL_5:.*]] : !fir.ref<!fir.char<4,?>>, index, !fir.ref<!fir.char<1,?>>
36-
! CHECK: %[[VAL_6:.*]]:2 = hlfir.declare %[[VAL_5]] typeparams %[[VAL_2]]#1 {uniq_name = "ctor.temp"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)
37-
! CHECK: hlfir.assign %[[VAL_6]]#0 to %[[VAL_1]]#0 : !fir.boxchar<1>, !fir.boxchar<1>
38-
! CHECK: return
39-
! CHECK: }
32+
! CHECK: %[[VAL_6:.*]]:2 = hlfir.declare %[[VAL_5]] typeparams %[[VAL_2]]#1 {uniq_name = "ctor.temp"} : (!fir.ref<!fir.char<1,?>>, index) -> (!fir.boxchar<1>, !fir.ref<!fir.char<1,?>>)

0 commit comments

Comments
 (0)