From: pault <pault@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 22 Sep 2018 10:21:25 +0000 (+0000)
Subject: 2018-09-22  Paul Thomas  <pault@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e54bf0ea93266970bca1a6a4fd29913b835306f;p=thirdparty%2Fgcc.git

2018-09-22  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/85603
	* trans-array.c (gfc_alloc_allocatable_for_assignment): Test
	the charlen backend_decl before using the VAR_P macro.

2018-09-22  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/85603
	* gfortran.dg/deferred_character_23.f90 : New test.



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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e6bf42949481..14a1de1da938 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-22  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/85603
+	* trans-array.c (gfc_alloc_allocatable_for_assignment): Test
+	the charlen backend_decl before using the VAR_P macro.
+
 2018-09-21  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/77325
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 9e00eb0474fa..0d699edba93c 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -9950,7 +9950,8 @@ gfc_alloc_allocatable_for_assignment (gfc_loopinfo *loop,
     {
       if (expr2->ts.deferred)
 	{
-	  if (VAR_P (expr2->ts.u.cl->backend_decl))
+	  if (expr2->ts.u.cl->backend_decl
+	      && VAR_P (expr2->ts.u.cl->backend_decl))
 	    tmp = expr2->ts.u.cl->backend_decl;
 	  else
 	    tmp = rss->info->string_length;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7cba59c83470..78800e898c94 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-09-22  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran/85603
+	* gfortran.dg/deferred_character_23.f90 : New test.
+
 2018-09-21  Jeff Law  <law@redhat.com>
 
 	* gcc.dg/tree-ssa/vrp113.c: Disable EVRP.
diff --git a/gcc/testsuite/gfortran.dg/deferred_character_23.f90 b/gcc/testsuite/gfortran.dg/deferred_character_23.f90
new file mode 100644
index 000000000000..c018334688e2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/deferred_character_23.f90
@@ -0,0 +1,22 @@
+! { dg-do run }
+!
+! Tests the fix for PR85603.
+!
+! Contributed by Walt Spector  <w6ws@earthlink.net>
+!
+program strlen_bug
+  implicit none
+
+  character(:), allocatable :: strings(:)
+  integer :: maxlen
+
+  strings = [ character(32) ::  &
+      'short',  &
+      'somewhat longer' ]
+  maxlen = maxval (len_trim (strings))
+  if (maxlen .ne. 15) stop 1
+  strings = strings(:)(:maxlen) ! Used to ICE
+  if (any (strings .ne. ['short          ','somewhat longer'])) stop 2
+
+  deallocate (strings)          ! To check for memory leaks
+end program