This is an archive of the discontinued LLVM Phabricator instance.

Differential D145928

[flang] Handle parent component in user function argument
ClosedPublic

Authored by clementval on Mar 13 2023, 5:39 AM.

Details

Reviewers
PeteSteinfeld
jdoerfert
Commits
rG33fbbf88afe5: [flang] Handle parent component in user function argument
Summary

When the argument is a parent component the box needs to
be updated to reflect the correct type. Use updateBoxForParentComponent
to update the argument accordingly.

Depends on D145907

Diff Detail

Event Timeline

clementval created this revision.Mar 13 2023, 5:39 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 13 2023, 5:39 AM
Herald added subscribers: sunshaoce, mehdi_amini. · View Herald Transcript
clementval requested review of this revision.Mar 13 2023, 5:39 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptMar 13 2023, 5:39 AM
Herald added subscribers: sstefan1, jdoerfert. · View Herald Transcript
clementval added a child revision: D145931: [flang] Handle parent component in user function argument for special cases.Mar 13 2023, 6:11 AM
PeteSteinfeld edited the summary of this revision. (Show Details)Mar 13 2023, 6:37 AM
PeteSteinfeld requested changes to this revision.Mar 13 2023, 7:03 AM

I get errors from check-flang:

******************** TEST 'Flang :: Lower/polymorphic.f90' FAILED ********************
Script:
--
: 'RUN: at line 1';   bbc -polymorphic-type -emit-fir /local/home/psteinfeld/main/928/flang/test/Lower/polymorphic.f90 -o - | /local/home/psteinfeld/main/928/build/bin/FileCheck /local/home/psteinfeld/main/928/flang/test/Lower/polymorphic.f90
--
Exit Code: 2

Command Output (stderr):
--
bbc: /local/home/psteinfeld/main/928/llvm/include/llvm/Support/Casting.h:663: decltype(auto) llvm::dyn_cast(From*) [with To = fir::EmboxOp; From = mlir::Operation]: Assertion `detail::isPresent(Val) && "dyn_cast on a non-existent value"' failed.
PLEASE submit a bug report to https://github.com/llvm/llvm-project/issues/ and include the crash backtrace.
Stack dump:
0.      Program arguments: bbc -polymorphic-type -emit-fir /local/home/psteinfeld/main/928/flang/test/Lower/polymorphic.f90 -o -
 #0 0x0000563e3b5b253b llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/local/home/psteinfeld/main/928/build/bin/bbc+0x1c7b53b)
 #1 0x0000563e3b5afdb4 SignalHandler(int) Signals.cpp:0:0
 #2 0x0000147555a4fc20 __restore_rt sigaction.c:0:0
 #3 0x000014755423e37f raise (/lib64/libc.so.6+0x3737f)
 #4 0x0000147554228db5 abort (/lib64/libc.so.6+0x21db5)
 #5 0x0000147554228c89 _nl_load_domain.cold.0 loadmsgcat.c:0:0
 #6 0x0000147554236a76 .annobin___GI___assert_fail.end assert.c:0:0
 #7 0x0000563e3a86bc36 Fortran::lower::updateBoxForParentComponent(Fortran::lower::AbstractConverter&, fir::ExtendedValue, Fortran::evaluate::Expr<Fortran::evaluate::SomeType> const&) (/local/home/psteinfeld/main/928/build/bin/bbc+0xf34c36)
 #8 0x0000563e3a95b16a (anonymous namespace)::ScalarExprLowering::genRawProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0
 #9 0x0000563e3a95b7d3 (anonymous namespace)::ScalarExprLowering::genProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0
This revision now requires changes to proceed.Mar 13 2023, 7:03 AM
clementval added a parent revision: D145910: [flang] Only check for embox/rebox if defining op is present.Mar 13 2023, 7:15 AM
In D145928#4189101, @PeteSteinfeld wrote:

I get errors from check-flang:

******************** TEST 'Flang :: Lower/polymorphic.f90' FAILED ********************
Script:
--
: 'RUN: at line 1';   bbc -polymorphic-type -emit-fir /local/home/psteinfeld/main/928/flang/test/Lower/polymorphic.f90 -o - | /local/home/psteinfeld/main/928/build/bin/FileCheck /local/home/psteinfeld/main/928/flang/test/Lower/polymorphic.f90
--
Exit Code: 2

Command Output (stderr):
--
bbc: /local/home/psteinfeld/main/928/llvm/include/llvm/Support/Casting.h:663: decltype(auto) llvm::dyn_cast(From*) [with To = fir::EmboxOp; From = mlir::Operation]: Assertion `detail::isPresent(Val) && "dyn_cast on a non-existent value"' failed.
PLEASE submit a bug report to https://github.com/llvm/llvm-project/issues/ and include the crash backtrace.
Stack dump:
0.      Program arguments: bbc -polymorphic-type -emit-fir /local/home/psteinfeld/main/928/flang/test/Lower/polymorphic.f90 -o -
 #0 0x0000563e3b5b253b llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/local/home/psteinfeld/main/928/build/bin/bbc+0x1c7b53b)
 #1 0x0000563e3b5afdb4 SignalHandler(int) Signals.cpp:0:0
 #2 0x0000147555a4fc20 __restore_rt sigaction.c:0:0
 #3 0x000014755423e37f raise (/lib64/libc.so.6+0x3737f)
 #4 0x0000147554228db5 abort (/lib64/libc.so.6+0x21db5)
 #5 0x0000147554228c89 _nl_load_domain.cold.0 loadmsgcat.c:0:0
 #6 0x0000147554236a76 .annobin___GI___assert_fail.end assert.c:0:0
 #7 0x0000563e3a86bc36 Fortran::lower::updateBoxForParentComponent(Fortran::lower::AbstractConverter&, fir::ExtendedValue, Fortran::evaluate::Expr<Fortran::evaluate::SomeType> const&) (/local/home/psteinfeld/main/928/build/bin/bbc+0xf34c36)
 #8 0x0000563e3a95b16a (anonymous namespace)::ScalarExprLowering::genRawProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0
 #9 0x0000563e3a95b7d3 (anonymous namespace)::ScalarExprLowering::genProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0

