aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-array.c
diff options
context:
space:
mode:
authorPaul Thomas <pault@gcc.gnu.org>2021-01-27 09:12:16 +0000
committerPaul Thomas <pault@gcc.gnu.org>2021-01-27 09:12:54 +0000
commit003f0414291d595d2126e6d2e24b281f38f3448f (patch)
tree8b199de6aef2fdd1f57e2e06d18d88382803cbb7 /gcc/fortran/trans-array.c
parentda5c25f37101cd71f08e31ad581a00840ef75497 (diff)
downloadgcc-003f0414291d595d2126e6d2e24b281f38f3448f.zip
gcc-003f0414291d595d2126e6d2e24b281f38f3448f.tar.gz
gcc-003f0414291d595d2126e6d2e24b281f38f3448f.tar.bz2
Fortran: Fix ICE due to elemental procedure pointers [PR98472].
2021-01-27 Paul Thomas <pault@gcc.gnu.org> 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.
Diffstat (limited to 'gcc/fortran/trans-array.c')
-rw-r--r--gcc/fortran/trans-array.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 4bd4db8..c346183 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