diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2007-11-18 17:14:40 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2007-11-18 17:14:40 +0000 |
| commit | 129c14bd4c1b3a043bc2bb2c80b1c2030ea72713 (patch) | |
| tree | 742fad5e58bb710c4972a11291e8b6bfb579fe21 /gcc/fortran | |
| parent | b5bf3e4d2eb38960cc2c6ac3b4b6dda7fe27fd43 (diff) | |
| download | gcc-129c14bd4c1b3a043bc2bb2c80b1c2030ea72713.zip gcc-129c14bd4c1b3a043bc2bb2c80b1c2030ea72713.tar.gz gcc-129c14bd4c1b3a043bc2bb2c80b1c2030ea72713.tar.bz2 | |
re PR fortran/31608 (wrong types in character array/scalar binop)
2007-11-18 Paul Thomas <pault@gcc.gnu.org>
PR fortran/31608
* trans-array.c (gfc_conv_expr_descriptor): Remove exception
for indirect references in the call to gfc_trans_scalar_assign.
* trans-expr.c (gfc_conv_string_parameter): Instead of asserting
that the expression is not an indirect reference, cast it to a
pointer type of the length given by se->string_length.
2007-11-18 Paul Thomas <pault@gcc.gnu.org>
PR fortran/31608
* gfortran.dg/char_cast_2.f90: New test based on achar_4.f90.
From-SVN: r130271
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 13 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 11 |
3 files changed, 22 insertions, 11 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f95ca66..0155ed1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2007-11-18 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/31608 + * trans-array.c (gfc_conv_expr_descriptor): Remove exception + for indirect references in the call to gfc_trans_scalar_assign. + * trans-expr.c (gfc_conv_string_parameter): Instead of asserting + that the expression is not an indirect reference, cast it to a + pointer type of the length given by se->string_length. + 2007-11-18 Tobias Burnus <burnus@net-b.de> PR fortran/34137 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index c418ae2..315279a 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -4734,15 +4734,10 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) gfc_add_block_to_block (&block, &rse.pre); gfc_add_block_to_block (&block, &lse.pre); - if (TREE_CODE (rse.expr) != INDIRECT_REF) - { - lse.string_length = rse.string_length; - tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, true, - expr->expr_type == EXPR_VARIABLE); - gfc_add_expr_to_block (&block, tmp); - } - else - gfc_add_modify_expr (&block, lse.expr, rse.expr); + lse.string_length = rse.string_length; + tmp = gfc_trans_scalar_assign (&lse, &rse, expr->ts, true, + expr->expr_type == EXPR_VARIABLE); + gfc_add_expr_to_block (&block, tmp); /* Finish the copying loops. */ gfc_trans_scalarizing_loops (&loop, &block); diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index a1f1ee9..ec5a73a 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -3597,8 +3597,15 @@ gfc_conv_string_parameter (gfc_se * se) type = TREE_TYPE (se->expr); if (TYPE_STRING_FLAG (type)) { - gcc_assert (TREE_CODE (se->expr) != INDIRECT_REF); - se->expr = gfc_build_addr_expr (pchar_type_node, se->expr); + if (TREE_CODE (se->expr) != INDIRECT_REF) + se->expr = gfc_build_addr_expr (pchar_type_node, se->expr); + else + { + type = gfc_get_character_type_len (gfc_default_character_kind, + se->string_length); + type = build_pointer_type (type); + se->expr = gfc_build_addr_expr (type, se->expr); + } } gcc_assert (POINTER_TYPE_P (TREE_TYPE (se->expr))); |