From: Harald Anlauf <anlauf@gmx.de>
Date: Thu, 18 Jan 2018 01:04:36 +0000 (+0000)
Subject: Back from mainline PR fortran/83874
X-Git-Tag: releases/gcc-6.5.0~578
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993fbff336b042c7606dcc4de776a8c4b0712a10;p=thirdparty%2Fgcc.git

Back from mainline PR fortran/83874

2018-01-17  Harald Anlauf  <anlauf@gmx.de>

	Back from mainline
	PR fortran/83874
	* decl.c (add_init_expr_to_sym): Do not dereference NULL pointer.

2018-01-17  Harald Anlauf  <anlauf@gmx.de>

	Back from mainline
	PR fortran/83874
	* gfortran.dg/pr83874.f90: New test.

From-SVN: r256830
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ccad53b1b86b..13d55bddca2a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-17  Harald Anlauf  <anlauf@gmx.de>
+
+	Back from mainline
+	PR fortran/83874
+	* decl.c (add_init_expr_to_sym): Do not dereference NULL pointer.
+
 2018-01-13  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	Backport from mainline
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 080492b3f4f0..e9a6440ff2af 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1692,7 +1692,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
 		    }
 		  else if (init->expr_type == EXPR_ARRAY)
 		    {
-		      if (init->ts.u.cl)
+		      if (init->ts.u.cl && init->ts.u.cl->length)
 			clen = mpz_get_si (init->ts.u.cl->length->value.integer);
 		      else if (init->value.constructor)
 			{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a489731028c..6dc3c0bb3758 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-17  Harald Anlauf  <anlauf@gmx.de>
+
+	Back from mainline
+	PR fortran/83874
+	* gfortran.dg/pr83874.f90: New test.
+
 2018-01-16  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	Backport from mainline
diff --git a/gcc/testsuite/gfortran.dg/pr83874.f90 b/gcc/testsuite/gfortran.dg/pr83874.f90
new file mode 100644
index 000000000000..d1bdc97b783d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr83874.f90
@@ -0,0 +1,19 @@
+! { dg-do run }
+! PR fortran/83874
+! There was an ICE while initializing the character arrays
+!
+! Contributed by Harald Anlauf <anlauf@gmx.de>
+!
+program charinit
+  implicit none
+  type t
+     character(len=1) :: name
+  end type t
+  type(t), parameter :: z(2)= [ t ('a'), t ('b') ]
+  character(len=1), parameter :: names1(*) = z% name
+  character(len=*), parameter :: names2(2) = z% name
+  character(len=*), parameter :: names3(*) = z% name
+  if (.not. (names1(1) == "a" .and. names1(2) == "b")) call abort ()
+  if (.not. (names2(1) == "a" .and. names2(2) == "b")) call abort ()
+  if (.not. (names3(1) == "a" .and. names3(2) == "b")) call abort ()
+end program charinit