From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 46E5C3857C4F; Sat, 11 Feb 2023 18:16:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 46E5C3857C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676139409; bh=9tvX57XylUqEeZHf9GfswPiYDCZLsy8HNswLx0iHkG4=; h=From:To:Subject:Date:From; b=p3pnX9B//FRtbQMpS2H9chcF1r8yb1lxP+irssm84DH/MUMXA0aXMrhCuH6CK2Aox LYysYxaREgjr/txpLLUlsN77JqLVOvHAnMj36S9JsIFVZZcoqtECJJ6EF9cMDef/en UtL+U5XYtDwMBj4xDCBDcCvxMRkK/T2N6e5E7hQU= 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-11207] Fortran: error recovery on invalid array section [PR108609] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 2965a4f925461d7814972845fe480e03856fe3fe X-Git-Newrev: 684a5a8734c4269786089f5d4ba0fbf79f190f3a Message-Id: <20230211181649.46E5C3857C4F@sourceware.org> Date: Sat, 11 Feb 2023 18:16:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:684a5a8734c4269786089f5d4ba0fbf79f190f3a commit r10-11207-g684a5a8734c4269786089f5d4ba0fbf79f190f3a Author: Harald Anlauf Date: Wed Feb 1 21:01:32 2023 +0100 Fortran: error recovery on invalid array section [PR108609] The testcase for PR108527 uncovered a latent issue with invalid array sections that resulted in different paths being taken on different architectures. Detect the invalid array declaration for a clean recovery. gcc/fortran/ChangeLog: PR fortran/108609 * expr.c (find_array_section): Add check to prevent interpreting an mpz non-integer constant as an integer. gcc/testsuite/ChangeLog: PR fortran/108609 * gfortran.dg/pr108527.f90: Adjust test pattern. (cherry picked from commit 88a2a09dd4529107e7ef7a6e7ce43acf96457173) Diff: --- gcc/fortran/expr.c | 6 +++++- gcc/testsuite/gfortran.dg/pr108527.f90 | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index b65fc764fb8..5f22270c2f0 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -1549,7 +1549,11 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) lower = ref->u.ar.as->lower[d]; upper = ref->u.ar.as->upper[d]; - if (!lower || !upper) + if (!lower || !upper + || lower->expr_type != EXPR_CONSTANT + || upper->expr_type != EXPR_CONSTANT + || lower->ts.type != BT_INTEGER + || upper->ts.type != BT_INTEGER) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr108527.f90 b/gcc/testsuite/gfortran.dg/pr108527.f90 index c97ba3111cb..804514810ac 100644 --- a/gcc/testsuite/gfortran.dg/pr108527.f90 +++ b/gcc/testsuite/gfortran.dg/pr108527.f90 @@ -4,7 +4,7 @@ program p integer, parameter :: a((2.)) = [4,8] ! { dg-error "must be of INTEGER type" } - integer(a(1:1)) :: b ! { dg-error "out of bounds" } + integer(a(1:1)) :: b ! { dg-error "Unclassifiable statement" } end ! { dg-prune-output "Parameter array" }