X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fcp%2Fsearch.c;h=66bbb133da0c13d9a62537e851bea6e8b299bab2;hb=0c573f984386af7be60890bd572fe1f94e919666;hp=b90f1921ac2b97eec657b238ec5b20e691267714;hpb=e6b62c3990cd51acd7f3e2c67a9177724b1a1c5f;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cp/search.c b/gcc/cp/search.c index b90f1921ac2..66bbb133da0 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1,7 +1,7 @@ /* Breadth-first and depth-first routines for searching multiple-inheritance lattice for GNU C++. Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. + 1999, 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GCC. @@ -18,8 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ /* High-level class interface. */ @@ -34,7 +34,6 @@ Boston, MA 02111-1307, USA. */ #include "rtl.h" #include "output.h" #include "toplev.h" -#include "stack.h" static int is_subobject_of_p (tree, tree); static tree dfs_lookup_base (tree, void *); @@ -82,23 +81,23 @@ static int n_contexts_saved; struct lookup_base_data_s { - tree t; /* type being searched. */ - tree base; /* The base type we're looking for. */ - tree binfo; /* Found binfo. */ - bool via_virtual; /* Found via a virtual path. */ + tree t; /* type being searched. */ + tree base; /* The base type we're looking for. */ + tree binfo; /* Found binfo. */ + bool via_virtual; /* Found via a virtual path. */ bool ambiguous; /* Found multiply ambiguous */ - bool repeated_base; /* Whether there are repeated bases in the + bool repeated_base; /* Whether there are repeated bases in the hierarchy. */ - bool want_any; /* Whether we want any matching binfo. */ + bool want_any; /* Whether we want any matching binfo. */ }; /* Worker function for lookup_base. See if we've found the desired - base and update DATA_ (a pointer to LOOKIP_BASE_DATA_S). */ + base and update DATA_ (a pointer to LOOKUP_BASE_DATA_S). */ static tree dfs_lookup_base (tree binfo, void *data_) { - struct lookup_base_data_s *data = data_; + struct lookup_base_data_s *data = (struct lookup_base_data_s *) data_; if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), data->base)) { @@ -107,22 +106,22 @@ dfs_lookup_base (tree binfo, void *data_) data->binfo = binfo; data->via_virtual = binfo_via_virtual (data->binfo, data->t) != NULL_TREE; - + if (!data->repeated_base) /* If there are no repeated bases, we can stop now. */ return binfo; - + if (data->want_any && !data->via_virtual) /* If this is a non-virtual base, then we can't do better. */ return binfo; - + return dfs_skip_bases; } else { gcc_assert (binfo != data->binfo); - + /* We've found more than one matching binfo. */ if (!data->want_any) { @@ -145,22 +144,24 @@ dfs_lookup_base (tree binfo, void *data_) return dfs_skip_bases; } } - + return NULL_TREE; } /* Returns true if type BASE is accessible in T. (BASE is known to be - a (possibly non-proper) base class of T.) */ + a (possibly non-proper) base class of T.) If CONSIDER_LOCAL_P is + true, consider any special access of the current scope, or access + bestowed by friendship. */ bool -accessible_base_p (tree t, tree base) +accessible_base_p (tree t, tree base, bool consider_local_p) { tree decl; /* [class.access.base] A base class is said to be accessible if an invented public - member of the base class is accessible. + member of the base class is accessible. If BASE is a non-proper base, this condition is trivially true. */ @@ -173,7 +174,7 @@ accessible_base_p (tree t, tree base) decl = TREE_CHAIN (decl); while (ANON_AGGR_TYPE_P (t)) t = TYPE_CONTEXT (t); - return accessible_p (t, decl); + return accessible_p (t, decl, consider_local_p); } /* Lookup BASE in the hierarchy dominated by T. Do access checking as @@ -192,7 +193,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) tree binfo; tree t_binfo; base_kind bk; - + if (t == error_mark_node || base == error_mark_node) { if (kind_ptr) @@ -200,7 +201,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) return error_mark_node; } gcc_assert (TYPE_P (base)); - + if (!TYPE_P (t)) { t_binfo = t; @@ -211,7 +212,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) t = complete_type (TYPE_MAIN_VARIANT (t)); t_binfo = TYPE_BINFO (t); } - + base = complete_type (TYPE_MAIN_VARIANT (base)); if (t_binfo) @@ -227,7 +228,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) dfs_walk_once (t_binfo, dfs_lookup_base, NULL, &data); binfo = data.binfo; - + if (!binfo) bk = data.ambiguous ? bk_ambig : bk_not_base; else if (binfo == t_binfo) @@ -259,7 +260,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) break; default: - if ((access & ~ba_quiet) != ba_ignore + if ((access & ba_check_bit) /* If BASE is incomplete, then BASE and TYPE are probably the same, in which case BASE is accessible. If they are not the same, then TYPE is invalid. In that case, @@ -267,7 +268,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) there's no implicit typedef to use in the code that follows, so we skip the check. */ && COMPLETE_TYPE_P (base) - && !accessible_base_p (t, base)) + && !accessible_base_p (t, base, !(access & ba_ignore_scope))) { if (!(access & ba_quiet)) { @@ -283,7 +284,7 @@ lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr) if (kind_ptr) *kind_ptr = bk; - + return binfo; } @@ -305,11 +306,11 @@ struct dcast_data_s static tree dfs_dcast_hint_pre (tree binfo, void *data_) { - struct dcast_data_s *data = data_; + struct dcast_data_s *data = (struct dcast_data_s *) data_; if (BINFO_VIRTUAL_P (binfo)) data->virt_depth++; - + if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), data->subtype)) { if (data->virt_depth) @@ -333,7 +334,7 @@ dfs_dcast_hint_pre (tree binfo, void *data_) static tree dfs_dcast_hint_post (tree binfo, void *data_) { - struct dcast_data_s *data = data_; + struct dcast_data_s *data = (struct dcast_data_s *) data_; if (BINFO_VIRTUAL_P (binfo)) data->virt_depth--; @@ -361,7 +362,7 @@ dcast_base_hint (tree subtype, tree target) data.virt_depth = 0; data.offset = NULL_TREE; data.repeated_base = CLASSTYPE_REPEATED_BASE_P (target); - + dfs_walk_once_accessible (TYPE_BINFO (target), /*friends=*/false, dfs_dcast_hint_pre, dfs_dcast_hint_post, &data); return data.offset ? data.offset : ssize_int (-2); @@ -385,7 +386,7 @@ lookup_field_1 (tree type, tree name, bool want_type) if (TREE_CODE (type) == TEMPLATE_TYPE_PARM || TREE_CODE (type) == BOUND_TEMPLATE_TEMPLATE_PARM || TREE_CODE (type) == TYPENAME_TYPE) - /* The TYPE_FIELDS of a TEMPLATE_TYPE_PARM and + /* The TYPE_FIELDS of a TEMPLATE_TYPE_PARM and BOUND_TEMPLATE_TEMPLATE_PARM are not fields at all; instead TYPE_FIELDS is the TEMPLATE_PARM_INDEX. (Miraculously, the code often worked even when we treated the index as a list @@ -469,18 +470,14 @@ lookup_field_1 (tree type, tree name, bool want_type) the compiler cannot handle that. Once the class is defined, USING_DECLs are purged from TYPE_FIELDS; see handle_using_decl. However, we make special efforts to - make using-declarations in template classes work - correctly. */ - if (CLASSTYPE_TEMPLATE_INFO (type) - && !CLASSTYPE_USE_TEMPLATE (type) - && !TREE_TYPE (field)) - ; - else + make using-declarations in class templates and class + template partial specializations work correctly. */ + if (!DECL_DEPENDENT_P (field)) continue; } if (DECL_NAME (field) == name - && (!want_type + && (!want_type || TREE_CODE (field) == TYPE_DECL || DECL_CLASS_TEMPLATE_P (field))) return field; @@ -495,7 +492,13 @@ lookup_field_1 (tree type, tree name, bool want_type) return NULL_TREE; } -/* There are a number of cases we need to be aware of here: +/* Return the FUNCTION_DECL, RECORD_TYPE, UNION_TYPE, or + NAMESPACE_DECL corresponding to the innermost non-block scope. */ + +tree +current_scope (void) +{ + /* There are a number of cases we need to be aware of here: current_class_type current_function_decl global NULL NULL fn-local NULL SET @@ -503,30 +506,26 @@ lookup_field_1 (tree type, tree name, bool want_type) class->fn SET SET fn->class SET SET - Those last two make life interesting. If we're in a function which is - itself inside a class, we need decls to go into the fn's decls (our - second case below). But if we're in a class and the class itself is - inside a function, we need decls to go into the decls for the class. To - achieve this last goal, we must see if, when both current_class_ptr and - current_function_decl are set, the class was declared inside that - function. If so, we know to put the decls into the class's scope. */ - -tree -current_scope (void) -{ - if (current_function_decl == NULL_TREE) - return current_class_type; - if (current_class_type == NULL_TREE) + Those last two make life interesting. If we're in a function which is + itself inside a class, we need decls to go into the fn's decls (our + second case below). But if we're in a class and the class itself is + inside a function, we need decls to go into the decls for the class. To + achieve this last goal, we must see if, when both current_class_ptr and + current_function_decl are set, the class was declared inside that + function. If so, we know to put the decls into the class's scope. */ + if (current_function_decl && current_class_type + && ((DECL_FUNCTION_MEMBER_P (current_function_decl) + && same_type_p (DECL_CONTEXT (current_function_decl), + current_class_type)) + || (DECL_FRIEND_CONTEXT (current_function_decl) + && same_type_p (DECL_FRIEND_CONTEXT (current_function_decl), + current_class_type)))) return current_function_decl; - if ((DECL_FUNCTION_MEMBER_P (current_function_decl) - && same_type_p (DECL_CONTEXT (current_function_decl), - current_class_type)) - || (DECL_FRIEND_CONTEXT (current_function_decl) - && same_type_p (DECL_FRIEND_CONTEXT (current_function_decl), - current_class_type))) + if (current_class_type) + return current_class_type; + if (current_function_decl) return current_function_decl; - - return current_class_type; + return current_namespace; } /* Returns nonzero if we are currently in a function scope. Note @@ -554,9 +553,8 @@ at_class_scope_p (void) bool at_namespace_scope_p (void) { - /* We are in a namespace scope if we are not it a class scope or a - function scope. */ - return !current_scope(); + tree cs = current_scope (); + return cs && TREE_CODE (cs) == NAMESPACE_DECL; } /* Return the scope of DECL, as appropriate when doing name-lookup. */ @@ -565,11 +563,11 @@ tree context_for_name_lookup (tree decl) { /* [class.union] - + For the purposes of name lookup, after the anonymous union definition, the members of the anonymous union are considered to have been defined in the scope in which the anonymous union is - declared. */ + declared. */ tree context = DECL_CONTEXT (decl); while (context && TYPE_P (context) && ANON_AGGR_TYPE_P (context)) @@ -613,7 +611,7 @@ dfs_access_in_type (tree binfo, void *data) else access = ak_public; } - else + else { /* First, check for an access-declaration that gives us more access to the DECL. The CONST_DECL for an enumeration @@ -622,11 +620,11 @@ dfs_access_in_type (tree binfo, void *data) if (DECL_LANG_SPECIFIC (decl) && !DECL_DISCRIMINATOR_P (decl)) { tree decl_access = purpose_member (type, DECL_ACCESS (decl)); - + if (decl_access) { decl_access = TREE_VALUE (decl_access); - + if (decl_access == access_public_node) access = ak_public; else if (decl_access == access_protected_node) @@ -642,8 +640,8 @@ dfs_access_in_type (tree binfo, void *data) { int i; tree base_binfo; - VEC (tree) *accesses; - + VEC(tree,gc) *accesses; + /* Otherwise, scan our baseclasses, and pick the most favorable access. */ accesses = BINFO_BASE_ACCESSES (binfo); @@ -700,7 +698,7 @@ access_in_type (tree type, tree decl) If a name can be reached by several paths through a multiple inheritance graph, the access is that of the path that gives - most access. + most access. The algorithm we use is to make a post-order depth-first traversal of the base-class hierarchy. As we come up the tree, we annotate @@ -723,7 +721,7 @@ protected_accessible_p (tree decl, tree derived, tree binfo) m as a member of N is protected, and the reference occurs in a member or friend of class N, or in a member or friend of a class P derived from N, where m as a member of P is private or - protected. + protected. Here DERIVED is a possible P and DECL is m. accessible_p will iterate over various values of N, but the access to m in DERIVED @@ -743,7 +741,7 @@ protected_accessible_p (tree decl, tree derived, tree binfo) /* If m is inaccessible in DERIVED, then it's not a P. */ if (access == ak_none) return 0; - + /* [class.protected] When a friend or a member function of a derived class references @@ -762,7 +760,7 @@ protected_accessible_p (tree decl, tree derived, tree binfo) tree t = binfo; while (BINFO_INHERITANCE_CHAIN (t)) t = BINFO_INHERITANCE_CHAIN (t); - + if (!DERIVED_FROM_P (derived, BINFO_TYPE (t))) return 0; } @@ -804,9 +802,9 @@ friend_accessible_p (tree scope, tree decl, tree binfo) if (TREE_CODE (scope) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (scope)) { - /* Perhaps this SCOPE is a member of a class which is a - friend. */ - if (DECL_CLASS_SCOPE_P (decl) + /* Perhaps this SCOPE is a member of a class which is a + friend. */ + if (DECL_CLASS_SCOPE_P (scope) && friend_accessible_p (DECL_CONTEXT (scope), decl, binfo)) return 1; @@ -822,16 +820,6 @@ friend_accessible_p (tree scope, tree decl, tree binfo) return ret; } } - else if (CLASSTYPE_TEMPLATE_INFO (scope)) - { - int ret; - /* Increment processing_template_decl to make sure that - dependent_type_p works correctly. */ - ++processing_template_decl; - ret = friend_accessible_p (CLASSTYPE_TI_TEMPLATE (scope), decl, binfo); - --processing_template_decl; - return ret; - } return 0; } @@ -841,10 +829,14 @@ friend_accessible_p (tree scope, tree decl, tree binfo) static tree dfs_accessible_post (tree binfo, void *data ATTRIBUTE_UNUSED) { - if (BINFO_ACCESS (binfo) != ak_none - && is_friend (BINFO_TYPE (binfo), current_scope ())) - return binfo; - + if (BINFO_ACCESS (binfo) != ak_none) + { + tree scope = current_scope (); + if (scope && TREE_CODE (scope) != NAMESPACE_DECL + && is_friend (BINFO_TYPE (binfo), scope)) + return binfo; + } + return NULL_TREE; } @@ -852,13 +844,14 @@ dfs_accessible_post (tree binfo, void *data ATTRIBUTE_UNUSED) class used to name DECL. Return nonzero if, in the current context, DECL is accessible. If TYPE is actually a BINFO node, then we can tell in what context the access is occurring by looking - at the most derived class along the path indicated by BINFO. */ + at the most derived class along the path indicated by BINFO. If + CONSIDER_LOCAL is true, do consider special access the current + scope or friendship thereof we might have. */ -int -accessible_p (tree type, tree decl) +int +accessible_p (tree type, tree decl, bool consider_local_p) { tree binfo; - tree t; tree scope; access_kind access; @@ -879,8 +872,12 @@ accessible_p (tree type, tree decl) /* In a template declaration, we cannot be sure whether the particular specialization that is instantiated will be a friend or not. Therefore, all access checks are deferred until - instantiation. */ - if (processing_template_decl) + instantiation. However, PROCESSING_TEMPLATE_DECL is set in the + parameter list for a template (because we may see dependent types + in default arguments for template parameters), and access + checking should be performed in the outermost parameter list. */ + if (processing_template_decl + && (!processing_template_parmlist || processing_template_decl > 1)) return 1; if (!TYPE_P (type)) @@ -906,19 +903,23 @@ accessible_p (tree type, tree decl) protected, or --there exists a base class B of N that is accessible at the point - of reference, and m is accessible when named in class B. + of reference, and m is accessible when named in class B. We walk the base class hierarchy, checking these conditions. */ - /* Figure out where the reference is occurring. Check to see if - DECL is private or protected in this scope, since that will - determine whether protected access is allowed. */ - if (current_class_type) - protected_ok = protected_accessible_p (decl, current_class_type, binfo); + if (consider_local_p) + { + /* Figure out where the reference is occurring. Check to see if + DECL is private or protected in this scope, since that will + determine whether protected access is allowed. */ + if (current_class_type) + protected_ok = protected_accessible_p (decl, + current_class_type, binfo); - /* Now, loop through the classes of which we are a friend. */ - if (!protected_ok) - protected_ok = friend_accessible_p (scope, decl, binfo); + /* Now, loop through the classes of which we are a friend. */ + if (!protected_ok) + protected_ok = friend_accessible_p (scope, decl, binfo); + } /* Standardize the binfo that access_in_type will use. We don't need to know what path was chosen from this point onwards. */ @@ -930,15 +931,15 @@ accessible_p (tree type, tree decl) if (access == ak_public || (access == ak_protected && protected_ok)) return 1; - else - { - /* Walk the hierarchy again, looking for a base class that allows - access. */ - t = dfs_walk_once_accessible (binfo, /*friends=*/true, - NULL, dfs_accessible_post, NULL); - - return t != NULL_TREE; - } + + if (!consider_local_p) + return 0; + + /* Walk the hierarchy again, looking for a base class that allows + access. */ + return dfs_walk_once_accessible (binfo, /*friends=*/true, + NULL, dfs_accessible_post, NULL) + != NULL_TREE; } struct lookup_field_info { @@ -962,7 +963,7 @@ struct lookup_field_info { /* Within the scope of a template class, you can refer to the to the current specialization with the name of the template itself. For example: - + template struct S { S* sp; } Returns nonzero if DECL is such a declaration in a class TYPE. */ @@ -1014,7 +1015,7 @@ static int is_subobject_of_p (tree parent, tree binfo) { tree probe; - + for (probe = parent; probe; probe = BINFO_INHERITANCE_CHAIN (probe)) { if (probe == binfo) @@ -1041,7 +1042,7 @@ lookup_field_r (tree binfo, void *data) /* If this is a dependent base, don't look in it. */ if (BINFO_DEPENDENT_BASE_P (binfo)) return NULL_TREE; - + /* If this base class is hidden by the best-known value so far, we don't need to look. */ if (lfi->rval_binfo && BINFO_INHERITANCE_CHAIN (binfo) == lfi->rval_binfo @@ -1087,17 +1088,17 @@ lookup_field_r (tree binfo, void *data) nval = NULL_TREE; if (!nval && CLASSTYPE_NESTED_UTDS (type) != NULL) { - binding_entry e = binding_table_find (CLASSTYPE_NESTED_UTDS (type), - lfi->name); + binding_entry e = binding_table_find (CLASSTYPE_NESTED_UTDS (type), + lfi->name); if (e != NULL) nval = TYPE_MAIN_DECL (e->type); - else + else goto done; } } /* You must name a template base class with a template-id. */ - if (!same_type_p (type, lfi->type) + if (!same_type_p (type, lfi->type) && template_self_reference_p (type, nval)) goto done; @@ -1105,7 +1106,7 @@ lookup_field_r (tree binfo, void *data) hide the old one, we might have an ambiguity. */ if (lfi->rval_binfo && !is_subobject_of_p (lfi->rval_binfo, binfo)) - + { if (nval == lfi->rval && shared_member_p (nval)) /* The two things are really the same. */ @@ -1129,7 +1130,7 @@ lookup_field_r (tree binfo, void *data) /* Add the new value. */ lfi->ambiguous = tree_cons (NULL_TREE, nval, lfi->ambiguous); TREE_TYPE (lfi->ambiguous) = error_mark_node; - lfi->errstr = "request for member `%D' is ambiguous"; + lfi->errstr = "request for member %qD is ambiguous"; } } else @@ -1239,8 +1240,8 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type) just return NULL_TREE. */ if (!protect && lfi.ambiguous) return NULL_TREE; - - if (protect == 2) + + if (protect == 2) { if (lfi.ambiguous) return lfi.ambiguous; @@ -1259,11 +1260,11 @@ lookup_member (tree xbasetype, tree name, int protect, bool want_type) { error (errstr, name, type); if (lfi.ambiguous) - print_candidates (lfi.ambiguous); + print_candidates (lfi.ambiguous); rval = error_mark_node; } - if (rval && is_overloaded_fn (rval)) + if (rval && is_overloaded_fn (rval)) rval = build_baselink (rval_binfo, basetype_path, rval, (IDENTIFIER_TYPENAME_P (name) ? TREE_TYPE (name): NULL_TREE)); @@ -1277,7 +1278,7 @@ tree lookup_field (tree xbasetype, tree name, int protect, bool want_type) { tree rval = lookup_member (xbasetype, name, protect, want_type); - + /* Ignore functions, but propagate the ambiguity list. */ if (!error_operand_p (rval) && (rval && BASELINK_P (rval))) @@ -1316,8 +1317,8 @@ lookup_conversion_operator (tree class_type, tree type) { int i; tree fn; - VEC(tree) *methods = CLASSTYPE_METHOD_VEC (class_type); - + VEC(tree,gc) *methods = CLASSTYPE_METHOD_VEC (class_type); + for (i = CLASSTYPE_FIRST_CONVERSION_SLOT; VEC_iterate (tree, methods, i, fn); ++i) { @@ -1328,7 +1329,7 @@ lookup_conversion_operator (tree class_type, tree type) fn = OVL_CURRENT (fn); if (!DECL_CONV_FN_P (fn)) break; - + if (TREE_CODE (fn) == TEMPLATE_DECL) /* All the templated conversion functions are on the same slot, so remember it. */ @@ -1347,11 +1348,11 @@ lookup_conversion_operator (tree class_type, tree type) int lookup_fnfields_1 (tree type, tree name) { - VEC(tree) *method_vec; + VEC(tree,gc) *method_vec; tree fn; tree tmp; size_t i; - + if (!CLASS_TYPE_P (type)) return -1; @@ -1369,6 +1370,12 @@ lookup_fnfields_1 (tree type, tree name) else if (name == ansi_assopname(NOP_EXPR) && CLASSTYPE_LAZY_ASSIGNMENT_OP (type)) lazily_declare_fn (sfk_assignment_operator, type); + else if ((name == dtor_identifier + || name == base_dtor_identifier + || name == complete_dtor_identifier + || name == deleting_dtor_identifier) + && CLASSTYPE_LAZY_DESTRUCTOR (type)) + lazily_declare_fn (sfk_destructor, type); } method_vec = CLASSTYPE_METHOD_VEC (type); @@ -1468,11 +1475,11 @@ class_method_index_for_fn (tree class_type, tree function) `B', not `D'. This function makes that adjustment. */ tree -adjust_result_of_qualified_name_lookup (tree decl, +adjust_result_of_qualified_name_lookup (tree decl, tree qualifying_scope, tree context_class) { - if (context_class && CLASS_TYPE_P (qualifying_scope) + if (context_class && CLASS_TYPE_P (qualifying_scope) && DERIVED_FROM_P (qualifying_scope, context_class) && BASELINK_P (decl)) { @@ -1486,13 +1493,13 @@ adjust_result_of_qualified_name_lookup (tree decl, or ambiguity -- in either case, the choice of a static member function might make the usage valid. */ base = lookup_base (context_class, qualifying_scope, - ba_ignore | ba_quiet, NULL); + ba_unique | ba_quiet, NULL); if (base) { BASELINK_ACCESS_BINFO (decl) = base; - BASELINK_BINFO (decl) + BASELINK_BINFO (decl) = lookup_base (base, BINFO_TYPE (BASELINK_BINFO (decl)), - ba_ignore | ba_quiet, + ba_unique | ba_quiet, NULL); } } @@ -1518,7 +1525,7 @@ dfs_walk_all (tree binfo, tree (*pre_fn) (tree, void *), tree rval; unsigned ix; tree base_binfo; - + /* Call the pre-order walking function. */ if (pre_fn) { @@ -1547,7 +1554,7 @@ dfs_walk_all (tree binfo, tree (*pre_fn) (tree, void *), gcc_assert (rval != dfs_skip_bases); return rval; } - + return NULL_TREE; } @@ -1561,7 +1568,7 @@ dfs_walk_once_r (tree binfo, tree (*pre_fn) (tree, void *), tree rval; unsigned ix; tree base_binfo; - + /* Call the pre-order walking function. */ if (pre_fn) { @@ -1570,7 +1577,7 @@ dfs_walk_once_r (tree binfo, tree (*pre_fn) (tree, void *), { if (rval == dfs_skip_bases) goto skip_bases; - + return rval; } } @@ -1584,12 +1591,12 @@ dfs_walk_once_r (tree binfo, tree (*pre_fn) (tree, void *), continue; BINFO_MARKED (base_binfo) = 1; } - + rval = dfs_walk_once_r (base_binfo, pre_fn, post_fn, data); if (rval) return rval; } - + skip_bases: /* Call the post-order walking function. */ if (post_fn) @@ -1598,19 +1605,19 @@ dfs_walk_once_r (tree binfo, tree (*pre_fn) (tree, void *), gcc_assert (rval != dfs_skip_bases); return rval; } - + return NULL_TREE; } /* Worker for dfs_walk_once. Recursively unmark the virtual base binfos of BINFO. */ - + static void dfs_unmark_r (tree binfo) { unsigned ix; tree base_binfo; - + /* Process the basetypes. */ for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++) { @@ -1635,10 +1642,13 @@ tree dfs_walk_once (tree binfo, tree (*pre_fn) (tree, void *), tree (*post_fn) (tree, void *), void *data) { + static int active = 0; /* We must not be called recursively. */ tree rval; gcc_assert (pre_fn || post_fn); - + gcc_assert (!active); + active++; + if (!CLASSTYPE_DIAMOND_SHAPED_P (BINFO_TYPE (binfo))) /* We are not diamond shaped, and therefore cannot encounter the same binfo twice. */ @@ -1649,12 +1659,12 @@ dfs_walk_once (tree binfo, tree (*pre_fn) (tree, void *), if (!BINFO_INHERITANCE_CHAIN (binfo)) { /* We are at the top of the hierarchy, and can use the - CLASSTYPE_VBASECLASSES list for unmarking the virtual - bases. */ - VEC (tree) *vbases; + CLASSTYPE_VBASECLASSES list for unmarking the virtual + bases. */ + VEC(tree,gc) *vbases; unsigned ix; tree base_binfo; - + for (vbases = CLASSTYPE_VBASECLASSES (BINFO_TYPE (binfo)), ix = 0; VEC_iterate (tree, vbases, ix, base_binfo); ix++) BINFO_MARKED (base_binfo) = 0; @@ -1662,6 +1672,9 @@ dfs_walk_once (tree binfo, tree (*pre_fn) (tree, void *), else dfs_unmark_r (binfo); } + + active--; + return rval; } @@ -1687,7 +1700,7 @@ dfs_walk_once_accessible_r (tree binfo, bool friends_p, bool once, { if (rval == dfs_skip_bases) goto skip_bases; - + return rval; } } @@ -1699,13 +1712,21 @@ dfs_walk_once_accessible_r (tree binfo, bool friends_p, bool once, if (mark && BINFO_MARKED (base_binfo)) continue; - + /* If the base is inherited via private or protected - inheritance, then we can't see it, unless we are a friend of - the current binfo. */ - if (BINFO_BASE_ACCESS (binfo, ix) != access_public_node - && !(friends_p && is_friend (BINFO_TYPE (binfo), current_scope ()))) - continue; + inheritance, then we can't see it, unless we are a friend of + the current binfo. */ + if (BINFO_BASE_ACCESS (binfo, ix) != access_public_node) + { + tree scope; + if (!friends_p) + continue; + scope = current_scope (); + if (!scope + || TREE_CODE (scope) == NAMESPACE_DECL + || !is_friend (BINFO_TYPE (binfo), scope)) + continue; + } if (mark) BINFO_MARKED (base_binfo) = 1; @@ -1715,7 +1736,7 @@ dfs_walk_once_accessible_r (tree binfo, bool friends_p, bool once, if (rval) return rval; } - + skip_bases: /* Call the post-order walking function. */ if (post_fn) @@ -1724,7 +1745,7 @@ dfs_walk_once_accessible_r (tree binfo, bool friends_p, bool once, gcc_assert (rval != dfs_skip_bases); return rval; } - + return NULL_TREE; } @@ -1740,18 +1761,18 @@ dfs_walk_once_accessible (tree binfo, bool friends_p, bool diamond_shaped = CLASSTYPE_DIAMOND_SHAPED_P (BINFO_TYPE (binfo)); tree rval = dfs_walk_once_accessible_r (binfo, friends_p, diamond_shaped, pre_fn, post_fn, data); - + if (diamond_shaped) { if (!BINFO_INHERITANCE_CHAIN (binfo)) { /* We are at the top of the hierarchy, and can use the - CLASSTYPE_VBASECLASSES list for unmarking the virtual - bases. */ - VEC (tree) *vbases; + CLASSTYPE_VBASECLASSES list for unmarking the virtual + bases. */ + VEC(tree,gc) *vbases; unsigned ix; tree base_binfo; - + for (vbases = CLASSTYPE_VBASECLASSES (BINFO_TYPE (binfo)), ix = 0; VEC_iterate (tree, vbases, ix, base_binfo); ix++) BINFO_MARKED (base_binfo) = 0; @@ -1765,7 +1786,7 @@ dfs_walk_once_accessible (tree binfo, bool friends_p, /* Check that virtual overrider OVERRIDER is acceptable for base function BASEFN. Issue diagnostic, and return zero, if unacceptable. */ -int +static int check_final_overrider (tree overrider, tree basefn) { tree over_type = TREE_TYPE (overrider); @@ -1787,12 +1808,12 @@ check_final_overrider (tree overrider, tree basefn) { /* Potentially covariant. */ unsigned base_quals, over_quals; - + fail = !POINTER_TYPE_P (base_return); if (!fail) { fail = cp_type_quals (base_return) != cp_type_quals (over_return); - + base_return = TREE_TYPE (base_return); over_return = TREE_TYPE (over_return); } @@ -1801,7 +1822,7 @@ check_final_overrider (tree overrider, tree basefn) if ((base_quals & over_quals) != over_quals) fail = 1; - + if (CLASS_TYPE_P (base_return) && CLASS_TYPE_P (over_return)) { tree binfo = lookup_base (over_return, base_return, @@ -1820,6 +1841,12 @@ check_final_overrider (tree overrider, tree basefn) over_return = non_reference (TREE_TYPE (over_type)); if (CLASS_TYPE_P (over_return)) fail = 2; + else + { + warning (0, "deprecated covariant return type for %q+#D", + overrider); + warning (0, " overriding %q+#D", basefn); + } } else fail = 2; @@ -1832,38 +1859,37 @@ check_final_overrider (tree overrider, tree basefn) { if (fail == 1) { - cp_error_at ("invalid covariant return type for %q#D", overrider); - cp_error_at (" overriding %q#D", basefn); + error ("invalid covariant return type for %q+#D", overrider); + error (" overriding %q+#D", basefn); } else { - cp_error_at ("conflicting return type specified for %q#D", - overrider); - cp_error_at (" overriding %q#D", basefn); + error ("conflicting return type specified for %q+#D", overrider); + error (" overriding %q+#D", basefn); } DECL_INVALID_OVERRIDER_P (overrider) = 1; return 0; } - + /* Check throw specifier is at least as strict. */ if (!comp_except_specs (base_throw, over_throw, 0)) { - cp_error_at ("looser throw specifier for %q#F", overrider); - cp_error_at (" overriding %q#F", basefn); + error ("looser throw specifier for %q+#F", overrider); + error (" overriding %q+#F", basefn); DECL_INVALID_OVERRIDER_P (overrider) = 1; return 0; } - + return 1; } /* Given a class TYPE, and a function decl FNDECL, look for virtual functions in TYPE's hierarchy which FNDECL overrides. We do not look in TYPE itself, only its bases. - + Returns nonzero, if we find any. Set FNDECL's DECL_VIRTUAL_P, if we find that it overrides anything. - + We check that every function which is overridden, is correctly overridden. */ @@ -1878,9 +1904,9 @@ look_for_overrides (tree type, tree fndecl) for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++) { tree basetype = BINFO_TYPE (base_binfo); - + if (TYPE_POLYMORPHIC_P (basetype)) - found += look_for_overrides_r (basetype, fndecl); + found += look_for_overrides_r (basetype, fndecl); } return found; } @@ -1906,23 +1932,23 @@ look_for_overrides_here (tree type, tree fndecl) if (ix >= 0) { tree fns = VEC_index (tree, CLASSTYPE_METHOD_VEC (type), ix); - + for (; fns; fns = OVL_NEXT (fns)) - { - tree fn = OVL_CURRENT (fns); + { + tree fn = OVL_CURRENT (fns); - if (!DECL_VIRTUAL_P (fn)) - /* Not a virtual. */; - else if (DECL_CONTEXT (fn) != type) - /* Introduced with a using declaration. */; + if (!DECL_VIRTUAL_P (fn)) + /* Not a virtual. */; + else if (DECL_CONTEXT (fn) != type) + /* Introduced with a using declaration. */; else if (DECL_STATIC_FUNCTION_P (fndecl)) { tree btypes = TYPE_ARG_TYPES (TREE_TYPE (fn)); tree dtypes = TYPE_ARG_TYPES (TREE_TYPE (fndecl)); - if (compparms (TREE_CHAIN (btypes), dtypes)) + if (compparms (TREE_CHAIN (btypes), dtypes)) return fn; - } - else if (same_signature_p (fndecl, fn)) + } + else if (same_signature_p (fndecl, fn)) return fn; } } @@ -1942,8 +1968,8 @@ look_for_overrides_r (tree type, tree fndecl) { /* A static member function cannot match an inherited virtual member function. */ - cp_error_at ("%q#D cannot be declared", fndecl); - cp_error_at (" since %q#D declared in base class", fn); + error ("%q+#D cannot be declared", fndecl); + error (" since %q+#D declared in base class", fn); } else { @@ -1971,12 +1997,12 @@ dfs_get_pure_virtuals (tree binfo, void *data) if (!BINFO_PRIMARY_P (binfo)) { tree virtuals; - + for (virtuals = BINFO_VIRTUALS (binfo); virtuals; virtuals = TREE_CHAIN (virtuals)) if (DECL_PURE_VIRTUAL_P (BV_FN (virtuals))) - VEC_safe_push (tree, CLASSTYPE_PURE_VIRTUALS (type), + VEC_safe_push (tree, gc, CLASSTYPE_PURE_VIRTUALS (type), BV_FN (virtuals)); } @@ -2016,6 +2042,10 @@ maybe_suppress_debug_info (tree t) /* We might have set this earlier in cp_finish_decl. */ TYPE_DECL_SUPPRESS_DEBUG (TYPE_MAIN_DECL (t)) = 0; + /* Always emit the information for each class every time. */ + if (flag_emit_class_debug_always) + return; + /* If we already know how we're handling this class, handle debug info the same way. */ if (CLASSTYPE_INTERFACE_KNOWN (t)) @@ -2126,17 +2156,17 @@ check_hidden_convs (tree binfo, int virtual_depth, int virtualness, if (virtual_depth || virtualness) { /* In a virtual hierarchy, we could be hidden, or could hide a - conversion function on the other_convs list. */ + conversion function on the other_convs list. */ for (level = other_convs; level; level = TREE_CHAIN (level)) { int we_hide_them; int they_hide_us; tree *prev, other; - + if (!(virtual_depth || TREE_STATIC (level))) - /* Neither is morally virtual, so cannot hide each other. */ + /* Neither is morally virtual, so cannot hide each other. */ continue; - + if (!TREE_VALUE (level)) /* They evaporated away already. */ continue; @@ -2149,13 +2179,13 @@ check_hidden_convs (tree binfo, int virtual_depth, int virtualness, if (!(we_hide_them || they_hide_us)) /* Neither is within the other, so no hiding can occur. */ continue; - + for (prev = &TREE_VALUE (level), other = *prev; other;) { if (same_type_p (to_type, TREE_TYPE (other))) { if (they_hide_us) - /* We are hidden. */ + /* We are hidden. */ return 0; if (we_hide_them) @@ -2189,12 +2219,12 @@ split_conversions (tree my_convs, tree parent_convs, { tree t; tree prev; - + /* Remove the original other_convs portion from child_convs. */ for (prev = NULL, t = child_convs; t != other_convs; prev = t, t = TREE_CHAIN (t)) continue; - + if (prev) TREE_CHAIN (prev) = NULL_TREE; else @@ -2208,7 +2238,7 @@ split_conversions (tree my_convs, tree parent_convs, } else my_convs = child_convs; - + return my_convs; } @@ -2246,22 +2276,22 @@ lookup_conversions_r (tree binfo, tree child_tpl_convs = NULL_TREE; unsigned i; tree base_binfo; - VEC(tree) *method_vec = CLASSTYPE_METHOD_VEC (BINFO_TYPE (binfo)); + VEC(tree,gc) *method_vec = CLASSTYPE_METHOD_VEC (BINFO_TYPE (binfo)); tree conv; /* If we have no conversion operators, then don't look. */ if (!TYPE_HAS_CONVERSION (BINFO_TYPE (binfo))) { *convs = *tpl_convs = NULL_TREE; - + return 0; } - + if (BINFO_VIRTUAL_P (binfo)) virtual_depth++; - + /* First, locate the unhidden ones at this level. */ - for (i = CLASSTYPE_FIRST_CONVERSION_SLOT; + for (i = CLASSTYPE_FIRST_CONVERSION_SLOT; VEC_iterate (tree, method_vec, i, conv); ++i) { @@ -2280,7 +2310,7 @@ lookup_conversions_r (tree binfo, { tree tpl = OVL_CURRENT (tpls); tree type = DECL_CONV_FN_TYPE (tpl); - + if (check_hidden_convs (binfo, virtual_depth, virtualness, type, parent_tpl_convs, other_tpl_convs)) { @@ -2301,7 +2331,7 @@ lookup_conversions_r (tree binfo, if (!IDENTIFIER_MARKED (name)) { tree type = DECL_CONV_FN_TYPE (cur); - + if (check_hidden_convs (binfo, virtual_depth, virtualness, type, parent_convs, other_convs)) { @@ -2324,17 +2354,17 @@ lookup_conversions_r (tree binfo, if (virtual_depth) TREE_STATIC (parent_convs) = 1; } - + if (my_tpl_convs) { parent_tpl_convs = tree_cons (binfo, my_tpl_convs, parent_tpl_convs); if (virtual_depth) - TREE_STATIC (parent_convs) = 1; + TREE_STATIC (parent_tpl_convs) = 1; } child_convs = other_convs; child_tpl_convs = other_tpl_convs; - + /* Now iterate over each base, looking for more conversions. */ for (i = 0; BINFO_BASE_ITERATE (binfo, i, base_binfo); i++) { @@ -2360,7 +2390,7 @@ lookup_conversions_r (tree binfo, child_convs, other_convs); *tpl_convs = split_conversions (my_tpl_convs, parent_tpl_convs, child_tpl_convs, other_tpl_convs); - + return my_virtualness; } @@ -2378,15 +2408,15 @@ lookup_conversions (tree type) { tree convs, tpl_convs; tree list = NULL_TREE; - + complete_type (type); if (!TYPE_BINFO (type)) return NULL_TREE; - + lookup_conversions_r (TYPE_BINFO (type), 0, 0, NULL_TREE, NULL_TREE, NULL_TREE, NULL_TREE, &convs, &tpl_convs); - + /* Flatten the list-of-lists */ for (; convs; convs = TREE_CHAIN (convs)) { @@ -2400,7 +2430,7 @@ lookup_conversions (tree type) list = probe; } } - + for (; tpl_convs; tpl_convs = TREE_CHAIN (tpl_convs)) { tree probe, next; @@ -2413,7 +2443,7 @@ lookup_conversions (tree type) list = probe; } } - + return list; } @@ -2441,7 +2471,7 @@ binfo_via_virtual (tree binfo, tree limit) if (limit && !CLASSTYPE_VBASECLASSES (limit)) /* LIMIT has no virtual bases, so BINFO cannot be via one. */ return NULL_TREE; - + for (; binfo && !SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), limit); binfo = BINFO_INHERITANCE_CHAIN (binfo)) { @@ -2459,7 +2489,7 @@ tree copied_binfo (tree binfo, tree here) { tree result = NULL_TREE; - + if (BINFO_VIRTUAL_P (binfo)) { tree t; @@ -2475,7 +2505,7 @@ copied_binfo (tree binfo, tree here) tree cbinfo; tree base_binfo; int ix; - + cbinfo = copied_binfo (BINFO_INHERITANCE_CHAIN (binfo), here); for (ix = 0; BINFO_BASE_ITERATE (cbinfo, ix, base_binfo); ix++) if (SAME_BINFO_TYPE_P (BINFO_TYPE (base_binfo), BINFO_TYPE (binfo))) @@ -2499,8 +2529,8 @@ binfo_for_vbase (tree base, tree t) { unsigned ix; tree binfo; - VEC (tree) *vbases; - + VEC(tree,gc) *vbases; + for (vbases = CLASSTYPE_VBASECLASSES (t), ix = 0; VEC_iterate (tree, vbases, ix, binfo); ix++) if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), base)) @@ -2517,7 +2547,7 @@ tree original_binfo (tree binfo, tree here) { tree result = NULL; - + if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), BINFO_TYPE (here))) result = here; else if (BINFO_VIRTUAL_P (binfo)) @@ -2527,13 +2557,13 @@ original_binfo (tree binfo, tree here) else if (BINFO_INHERITANCE_CHAIN (binfo)) { tree base_binfos; - + base_binfos = original_binfo (BINFO_INHERITANCE_CHAIN (binfo), here); if (base_binfos) { int ix; tree base_binfo; - + for (ix = 0; (base_binfo = BINFO_BASE_BINFO (base_binfos, ix)); ix++) if (SAME_BINFO_TYPE_P (BINFO_TYPE (base_binfo), BINFO_TYPE (binfo))) @@ -2543,7 +2573,7 @@ original_binfo (tree binfo, tree here) } } } - + return result; }