diff options
| author | Tobias Burnus <burnus@net-b.de> | 2012-01-31 19:41:47 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2012-01-31 19:41:47 +0100 |
| commit | 218e1228c941cf0e1669610eaf33fdf5c010c3c0 (patch) | |
| tree | 6bff3afd3f9d393e15e10848c5abbfe4346820f6 /gcc/fortran | |
| parent | 0b73eb812e8455701ef3044839f6de2ee895b15b (diff) | |
| download | gcc-218e1228c941cf0e1669610eaf33fdf5c010c3c0.zip gcc-218e1228c941cf0e1669610eaf33fdf5c010c3c0.tar.gz gcc-218e1228c941cf0e1669610eaf33fdf5c010c3c0.tar.bz2 | |
re PR fortran/52024 ([OOP] GENERIC operator cannot be resolved)
2012-01-31 Tobias Burnus <burnus@net-b.de>
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 <burnus@net-b.de>
PR fortran/52024
* gfortran.dg/typebound_generic_11.f90: New.
From-SVN: r183771
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/gfortran.h | 1 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 4 |
4 files changed, 15 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a0397cc..fbbfccf 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,14 @@ 2012-01-31 Tobias Burnus <burnus@net-b.de> + 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 <burnus@net-b.de> + PR fortran/52029 * class.c (gfc_find_derived_vtab): Mark _copy function as pure. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index c87fc1b..43c558a 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -8391,6 +8391,8 @@ gfc_match_generic (void) target->specific_st = target_st; target->specific = NULL; target->next = tb->u.generic; + target->is_operator = ((op_type == INTERFACE_USER_OP) + || (op_type == INTERFACE_INTRINSIC_OP)); tb->u.generic = target; } while (gfc_match (" ,") == MATCH_YES); diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 6f49d61..757a4e5 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -1115,6 +1115,7 @@ typedef struct gfc_tbp_generic struct gfc_typebound_proc* specific; struct gfc_tbp_generic* next; + bool is_operator; } gfc_tbp_generic; 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); |