diff options
| author | Tobias Burnus <burnus@net-b.de> | 2013-01-07 09:36:16 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2013-01-07 09:36:16 +0100 |
| commit | 55d8631bfab9a9abfb52a7f1ef79b588243a8919 (patch) | |
| tree | f99d0a7046c7f966d4961c0524aab97a55725570 | |
| parent | 9bdae0133df72dab6604c2b9b25f6411e4c41e8b (diff) | |
| download | gcc-55d8631bfab9a9abfb52a7f1ef79b588243a8919.zip gcc-55d8631bfab9a9abfb52a7f1ef79b588243a8919.tar.gz gcc-55d8631bfab9a9abfb52a7f1ef79b588243a8919.tar.bz2 | |
re PR fortran/55763 (Issues with some simpler CLASS(*) programs)
2012-01-07 Tobias Burnus <burnus@net-b.de>
PR fortran/55763
* resolve.c (resolve_select_type): Reject intrinsic types for
a non-unlimited-polymorphic selector.
2012-01-07 Tobias Burnus <burnus@net-b.de>
PR fortran/55763
* gfortran.dg/select_type_32.f90: New.
From-SVN: r194962
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/select_type_32.f90 | 25 |
4 files changed, 45 insertions, 5 deletions
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 <burnus@net-b.de> + + PR fortran/55763 + * resolve.c (resolve_select_type): Reject intrinsic types for + a non-unlimited-polymorphic selector. + 2013-01-06 Paul Thomas <pault@gcc.gnu.org> 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; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 217e40f..0d36ca2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-01-07 Tobias Burnus <burnus@net-b.de> + + PR fortran/55763 + * gfortran.dg/select_type_32.f90: New. + 2013-01-04 Dodji Seketeli <dodji@redhat.com> PR c++/52343 diff --git a/gcc/testsuite/gfortran.dg/select_type_32.f90 b/gcc/testsuite/gfortran.dg/select_type_32.f90 new file mode 100644 index 0000000..5e36639 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/select_type_32.f90 @@ -0,0 +1,25 @@ +! { dg-do compile } +! +! PR fortran/55763 +! +! Contributed by Harald Anlauf +! + +module gfcbug122 + implicit none + type myobj + class(*), allocatable :: x + contains + procedure :: print + end type myobj +contains + subroutine print(this) + class(myobj) :: this + select type (this) + type is (integer) ! { dg-error "Unexpected intrinsic type 'INTEGER'" } + type is (real) ! { dg-error "Unexpected intrinsic type 'REAL'" } + type is (complex) ! { dg-error "Unexpected intrinsic type 'COMPLEX'" } + type is (character(len=*)) ! { dg-error "Unexpected intrinsic type 'CHARACTER'" } + end select + end subroutine print +end module gfcbug122 |