From: Thomas Koenig <tkoenig@gcc.gnu.org>
Date: Fri, 1 Dec 2017 18:06:31 +0000 (+0000)
Subject: re PR fortran/83224 (creating character array from elements shorter than declared... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1cde289f1cf4d06815dbef089e969f7be0294178;p=gcc.git

re PR fortran/83224 (creating character array from elements shorter than declared does not pad with whitespace properly and aborts)

2017-12-01  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/83224
	* frontend-passes.c (create_var): Also handle
	character arrays, handling deferred lenghts.

2017-12-01  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/83224
	* gfortran.dg/dependency_51.f90: New test.

From-SVN: r255331
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 75a2b7a4108..b7f8a5856e4 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/83224
+	* frontend-passes.c (create_var): Also handle
+	character arrays, handling deferred lenghts.
+
 2017-12-01  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/82605
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 80d8767fc03..33820585c86 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -767,7 +767,7 @@ create_var (gfc_expr * e, const char *vname)
     }
 
   deferred = 0;
-  if (e->ts.type == BT_CHARACTER && e->rank == 0)
+  if (e->ts.type == BT_CHARACTER)
     {
       gfc_expr *length;
 
@@ -778,6 +778,8 @@ create_var (gfc_expr * e, const char *vname)
       else
 	{
 	  symbol->attr.allocatable = 1;
+	  symbol->ts.u.cl->length = NULL;
+	  symbol->ts.deferred = 1;
 	  deferred = 1;
 	}
     }
@@ -790,7 +792,7 @@ create_var (gfc_expr * e, const char *vname)
 
   result = gfc_get_expr ();
   result->expr_type = EXPR_VARIABLE;
-  result->ts = e->ts;
+  result->ts = symbol->ts;
   result->ts.deferred = deferred;
   result->rank = e->rank;
   result->shape = gfc_copy_shape (e->shape, e->rank);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cd00f52b574..41092f02c70 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-01  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/83224
+	* gfortran.dg/dependency_51.f90: New test.
+
 2017-12-01  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/82605
diff --git a/gcc/testsuite/gfortran.dg/dependency_51.f90 b/gcc/testsuite/gfortran.dg/dependency_51.f90
new file mode 100644
index 00000000000..62b76e1543a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dependency_51.f90
@@ -0,0 +1,14 @@
+! { dg-do  run }
+! PR 83224 - dependency mishandling with an array constructor
+! Original test case by Urban Jost
+program dusty_corner
+  implicit none
+  character(len=:),allocatable :: words(:)
+  integer :: n
+
+  words=[character(len=3) :: 'one', 'two']
+  n = 5
+  words=[character(len=n) :: words, 'three']
+  if (any(words /= [ "one  ", "two  ", "three"])) call abort
+
+end program dusty_corner