From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2071) id 6358B385DC02; Tue, 25 Jan 2022 19:37:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6358B385DC02 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-10418] Fortran: fix error recovery on bad structure constructor in DATA statement X-Act-Checkin: gcc X-Git-Author: Harald Anlauf X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: a123a1d2d82ab9dc050400a197f636b878296a84 X-Git-Newrev: 21551a4af1be07d7b98221639ec1bd18106c1f80 Message-Id: <20220125193738.6358B385DC02@sourceware.org> Date: Tue, 25 Jan 2022 19:37:38 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jan 2022 19:37:38 -0000 https://gcc.gnu.org/g:21551a4af1be07d7b98221639ec1bd18106c1f80 commit r10-10418-g21551a4af1be07d7b98221639ec1bd18106c1f80 Author: Harald Anlauf Date: Wed Jan 12 21:24:49 2022 +0100 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. (cherry picked from commit 0b8464365b15ac108cd1d00d5bc56d229c1340de) Diff: --- 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(-) diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index 78c4b634db3..56b05795c27 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -3376,6 +3376,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); @@ -3406,10 +3407,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