From 003f0414291d595d2126e6d2e24b281f38f3448f Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Wed, 27 Jan 2021 09:12:16 +0000 Subject: [PATCH] Fortran: Fix ICE due to elemental procedure pointers [PR98472]. 2021-01-27 Paul Thomas gcc/fortran PR fortran/98472 * trans-array.c (gfc_conv_expr_descriptor): Include elemental procedure pointers in the assert under the comment 'elemental function' and eliminate the second, spurious assert. gcc/testsuite/ PR fortran/98472 * gfortran.dg/elemental_function_5.f90 : New test. --- gcc/fortran/trans-array.c | 4 +- .../gfortran.dg/elemental_function_5.f90 | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/elemental_function_5.f90 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 4bd4db877bd..c346183e129 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -7477,9 +7477,9 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr) && expr->value.function.esym->attr.elemental) || (expr->value.function.isym != NULL && expr->value.function.isym->elemental) + || (gfc_expr_attr (expr).proc_pointer + && gfc_expr_attr (expr).elemental) || gfc_inline_intrinsic_function_p (expr)); - else - gcc_assert (ss_type == GFC_SS_INTRINSIC); need_tmp = 1; if (expr->ts.type == BT_CHARACTER diff --git a/gcc/testsuite/gfortran.dg/elemental_function_5.f90 b/gcc/testsuite/gfortran.dg/elemental_function_5.f90 new file mode 100644 index 00000000000..315ff9162b3 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/elemental_function_5.f90 @@ -0,0 +1,46 @@ +! { dg-do compile } +! +! Test the fix for PR98472. +! +! Contributed by Rui Coelho +! +module a + type, abstract :: base + contains + procedure(elem_func), deferred, nopass :: add + end type base + + type, extends(base) :: derived + contains + procedure, nopass :: add => add_derived + end type derived + + abstract interface + elemental function elem_func(x, y) result(out) + integer, intent(in) :: x, y + integer :: out + end function elem_func + end interface + +contains + elemental function add_derived(x, y) result(out) + integer, intent(in) :: x, y + integer :: out + out = x + y + end function add_derived +end module a + +program main + use a + call foo +contains + subroutine foo + integer, dimension(:), allocatable :: vec + class(base), allocatable :: instance + allocate(derived :: instance) + allocate(vec, source=instance%add([1, 2], [1, 2])) ! ICE here + if (any (vec .ne. [2, 4])) stop 1 + end +end program main + + -- 2.30.2