From patchwork Wed Jan 12 20:29:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 49938 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E39E43947C02 for ; Wed, 12 Jan 2022 20:31:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E39E43947C02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1642019496; bh=TUcJUIdr8n4l6MFXP8mhohPWQuH/P7fNprmUkYzv3/8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=y3rHiI6aPc14MACQBpaRLk2go9u3H2N+X9L0k24cZCOF46Zi7Ci5xNY3xUeVsOC+4 s2m6dmhf17c5Eg52XiX3lB8U7GwnjzOVbFORWquUDMUE2A065iRx6QdgoAprQGBXiW VyktYMeEVTppJSOhC9MfLUaXZOO2X11qILIyb1uA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by sourceware.org (Postfix) with ESMTPS id 1EADD3947427; Wed, 12 Jan 2022 20:29:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1EADD3947427 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.81.111] ([93.207.81.111]) by web-mail.gmx.net (3c-app-gmx-bs39.server.lan [172.19.170.91]) (via HTTP); Wed, 12 Jan 2022 21:29:56 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/67804 - ICE on data initialization of type(character) with wrong data Date: Wed, 12 Jan 2022 21:29:56 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:ek/W1yGx89u1oQGgkhHMVWpNTxQpHkJTAj15N1prSimU7SMXtvWx1DIrwDeWxyBDYH7T9 2+lkqm4+fopQsCu00kvIg7MEt8Qdk7EIt1DoRjhmuJguOg65op+pyLQwBjvlH+YIpJHcwaTOw6oo p641+8v3JPifuP4mKQgR3NA94eqokJYY747Qg4twSnxB/paVBHmgd8gNCSv2ee3JmTgQYYBcXfhx YptExbKg+U7hR/yZA5H04rbW4j4Eq9b0FcHh9y3FfSUjMewPuixQLDO/VsuxBuAl15pNoeMdWvVa qM= X-UI-Out-Filterresults: notjunk:1;V03:K0:HgvWQWM64KI=:xp/j8U3njHAW0CqCp+7ke2 1HsONcJliDMfjQYv3H+7P2Hy4ocKc4velXd6OWJVj5HmICxOqQhbK7ybVMJBMZRKTeIAFPFTY YO05Q3Hwv/OIVHw0LtEXi0exJMtxCxgvvgPmA3dBQqk8f7nen9j41qMVeOUh78+MpS0/iQx9F zenc9yspaUpz0bGBYVc67rJQf2L8ijWeEVjqSQ+q96ZjjLa+056gEhRcRHWLsSSvJNUx7pUA0 0wsZfX3tHrHKl2xW3eO+yAj0ORUsqs0BiCAxEvfP1FVLJNIyutbnRCHfmgqjKeUv7EmvP8yWV NBxuxqaTci4Vi93Bz0/oM8lulKjReRTWE7iqp/O9na4jv2pAcBrDt2uzxnVShYeCQsi3t/dXQ dsWjt0EgWt5OMwo3Y9RMnTFacop2OSFFlDuPQZKg+7QtKa/ratvV/WIXmWCpWreWoKC4QUfxr 6kWQKRmthYT9gUj7CY1KZ90pxYT6g+nszoFcX1690sAPW0dipZJEwL3Hhq9ZG3S9WtjAkjDWT 0QhADLb4hEtYi3ro8euix/kblJ1bxFT98VP9LAmv+cHgVidiPHPOFEwiVznnjLbCnzriQsg8u Jc9Y9al2Epb4T+lavErwR82d+il6w3QcEE1/JuYB/53UZ4NJMOO/ERIdl6Sa1YhRe3mCL3nrI fUF/EFKe/rgDh4krfY8cxLAblblCoDGAUmGmZMP81c6oC7lLM91KKQmnBd368tSCJwzhnnz8W KHXykE+gN2BhEClNP31TD2zAkqhapxAyiPEqDeanFN4ORW0+XKcvv9whs6fnIxQO/9BoMD16h SNaGfZD X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear Fortranners, the attached patch improves error recovery after an invalid structure constructor has been detected in a DATA statement. Testcase by Gerhard. Regtested on x86_64-pc-linux-gnu. OK for mainline? This should be a rather safe patch which I would like to backport to 11-branch after a suitable waiting period. Thanks, Harald From 31436189cb28590407030000ec6baff816cd63ef Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Wed, 12 Jan 2022 21:24:49 +0100 Subject: [PATCH] Fortran: fix error recovery on bad structure constructor in DATA statement gcc/fortran/ChangeLog: PR fortran/67804 * primary.c (gfc_match_structure_constructor): Recover from errors that occurred while checking for a valid structure constructor in a DATA statement. gcc/testsuite/ChangeLog: PR fortran/67804 * gfortran.dg/pr93604.f90: Adjust to changed diagnostics. * gfortran.dg/pr67804.f90: New test. --- gcc/fortran/primary.c | 15 ++++++++++++--- gcc/testsuite/gfortran.dg/pr67804.f90 | 25 +++++++++++++++++++++++++ gcc/testsuite/gfortran.dg/pr93604.f90 | 2 +- 3 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr67804.f90 diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index fd4d6af50c0..3f01f67cd49 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -3364,6 +3364,7 @@ gfc_match_structure_constructor (gfc_symbol *sym, gfc_expr **result) match m; gfc_expr *e; gfc_symtree *symtree; + bool t = true; gfc_get_ha_sym_tree (sym->name, &symtree); @@ -3394,10 +3395,18 @@ gfc_match_structure_constructor (gfc_symbol *sym, gfc_expr **result) in the structure constructor must be a constant. Try to reduce the expression here. */ if (gfc_in_match_data ()) - gfc_reduce_init_expr (e); + t = gfc_reduce_init_expr (e); - *result = e; - return MATCH_YES; + if (t) + { + *result = e; + return MATCH_YES; + } + else + { + gfc_free_expr (e); + return MATCH_ERROR; + } } diff --git a/gcc/testsuite/gfortran.dg/pr67804.f90 b/gcc/testsuite/gfortran.dg/pr67804.f90 new file mode 100644 index 00000000000..e2009a5bfdb --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr67804.f90 @@ -0,0 +1,25 @@ +! { dg-do compile } +! PR fortran/67804 - ICE on bad type in structure constructor in DATA statement +! Contributed by G.Steinmetz + +program p + type t + character :: c + end type + type u + character, pointer :: c + end type + type(t) :: x0, x1, x2, x3, x4, x5, x6, x7, x8, x9 + type(u) :: y6 + data x0 /t('a')/ ! OK + data x1 /t(1)/ ! { dg-error "Cannot convert" } + data x2 /t(1.)/ ! { dg-error "Cannot convert" } + data x3 /t(1d1)/ ! { dg-error "Cannot convert" } + data x4 /t((0.,1.))/ ! { dg-error "Cannot convert" } + data x5 /t(.true.)/ ! { dg-error "Cannot convert" } + data x6 /t(null())/ ! { dg-error "neither a POINTER nor ALLOCATABLE" } + data x7 /t(['1'])/ ! { dg-error "The rank of the element" } + data x8 /t([1])/ ! { dg-error "Cannot convert" } + data x9 /t(z'0')/ ! { dg-error "Cannot convert" } + data y6 /u(null())/ ! OK +end diff --git a/gcc/testsuite/gfortran.dg/pr93604.f90 b/gcc/testsuite/gfortran.dg/pr93604.f90 index 2c695d37829..4040155120c 100644 --- a/gcc/testsuite/gfortran.dg/pr93604.f90 +++ b/gcc/testsuite/gfortran.dg/pr93604.f90 @@ -5,6 +5,6 @@ program p integer :: a end type type(t) :: x - data x /t(z'1')/ ! { dg-error "cannot appear in a structure constructor" } + data x /t(z'1')/ ! { dg-error "BOZ" } end -- 2.31.1