From 16a55411b4b374fbd2274ca4f8a4d9a2127b120c Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Mon, 19 May 2008 15:57:28 +0000 Subject: [PATCH] re PR fortran/36265 (character issue with gfortran) PR fortran/36265 * trans-expr.c (gfc_conv_string_tmp): Pick the correct type for the temporary variable. * gfortran.dg/char_length_11.f90: New test. From-SVN: r135576 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-expr.c | 7 ++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/char_length_11.f90 | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/char_length_11.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3b1617eed65..436142879da 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2008-05-19 Francois-Xavier Coudert + + PR fortran/36265 + * trans-expr.c (gfc_conv_string_tmp): Pick the correct type for + the temporary variable. + 2008-05-19 Francois-Xavier Coudert * simplify.c (gfc_simplify_dble, gfc_simplify_real): Initialize diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 482e8b14ff2..6deaad65f04 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -977,7 +977,12 @@ gfc_conv_string_tmp (gfc_se * se, tree type, tree len) tmp = fold_build2 (MINUS_EXPR, gfc_charlen_type_node, len, build_int_cst (gfc_charlen_type_node, 1)); tmp = build_range_type (gfc_array_index_type, gfc_index_zero_node, tmp); - tmp = build_array_type (TREE_TYPE (TREE_TYPE (type)), tmp); + + if (TREE_CODE (TREE_TYPE (type)) == ARRAY_TYPE) + tmp = build_array_type (TREE_TYPE (TREE_TYPE (type)), tmp); + else + tmp = build_array_type (TREE_TYPE (type), tmp); + var = gfc_create_var (tmp, "str"); var = gfc_build_addr_expr (type, var); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e334077a0a5..8da6d5f1622 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-05-19 Francois-Xavier Coudert + + PR fortran/36265 + * gfortran.dg/char_length_11.f90: New test. + 2008-05-19 Francois-Xavier Coudert * gfortran.dg/widechar_intrinsics_5.f90: Add dg-do directive and diff --git a/gcc/testsuite/gfortran.dg/char_length_11.f90 b/gcc/testsuite/gfortran.dg/char_length_11.f90 new file mode 100644 index 00000000000..e745c123e3a --- /dev/null +++ b/gcc/testsuite/gfortran.dg/char_length_11.f90 @@ -0,0 +1,5 @@ +! { dg-do compile } + + character(len=*), parameter :: s = "foo" + write (*,*) adjustr(s(:)) +end -- 2.30.2