From 74a5d8b9fe448b0b12402e99de63948e10be7382 Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Fri, 23 Feb 2007 16:35:25 +0000 Subject: [PATCH] re PR fortran/30660 (Allocatable components of a derived type "require" the SAVE attribute.) 2007-02-23 Paul Thomas PR fortran/30660 * resolve.c (has_default_initializer): New function. (resolve_fl_variable): Call has_default_initializer to determine if the derived type has a default initializer to its ultimate components. 2007-02-23 Paul Thomas PR fortran/30660 * gfortran.dg/alloc_comp_basics_4.f90: Add component with an allocatable component. From-SVN: r122263 --- gcc/fortran/ChangeLog | 9 +++++++++ gcc/fortran/resolve.c | 19 ++++++++++++++++--- gcc/testsuite/ChangeLog | 7 +++++++ .../gfortran.dg/alloc_comp_basics_4.f90 | 6 ++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ce305532ed8..777f926421b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2007-02-23 Paul Thomas + + PR fortran/30660 + * resolve.c (has_default_initializer): New function. + (resolve_fl_variable): Call has_default_initializer to determine if + the derived type has a default initializer to its ultimate + components. + + 2007-02-22 Jerry DeLisle * options.c (set_default_std_flags): New function to consolidate diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 8db36b5f2c0..a66d1ae9807 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5529,6 +5529,21 @@ resolve_fl_var_and_proc (gfc_symbol *sym, int mp_flag) } +static gfc_component * +has_default_initializer (gfc_symbol *der) +{ + gfc_component *c; + for (c = der->components; c; c = c->next) + if ((c->ts.type != BT_DERIVED && c->initializer) + || (c->ts.type == BT_DERIVED + && !c->pointer + && has_default_initializer (c->ts.derived))) + break; + + return c; +} + + /* Resolve symbols with flavor variable. */ static try @@ -5676,9 +5691,7 @@ resolve_fl_variable (gfc_symbol *sym, int mp_flag) components. */ c = NULL; if (sym->ts.type == BT_DERIVED && !(sym->value || flag)) - for (c = sym->ts.derived->components; c; c = c->next) - if (c->initializer) - break; + c = has_default_initializer (sym->ts.derived); /* 4th constraint in section 11.3: "If an object of a type for which component-initialization is specified (R429) appears in the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cce1dd9897a..45bed9f21a6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2007-02-23 Paul Thomas + + PR fortran/30660 + * gfortran.dg/alloc_comp_basics_4.f90: Add component with an + allocatable component. + + 2007-02-23 Kaveh R. Ghazi * gcc.dg/torture/builtin-logb-1.c: New test. diff --git a/gcc/testsuite/gfortran.dg/alloc_comp_basics_4.f90 b/gcc/testsuite/gfortran.dg/alloc_comp_basics_4.f90 index c910b708bd3..508d5670689 100644 --- a/gcc/testsuite/gfortran.dg/alloc_comp_basics_4.f90 +++ b/gcc/testsuite/gfortran.dg/alloc_comp_basics_4.f90 @@ -6,8 +6,14 @@ ! Contributed by Toon Moene ! MODULE types_m + TYPE coord_t + INTEGER ncord + REAL,ALLOCATABLE,DIMENSION(:) :: x, y + END TYPE + TYPE grib_t REAL,DIMENSION(:),ALLOCATABLE :: vdata + TYPE(coord_t) coords END TYPE END MODULE -- 2.30.2