aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2019-09-29 19:12:08 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2019-09-29 19:12:08 +0000
commit3262dde64c162a520fbe8bae6bd4372411f6a790 (patch)
tree506e700968ac5413ec321638d23ddcf5a8e93915 /gcc
parent7a40dd5a26ee497e80c86c939542de96d5e2a474 (diff)
downloadgcc-3262dde64c162a520fbe8bae6bd4372411f6a790.zip
gcc-3262dde64c162a520fbe8bae6bd4372411f6a790.tar.gz
gcc-3262dde64c162a520fbe8bae6bd4372411f6a790.tar.bz2
re PR fortran/91641 (ICE in gfc_conv_is_contiguous_expr, at fortran/trans-intrinsic.c:2857)
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/check.c9
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/pr91641.f907
4 files changed, 26 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d4f39cc..694fc32 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
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
* decl.c (gfc_match_decl_type_spec): Issue errors for a few
mangled types.
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index a04f9fb..98203bc 100644
--- 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 052fd2e..43dc4ce 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
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
* gfortran.dg/dec_type_print_3.f90: Update dg-error regex.
* gfortran.dg/pr91714.f90: New test.
diff --git a/gcc/testsuite/gfortran.dg/pr91641.f90 b/gcc/testsuite/gfortran.dg/pr91641.f90
new file mode 100644
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