maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Handle polymorphic value when creating temporary 

Reviewed By: PeteSteinfeld

Differential Revision: https://reviews.llvm.org/D138921
This commit is contained in:
Valentin Clement 2022-11-30 09:58:27 +01:00
parent 0aedf9d714
commit b9e53b96e0
No known key found for this signature in database
GPG Key ID: 086D54783C928776
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flang/lib/Lower/ConvertExpr.cpp
View File

@ -2189,6 +2189,19 @@ public:
builder.create<fir::StoreOp>(loc, value, temp);
return temp;
},
[&](const fir::PolymorphicValue &p) -> ExtValue {
mlir::Type type = p.getAddr().getType();
mlir::Value value = p.getAddr();
if (fir::isa_ref_type(type))
value = builder.create<fir::LoadOp>(loc, value);
mlir::Value temp = builder.createTemporary(loc, value.getType());
builder.create<fir::StoreOp>(loc, value, temp);
mlir::Value empty;
mlir::ValueRange emptyRange;
auto boxTy = fir::ClassType::get(value.getType());
return builder.create<fir::EmboxOp>(loc, boxTy, temp, empty, empty,
emptyRange, p.getTdesc());
},
[&](const auto &) -> ExtValue {
fir::emitFatalError(loc, "expr is not a scalar value");
});

27
flang/test/Lower/polymorphic.f90
View File

@ -192,4 +192,31 @@ module polymorphic_test
a = p3(b)
end subroutine
subroutine takes_p1(p)
class(p1), intent(in) :: p
end subroutine
! CHECK-LABEL: func.func @_QMpolymorphic_testPtakes_p1
subroutine no_reassoc_poly_value(a, i)
class(p1), intent(in) :: a(:)
integer :: i
call takes_p1((a(i)))
end subroutine
! CHECK-LABEL: func.func @_QMpolymorphic_testPno_reassoc_poly_value(
! CHECK-SAME: %[[ARG0:.*]]: !fir.class<!fir.array<?x!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>> {fir.bindc_name = "a"}, %[[I:.*]]: !fir.ref<i32> {fir.bindc_name = "i"}) {
! CHECK: %[[TEMP:.*]] = fir.alloca !fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>
! CHECK: %[[LOADED_I:.*]] = fir.load %[[I]] : !fir.ref<i32>
! CHECK: %[[I_I64:.*]] = fir.convert %[[LOADED_I]] : (i32) -> i64
! CHECK: %[[C1:.*]] = arith.constant 1 : i64
! CHECK: %[[IDX:.*]] = arith.subi %[[I_I64]], %[[C1]] : i64
! CHECK: %[[COORD:.*]] = fir.coordinate_of %[[ARG0]], %[[IDX]] : (!fir.class<!fir.array<?x!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>>, i64) -> !fir.ref<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: %[[TDESC:.*]] = fir.box_tdesc %[[ARG0]] : (!fir.class<!fir.array<?x!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>>) -> !fir.tdesc<none>
! CHECK: %[[NO_REASSOC:.*]] = fir.no_reassoc %[[COORD]] : !fir.ref<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: %[[LOAD:.*]] = fir.load %[[NO_REASSOC]] : !fir.ref<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: fir.store %[[LOAD]] to %[[TEMP]] : !fir.ref<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: %[[EMBOX:.*]] = fir.embox %[[TEMP]] tdesc %[[TDESC]] : (!fir.ref<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>, !fir.tdesc<none>) -> !fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: fir.call @_QMpolymorphic_testPtakes_p1(%[[EMBOX]]) {{.*}} : (!fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> ()
end module