From 55d8631bfab9a9abfb52a7f1ef79b588243a8919 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Mon, 7 Jan 2013 09:36:16 +0100 Subject: re PR fortran/55763 (Issues with some simpler CLASS(*) programs) 2012-01-07 Tobias Burnus PR fortran/55763 * resolve.c (resolve_select_type): Reject intrinsic types for a non-unlimited-polymorphic selector. 2012-01-07 Tobias Burnus PR fortran/55763 * gfortran.dg/select_type_32.f90: New. From-SVN: r194962 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/resolve.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 8c2cb3c..7266110 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-01-07 Tobias Burnus + + PR fortran/55763 + * resolve.c (resolve_select_type): Reject intrinsic types for + a non-unlimited-polymorphic selector. + 2013-01-06 Paul Thomas PR fortran/PR53876 diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index b81f231..70bfae6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -8388,12 +8388,16 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns) } /* Check F03:C816. */ - if ((c->ts.type == BT_DERIVED || c->ts.type == BT_CLASS) - && !selector_type->attr.unlimited_polymorphic - && !gfc_type_is_extension_of (selector_type, c->ts.u.derived)) + if (c->ts.type != BT_UNKNOWN && !selector_type->attr.unlimited_polymorphic + && ((c->ts.type != BT_DERIVED && c->ts.type != BT_CLASS) + || !gfc_type_is_extension_of (selector_type, c->ts.u.derived))) { - gfc_error ("Derived type '%s' at %L must be an extension of '%s'", - c->ts.u.derived->name, &c->where, selector_type->name); + if (c->ts.type == BT_DERIVED || c->ts.type == BT_CLASS) + gfc_error ("Derived type '%s' at %L must be an extension of '%s'", + c->ts.u.derived->name, &c->where, selector_type->name); + else + gfc_error ("Unexpected intrinsic type '%s' at %L", + gfc_basic_typename (c->ts.type), &c->where); error++; continue; } -- cgit v1.1