From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id DB2EA3858412; Sun, 19 Dec 2021 20:29:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DB2EA3858412 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Harald Anlauf To: gcc-cvs@gcc.gnu.org Subject: [gcc r10-10351] Fortran: catch failed simplification of bad stride expression X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: e301a0a8a0f6287ff04e74893265e40dff256301 X-Git-Newrev: 650ac4b25121e48a64a021b0d21738ea08be3511 Message-Id: <20211219202909.DB2EA3858412@sourceware.org> Date: Sun, 19 Dec 2021 20:29:09 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2021 20:29:10 -0000 https://gcc.gnu.org/g:650ac4b25121e48a64a021b0d21738ea08be3511 commit r10-10351-g650ac4b25121e48a64a021b0d21738ea08be3511 Author: Harald Anlauf Date: Tue Dec 7 18:46:52 2021 +0100 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. (cherry picked from commit 652c28736209f10bac1aa7ecb31f9056b518dacf) Diff: --- gcc/fortran/array.c | 9 ++++----- gcc/testsuite/gfortran.dg/pr103588.f90 | 8 ++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index 5f3aec78711..edf5cef61ec 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -2405,12 +2405,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 00000000000..198e1766cd2 --- /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