re PR fortran/78814 (ICE in symbol_rank, at fortran/interface.c:1265)

2017-11-09  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/78814
	* interface.c (symbol_rank): Check for NULL pointer.

2017-11-09  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/78814
	* gfortran.dg/interface_40.f90: New testcase.

From-SVN: r254604

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6c9f246d64ea2bddfb1249e1e9072edf41727d32..9be20c889a17a3e00136bb2917f12bf3e91d3764 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/78814
+       * interface.c (symbol_rank): Check for NULL pointer.
+
 2017-11-08  Steven G. Kargl  <kargl@kgcc.gnu.org>
 
        PR Fortran/82841

diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index 9f0fcc82f24083131fac1887d10b279932a23a07..1b7ebf56b92b674e40384ab84dd596661e700377 100644 (file)
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -1262,8 +1262,13 @@ generic_correspondence (gfc_formal_arglist *f1, gfc_formal_arglist *f2,
 static int
 symbol_rank (gfc_symbol *sym)
 {
-  gfc_array_spec *as;
-  as = (sym->ts.type == BT_CLASS) ? CLASS_DATA (sym)->as : sym->as;
+  gfc_array_spec *as = NULL;
+
+  if (sym->ts.type == BT_CLASS && CLASS_DATA (sym) && CLASS_DATA (sym)->as)
+    as = CLASS_DATA (sym)->as;
+  else
+    as = sym->as;
+
   return as ? as->rank : 0;
 }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a38d19f72c362af4c3ba0579df3f1100763fdae1..7ee000b07dedfeeef006db488b20dff35dd9876c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-11-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/78814
+       * gfortran.dg/interface_40.f90: New testcase.
+
 2017-11-09  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/controlled2.adb, gnat.dg/controlled4.adb,

diff --git a/gcc/testsuite/gfortran.dg/interface_40.f90 b/gcc/testsuite/gfortran.dg/interface_40.f90
new file mode 100644 (file)
index 0000000..085c6b3
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/interface_40.f90
@@ -0,0 +1,8 @@
+! { dg-do compile }
+! PR fortran/78814
+! Code contributed by Gerhard Steinmetz
+program p
+   class(*) :: x  ! { dg-error " must be dummy, allocatable or pointer" }
+   print *, f(x)
+end
+