From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 7C6B4384B829; Thu, 20 Oct 2022 20:20:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C6B4384B829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666297255; bh=/QB2C+iulgP6Q6Eecfr72gp1nRACBoHPo7hoyXyqR2c=; h=From:To:Subject:Date:From; b=P6YTghY7735HFGS7X7/iP3+cBIMeO1TaJUNdE+hpKUhv3VAlxwvIp68Y1UJqD/C+G 9HGF114HlTv9FiUW0VupJOJSUFyqvvdjtET+wTUkv/2LlsC1dd0pS1ETA9C2j/oZJH eJ50G9DwGwo0sJtSmR6hvVIFBaNfKl+nq3xHaI4M= 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 r13-3421] Fortran: error recovery with references of bad array constructors [PR105633] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/master X-Git-Oldrev: d155442de043c1bef7d27cf2d6be4eba618afcb9 X-Git-Newrev: ecb20df4fa6d99daa635c7fb662dc0554610777e Message-Id: <20221020202055.7C6B4384B829@sourceware.org> Date: Thu, 20 Oct 2022 20:20:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ecb20df4fa6d99daa635c7fb662dc0554610777e commit r13-3421-gecb20df4fa6d99daa635c7fb662dc0554610777e Author: Harald Anlauf Date: Wed Oct 19 22:37:56 2022 +0200 Fortran: error recovery with references of bad array constructors [PR105633] gcc/fortran/ChangeLog: PR fortran/105633 * expr.cc (find_array_section): Move check for NULL pointers so that both subscript triplets and vector subscripts are covered. gcc/testsuite/ChangeLog: PR fortran/105633 * gfortran.dg/pr105633.f90: New test. Co-authored-by: Steven G. Kargl Diff: --- gcc/fortran/expr.cc | 10 +++++++--- gcc/testsuite/gfortran.dg/pr105633.f90 | 8 ++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc index 290ddf360c8..69d0b57c688 100644 --- a/gcc/fortran/expr.cc +++ b/gcc/fortran/expr.cc @@ -1552,6 +1552,12 @@ 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) + { + t = false; + goto cleanup; + } + if (ref->u.ar.dimen_type[d] == DIMEN_VECTOR) /* Vector subscript. */ { gfc_constructor *ci; @@ -1594,9 +1600,7 @@ find_array_section (gfc_expr *expr, gfc_ref *ref) { if ((begin && begin->expr_type != EXPR_CONSTANT) || (finish && finish->expr_type != EXPR_CONSTANT) - || (step && step->expr_type != EXPR_CONSTANT) - || !lower - || !upper) + || (step && step->expr_type != EXPR_CONSTANT)) { t = false; goto cleanup; diff --git a/gcc/testsuite/gfortran.dg/pr105633.f90 b/gcc/testsuite/gfortran.dg/pr105633.f90 new file mode 100644 index 00000000000..f2dbc5e742a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr105633.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/105633 - ICE in find_array_section +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1,2] ! { dg-error "deferred shape" } + print *, [a([1,2])] +end