diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2006-10-03 20:13:03 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2006-10-03 20:13:03 +0000 |
| commit | 5be382734db43285b6ce08aee4982c18cebf2cf6 (patch) | |
| tree | ff6592e326477dbf0ff17a5d2950e64c46cbeade /gcc/fortran/trans-expr.c | |
| parent | b7bf91917adec5526a5ffc2328a6402494d9e8ee (diff) | |
| download | gcc-5be382734db43285b6ce08aee4982c18cebf2cf6.zip gcc-5be382734db43285b6ce08aee4982c18cebf2cf6.tar.gz gcc-5be382734db43285b6ce08aee4982c18cebf2cf6.tar.bz2 | |
re PR fortran/29284 (ICE for optional subroutine argument)
2006-10-03 Paul Thomas <pault@gcc.gnu.org>
PR fortran/29284
PR fortran/29321
PR fortran/29322
* trans-expr.c (gfc_conv_function_call): Check the expression
and the formal symbol are present when testing the actual
argument.
PR fortran/25091
PR fortran/25092
* resolve.c (resolve_entries): It is an error if the entries
of an array-valued function do not have the same shape.
2006-10-03 Paul Thomas <pault@gcc.gnu.org>
PR fortran/29284
* gfortran.dg/optional_assumed_charlen_1.f90: New test.
PR fortran/29321
PR fortran/29322
* gfortran.dg/missing_optional_dummy_2.f90: New test.
PR fortran/25091
PR fortran/25092
* gfortran.dg/entry_array_specs_1.f90: New test.
From-SVN: r117413
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 67 |
1 files changed, 39 insertions, 28 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index e477f9c..4bce65e 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2006,38 +2006,49 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym, } } - /* If an optional argument is itself an optional dummy argument, - check its presence and substitute a null if absent. */ - if (e && e->expr_type == EXPR_VARIABLE - && e->symtree->n.sym->attr.optional - && fsym && fsym->attr.optional) - gfc_conv_missing_dummy (&parmse, e, fsym->ts); - - if (fsym && need_interface_mapping) - gfc_add_interface_mapping (&mapping, fsym, &parmse); + if (fsym) + { + if (e) + { + /* If an optional argument is itself an optional dummy + argument, check its presence and substitute a null + if absent. */ + if (e->expr_type == EXPR_VARIABLE + && e->symtree->n.sym->attr.optional + && fsym->attr.optional) + gfc_conv_missing_dummy (&parmse, e, fsym->ts); + + /* If an INTENT(OUT) dummy of derived type has a default + initializer, it must be (re)initialized here. */ + if (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); + } - gfc_add_block_to_block (&se->pre, &parmse.pre); - gfc_add_block_to_block (&post, &parmse.post); + /* Obtain the character length of an assumed character + length procedure from the typespec. */ + if (fsym->ts.type == BT_CHARACTER + && parmse.string_length == NULL_TREE + && e->ts.type == BT_PROCEDURE + && e->symtree->n.sym->ts.type == BT_CHARACTER + && e->symtree->n.sym->ts.cl->length != NULL) + { + gfc_conv_const_charlen (e->symtree->n.sym->ts.cl); + parmse.string_length + = e->symtree->n.sym->ts.cl->backend_decl; + } + } - /* 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); + if (need_interface_mapping) + gfc_add_interface_mapping (&mapping, fsym, &parmse); } - if (fsym && fsym->ts.type == BT_CHARACTER - && parmse.string_length == NULL_TREE - && e->ts.type == BT_PROCEDURE - && e->symtree->n.sym->ts.type == BT_CHARACTER - && e->symtree->n.sym->ts.cl->length != NULL) - { - gfc_conv_const_charlen (e->symtree->n.sym->ts.cl); - parmse.string_length = e->symtree->n.sym->ts.cl->backend_decl; - } + gfc_add_block_to_block (&se->pre, &parmse.pre); + gfc_add_block_to_block (&post, &parmse.post); /* Character strings are passed as two parameters, a length and a pointer. */ |