diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-06-12 20:35:00 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-06-12 20:35:00 +0200 |
| commit | 8fdcb6a997e7125d155b79947a1793f01611527b (patch) | |
| tree | 031a2f7aac4534d08879ee1f3ad488ddc5eec811 /gcc/fortran/trans-intrinsic.c | |
| parent | 551a6341d5d0fed634c71f710bdae6d7b6b1491e (diff) | |
| download | gcc-8fdcb6a997e7125d155b79947a1793f01611527b.zip gcc-8fdcb6a997e7125d155b79947a1793f01611527b.tar.gz gcc-8fdcb6a997e7125d155b79947a1793f01611527b.tar.bz2 | |
gfortran.h (gfc_copy_formal_args_intr): Update prototype.
2014-06-12 Tobias Burnus <burnus@net-b.de>
* gfortran.h (gfc_copy_formal_args_intr): Update prototype.
* symbol.c (gfc_copy_formal_args_intr): Handle the case
that absent optional arguments should be ignored.
* trans-intrinsic.c (gfc_get_symbol_for_expr): Ditto.
(gfc_conv_intrinsic_funcall,
conv_generic_with_optional_char_arg): Update call.
* resolve.c (gfc_resolve_intrinsic): Ditto.
From-SVN: r211587
Diffstat (limited to 'gcc/fortran/trans-intrinsic.c')
| -rw-r--r-- | gcc/fortran/trans-intrinsic.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index a76d0f7..2ac39f6 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -2371,7 +2371,7 @@ gfc_conv_intrinsic_minmax_char (gfc_se * se, gfc_expr * expr, int op) has the generic name. */ static gfc_symbol * -gfc_get_symbol_for_expr (gfc_expr * expr) +gfc_get_symbol_for_expr (gfc_expr * expr, bool ignore_optional) { gfc_symbol *sym; @@ -2394,7 +2394,9 @@ gfc_get_symbol_for_expr (gfc_expr * expr) sym->as->rank = expr->rank; } - gfc_copy_formal_args_intr (sym, expr->value.function.isym); + gfc_copy_formal_args_intr (sym, expr->value.function.isym, + ignore_optional ? expr->value.function.actual + : NULL); return sym; } @@ -2413,7 +2415,7 @@ gfc_conv_intrinsic_funcall (gfc_se * se, gfc_expr * expr) else gcc_assert (expr->rank == 0); - sym = gfc_get_symbol_for_expr (expr); + sym = gfc_get_symbol_for_expr (expr, se->ignore_optional); /* Calls to libgfortran_matmul need to be appended special arguments, to be able to call the BLAS ?gemm functions if required and possible. */ @@ -4584,7 +4586,8 @@ conv_generic_with_optional_char_arg (gfc_se* se, gfc_expr* expr, } /* Build the call itself. */ - sym = gfc_get_symbol_for_expr (expr); + gcc_assert (!se->ignore_optional); + sym = gfc_get_symbol_for_expr (expr, false); gfc_conv_procedure_call (se, sym, expr->value.function.actual, expr, append_args); gfc_free_symbol (sym); |