diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2010-09-04 11:29:11 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2010-09-04 11:29:11 +0200 |
| commit | b6ff8128de0583a91126718e81c48320aad243ce (patch) | |
| tree | d729152a99901da881cd9e9f83314edc3ea3beb4 /gcc/fortran/resolve.c | |
| parent | 502ef838c9c03499ccc8f55e0ff86f19c0f66119 (diff) | |
| download | gcc-b6ff8128de0583a91126718e81c48320aad243ce.zip gcc-b6ff8128de0583a91126718e81c48320aad243ce.tar.gz gcc-b6ff8128de0583a91126718e81c48320aad243ce.tar.bz2 | |
re PR fortran/45507 (Bogus Error: Can't convert TYPE(c_ptr) to INTEGER(4))
2010-09-04 Janus Weil <janus@gcc.gnu.org>
PR fortran/45507
* resolve.c (resolve_allocate_expr): Generate default initializers
already at this point, resolve them and put them into expr3, ...
* trans-stmt.c (gfc_trans_allocate): ... instead of waiting until
translation stage.
2010-09-04 Janus Weil <janus@gcc.gnu.org>
PR fortran/45507
* gfortran.dg/allocate_alloc_opt_12.f90: New.
From-SVN: r163856
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 88f43cd..9099ada 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6714,6 +6714,34 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code) goto failure; } + if (!code->expr3) + { + /* Set up default initializer if needed. */ + gfc_typespec ts; + + if (code->ext.alloc.ts.type == BT_DERIVED) + ts = code->ext.alloc.ts; + else + ts = e->ts; + + 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); + } + } + else if (code->expr3->mold && code->expr3->ts.type == BT_DERIVED) + { + /* Default initialization via MOLD (non-polymorphic). */ + gfc_expr *rhs = gfc_default_initializer (&code->expr3->ts); + gfc_resolve_expr (rhs); + gfc_free_expr (code->expr3); + code->expr3 = rhs; + } + if (e->ts.type == BT_CLASS) { /* Make sure the vtab symbol is present when |