From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Thu, 10 May 2018 22:43:00 +0000 (+0000)
Subject: re PR fortran/70870 (Segmentation violation in gfc_assign_data_value)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b24db31a41695cfd4adcee73f5edd73ae001517;p=gcc.git

re PR fortran/70870 (Segmentation violation in gfc_assign_data_value)

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

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

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

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

From-SVN: r260138
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c41804ea4c7..aedcb2d9608 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-10  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/70870
+	* data.c (gfc_assign_data_value): Check that a data object does
+	not also have default initialization.
+
 2018-05-10  Marek Polacek  <polacek@redhat.com>
 
 	PR fortran/85735
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c
index fdd7052e6a4..780a5ad9564 100644
--- a/gcc/fortran/data.c
+++ b/gcc/fortran/data.c
@@ -491,6 +491,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 6d906667a21..64014c48585 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-10  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/70870
+	* gfortran.dg/pr70870_1.f90: New test.
+
 2018-05-10  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.target/i386/xgetsetbv.c: Check also variable arguments.
diff --git a/gcc/testsuite/gfortran.dg/pr70870_1.f90 b/gcc/testsuite/gfortran.dg/pr70870_1.f90
new file mode 100644
index 00000000000..0f9584a36db
--- /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