diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2006-12-22 20:49:00 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2006-12-22 20:49:00 +0000 |
| commit | 54129a64cd5ec8254cdf7cc735537f14cb3c27d7 (patch) | |
| tree | 4e9caba7e2118566a1520357042b647f701edfe8 /gcc/fortran/trans-array.c | |
| parent | 2b0017242d6888e91146422831551f64e9854698 (diff) | |
| download | gcc-54129a64cd5ec8254cdf7cc735537f14cb3c27d7.zip gcc-54129a64cd5ec8254cdf7cc735537f14cb3c27d7.tar.gz gcc-54129a64cd5ec8254cdf7cc735537f14cb3c27d7.tar.bz2 | |
re PR fortran/25818 ([4.1 only] Problem with handling optional and entry master arguments)
2006-12-22 Paul Thomas <pault@gcc.gnu.org>
PR fortran/25818
* trans-array.c (gfc_trans_g77_array): If the variable is
optional or not always present, make the statement conditional
on presence of the argument.
* gfortran.h : Add symbol_attribute not_always_present.
* resolve.c (check_argument_lists): New function to check if
arguments are not present in all entries.
PR fortran/30084
* module.c (mio_component_ref): Move treatment of unique name
variables, during output, to fix_mio_expr.
(fix_mio_expr): New function that fixes defective expressions
before they are written to the module file.
(mio_expr): Call the new function.
(resolve_entries): Call check_argument_lists.
2006-12-22 Paul Thomas <pault@gcc.gnu.org>
PR fortran/25818
* gfortran.dg/entry_array_specs_2.f: New test.
PR fortran/30084
* gfortran.dg/nested_modules_6.f90: New test.
From-SVN: r120155
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 56e69a3..10243fe 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -3767,6 +3767,7 @@ gfc_trans_g77_array (gfc_symbol * sym, tree body) locus loc; tree offset; tree tmp; + tree stmt; stmtblock_t block; gfc_get_backend_locus (&loc); @@ -3796,13 +3797,21 @@ gfc_trans_g77_array (gfc_symbol * sym, tree body) tmp = convert (TREE_TYPE (parm), GFC_DECL_SAVED_DESCRIPTOR (parm)); gfc_add_modify_expr (&block, parm, tmp); } - tmp = gfc_finish_block (&block); + stmt = gfc_finish_block (&block); gfc_set_backend_locus (&loc); gfc_start_block (&block); + /* Add the initialization code to the start of the function. */ - gfc_add_expr_to_block (&block, tmp); + + if (sym->attr.optional || sym->attr.not_always_present) + { + tmp = gfc_conv_expr_present (sym); + stmt = build3_v (COND_EXPR, tmp, stmt, build_empty_stmt ()); + } + + gfc_add_expr_to_block (&block, stmt); gfc_add_expr_to_block (&block, body); return gfc_finish_block (&block); |