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 cdbb6574f4b300ebb7db15a8afe1c87999f49613..63fc406a6e061da3d9bd29bae0ebd089c455984e 100644 (file)
--- 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 139ce880534d5d0c0049a1a3d23485bf342cf9a6..6e580700b77f3185c20622028a64a97b44b9d9ab 100644 (file)
--- 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 0d0ae553c128979ce784c14d8dce59cf4d3ab671..6f0fb714be0c92e2cb38dec72924b5822e82978d 100644 (file)
--- 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 (file)
index 0000000..0f9584a
--- /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