From: fxcoudert <fxcoudert@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 19 May 2008 15:57:28 +0000 (+0000)
Subject: 	PR fortran/36265
X-Git-Tag: upstream/4.9.2~42104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51bd64793975eddff040d7f96228a9141a97ac97;p=platform%2Fupstream%2Flinaro-gcc.git

	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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135576 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3b1617e..4361428 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
 2008-05-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
+	PR fortran/36265
+	* trans-expr.c (gfc_conv_string_tmp): Pick the correct type for
+	the temporary variable.
+
+2008-05-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
 	* simplify.c (gfc_simplify_dble, gfc_simplify_real): Initialize
 	result variable to avoid warnings.
 
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 482e8b1..6deaad6 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 e334077..8da6d5f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2008-05-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
+	PR fortran/36265
+	* gfortran.dg/char_length_11.f90: New test.
+
+2008-05-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
 	* gfortran.dg/widechar_intrinsics_5.f90: Add dg-do directive and
 	use -fbackslash option.
 
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 0000000..e745c12
--- /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