Skip to content

Commit 1538ad9

Browse files
tblahtblah
committed
[flang][hlfir] fix elemental subroutine calls
genElementalCall can return a null option when lowering elemental subroutine calls (as there is no return value). Therefore std::option::value should not be used as it will cause an assertion failure. This fixes uses of the mvbits intrinsic with array arguments, as used in the gfortran test suite. Differential Revision: https://reviews.llvm.org/D154340
1 parent 1b74fad commit 1538ad9

File tree

2 files changed

+76
-2
lines changed

2 files changed

+76
-2
lines changed

‎flang/lib/Lower/ConvertCall.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,8 +1773,8 @@ genIntrinsicRef(const Fortran::evaluate::SpecificIntrinsic *intrinsic,
17731773
// All intrinsic elemental functions are pure.
17741774
const bool isFunction = callContext.resultType.has_value();
17751775
return ElementalIntrinsicCallBuilder{intrinsic, argLowering, isFunction}
1776-
.genElementalCall(loweredActuals, /*isImpure=*/!isFunction, callContext)
1777-
.value();
1776+
.genElementalCall(loweredActuals, /*isImpure=*/!isFunction,
1777+
callContext);
17781778
}
17791779
std::optional<hlfir::EntityWithAttributes> result = genHLFIRIntrinsicRefCore(
17801780
loweredActuals, intrinsic, argLowering, callContext);

