From 7ca776a2a076f76db30182a3fff64c6c97ba795c Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 25 May 2018 19:38:11 +0000 Subject: [PATCH] re PR fortran/85543 (ICE in update_current_proc_array_outer_dependency, at fortran/resolve.c:3060) 2018-05-25 Steven G. Kargl PR fortran/85543 Backport from trunk * resolve.c (update_current_proc_array_outer_dependency): Avoid NULL pointer dereference. 2018-05-25 Steven G. Kargl PR fortran/85543 Backport from trunk * gfortran.dg/pr85543.f90: New test. From-SVN: r260775 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/resolve.c | 4 ++-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/pr85543.f90 | 8 ++++++++ 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr85543.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 88c80c97243b..caffbd21a157 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2018-05-25 Steven G. Kargl + + PR fortran/85543 + Backport from trunk + * resolve.c (update_current_proc_array_outer_dependency): Avoid NULL + pointer dereference. + 2018-05-16 Paul Thomas PR fortran/83149 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 0285089ef0e4..001705b1bb70 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -2899,8 +2899,8 @@ update_current_proc_array_outer_dependency (gfc_symbol *sym) /* If SYM has references to outer arrays, so has the procedure calling SYM. If SYM is a procedure pointer, we can assume the worst. */ - if (sym->attr.array_outer_dependency - || sym->attr.proc_pointer) + if ((sym->attr.array_outer_dependency || sym->attr.proc_pointer) + && gfc_current_ns->proc_name) gfc_current_ns->proc_name->attr.array_outer_dependency = 1; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 79ce1b61f5e7..d15a73cc2033 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-05-25 Steven G. Kargl + + PR fortran/85543 + Backport from trunk + * gfortran.dg/pr85543.f90: New test. + 2018-05-24 Uros Bizjak * gcc.target/i386/avx512f-vcvtusi2sd64-1.c: Update scan string. diff --git a/gcc/testsuite/gfortran.dg/pr85543.f90 b/gcc/testsuite/gfortran.dg/pr85543.f90 new file mode 100644 index 000000000000..d3f83276a7f2 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr85543.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/85543 +program p + procedure(), pointer :: z +contains + real(z()) function f() ! { dg-error "in initialization expression at" } + end +end -- 2.47.2