From 218e1228c941cf0e1669610eaf33fdf5c010c3c0 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Tue, 31 Jan 2012 19:41:47 +0100 Subject: re PR fortran/52024 ([OOP] GENERIC operator cannot be resolved) 2012-01-31 Tobias Burnus PR fortran/52024 * gfortran.h (gfc_tbp_generic): Store whether the generic is an operator. * decl.c (gfc_match_generic): Set that flag. * resolve.c (check_generic_tbp_ambiguity): Use it in the gfc_compare_interfaces check. 2012-01-31 Tobias Burnus PR fortran/52024 * gfortran.dg/typebound_generic_11.f90: New. From-SVN: r183771 --- gcc/fortran/resolve.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gcc/fortran/resolve.c') diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 0560261..4dcf9b1 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -10950,6 +10950,7 @@ check_generic_tbp_ambiguity (gfc_tbp_generic* t1, gfc_tbp_generic* t2, gcc_assert (t1->specific && t2->specific); gcc_assert (!t1->specific->is_generic); gcc_assert (!t2->specific->is_generic); + gcc_assert (t1->is_operator == t2->is_operator); sym1 = t1->specific->u.specific->n.sym; sym2 = t2->specific->u.specific->n.sym; @@ -10968,7 +10969,8 @@ check_generic_tbp_ambiguity (gfc_tbp_generic* t1, gfc_tbp_generic* t2, } /* Compare the interfaces. */ - if (gfc_compare_interfaces (sym1, sym2, sym2->name, 1, 0, NULL, 0)) + if (gfc_compare_interfaces (sym1, sym2, sym2->name, !t1->is_operator, 0, + NULL, 0)) { gfc_error ("'%s' and '%s' for GENERIC '%s' at %L are ambiguous", sym1->name, sym2->name, generic_name, &where); -- cgit v1.1