From: Harald Anlauf <anlauf@gmx.de>
Date: Thu, 12 Dec 2019 20:46:03 +0000 (+0000)
Subject: backport: re PR fortran/92898 (ICE in gfc_check_is_contiguous, at fortran/check.c... 
X-Git-Tag: releases/gcc-9.3.0~319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70e28f6c4a42efc2ef1f5c0aef474aab0ab8c790;p=thirdparty%2Fgcc.git

backport: re PR fortran/92898 (ICE in gfc_check_is_contiguous, at fortran/check.c:7157)

2019-12-12  Harald Anlauf  <anlauf@gmx.de>

	Backport from mainline
	PR fortran/92898
	* check.c (gfc_check_is_contiguous): Simplify check to handle
	arbitrary NULL() argument.

	PR fortran/92898
	* gfortran.dg/pr92898.f90: New test.

From-SVN: r279315
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 22e34ff59d7b..6f9baa48a8f8 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2019-12-12  Harald Anlauf  <anlauf@gmx.de>
+
+	Backport from mainline
+	PR fortran/92898
+	* check.c (gfc_check_is_contiguous): Simplify check to handle
+	arbitrary NULL() argument.
+
 2019-12-11 Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/92897
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 4ef354f0a6ef..6d37bbb8fd2a 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -6578,8 +6578,7 @@ gfc_check_ttynam_sub (gfc_expr *unit, gfc_expr *name)
 bool
 gfc_check_is_contiguous (gfc_expr *array)
 {
-  if (array->expr_type == EXPR_NULL
-      && array->symtree->n.sym->attr.pointer == 1)
+  if (array->expr_type == EXPR_NULL)
     {
       gfc_error ("Actual argument at %L of %qs intrinsic shall be an "
 		 "associated pointer", &array->where, gfc_current_intrinsic);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4b1d6361476f..3ec5f55852b1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-12-12  Harald Anlauf  <anlauf@gmx.de>
+
+	Backport from mainline
+	PR fortran/92898
+	* gfortran.dg/pr92898.f90: New test.
+
 2019-12-11 Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/92897
@@ -10,7 +16,7 @@
 2019-12-02  Sandra Loosemore  <sandra@codesourcery.com>
 
 	Fix bugs relating to flexibly-sized objects in nios2 backend.
-	
+
 	PR target/92499
 	* gcc.target/nios2/pr92499-1.c: New.
 	* gcc.target/nios2/pr92499-2.c: New.
diff --git a/gcc/testsuite/gfortran.dg/pr92898.f90 b/gcc/testsuite/gfortran.dg/pr92898.f90
new file mode 100644
index 000000000000..1c831eda1bba
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr92898.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! PR fortran/92898
+! Code contributed by Gerhard Steinmetz
+program p
+  print *, is_contiguous (null())     ! { dg-error "shall be an associated" }
+end