aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/arith.c
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2008-08-23 20:49:43 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2008-08-23 20:49:43 +0200
commit3434e9a415d79a15315b333d03101dfa549b09b9 (patch)
treeda9f4000e03ed395a8392d63843a1ee0d0306e9f /gcc/fortran/arith.c
parent12ba225d76f5e210fe59c3d5f8fd6615fef2d118 (diff)
downloadgcc-3434e9a415d79a15315b333d03101dfa549b09b9.zip
gcc-3434e9a415d79a15315b333d03101dfa549b09b9.tar.gz
gcc-3434e9a415d79a15315b333d03101dfa549b09b9.tar.bz2
re PR fortran/37076 (Concatenation of KIND=4 strings with KIND=4 parameters fails)
2008-08-23 Tobias Burnus <burnus@net-b.de> PR fortran/37076 * arith.c (gfc_arith_concat): Fix concat of kind=4 strings. 2008-08-23 Tobias Burnus <burnus@net-b.de> PR fortran/37076 * gfortran.dg/widechar_9.f90: New. From-SVN: r139521
Diffstat (limited to 'gcc/fortran/arith.c')
-rw-r--r--gcc/fortran/arith.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index 2e21b84..34780b6 100644
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -1069,7 +1069,8 @@ gfc_arith_concat (gfc_expr *op1, gfc_expr *op2, gfc_expr **resultp)
gfc_expr *result;
int len;
- result = gfc_constant_result (BT_CHARACTER, gfc_default_character_kind,
+ gcc_assert (op1->ts.kind == op2->ts.kind);
+ result = gfc_constant_result (BT_CHARACTER, op1->ts.kind,
&op1->where);
len = op1->value.character.length + op2->value.character.length;