From 652c28736209f10bac1aa7ecb31f9056b518dacf Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 7 Dec 2021 18:46:52 +0100 Subject: [PATCH] Fortran: catch failed simplification of bad stride expression gcc/fortran/ChangeLog: PR fortran/103588 * array.c (gfc_ref_dimen_size): Do not generate internal error on failed simplification of stride expression; just return failure. gcc/testsuite/ChangeLog: PR fortran/103588 * gfortran.dg/pr103588.f90: New test. --- gcc/fortran/array.c | 9 ++++----- gcc/testsuite/gfortran.dg/pr103588.f90 | 8 ++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr103588.f90 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 5762c8d..e5e2209 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -2403,12 +2403,11 @@ gfc_ref_dimen_size (gfc_array_ref *ar, int dimen, mpz_t *result, mpz_t *end) { stride_expr = gfc_copy_expr(ar->stride[dimen]); - if(!gfc_simplify_expr(stride_expr, 1)) - gfc_internal_error("Simplification error"); - - if (stride_expr->expr_type != EXPR_CONSTANT - || mpz_cmp_ui (stride_expr->value.integer, 0) == 0) + if (!gfc_simplify_expr (stride_expr, 1) + || stride_expr->expr_type != EXPR_CONSTANT + || mpz_cmp_ui (stride_expr->value.integer, 0) == 0) { + gfc_free_expr (stride_expr); mpz_clear (stride); return false; } diff --git a/gcc/testsuite/gfortran.dg/pr103588.f90 b/gcc/testsuite/gfortran.dg/pr103588.f90 new file mode 100644 index 0000000..198e176 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr103588.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/103588 - ICE: Simplification error in gfc_ref_dimen_size +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1,2] ! { dg-error "cannot be automatic or of deferred shape" } + integer :: b(2) = a(::a(1)) ! { dg-error "Invalid" } +end -- 2.7.4