From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id 835673858D37; Thu, 14 Jul 2022 20:34:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 835673858D37 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.15.109] ([79.251.15.109]) by web-mail.gmx.net (3c-app-gmx-bap08.server.lan [172.19.172.78]) (via HTTP); Thu, 14 Jul 2022 22:34:46 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery for bad initializers of implied-shape arrays [PR106209] Content-Type: multipart/mixed; boundary=rekceb-84fcf2b0-da92-40c0-8683-dc9f4ef1e862 Date: Thu, 14 Jul 2022 22:34:46 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:pTBgMJX937F1jtp+IphXecda9i3FL4f5CZ+gkFkGL/pY9TIosD/Pxy8y30FQqiLOypjCA 9k9UXxpke8+jzv5IikzpdLHwGLPo6zpYhU04keiRe1Eaq9WPl02TrgVWJVcft8EvRdWojDVHGYqw RuCD9ED/SdUgquw9KrBagLQbuSvz8LWjcJG+40mn3529KxtepfuqTX6O8LV+GZw2d23NBTXnwdBi 64FLf2cQSMGpuzN0ISlamPkaiTjL5bT6xM4EbSnMo6QOO0dbm8dZuTlKHjDqRH97NL5wmHQX3lG1 uo= X-UI-Out-Filterresults: notjunk:1;V03:K0:CQGB2Su3e10=:xY9h524V3TiF/vgcLQvP0M uDHlLb6xiwZLNgCT1WbzzgMgYNI2A9Bc2r7s+SZQiMeg7Vi2yIUaKOGjJaNcwXpTJAp7sqDnc 3i3tLGt+J/ap3YlK16D9aQj81Wc9NTU5O2tRi0WQMg9NmOAFbrTS7vnGE9G6istdUc3kOqLvN YXW428TKxH/mHc9Yjuk+OFUZgSkScknbKK+FRhnqbbLQAMptX6EhMXDk2XgBJgO1MB8Lx0ZC+ Td6rlHzs4R0S8Fv3qMY/RiMB3PJnySZcc95e3F0htsGCdXAI1CWDM+9xyiSiLcaFJQbK3I6Mm Zy1BSweQxiXpZAtCLxKNkHCfrHtxhwnSc3u+vTMlOj9Zxek3WJWw3bnKc/VyyRbDfBwYTzIUn lBAQ0f/U0LkL8zO8U6diQeTY5QJOrNiDuoHMVtCbLsr5s4P3a6yJjhJ6UGDXttCeQsFsPz3R+ 6vVQTwzQCBjff5x2aBkU68dhmLm6ik6pqKJJ09Bw5WsNlGIuByknKFGaqrD6QVb6tU65boEwg Kg7Fy0ho4YvkBypL2T+9rSms13rt/6lfJgZ9LpQJVpqDOxM7i8cFv8wj+WerZvc8wKJ/Xzlgg 2oDYsjQ+IQB0YddvXzCti762ktNvIYf3zhe7DyGNmMKsB9SUXrKz6hh/5FK63jFrO1jbmK2jX 9cToRgSijFlN4815OObyp2JgFuGa6LIV6p6oMz3enuF8e1uHnn8GDI5uhZ0/UPgrHAZFm2H9J +5dSdWgPgzIIWH4bqqNY4Agt6K05gOGS4iXsjd2gWBBV5kzZ4gRqnqP2279VqzFXISXU8Uwol Uy9Gdz6 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2022 20:34:53 -0000 --rekceb-84fcf2b0-da92-40c0-8683-dc9f4ef1e862 Content-Type: text/plain; charset=UTF-8 Dear all, the attached patch introduces error recovery for two cases of using an invalid array in a declaration of an implied-shape array instead of hitting internal errors. Initial patch by Steve. The final version was approved in the PR by Steve. Committed as: https://gcc.gnu.org/g:748f8a8b145dde59c7b63aa68b5a59515b7efc49 Thanks, Harald --rekceb-84fcf2b0-da92-40c0-8683-dc9f4ef1e862 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr106209.patch Content-Transfer-Encoding: quoted-printable =46rom 748f8a8b145dde59c7b63aa68b5a59515b7efc49 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Thu, 14 Jul 2022 22:24:55 +0200 Subject: [PATCH] Fortran: error recovery for bad initializers of implied-s= hape 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 =2D-- gcc/fortran/decl.cc | 15 +++++++++++++-- gcc/testsuite/gfortran.dg/pr106209.f90 | 9 +++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr106209.f90 diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc index 339f8b15035..b6400514731 100644 =2D-- 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 =3D=3D NULL) { - gcc_assert (init->expr_type =3D=3D EXPR_ARRAY); + if (init->expr_type !=3D EXPR_ARRAY) + { + gfc_error ("Bad shape of initializer at %L", &init->where); + return false; + } + init->shape =3D 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 =3D NULL; + return false; + } } for (dim =3D 0; dim < sym->as->rank; ++dim) diff --git a/gcc/testsuite/gfortran.dg/pr106209.f90 b/gcc/testsuite/gfortr= an.dg/pr106209.f90 new file mode 100644 index 00000000000..44f9233ec2f =2D-- /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(:) =3D 0 ! { dg-error "of deferred shape" } + integer, parameter :: b(*) =3D a ! { dg-error "Bad shape of initializ= er" } + integer, parameter :: c(*) =3D [a] ! { dg-error "Cannot determine shape= " } +end =2D- 2.35.3 --rekceb-84fcf2b0-da92-40c0-8683-dc9f4ef1e862--