diff options
| author | Janus Weil <janus@gcc.gnu.org> | 2012-10-02 23:02:16 +0200 |
|---|---|---|
| committer | Janus Weil <janus@gcc.gnu.org> | 2012-10-02 23:02:16 +0200 |
| commit | 0a59e5832e6febfd497966c0b0edfe948f34ff7a (patch) | |
| tree | 0fe37c4a26ea248acbc7b2161505ffbff26f5cf8 /gcc | |
| parent | 1504e3e1c4f7cb5aa477cdfd0ebefe1e10fe539a (diff) | |
| download | gcc-0a59e5832e6febfd497966c0b0edfe948f34ff7a.zip gcc-0a59e5832e6febfd497966c0b0edfe948f34ff7a.tar.gz gcc-0a59e5832e6febfd497966c0b0edfe948f34ff7a.tar.bz2 | |
re PR fortran/54778 ([OOP] an ICE on invalid OO code)
2012-10-02 Janus Weil <janus@gcc.gnu.org>
PR fortran/54778
* interface.c (matching_typebound_op): Check for 'class_ok' attribute.
2012-10-02 Janus Weil <janus@gcc.gnu.org>
PR fortran/54778
* gfortran.dg/class_53.f90: New.
From-SVN: r192005
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/class_53.f90 | 18 |
4 files changed, 30 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index e1cb45a..b6d44cd 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2012-10-02 Janus Weil <janus@gcc.gnu.org> + + PR fortran/54778 + * interface.c (matching_typebound_op): Check for 'class_ok' attribute. + 2012-09-30 Janus Weil <janus@gcc.gnu.org> PR fortran/54667 diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 88689aa..6bcd607 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -3386,7 +3386,8 @@ matching_typebound_op (gfc_expr** tb_base, if (base->expr->ts.type == BT_CLASS) { - if (CLASS_DATA (base->expr) == NULL) + if (CLASS_DATA (base->expr) == NULL + || !gfc_expr_attr (base->expr).class_ok) continue; derived = CLASS_DATA (base->expr)->ts.u.derived; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1d2cac5..2120cb4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-10-02 Janus Weil <janus@gcc.gnu.org> + + PR fortran/54778 + * gfortran.dg/class_53.f90: New. + 2012-10-02 Alexandre Oliva <aoliva@redhat.com> PR debug/54551 diff --git a/gcc/testsuite/gfortran.dg/class_53.f90 b/gcc/testsuite/gfortran.dg/class_53.f90 new file mode 100644 index 0000000..0a8c962 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/class_53.f90 @@ -0,0 +1,18 @@ +! { dg-do compile } +! +! PR 54778: [OOP] an ICE on invalid OO code +! +! Contributed by Sylwester Arabas <slayoo@staszic.waw.pl> + +implicit none + +type :: arr_t + real :: at +end type + +type(arr_t) :: this +class(arr_t) :: elem ! { dg-error "must be dummy, allocatable or pointer" } + +elem = this ! { dg-error "Variable must not be polymorphic in intrinsic assignment" } + +end |