From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 326A73858D28; Sat, 28 Jan 2023 22:03:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 326A73858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674943423; bh=kdiZnAjXYWqPMejFEb5PnOy8Hkg4/vlkuhZ3HCB5JdU=; h=From:To:Subject:Date:From; b=vjlFL0N2LU7idFiRBlyA/bgDIN9ayWuqzwNDA115WMTGfbc346hOHtbhgZA/5fEis nA5Y39bophi5NUbO3rK81ZRpGsaehms9wAazLwXn99zXdGVrLoh6d6OWxMeYkM8p9+ TnoCnboq7kG1nW0ebBJx+/yJWO7MTZbjwirOya6A= 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 r12-9079] Fortran: error recovery for bad initializers of implied-shape arrays [PR106209] X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 0e4c239ebde0a926832e3bcaae707eabf81927ff X-Git-Newrev: 6dc4f984dd14ffad34e0540f2030f553579adefd Message-Id: <20230128220343.326A73858D28@sourceware.org> Date: Sat, 28 Jan 2023 22:03:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6dc4f984dd14ffad34e0540f2030f553579adefd commit r12-9079-g6dc4f984dd14ffad34e0540f2030f553579adefd Author: Harald Anlauf Date: Thu Jul 14 22:24:55 2022 +0200 Fortran: error recovery for bad initializers of implied-shape arrays [PR106209] gcc/fortran/ChangeLog: PR fortran/106209 * decl.cc (add_init_expr_to_sym): Handle bad initializers for implied-shape arrays. gcc/testsuite/ChangeLog: PR fortran/106209 * gfortran.dg/pr106209.f90: New test. Co-authored-by: Steven G. Kargl (cherry picked from commit 748f8a8b145dde59c7b63aa68b5a59515b7efc49) Diff: --- gcc/fortran/decl.cc | 15 +++++++++++++-- gcc/testsuite/gfortran.dg/pr106209.f90 | 9 +++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc index 339f8b15035..b6400514731 100644 --- a/gcc/fortran/decl.cc +++ b/gcc/fortran/decl.cc @@ -2129,10 +2129,21 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus) /* The shape may be NULL for EXPR_ARRAY, set it. */ if (init->shape == NULL) { - gcc_assert (init->expr_type == EXPR_ARRAY); + if (init->expr_type != EXPR_ARRAY) + { + gfc_error ("Bad shape of initializer at %L", &init->where); + return false; + } + init->shape = gfc_get_shape (1); if (!gfc_array_size (init, &init->shape[0])) - gfc_internal_error ("gfc_array_size failed"); + { + gfc_error ("Cannot determine shape of initializer at %L", + &init->where); + free (init->shape); + init->shape = NULL; + return false; + } } for (dim = 0; dim < sym->as->rank; ++dim) diff --git a/gcc/testsuite/gfortran.dg/pr106209.f90 b/gcc/testsuite/gfortran.dg/pr106209.f90 new file mode 100644 index 00000000000..44f9233ec2f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr106209.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! PR fortran/106209 - ICE in add_init_expr_to_sym +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = 0 ! { dg-error "of deferred shape" } + integer, parameter :: b(*) = a ! { dg-error "Bad shape of initializer" } + integer, parameter :: c(*) = [a] ! { dg-error "Cannot determine shape" } +end