[flang] Handle parent component in user function argument for special cases

[clementval]

Summary

In some cases the argument is already handled by a fir.rebox operation. Just
adapat the type to match the parent component in that case.

Depends on D145928

[PeteSteinfeld]

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/931/flang/test/Lower/polymorphic.f90 -o - | /local/home/psteinfeld/main/931/build/bin/FileCheck /local/home/psteinfeld/main/931/flang/test/Lower/polymorphic.f90
--
Exit Code: 2

Command Output (stderr):
--
bbc: /local/home/psteinfeld/main/931/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/931/flang/test/Lower/polymorphic.f90 -o -
 #0 0x00005651e153756b llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/local/home/psteinfeld/main/931/build/bin/bbc+0x1c7b56b)
 #1 0x00005651e1534de4 SignalHandler(int) Signals.cpp:0:0
 #2 0x000014887cdfdc20 __restore_rt sigaction.c:0:0
 #3 0x000014887b5ec37f raise (/lib64/libc.so.6+0x3737f)
 #4 0x000014887b5d6db5 abort (/lib64/libc.so.6+0x21db5)
 #5 0x000014887b5d6c89 _nl_load_domain.cold.0 loadmsgcat.c:0:0
 #6 0x000014887b5e4a76 .annobin___GI___assert_fail.end assert.c:0:0
 #7 0x00005651e07f0c36 Fortran::lower::updateBoxForParentComponent(Fortran::lower::AbstractConverter&, fir::ExtendedValue, Fortran::evaluate::Expr<Fortran::evaluate::SomeType> const&) (/local/home/psteinfeld/main/931/build/bin/bbc+0xf34c36)
 #8 0x00005651e08e01a2 (anonymous namespace)::ScalarExprLowering::genRawProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0
 #9 0x00005651e08e0803 (anonymous namespace)::ScalarExprLowering::genProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0

[PeteSteinfeld]

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/931/flang/test/Lower/polymorphic.f90 -o - | /local/home/psteinfeld/main/931/build/bin/FileCheck /local/home/psteinfeld/main/931/flang/test/Lower/polymorphic.f90
--
Exit Code: 2

Command Output (stderr):
--
bbc: /local/home/psteinfeld/main/931/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/931/flang/test/Lower/polymorphic.f90 -o -
 #0 0x00005651e153756b llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/local/home/psteinfeld/main/931/build/bin/bbc+0x1c7b56b)
 #1 0x00005651e1534de4 SignalHandler(int) Signals.cpp:0:0
 #2 0x000014887cdfdc20 __restore_rt sigaction.c:0:0
 #3 0x000014887b5ec37f raise (/lib64/libc.so.6+0x3737f)
 #4 0x000014887b5d6db5 abort (/lib64/libc.so.6+0x21db5)
 #5 0x000014887b5d6c89 _nl_load_domain.cold.0 loadmsgcat.c:0:0
 #6 0x000014887b5e4a76 .annobin___GI___assert_fail.end assert.c:0:0
 #7 0x00005651e07f0c36 Fortran::lower::updateBoxForParentComponent(Fortran::lower::AbstractConverter&, fir::ExtendedValue, Fortran::evaluate::Expr<Fortran::evaluate::SomeType> const&) (/local/home/psteinfeld/main/931/build/bin/bbc+0xf34c36)
 #8 0x00005651e08e01a2 (anonymous namespace)::ScalarExprLowering::genRawProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0
 #9 0x00005651e08e0803 (anonymous namespace)::ScalarExprLowering::genProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0

[clementval]

In D145931#4189125, @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/931/flang/test/Lower/polymorphic.f90 -o - | /local/home/psteinfeld/main/931/build/bin/FileCheck /local/home/psteinfeld/main/931/flang/test/Lower/polymorphic.f90
--
Exit Code: 2

Command Output (stderr):
--
bbc: /local/home/psteinfeld/main/931/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/931/flang/test/Lower/polymorphic.f90 -o -
 #0 0x00005651e153756b llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) (/local/home/psteinfeld/main/931/build/bin/bbc+0x1c7b56b)
 #1 0x00005651e1534de4 SignalHandler(int) Signals.cpp:0:0
 #2 0x000014887cdfdc20 __restore_rt sigaction.c:0:0
 #3 0x000014887b5ec37f raise (/lib64/libc.so.6+0x3737f)
 #4 0x000014887b5d6db5 abort (/lib64/libc.so.6+0x21db5)
 #5 0x000014887b5d6c89 _nl_load_domain.cold.0 loadmsgcat.c:0:0
 #6 0x000014887b5e4a76 .annobin___GI___assert_fail.end assert.c:0:0
 #7 0x00005651e07f0c36 Fortran::lower::updateBoxForParentComponent(Fortran::lower::AbstractConverter&, fir::ExtendedValue, Fortran::evaluate::Expr<Fortran::evaluate::SomeType> const&) (/local/home/psteinfeld/main/931/build/bin/bbc+0xf34c36)
 #8 0x00005651e08e01a2 (anonymous namespace)::ScalarExprLowering::genRawProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0
 #9 0x00005651e08e0803 (anonymous namespace)::ScalarExprLowering::genProcedureRef(Fortran::evaluate::ProcedureRef const&, std::optional<mlir::Type>) ConvertExpr.cpp:0:0