I added https://reviews.llvm.org/D145910 as a dependency. This should fix the issue.

Harbormaster completed remote builds in B219010: Diff 504613.Mar 13 2023, 7:30 AM
clementval updated this revision to Diff 504702.Mar 13 2023, 9:19 AM

Rebase

clementval updated this revision to Diff 504705.Mar 13 2023, 9:21 AM

Remove conflict

Harbormaster completed remote builds in B219073: Diff 504705.Mar 13 2023, 9:21 AM
clementval updated this revision to Diff 504711.Mar 13 2023, 9:28 AM

Clean up the mess

PeteSteinfeld accepted this revision.Mar 13 2023, 9:59 AM

All builds and tests correctly and looks good.

This revision is now accepted and ready to land.Mar 13 2023, 9:59 AM
Harbormaster completed remote builds in B219077: Diff 504711.Mar 13 2023, 12:25 PM
Closed by commit rG33fbbf88afe5: [flang] Handle parent component in user function argument (authored by clementval). · Explain WhyMar 13 2023, 12:30 PM
This revision was automatically updated to reflect the committed changes.
clementval added a commit: rG33fbbf88afe5: [flang] Handle parent component in user function argument.

Revision Contents

PathSize
flang/
lib/
Lower/
6 lines
test/
Lower/
12 lines

Diff 504613

