From e2b2e56e706444249ee0b20d14d54aed8d38c8f1 Mon Sep 17 00:00:00 2001 From: janus Date: Tue, 2 Oct 2012 21:02:16 +0000 Subject: [PATCH] 2012-10-02 Janus Weil PR fortran/54778 * interface.c (matching_typebound_op): Check for 'class_ok' attribute. 2012-10-02 Janus Weil PR fortran/54778 * gfortran.dg/class_53.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192005 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/interface.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/class_53.f90 | 18 ++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/class_53.f90 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 + + PR fortran/54778 + * interface.c (matching_typebound_op): Check for 'class_ok' attribute. + 2012-09-30 Janus Weil 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 + + PR fortran/54778 + * gfortran.dg/class_53.f90: New. + 2012-10-02 Alexandre Oliva 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 + +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 -- 2.7.4