diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-09-15 15:50:15 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-09-15 15:50:15 +0200 |
| commit | edd2b56ab9ae8828d996a266d8819a0ff9e5d499 (patch) | |
| tree | 2d36d040da2849e220509c62394c75c152699789 /gcc/fortran/resolve.c | |
| parent | ea395a11a35718e110d0ba783619207c9fd9d354 (diff) | |
| download | gcc-edd2b56ab9ae8828d996a266d8819a0ff9e5d499.zip gcc-edd2b56ab9ae8828d996a266d8819a0ff9e5d499.tar.gz gcc-edd2b56ab9ae8828d996a266d8819a0ff9e5d499.tar.bz2 | |
re PR fortran/45577 (Bogus(?) "... type incompatible with source-expr ..." error)
2010-09-15 Janus Weil <janus@gcc.gnu.org>
PR fortran/45577
* resolve.c (resolve_allocate_expr): Do default initialization via
EXEC_INIT_ASSIGN.
2010-09-15 Janus Weil <janus@gcc.gnu.org>
PR fortran/45577
* gfortran.dg/allocate_derived_4.f90: New.
From-SVN: r164305
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 90d80a7..2d5e04f 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6697,10 +6697,16 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code) if (ts.type == BT_CLASS) ts = ts.u.derived->components->ts; - if (ts.type == BT_DERIVED) - { - code->expr3 = gfc_default_initializer (&ts); - gfc_resolve_expr (code->expr3); + if (ts.type == BT_DERIVED && gfc_has_default_initializer(ts.u.derived)) + { + gfc_expr *init_e = gfc_default_initializer (&ts); + gfc_code *init_st = gfc_get_code (); + init_st->loc = code->loc; + init_st->op = EXEC_INIT_ASSIGN; + init_st->expr1 = gfc_expr_to_initialize (e); + init_st->expr2 = init_e; + init_st->next = code->next; + code->next = init_st; } } else if (code->expr3->mold && code->expr3->ts.type == BT_DERIVED) |