diff options
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index d504043..3505236 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -447,15 +447,21 @@ gfc_conv_variable (gfc_se * se, gfc_expr * expr) separately. */ if (sym->ts.type == BT_CHARACTER) { - /* Dereference character pointer dummy arguments + /* Dereference character pointer dummy arguments or results. */ if ((sym->attr.pointer || sym->attr.allocatable) && (sym->attr.dummy || sym->attr.function || sym->attr.result)) se->expr = build_fold_indirect_ref (se->expr); + + /* A character with VALUE attribute needs an address + expression. */ + if (sym->attr.value) + se->expr = build_fold_addr_expr (se->expr); + } - else + else if (!sym->attr.value) { /* Dereference non-character scalar dummy arguments. */ if (sym->attr.dummy && !sym->attr.dimension) @@ -2005,19 +2011,26 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym, argss = gfc_walk_expr (e); if (argss == gfc_ss_terminator) - { - gfc_conv_expr_reference (&parmse, e); + { parm_kind = SCALAR; - if (fsym && fsym->attr.pointer - && e->expr_type != EXPR_NULL) - { - /* Scalar pointer dummy args require an extra level of - indirection. The null pointer already contains - this level of indirection. */ - parm_kind = SCALAR_POINTER; - parmse.expr = build_fold_addr_expr (parmse.expr); - } - } + if (fsym && fsym->attr.value) + { + gfc_conv_expr (&parmse, e); + } + else + { + gfc_conv_expr_reference (&parmse, e); + if (fsym && fsym->attr.pointer + && e->expr_type != EXPR_NULL) + { + /* Scalar pointer dummy args require an extra level of + indirection. The null pointer already contains + this level of indirection. */ + parm_kind = SCALAR_POINTER; + parmse.expr = build_fold_addr_expr (parmse.expr); + } + } + } else { /* If the procedure requires an explicit interface, the actual |