Fix fortran/93686 -- ICE matching data statements with derived-type pointers.

gcc/fortran/ChangeLog:

2020-04-06  Fritz Reese  <foreese@gcc.gnu.org>

	Backport from master
	Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/93686
	* decl.c (gfc_match_data): Handle data matching for derived type
	pointers.

gcc/testsuite/ChangeLog:

2020-04-06  Fritz Reese  <foreese@gcc.gnu.org>

	Backport from master.
	Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/93686
	* gfortran.dg/pr93686_1.f90: New test.
	* gfortran.dg/pr93686_2.f90: Likewise.
	* gfortran.dg/pr93686_3.f90: Likewise.
	* gfortran.dg/pr93686_4.f90: Likewise.

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 744511a5cb8ee2e19ac503c130f72069860f0cb9..68a85ed026c080b3ab3256551684122dd4275ce4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,12 @@
+2020-04-06  Fritz Reese  <foreese@gcc.gnu.org>
+
+       Backport from master
+       Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/93686
+       * decl.c (gfc_match_data): Handle data matching for derived type
+       pointers.
+
 2020-04-02  Mark Eggleston <markeggleston@gcc.gnu.org>
 
        Backport from master

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 78ea32a37709ef663e4158b20141cfba377db5e2..86226b63ecc56261038257339f003e4e5eca7043 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -668,6 +668,10 @@ gfc_match_data (void)
          /* F2008:C567 (R536) A data-i-do-object or a variable that appears
             as a data-stmt-object shall not be an object designator in which
             a pointer appears other than as the entire rightmost part-ref.  */
+         if (!e->ref && e->ts.type == BT_DERIVED
+             && e->symtree->n.sym->attr.pointer)
+           goto partref;
+
          ref = e->ref;
          if (e->symtree->n.sym->ts.type == BT_DERIVED
              && e->symtree->n.sym->attr.pointer

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ab5f3b16775575275fc710c56273c96ad021c545..cb98ddd10b20cff17e427b447c5c7fa48406b392 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2020-04-06  Fritz Reese  <foreese@gcc.gnu.org>
+
+       Backport from master.
+       Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/93686
+       * gfortran.dg/pr93686_1.f90: New test.
+       * gfortran.dg/pr93686_2.f90: Likewise.
+       * gfortran.dg/pr93686_3.f90: Likewise.
+       * gfortran.dg/pr93686_4.f90: Likewise.
+
 2020-04-05  Marek Polacek  <polacek@redhat.com>
 
        2020-02-06  Marek Polacek  <polacek@redhat.com>

diff --git a/gcc/testsuite/gfortran.dg/pr93686_1.f90 b/gcc/testsuite/gfortran.dg/pr93686_1.f90
new file mode 100644 (file)
index 0000000..0e7560a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr93686_1.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! PR fortran/93686
+
+program p
+   type t
+      integer :: a
+   end type
+   type(t), pointer :: x
+   data x /t(2)/ ! { dg-error "part-ref with pointer attribute near ... is not rightmost part-ref of data-stmt-object" }
+end

diff --git a/gcc/testsuite/gfortran.dg/pr93686_2.f90 b/gcc/testsuite/gfortran.dg/pr93686_2.f90
new file mode 100644 (file)
index 0000000..aac4d91
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr93686_2.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! PR fortran/93686
+
+program p
+   type t
+      integer :: a = 1
+   end type
+   type(t), pointer :: x
+   data x /t(2)/ ! { dg-error "part-ref with pointer attribute near ... is not rightmost part-ref of data-stmt-object" }
+end

diff --git a/gcc/testsuite/gfortran.dg/pr93686_3.f90 b/gcc/testsuite/gfortran.dg/pr93686_3.f90
new file mode 100644 (file)
index 0000000..5b57040
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr93686_3.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! PR fortran/93686
+
+program p
+   type t
+   end type
+   type(t), pointer :: x
+   data x /t()/ ! { dg-error "part-ref with pointer attribute near ... is not rightmost part-ref of data-stmt-object" }
+end

diff --git a/gcc/testsuite/gfortran.dg/pr93686_4.f90 b/gcc/testsuite/gfortran.dg/pr93686_4.f90
new file mode 100644 (file)
index 0000000..ff3ae76
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr93686_4.f90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR fortran/93686
+
+type t
+end type
+type(t), pointer :: x
+data x / ! { dg-error "part-ref with pointer attribute near ... is not rightmost part-ref of data-stmt-object" }
+end