re PR fortran/85542 (ICE in check_inquiry, at fortran/expr.c:2426)

2018-05-12  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/85542
	Backport from trunk
	* expr.c (check_inquiry): Avoid NULL pointer dereference.

2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/85542
	Backport from trunk
	* gfortran.dg/pr85542.f90: New test.

From-SVN: r260198

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 63fc406a6e061da3d9bd29bae0ebd089c455984e..589610208b32e37597f39c5c531fb8e2e0d3a7b3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-12  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/85542
+       Backport from trunk
+       * expr.c (check_inquiry): Avoid NULL pointer dereference.
+ 
 2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/70870

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index aceefb6e110f584ad087ef5a919b2a7660d4ca43..bc42dea14ec9bf3df362a19e3a7cb762f7e0afac 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2321,7 +2321,7 @@ check_inquiry (gfc_expr *e, int not_restricted)
 
        /* Assumed character length will not reduce to a constant expression
           with LEN, as required by the standard.  */
-       if (i == 5 && not_restricted
+       if (i == 5 && not_restricted && ap->expr->symtree
            && ap->expr->symtree->n.sym->ts.type == BT_CHARACTER
            && (ap->expr->symtree->n.sym->ts.u.cl->length == NULL
                || ap->expr->symtree->n.sym->ts.deferred))

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6f0fb714be0c92e2cb38dec72924b5822e82978d..125301d4e30327d805f9cd48cf064679f166ef38 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-12  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/85542
+       Backport from trunk
+       * gfortran.dg/pr85542.f90: New test.
+
 2018-05-11  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/70870

diff --git a/gcc/testsuite/gfortran.dg/pr85542.f90 b/gcc/testsuite/gfortran.dg/pr85542.f90
new file mode 100644 (file)
index 0000000..f61d2c9
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr85542.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! PR fortran/85542
+function f(x)
+   character(*), intent(in) :: x
+   character((len((x)))) :: f
+   f = x
+end