From: Steven G. Kargl <kargl@gcc.gnu.org>
Date: Mon, 24 Oct 2016 21:36:49 +0000 (+0000)
Subject: re PR fortran/71895 (ICE in gfc_compare_derived_types, at fortran/interface.c:520)
X-Git-Tag: releases/gcc-5.5.0~742
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=698d7502afc3d387df4b53a120fdb10cde31b838;p=thirdparty%2Fgcc.git

re PR fortran/71895 (ICE in gfc_compare_derived_types, at fortran/interface.c:520)

2016-10-24  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/71895
	* interface.c (gfc_compare_derived_types):  Convert gcc_assert()
	to a gfc_internal_error() to prevent an ICE.

2016-10-24  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/71895
	* gfortran.dg/pr71895.f90: New test.

From-SVN: r241496
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cc3254a8f777..3c392a69f934 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-24  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/71895
+	* interface.c (gfc_compare_derived_types):  Convert gcc_assert()
+	to a gfc_internal_error() to prevent an ICE.
+
 2016-10-24  Paul Thomas  <pault@gcc.gnu.org>
 
 	Backport from trunk
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index f575d76349ed..92b86a823274 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -398,7 +398,8 @@ gfc_compare_derived_types (gfc_symbol *derived1, gfc_symbol *derived2)
   if (derived1 == derived2)
     return 1;
 
-  gcc_assert (derived1 && derived2);
+  if (!derived1 || !derived2)
+    gfc_internal_error ("gfc_compare_derived_types: invalid derived type");
 
   /* Special case for comparing derived types across namespaces.  If the
      true names and module names are the same and the module name is
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 050a77ff9a3d..d9c8de752bf5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-24  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/71895
+	* gfortran.dg/pr71895.f90: New test.
+
 2016-10-24  Paul Thomas  <pault@gcc.gnu.org>
 
 	Backport from trunk
diff --git a/gcc/testsuite/gfortran.dg/pr71895.f90 b/gcc/testsuite/gfortran.dg/pr71895.f90
new file mode 100644
index 000000000000..e5d40026d03a
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr71895.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+program p
+   type t
+      integer :: n
+   end type
+   type(t) :: x
+   class(t) :: y        ! { dg-error "must be dummy, allocatable or pointer" }
+   print *, extends_type_of(x, y)
+   print *, extends_type_of(y, x)
+end