aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/trans-array.c
diff options
context:
space:
mode:
authorMikael Morin <mikael@gcc.gnu.org>2010-09-23 11:11:23 +0000
committerMikael Morin <mikael@gcc.gnu.org>2010-09-23 11:11:23 +0000
commitbef6486a5a2fdb1008e582d5ac048dd243e91142 (patch)
tree94e5907b5697121d848e22dd6a4f1c3965a75700 /gcc/fortran/trans-array.c
parentdca267461a4ec936658e9dccdb952a2ca4b9f3e4 (diff)
downloadgcc-bef6486a5a2fdb1008e582d5ac048dd243e91142.zip
gcc-bef6486a5a2fdb1008e582d5ac048dd243e91142.tar.gz
gcc-bef6486a5a2fdb1008e582d5ac048dd243e91142.tar.bz2
re PR fortran/45745 (ICE in gfc_conv_array_stride)
2010-09-23 Mikael Morin <mikael@gcc.gnu.org> PR fortran/45745 PR fortran/45648 * trans-array.c (gfc_conv_expr_descriptor): Handle ss->type == GFC_SS_INTRINSIC (for {l,u}bound intrinsics) case. 2010-09-23 Mikael Morin <mikael@gcc.gnu.org> PR fortran/45745 PR fortran/45648 * gfortran.dg/vector_subscript_bound_1.f90: New. From-SVN: r164558
Diffstat (limited to 'gcc/fortran/trans-array.c')
-rw-r--r--gcc/fortran/trans-array.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 310a42b..b32c3ec 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -5290,13 +5290,17 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
return;
}
- if (ss->expr != expr)
+ if (ss->expr != expr || ss->type != GFC_SS_FUNCTION)
{
- /* Elemental function. */
- gcc_assert ((expr->value.function.esym != NULL
- && expr->value.function.esym->attr.elemental)
- || (expr->value.function.isym != NULL
- && expr->value.function.isym->elemental));
+ if (ss->expr != expr)
+ /* Elemental function. */
+ gcc_assert ((expr->value.function.esym != NULL
+ && expr->value.function.esym->attr.elemental)
+ || (expr->value.function.isym != NULL
+ && expr->value.function.isym->elemental));
+ else
+ gcc_assert (ss->type == GFC_SS_INTRINSIC);
+
need_tmp = 1;
if (expr->ts.type == BT_CHARACTER
&& expr->ts.u.cl->length->expr_type != EXPR_CONSTANT)