diff options
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 8db36b5..a66d1ae 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 |