re PR fortran/91641 (ICE in gfc_conv_is_contiguous_expr, at fortran/trans-intrinsic...

2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91641
	* check.c (gfc_check_is_contiguous): null() cannot be an actual
	argument to is_contiguous().

2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/91641
	* gfortran.dg/pr91641.f90: New test.

From-SVN: r276272

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d4f39cc6dfaf1872b5d7fe6e6af56b17438d820d..694fc3278b0e958c8698d404632c12f65f4518da 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/91641
+       * check.c (gfc_check_is_contiguous): null() cannot be an actual
+       argument to is_contiguous().
+
 2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/91714

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index a04f9fbb2a9925256695f8994261412056493651..98203bcd8397e5f69b0f6edaea00aab7ccdfdb1d 100644 (file)
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -7098,6 +7098,14 @@ 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)
+    {
+      gfc_error ("Actual argument at %L of %qs intrinsic shall be an "
+                "associated pointer", &array->where, gfc_current_intrinsic);
+      return false;
+    }
+
   if (!array_check (array, 0))
     return false;
 
@@ -7105,7 +7113,6 @@ gfc_check_is_contiguous (gfc_expr *array)
 }
 
 
-
 bool
 gfc_check_isatty (gfc_expr *unit)
 {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 052fd2e1f8ab382fe6f8f4f9d2bb3f20a1630c91..43dc4ce65ea23217c63cf4e20f7e4af6cd2deafb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/91641
+       * gfortran.dg/pr91641.f90: New test.
+
 2019-09-29  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/91714

diff --git a/gcc/testsuite/gfortran.dg/pr91641.f90 b/gcc/testsuite/gfortran.dg/pr91641.f90
new file mode 100644 (file)
index 0000000..1970824
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr91641.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/91641
+! Code conyributed by Gerhard Steinmetz
+program p
+   real, pointer :: z(:)
+   print *, is_contiguous (null(z))    ! { dg-error "shall be an associated" }
+end