Also added the dependency

[clementval]

Rebase

[PeteSteinfeld]

All builds and tests correctly and looks good.

flang/lib/Lower/ConvertExpr.cpp

for (const Fortran::lower::CallInterface<
             box = Fortran::evaluate::IsVariable(*expr)
                       ? builder.createBox(loc, genBoxArg(*expr),
                                           fir::isPolymorphicType(argTy))
                       : builder.createBox(getLoc(), genTempExtAddr(*expr),
                                           fir::isPolymorphicType(argTy));
 
             if (box.getType().isa<fir::BoxType>() &&
                 fir::isPolymorphicType(argTy)) {
+              mlir::Type actualTy = argTy;
+              if (Fortran::lower::isParentComponent(*expr))
+                actualTy = fir::BoxType::get(converter.genType(*expr));
               // Rebox can only be performed on a present argument.
               if (arg.isOptional()) {
                 mlir::Value isPresent =
                     genActualIsPresentTest(builder, loc, box);
                 box = builder
-                          .genIfOp(loc, {argTy}, isPresent,
+                          .genIfOp(loc, {actualTy}, isPresent,
                                    /*withElseRegion=*/true)
                           .genThen([&]() {
-                            auto rebox = builder
-                                             .create<fir::ReboxOp>(
-                                                 loc, argTy, box, mlir::Value{},
-                                                 /*slice=*/mlir::Value{})
-                                             .getResult();
+                            auto rebox =
+                                builder
+                                        loc, actualTy, box, mlir::Value{},
                             builder.create<fir::ResultOp>(loc, rebox);
                           })
                           .genElse([&]() {
                             auto absent =
-                                builder.create<fir::AbsentOp>(loc, argTy)
+                                builder.create<fir::AbsentOp>(loc, actualTy)
                                     .getResult();
                             builder.create<fir::ResultOp>(loc, absent);
                           })
                           .getResults()[0];
               } else {
-                box =
-                    builder.create<fir::ReboxOp>(loc, argTy, box, mlir::Value{},
+                box = builder.create<fir::ReboxOp>(loc, actualTy, box,
+                                                   mlir::Value{},
                                                    /*slice=*/mlir::Value{});
               }
             } else if (Fortran::lower::isParentComponent(*expr)) {
               fir::ExtendedValue newExv =
                   Fortran::lower::updateBoxForParentComponent(converter, box,
                                                               *expr);
               box = fir::getBase(newExv);
             }
           }

flang/test/Lower/polymorphic.f90

! CHECK: %{{.*}} = fir.call @_FortranASameTypeAs(%[[BOX_NONE_ARG0]], %[[BOX_NONE_ARG1]]) {{.*}} : (!fir.box<none>, !fir.box<none>) -> i1
   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}>>) -> ()
 
+  subroutine takes_p1_opt(a)
+    class(p1), optional :: a
+  end subroutine
+
+  subroutine test_parent_comp_opt(p)
+    type(p2), allocatable :: p
+    allocate(p)
+    call takes_p1_opt(p%p1)
+  end subroutine
+
+! CHECK-LABEL: func.func @_QMpolymorphic_testPtest_parent_comp_opt(
+! CHECK-SAME: %[[ARG0:.*]]: !fir.ref<!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>> {fir.bindc_name = "p"}) {
+! CHECK: %[[LOAD_ARG0:.*]] = fir.load %[[ARG0]] : !fir.ref<!fir.box<!fir.heap<!fir.type<_QMpolymorphic_testTp2{a:i32,b:i32,c:f32}>>>>
+! CHECK: %[[RES:.*]] = fir.if %{{.*}} -> (!fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) {
+! CHECK:   %[[REBOX:.*]] = fir.rebox %[[LOAD_ARG0:.*]] : (!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:   fir.result %[[REBOX]] : !fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
+! CHECK: %[[CONV:.*]] = fir.convert %[[RES]] : (!fir.box<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> !fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>
+! CHECK: fir.call @_QMpolymorphic_testPtakes_p1_opt(%[[CONV]]) {{.*}} : (!fir.class<!fir.type<_QMpolymorphic_testTp1{a:i32,b:i32}>>) -> ()
+
 end module
 
 program test
   use polymorphic_test
   type(outer), allocatable :: o
   integer :: i(5)
   logical :: l(5)
   allocate(o)