From: janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 22 May 2010 10:21:32 +0000 (+0000)
Subject: 2010-05-22  Janus Weil  <janus@gcc.gnu.org>
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a96bd516338df9c61aa2692f140af6acc497eb88;p=thirdparty%2Fgcc.git

2010-05-22  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/44213
	* resolve.c (ensure_not_abstract): Allow abstract types with
	non-abstract ancestors.


2010-05-22  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/44213
	* gfortran.dg/abstract_type_7.f03: New.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159695 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fc996199e5c9..9e4702e40a4b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-22  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/44213
+	* resolve.c (ensure_not_abstract): Allow abstract types with
+	non-abstract ancestors.
+
 2010-05-21  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* trans-const.c: Include realmpfr.h.
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index e5a46fac6155..f08e1988816c 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -10541,7 +10541,10 @@ ensure_not_abstract (gfc_symbol* sub, gfc_symbol* ancestor)
      This is not the most efficient way to do this, but it should be ok and is
      clearer than something sophisticated.  */
 
-  gcc_assert (ancestor && ancestor->attr.abstract && !sub->attr.abstract);
+  gcc_assert (ancestor && !sub->attr.abstract);
+  
+  if (!ancestor->attr.abstract)
+    return SUCCESS;
 
   /* Walk bindings of this ancestor.  */
   if (ancestor->f2k_derived)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 227a77c73a85..faea1c4fe93e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-22  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/44213
+	* gfortran.dg/abstract_type_7.f03: New.
+
 2010-05-21  Jason Merrill  <jason@redhat.com>
 
 	* g++.dg/eh/spec11.C: Test cleanup optimization.
diff --git a/gcc/testsuite/gfortran.dg/abstract_type_7.f03 b/gcc/testsuite/gfortran.dg/abstract_type_7.f03
new file mode 100644
index 000000000000..3ea0fdca6147
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/abstract_type_7.f03
@@ -0,0 +1,18 @@
+! { dg-do compile }
+!
+! PR 44213: ICE when extending abstract type
+!
+! Contributed by Hans-Werner Boschmann <boschmann@tp1.physik.uni-siegen.de>
+
+module ice_module
+  type :: a_type
+  end type a_type
+
+  type,extends(a_type),abstract :: b_type
+  end type b_type
+
+  type,extends(b_type) :: c_type
+  end type c_type
+end module ice_module
+ 
+! { dg-final { cleanup-modules "ice_module" } }