diff options
| author | Erik Edelmann <eedelman@gcc.gnu.org> | 2006-08-19 21:05:59 +0000 |
|---|---|---|
| committer | Erik Edelmann <eedelman@gcc.gnu.org> | 2006-08-19 21:05:59 +0000 |
| commit | 6df364d720c66a9153b3d1d9405124d149cddfa5 (patch) | |
| tree | 9ffd252da63b015eb650b5b5e804b45dbdf68a64 /gcc/fortran | |
| parent | d58b0443ec5c1f1a434ac701aa41c0839a142ec2 (diff) | |
| download | gcc-6df364d720c66a9153b3d1d9405124d149cddfa5.zip gcc-6df364d720c66a9153b3d1d9405124d149cddfa5.tar.gz gcc-6df364d720c66a9153b3d1d9405124d149cddfa5.tar.bz2 | |
re PR fortran/25217 (Derived type dummy argument having intent(out) attribute)
fortran/
2006-08-19 Erik Edelmann <eedelman@gcc.gnu.org>
PR fortran/25217
* resolve.c (resolve_fl_variable): Set a default initializer for
derived types with INTENT(OUT) even if 'flag' is true.
* trans-expr.c (gfc_conv_function_call): Insert code to
reinitialize INTENT(OUT) arguments of derived type with default
initializers.
testsuite/
2006-08-19 Erik Edelmann <eedelman@gcc.gnu.org>
PR fortran/25217
* gfortran.dg/derived_init_2.f90: New.
From-SVN: r116261
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 4 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 10 |
3 files changed, 21 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index aacdc11..c922b8d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2006-08-19 Erik Edelmann <eedelman@gcc.gnu.org> + + PR fortran/25217 + * resolve.c (resolve_fl_variable): Set a default initializer for + derived types with INTENT(OUT) even if 'flag' is true. + * trans-expr.c (gfc_conv_function_call): Insert code to + reinitialize INTENT(OUT) arguments of derived type with default + initializers. + 2006-08-15 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/25828 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index cb45a2b..5c9786b 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -5232,8 +5232,8 @@ resolve_fl_variable (gfc_symbol *sym, int mp_flag) } /* Assign default initializer. */ - if (sym->ts.type == BT_DERIVED && !(sym->value || flag) - && !sym->attr.pointer) + if (sym->ts.type == BT_DERIVED && !sym->value && !sym->attr.pointer + && !sym->attr.allocatable && (!flag || sym->attr.intent == INTENT_OUT)) sym->value = gfc_default_initializer (&sym->ts); return SUCCESS; diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index d536dcd..4225b69 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2014,6 +2014,16 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym, gfc_add_block_to_block (&se->pre, &parmse.pre); gfc_add_block_to_block (&post, &parmse.post); + /* If an INTENT(OUT) dummy of derived type has a default + initializer, it must be (re)initialized here. */ + if (fsym && fsym->attr.intent == INTENT_OUT && fsym->ts.type == BT_DERIVED + && fsym->value) + { + gcc_assert (!fsym->attr.allocatable); + tmp = gfc_trans_assignment (e, fsym->value); + gfc_add_expr_to_block (&se->pre, tmp); + } + /* Character strings are passed as two parameters, a length and a pointer. */ if (parmse.string_length != NULL_TREE) |