flang/lib/Lower/ConvertExpr.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 2,713 Lines • ▼ Show 20 Lines for (const Fortran::lower::CallInterface<
builder.create<fir::ResultOp>(loc, absent); builder.create<fir::ResultOp>(loc, absent);
}) })
.getResults()[0]; .getResults()[0];
} else { } else {
box = box =
builder.create<fir::ReboxOp>(loc, argTy, box, mlir::Value{}, builder.create<fir::ReboxOp>(loc, argTy, box, mlir::Value{},
/*slice=*/mlir::Value{}); /*slice=*/mlir::Value{});
} }
} else if (Fortran::lower::isParentComponent(*expr)) {
fir::ExtendedValue newExv =
Fortran::lower::updateBoxForParentComponent(converter, box,
*expr);
box = fir::getBase(newExv);
} }
} }
caller.placeInput(arg, box); caller.placeInput(arg, box);
} }
} else if (arg.passBy == PassBy::AddressAndLength) { } else if (arg.passBy == PassBy::AddressAndLength) {
ExtValue argRef = genExtAddr(*expr); ExtValue argRef = genExtAddr(*expr);
caller.placeAddressAndLengthInput(arg, fir::getBase(argRef), caller.placeAddressAndLengthInput(arg, fir::getBase(argRef),
fir::getLen(argRef)); fir::getLen(argRef));
} else if (arg.passBy == PassBy::CharProcTuple) { } else if (arg.passBy == PassBy::CharProcTuple) {
ExtValue argRef = genExtAddr(*expr); ExtValue argRef = genExtAddr(*expr);
▲ Show 20 Lines • Show All 4,668 Lines • Show Last 20 Lines

flang/test/Lower/polymorphic.f90

Show First 20 Lines • Show All 1,049 Lines • ▼ Show 20 Lines
! CHECK-LABEL: func.func @_QMpolymorphic_testPtest_parent_comp_intrinsic( ! CHECK-LABEL: func.func @_QMpolymorphic_testPtest_parent_comp_intrinsic(
! CHECK-SAME: %[[ARG0:.*]]: !fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>> {fir.bindc_name = "a"}, %[[ARG1:.*]]: !fir.ref<!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>> {fir.bindc_name = "b"}) { ! CHECK-SAME: %[[ARG0:.*]]: !fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>> {fir.bindc_name = "a"}, %[[ARG1:.*]]: !fir.ref<!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>> {fir.bindc_name = "b"}) {
! CHECK: %[[LOAD_ARG1:.*]] = fir.load %[[ARG1]] : !fir.ref<!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>> ! CHECK: %[[LOAD_ARG1:.*]] = fir.load %[[ARG1]] : !fir.ref<!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>>
! CHECK: %[[REBOX_ARG1:.*]] = fir.rebox %[[LOAD_ARG1]] : (!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>) -> !fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>> ! CHECK: %[[REBOX_ARG1:.*]] = fir.rebox %[[LOAD_ARG1]] : (!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>) -> !fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: %[[BOX_NONE_ARG0:.*]] = fir.convert %[[ARG0]] : (!fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> !fir.box<none> ! CHECK: %[[BOX_NONE_ARG0:.*]] = fir.convert %[[ARG0]] : (!fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> !fir.box<none>
! CHECK: %[[BOX_NONE_ARG1:.*]] = fir.convert %[[REBOX_ARG1]] : (!fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> !fir.box<none> ! CHECK: %[[BOX_NONE_ARG1:.*]] = fir.convert %[[REBOX_ARG1]] : (!fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> !fir.box<none>
! CHECK: %{{.*}} = fir.call @_FortranASameTypeAs(%[[BOX_NONE_ARG0]], %[[BOX_NONE_ARG1]]) {{.*}} : (!fir.box<none>, !fir.box<none>) -> i1 ! CHECK: %{{.*}} = fir.call @_FortranASameTypeAs(%[[BOX_NONE_ARG0]], %[[BOX_NONE_ARG1]]) {{.*}} : (!fir.box<none>, !fir.box<none>) -> i1
subroutine test_parent_comp_normal(a)
class(p2) :: a
call print(a%p1)
end subroutine
! CHECK-LABEL: func.func @_QMpolymorphic_testPtest_parent_comp_normal(
! CHECK-SAME: %[[ARG0:.*]]: !fir.class<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>> {fir.bindc_name = "a"}) {
! CHECK: %[[REBOX:.*]] = fir.rebox %[[ARG0]] : (!fir.class<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>) -> !fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: %[[CONV:.*]] = fir.convert %[[REBOX]] : (!fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> !fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
! CHECK: fir.call @_QMpolymorphic_testPprint(%[[CONV]]) {{.*}} : (!fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> ()
end module end module
program test program test
use polymorphic_test use polymorphic_test
type(outer), allocatable :: o type(outer), allocatable :: o
integer :: i(5) integer :: i(5)
logical :: l(5) logical :: l(5)
allocate(o) allocate(o)
Show All 15 Lines