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/trans-expr.c | |
| 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/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 11 |
1 files changed, 9 insertions, 2 deletions
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))); |