From 078c5aff5ed83e9c237f3090e947860314838e00 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Mon, 2 Apr 2018 16:47:48 +0000 Subject: [PATCH] re PR fortran/85102 (ICE in gfc_conv_intrinsic_dot_product, at fortran/trans-intrinsic.c:4464) 2018-04-02 Thomas Koenig PR fortran/85102 * decl.c (variable_decl): If upper or lower bounds simplify to a constant, use that. 2018-04-02 Thomas Koenig PR fortran/85102 * gfortran.dg/array_simplify_2.f90: New test. From-SVN: r259014 --- gcc/fortran/ChangeLog | 6 +++++ gcc/fortran/decl.c | 27 +++++++++++++++++++ gcc/testsuite/ChangeLog | 5 ++++ .../gfortran.dg/array_simplify_2.f90 | 11 ++++++++ 4 files changed, 49 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/array_simplify_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e2765e1e73a..1d90f4fa317 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2018-04-02 Thomas Koenig + + PR fortran/85102 + * decl.c (variable_decl): If upper or lower bounds simplify + to a constant, use that. + 2018-03-30 Paul Thomas PR fortran/84931 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index dce9dd2d6df..192910dfe65 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2424,6 +2424,33 @@ variable_decl (int elem) goto cleanup; } } + if (as->type == AS_EXPLICIT) + { + for (int i = 0; i < as->rank; i++) + { + gfc_expr *e, *n; + e = as->lower[i]; + if (e->expr_type != EXPR_CONSTANT) + { + n = gfc_copy_expr (e); + gfc_simplify_expr (n, 1); + if (n->expr_type == EXPR_CONSTANT) + gfc_replace_expr (e, n); + else + gfc_free_expr (n); + } + e = as->upper[i]; + if (e->expr_type != EXPR_CONSTANT) + { + n = gfc_copy_expr (e); + gfc_simplify_expr (n, 1); + if (n->expr_type == EXPR_CONSTANT) + gfc_replace_expr (e, n); + else + gfc_free_expr (n); + } + } + } } char_len = NULL; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7fddf8c271a..ca5953f2234 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-04-02 Thomas Koenig + + PR fortran/85102 + * gfortran.dg/array_simplify_2.f90: New test. + 2018-04-01 Jakub Jelinek PR middle-end/85090 diff --git a/gcc/testsuite/gfortran.dg/array_simplify_2.f90 b/gcc/testsuite/gfortran.dg/array_simplify_2.f90 new file mode 100644 index 00000000000..36454044ee2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/array_simplify_2.f90 @@ -0,0 +1,11 @@ +! { dg-do run } +! PR 85102 - this used to ICE +! Original test case by Gerhard Steinmetz +program p + integer, parameter :: a((1+2)) = 1 + integer, parameter :: b((1+1)+1) = 1 + integer, parameter :: c = dot_product(a, a) + integer, parameter :: d = dot_product(b,b) + if (c /= 3) stop 1 + if (d /= 3) stop 2 + end program p