From b64c3d0696c572b7fc21fecfd78b9aaadf2b4892 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 2 Oct 2015 00:45:59 +0000 Subject: [PATCH] re PR fortran/67616 (ICE on data initialization of type variable in block) 2015-10-01 Steven G. Kargl PR fortran/67616 * primary.c (gfc_match_structure_constructor): Use a possibly host-associated symtree to prevent ICE. 2015-10-01 Steven G. Kargl PR fortran/67616 * gfortran.dg/pr67616.f90: New test. From-SVN: r228363 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/primary.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr67616.f90 | 13 +++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr67616.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2830c912b03..2a306e55f69 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2015-10-01 Steven G. Kargl + + PR fortran/67616 + * primary.c (gfc_match_structure_constructor): Use a possibly + host-associated symtree to prevent ICE. + 2015-09-28 Paul Thomas PR fortran/40054 diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index c8c65816a33..9f75666becf 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -2697,7 +2697,7 @@ gfc_match_structure_constructor (gfc_symbol *sym, gfc_expr **result) gfc_expr *e; gfc_symtree *symtree; - gfc_get_sym_tree (sym->name, NULL, &symtree, false); /* Can't fail */ + gfc_get_ha_sym_tree (sym->name, &symtree); e = gfc_get_expr (); e->symtree = symtree; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 92625b32e56..bf9b3e406f2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-10-01 Steven G. Kargl + + PR fortran/67616 + * gfortran.dg/pr67616.f90: New test. + 2015-10-01 Ville Voutilainen PR c++/54430 diff --git a/gcc/testsuite/gfortran.dg/pr67616.f90 b/gcc/testsuite/gfortran.dg/pr67616.f90 new file mode 100644 index 00000000000..3c2107d175c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr67616.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } +! PR fortran/67616 +! Original code contributed by Gerhard Steinmetz +program p + type t + end type + type(t) :: y + data y /t()/ + block + type(t) :: x + data x /t()/ ! Prior to patch, this would ICE. + end block +end -- 2.30.2