diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-12-29 17:14:11 +0100 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-12-29 17:14:11 +0100 |
| commit | fbd30c381c53eb734642603671fadfa9120afecd (patch) | |
| tree | aa1f5f816e9af0d6122fd72eb434ce66f347d509 /gcc/fortran/expr.c | |
| parent | bc81f55980f7c3652a4f9c838c4ff6e825f92e5a (diff) | |
| download | gcc-fbd30c381c53eb734642603671fadfa9120afecd.zip gcc-fbd30c381c53eb734642603671fadfa9120afecd.tar.gz gcc-fbd30c381c53eb734642603671fadfa9120afecd.tar.bz2 | |
re PR fortran/46838 ([OOP] Initialization of polymorphic allocatable components)
2010-12-29 Janus Weil <janus@gcc.gnu.org>
PR fortran/46838
* expr.c (gfc_default_initializer): Handle allocatable CLASS components.
2010-12-29 Janus Weil <janus@gcc.gnu.org>
PR fortran/46838
* gfortran.dg/alloc_comp_class_2.f90: New.
From-SVN: r168322
Diffstat (limited to 'gcc/fortran/expr.c')
| -rw-r--r-- | gcc/fortran/expr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index a22e660..a222ff2 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3648,7 +3648,8 @@ gfc_default_initializer (gfc_typespec *ts) /* See if we have a default initializer in this, but not in nested types (otherwise we could use gfc_has_default_initializer()). */ for (comp = ts->u.derived->components; comp; comp = comp->next) - if (comp->initializer || comp->attr.allocatable) + if (comp->initializer || comp->attr.allocatable + || (comp->ts.type == BT_CLASS && CLASS_DATA (comp)->attr.allocatable)) break; if (!comp) @@ -3665,7 +3666,8 @@ gfc_default_initializer (gfc_typespec *ts) if (comp->initializer) ctor->expr = gfc_copy_expr (comp->initializer); - if (comp->attr.allocatable) + if (comp->attr.allocatable + || (comp->ts.type == BT_CLASS && CLASS_DATA (comp)->attr.allocatable)) { ctor->expr = gfc_get_expr (); ctor->expr->expr_type = EXPR_NULL; |