From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Fri, 11 May 2018 18:35:20 +0000 (+0000)
Subject: re PR fortran/70870 (Segmentation violation in gfc_assign_data_value)
X-Git-Tag: releases/gcc-6.5.0~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1b0c33e64ac6a82517e00df8b4af5a7df9343d8;p=thirdparty%2Fgcc.git

re PR fortran/70870 (Segmentation violation in gfc_assign_data_value)

2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/70870
	Backport from trunk
	* data.c (gfc_assign_data_value): Check that a data object does
	not also have default initialization.

2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/70870
	Backport from trunk
	* gfortran.dg/pr70870_1.f90: New test.

From-SVN: r260181
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cdbb6574f4b3..63fc406a6e06 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/70870
+	Backport from trunk
+	* data.c (gfc_assign_data_value): Check that a data object does
+	not also have default initialization.
+
 2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/85521
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index 139ce880534d..6e580700b77f 100644
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -489,6 +489,15 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index,
     }
   else
     {
+      if (lvalue->ts.type == BT_DERIVED
+	  && gfc_has_default_initializer (lvalue->ts.u.derived))
+	{
+	  gfc_error ("Nonpointer object %qs with default initialization "
+		     "shall not appear in a DATA statement at %L", 
+		     symbol->name, &lvalue->where);
+	  return false;
+	}
+
       /* Overwriting an existing initializer is non-standard but usually only
 	 provokes a warning from other compilers.  */
       if (init != NULL)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0d0ae553c128..6f0fb714be0c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/70870
+	Backport from trunk
+	* gfortran.dg/pr70870_1.f90: New test.
+
 2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/85521
diff --git a/gcc/testsuite/gfortran.dg/pr70870_1.f90 b/gcc/testsuite/gfortran.dg/pr70870_1.f90
new file mode 100644
index 000000000000..0f9584a36dbf
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr70870_1.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/70870
+! Contributed by Vittorio Zecca <zeccav at gmail dot com >
+      type t
+       integer :: g=0   ! default initialization
+      end type
+      type(t) :: v2
+      data v2/t(2)/     ! { dg-error "default initialization shall not" }
+      end