aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/array.c
diff options
context:
space:
mode:
authorHarald Anlauf <anlauf@gmx.de>2021-12-02 22:33:49 +0100
committerHarald Anlauf <anlauf@gmx.de>2021-12-03 21:07:55 +0100
commitf46d32dd29b7623915e31b0508e2e925526fa7d8 (patch)
treec4b1148f1ca7351c74dd2fa8e00262ad61f6925d /gcc/fortran/array.c
parentabd7712f91c99690f8b0046ea168b2782afbac69 (diff)
downloadgcc-f46d32dd29b7623915e31b0508e2e925526fa7d8.zip
gcc-f46d32dd29b7623915e31b0508e2e925526fa7d8.tar.gz
gcc-f46d32dd29b7623915e31b0508e2e925526fa7d8.tar.bz2
Fortran: improve checking of array specifications
gcc/fortran/ChangeLog: PR fortran/103505 * array.c (match_array_element_spec): Try to simplify array element specifications to improve early checking. * expr.c (gfc_try_simplify_expr): New. Try simplification of an expression via gfc_simplify_expr. When an error occurs, roll back. * gfortran.h (gfc_try_simplify_expr): Declare it. gcc/testsuite/ChangeLog: PR fortran/103505 * gfortran.dg/pr103505.f90: New test. Co-authored-by: Steven G. Kargl <kargl@gcc.gnu.org>
Diffstat (limited to 'gcc/fortran/array.c')
-rw-r--r--gcc/fortran/array.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index fbc6609..5762c8d 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -492,6 +492,8 @@ match_array_element_spec (gfc_array_spec *as)
if (!gfc_expr_check_typed (*upper, gfc_current_ns, false))
return AS_UNKNOWN;
+ gfc_try_simplify_expr (*upper, 0);
+
if (((*upper)->expr_type == EXPR_CONSTANT
&& (*upper)->ts.type != BT_INTEGER) ||
((*upper)->expr_type == EXPR_FUNCTION
@@ -524,6 +526,8 @@ match_array_element_spec (gfc_array_spec *as)
if (!gfc_expr_check_typed (*upper, gfc_current_ns, false))
return AS_UNKNOWN;
+ gfc_try_simplify_expr (*upper, 0);
+
if (((*upper)->expr_type == EXPR_CONSTANT
&& (*upper)->ts.type != BT_INTEGER) ||
((*upper)->expr_type == EXPR_FUNCTION