diff options
| author | Tobias Burnus <burnus@net-b.de> | 2007-11-25 23:02:53 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2007-11-25 23:02:53 +0100 |
| commit | bfd61955ce652ec1c4bb1228fcf43e46424ebf41 (patch) | |
| tree | 7450a7309aad864e7a3b61af66cf21d340b9b297 /gcc/fortran | |
| parent | a4b7c9cd4c2df850eda972f7257ec0cdc6e60aae (diff) | |
| download | gcc-bfd61955ce652ec1c4bb1228fcf43e46424ebf41.zip gcc-bfd61955ce652ec1c4bb1228fcf43e46424ebf41.tar.gz gcc-bfd61955ce652ec1c4bb1228fcf43e46424ebf41.tar.bz2 | |
re PR fortran/34079 (Bind(C): Character argument/return value problems)
2007-11-25 Tobias Burnus <burnus@net-b.de>
PR fortran/34079
* trans-types.c (gfc_return_by_reference,
gfc_get_function_type): Do not return result of
character-returning bind(C) functions as argument.
* trans-expr.c (gfc_conv_function_call): Ditto.
2007-11-25 Tobias Burnus <burnus@net-b.de>
PR fortran/34079
* gfortran.dg/bind_c_usage_10_c.c: Fix comment.
* gfortran.dg/bind_c_usage_16.f03: New.
* gfortran.dg/bind_c_usage_16_c.c: New.
From-SVN: r130414
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 9 | ||||
| -rw-r--r-- | gcc/fortran/trans-types.c | 18 |
3 files changed, 26 insertions, 9 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 94ebe8e..2b4799a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2007-11-25 Tobias Burnus <burnus@net-b.de> + + PR fortran/34079 + * trans-types.c (gfc_return_by_reference, + gfc_get_function_type): Do not return result of + character-returning bind(C) functions as argument. + * trans-expr.c (gfc_conv_function_call): Ditto. + 2007-11-25 Jerry DeLisle <jvdelisle@gcc.gnu.org> PR fortran/34175 diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 231fef5..813e43d 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -2586,6 +2586,15 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym, && !sym->attr.always_explicit) se->expr = fold_convert (gfc_get_real_type (sym->ts.kind), se->expr); + /* Bind(C) character variables may have only length 1. */ + if (sym->ts.type == BT_CHARACTER && sym->attr.is_bind_c) + { + gcc_assert (sym->ts.cl->length + && sym->ts.cl->length->expr_type == EXPR_CONSTANT + && mpz_cmp_si (sym->ts.cl->length->value.integer, 1)); + se->string_length = build_int_cst (gfc_charlen_type_node, 1); + } + /* A pure function may still have side-effects - it may modify its parameters. */ TREE_SIDE_EFFECTS (se->expr) = 1; diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index 5202539..ff5643b 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -1853,7 +1853,7 @@ gfc_return_by_reference (gfc_symbol * sym) if (sym->attr.dimension) return 1; - if (sym->ts.type == BT_CHARACTER) + if (sym->ts.type == BT_CHARACTER && !sym->attr.is_bind_c) return 1; /* Possibly return complex numbers by reference for g77 compatibility. @@ -1942,17 +1942,17 @@ gfc_get_function_type (gfc_symbol * sym) typelist = gfc_chainon_list (typelist, gfc_array_index_type); } + if (sym->result) + arg = sym->result; + else + arg = sym; + + if (arg->ts.type == BT_CHARACTER) + gfc_conv_const_charlen (arg->ts.cl); + /* Some functions we use an extra parameter for the return value. */ if (gfc_return_by_reference (sym)) { - if (sym->result) - arg = sym->result; - else - arg = sym; - - if (arg->ts.type == BT_CHARACTER) - gfc_conv_const_charlen (arg->ts.cl); - type = gfc_sym_type (arg); if (arg->ts.type == BT_COMPLEX || arg->attr.dimension |