From 7c4b35823f78c3c37afb42d79da55a70f0635e14 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Tue, 1 Oct 2019 18:16:36 +0000 Subject: [PATCH] re PR fortran/91641 (ICE in gfc_conv_is_contiguous_expr, at fortran/trans-intrinsic.c:2857) 2019-10-01 Steven G. Kargl PR fortran/91641 * check.c (gfc_check_is_contiguous): null() cannot be an actual argument to is_contiguous(). 2019-10-01 Steven G. Kargl PR fortran/91641 * gfortran.dg/pr91641.f90: New test. From-SVN: r276419 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/check.c | 9 ++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/pr91641.f90 | 7 +++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr91641.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 97b32bb7e254..d2f47da78a72 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-10-01 Steven G. Kargl + + PR fortran/91641 + * check.c (gfc_check_is_contiguous): null() cannot be an actual + argument to is_contiguous(). + 2019-09-21 Paul Thomas Backport from mainline diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c index 265fb1fda53e..27cb76dff718 100644 --- a/gcc/fortran/check.c +++ b/gcc/fortran/check.c @@ -6569,6 +6569,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; @@ -6576,7 +6584,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 5cf8feb32a52..50db9f2125ee 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-01 Steven G. Kargl + + PR fortran/91641 + * gfortran.dg/pr91641.f90: New test. + 2019-10-01 Kyrylo Tkachov Backport from mainline diff --git a/gcc/testsuite/gfortran.dg/pr91641.f90 b/gcc/testsuite/gfortran.dg/pr91641.f90 new file mode 100644 index 000000000000..1970824a9465 --- /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 -- 2.47.2