‎flang/test/Lower/HLFIR/intrinsic-subroutines.f90

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,77 @@ subroutine test_subroutine(x)
1212
! CHECK: %[[VAL_2:.*]] = fir.call @_FortranACpuTime() fastmath<contract> : () -> f64
1313
! CHECK: %[[VAL_3:.*]] = fir.convert %[[VAL_2]] : (f64) -> f32
1414
! CHECK: fir.store %[[VAL_3]] to %[[VAL_1]]#1 : !fir.ref<f32>
15+
16+
! test elemental subroutine calls
17+
program main
18+
implicit none
19+
integer, parameter :: N = 3
20+
integer :: from(N), to(N)
21+
from = 7
22+
to = 6
23+
24+
call mvbits(from, 2, 2, to, 0)
25+
if (any(to /= 5)) STOP 1
26+
end program
27+
! CHECK-LABEL: func.func @_QQmain() attributes {fir.bindc_name = "main"} {
28+
! CHECK: %[[VAL_0:.*]] = arith.constant 3 : index
29+
! CHECK: %[[VAL_1:.*]] = fir.alloca !fir.array<3xi32> {bindc_name = "from", uniq_name = "_QFEfrom"}
30+
! CHECK: %[[VAL_2:.*]] = fir.shape %[[VAL_0]] : (index) -> !fir.shape<1>
31+
! CHECK: %[[VAL_3:.*]]:2 = hlfir.declare %[[VAL_1]](%[[VAL_2]]) {uniq_name = "_QFEfrom"} : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<3xi32>>, !fir.ref<!fir.array<3xi32>>)
32+
! CHECK: %[[VAL_4:.*]] = fir.address_of(@_QFECn) : !fir.ref<i32>
33+
! CHECK: %[[VAL_5:.*]]:2 = hlfir.declare %[[VAL_4]] {fortran_attrs = #fir.var_attrs<parameter>, uniq_name = "_QFECn"} : (!fir.ref<i32>) -> (!fir.ref<i32>, !fir.ref<i32>)
34+
! CHECK: %[[VAL_6:.*]] = arith.constant 3 : index
35+
! CHECK: %[[VAL_7:.*]] = fir.alloca !fir.array<3xi32> {bindc_name = "to", uniq_name = "_QFEto"}
36+
! CHECK: %[[VAL_8:.*]] = fir.shape %[[VAL_6]] : (index) -> !fir.shape<1>
37+
! CHECK: %[[VAL_9:.*]]:2 = hlfir.declare %[[VAL_7]](%[[VAL_8]]) {uniq_name = "_QFEto"} : (!fir.ref<!fir.array<3xi32>>, !fir.shape<1>) -> (!fir.ref<!fir.array<3xi32>>, !fir.ref<!fir.array<3xi32>>)
38+
! CHECK: %[[VAL_10:.*]] = arith.constant 7 : i32
39+
! CHECK: hlfir.assign %[[VAL_10]] to %[[VAL_3]]#0 : i32, !fir.ref<!fir.array<3xi32>>
40+
! CHECK: %[[VAL_11:.*]] = arith.constant 6 : i32
41+
! CHECK: hlfir.assign %[[VAL_11]] to %[[VAL_9]]#0 : i32, !fir.ref<!fir.array<3xi32>>
42+
! CHECK: %[[VAL_12:.*]] = arith.constant 2 : i32
43+
! CHECK: %[[VAL_13:.*]] = arith.constant 2 : i32
44+
! CHECK: %[[VAL_14:.*]] = arith.constant 0 : i32
45+
! CHECK: %[[VAL_15:.*]] = arith.constant 1 : index
46+
! CHECK: fir.do_loop %[[VAL_16:.*]] = %[[VAL_15]] to %[[VAL_0]] step %[[VAL_15]] {
47+
! CHECK: %[[VAL_17:.*]] = hlfir.designate %[[VAL_3]]#0 (%[[VAL_16]]) : (!fir.ref<!fir.array<3xi32>>, index) -> !fir.ref<i32>
48+
! CHECK: %[[VAL_18:.*]] = fir.load %[[VAL_17]] : !fir.ref<i32>
49+
! CHECK: %[[VAL_19:.*]] = hlfir.designate %[[VAL_9]]#0 (%[[VAL_16]]) : (!fir.ref<!fir.array<3xi32>>, index) -> !fir.ref<i32>
50+
! CHECK: %[[VAL_20:.*]] = fir.load %[[VAL_19]] : !fir.ref<i32>
51+
! CHECK: %[[VAL_21:.*]] = arith.constant 0 : i32
52+
! CHECK: %[[VAL_22:.*]] = arith.constant -1 : i32
53+
! CHECK: %[[VAL_23:.*]] = arith.constant 32 : i32
54+
! CHECK: %[[VAL_24:.*]] = arith.subi %[[VAL_23]], %[[VAL_13]] : i32
55+
! CHECK: %[[VAL_25:.*]] = arith.shrui %[[VAL_22]], %[[VAL_24]] : i32
56+
! CHECK: %[[VAL_26:.*]] = arith.shli %[[VAL_25]], %[[VAL_14]] : i32
57+
! CHECK: %[[VAL_27:.*]] = arith.xori %[[VAL_26]], %[[VAL_22]] : i32
58+
! CHECK: %[[VAL_28:.*]] = arith.andi %[[VAL_27]], %[[VAL_20]] : i32
59+
! CHECK: %[[VAL_29:.*]] = arith.shrui %[[VAL_18]], %[[VAL_12]] : i32
60+
! CHECK: %[[VAL_30:.*]] = arith.andi %[[VAL_29]], %[[VAL_25]] : i32
61+
! CHECK: %[[VAL_31:.*]] = arith.shli %[[VAL_30]], %[[VAL_14]] : i32
62+
! CHECK: %[[VAL_32:.*]] = arith.ori %[[VAL_28]], %[[VAL_31]] : i32
63+
! CHECK: %[[VAL_33:.*]] = arith.cmpi eq, %[[VAL_13]], %[[VAL_21]] : i32
64+
! CHECK: %[[VAL_34:.*]] = arith.select %[[VAL_33]], %[[VAL_20]], %[[VAL_32]] : i32
65+
! CHECK: fir.store %[[VAL_34]] to %[[VAL_19]] : !fir.ref<i32>
66+
! CHECK: }
67+
! CHECK: %[[VAL_35:.*]] = arith.constant 5 : i32
68+
! CHECK: %[[VAL_36:.*]] = hlfir.elemental %[[VAL_8]] unordered : (!fir.shape<1>) -> !hlfir.expr<3x!fir.logical<4>> {
69+
! CHECK: ^bb0(%[[VAL_37:.*]]: index):
70+
! CHECK: %[[VAL_38:.*]] = hlfir.designate %[[VAL_9]]#0 (%[[VAL_37]]) : (!fir.ref<!fir.array<3xi32>>, index) -> !fir.ref<i32>
71+
! CHECK: %[[VAL_39:.*]] = fir.load %[[VAL_38]] : !fir.ref<i32>
72+
! CHECK: %[[VAL_40:.*]] = arith.cmpi ne, %[[VAL_39]], %[[VAL_35]] : i32
73+
! CHECK: %[[VAL_41:.*]] = fir.convert %[[VAL_40]] : (i1) -> !fir.logical<4>
74+
! CHECK: hlfir.yield_element %[[VAL_41]] : !fir.logical<4>
75+
! CHECK: }
76+
! CHECK: %[[VAL_42:.*]] = hlfir.any %[[VAL_43:.*]] : (!hlfir.expr<3x!fir.logical<4>>) -> !fir.logical<4>
77+
! CHECK: hlfir.destroy %[[VAL_43]] : !hlfir.expr<3x!fir.logical<4>>
78+
! CHECK: %[[VAL_44:.*]] = fir.convert %[[VAL_42]] : (!fir.logical<4>) -> i1
79+
! CHECK: cf.cond_br %[[VAL_44]], ^bb1, ^bb2
80+
! CHECK: ^bb1:
81+
! CHECK: %[[VAL_45:.*]] = arith.constant 1 : i32
82+
! CHECK: %[[VAL_46:.*]] = arith.constant false
83+
! CHECK: %[[VAL_47:.*]] = arith.constant false
84+
! CHECK: %[[VAL_48:.*]] = fir.call @_FortranAStopStatement(%[[VAL_45]], %[[VAL_46]], %[[VAL_47]]) fastmath<contract> : (i32, i1, i1) -> none
85+
! CHECK: fir.unreachable
86+
! CHECK: ^bb2:
87+
! CHECK: return
88+
! CHECK: }

0 commit comments

Comments
 (0)