From 7c9b8fb912cdbac53aab302ab0e6b1b0831036df Mon Sep 17 00:00:00 2001 From: Janus Weil Date: Sat, 22 May 2010 12:21:32 +0200 Subject: [PATCH] re PR fortran/44213 (ICE when extending abstract type) 2010-05-22 Janus Weil PR fortran/44213 * resolve.c (ensure_not_abstract): Allow abstract types with non-abstract ancestors. 2010-05-22 Janus Weil PR fortran/44213 * gfortran.dg/abstract_type_7.f03: New. From-SVN: r159695 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 5 ++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/abstract_type_7.f03 | 18 ++++++++++++++++++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/abstract_type_7.f03 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fc996199e5c..9e4702e40a4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2010-05-22 Janus Weil + + PR fortran/44213 + * resolve.c (ensure_not_abstract): Allow abstract types with + non-abstract ancestors. + 2010-05-21 Steven Bosscher * trans-const.c: Include realmpfr.h. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index e5a46fac615..f08e1988816 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 227a77c73a8..faea1c4fe93 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-05-22 Janus Weil + + PR fortran/44213 + * gfortran.dg/abstract_type_7.f03: New. + 2010-05-21 Jason Merrill * 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 00000000000..3ea0fdca614 --- /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 + +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" } } -- 2.30.2