/* 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, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com)
This file is part of GCC.
GCC is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
any later version.
GCC is distributed in the hope that it will be useful,
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. */
+along with GCC; see the file COPYING3. If not see
+<http://www.gnu.org/licenses/>. */
/* High-level class interface. */
#include "tm.h"
#include "tree.h"
#include "cp-tree.h"
-#include "obstack.h"
+#include "intl.h"
#include "flags.h"
-#include "rtl.h"
#include "output.h"
#include "toplev.h"
-#include "stack.h"
-
-struct vbase_info
-{
- /* The class dominating the hierarchy. */
- tree type;
- /* A pointer to a complete object of the indicated TYPE. */
- tree decl_ptr;
- tree inits;
-};
+#include "target.h"
static int is_subobject_of_p (tree, tree);
-static tree dfs_check_overlap (tree, void *);
-static tree dfs_no_overlap_yet (tree, int, void *);
-static base_kind lookup_base_r (tree, tree, base_access, bool, tree *);
-static int dynamic_cast_base_recurse (tree, tree, bool, tree *);
-static tree dfs_debug_unmarkedp (tree, int, void *);
+static tree dfs_lookup_base (tree, void *);
+static tree dfs_dcast_hint_pre (tree, void *);
+static tree dfs_dcast_hint_post (tree, void *);
static tree dfs_debug_mark (tree, void *);
+static tree dfs_walk_once_r (tree, tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *), void *data);
+static void dfs_unmark_r (tree);
static int check_hidden_convs (tree, int, int, tree, tree, tree);
static tree split_conversions (tree, tree, tree, tree);
static int lookup_conversions_r (tree, int, int,
tree, tree, tree, tree, tree *, tree *);
static int look_for_overrides_r (tree, tree);
-static tree bfs_walk (tree, tree (*) (tree, void *),
- tree (*) (tree, int, void *), void *);
-static tree lookup_field_queue_p (tree, int, void *);
-static int shared_member_p (tree);
static tree lookup_field_r (tree, void *);
-static tree dfs_accessible_queue_p (tree, int, void *);
-static tree dfs_accessible_p (tree, void *);
+static tree dfs_accessible_post (tree, void *);
+static tree dfs_walk_once_accessible_r (tree, bool, bool,
+ tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *),
+ void *data);
+static tree dfs_walk_once_accessible (tree, bool,
+ tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *),
+ void *data);
static tree dfs_access_in_type (tree, void *);
static access_kind access_in_type (tree, tree);
static int protected_accessible_p (tree, tree, tree);
static int friend_accessible_p (tree, tree, tree);
-static int template_self_reference_p (tree, tree);
static tree dfs_get_pure_virtuals (tree, void *);
\f
#endif /* GATHER_STATISTICS */
\f
-/* Worker for lookup_base. BINFO is the binfo we are searching at,
- BASE is the RECORD_TYPE we are searching for. ACCESS is the
- required access checks. IS_VIRTUAL indicates if BINFO is morally
- virtual.
-
- If BINFO is of the required type, then *BINFO_PTR is examined to
- compare with any other instance of BASE we might have already
- discovered. *BINFO_PTR is initialized and a base_kind return value
- indicates what kind of base was located.
-
- Otherwise BINFO's bases are searched. */
-
-static base_kind
-lookup_base_r (tree binfo, tree base, base_access access,
- bool is_virtual, /* inside a virtual part */
- tree *binfo_ptr)
+/* Data for lookup_base and its workers. */
+
+struct lookup_base_data_s
{
- int i;
- tree base_binfo;
- base_kind found = bk_not_base;
-
- if (same_type_p (BINFO_TYPE (binfo), base))
- {
- /* We have found a base. Check against what we have found
- already. */
- found = bk_same_type;
- if (is_virtual)
- found = bk_via_virtual;
-
- if (!*binfo_ptr)
- *binfo_ptr = binfo;
- else if (binfo != *binfo_ptr)
- {
- if (access != ba_any)
- *binfo_ptr = NULL;
- else if (!is_virtual)
- /* Prefer a non-virtual base. */
- *binfo_ptr = binfo;
- found = bk_ambig;
- }
-
- return found;
- }
-
- for (i = 0; BINFO_BASE_ITERATE (binfo, i, base_binfo); i++)
+ 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
+ hierarchy. */
+ 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 LOOKUP_BASE_DATA_S). */
+
+static tree
+dfs_lookup_base (tree binfo, void *data_)
+{
+ struct lookup_base_data_s *data = (struct lookup_base_data_s *) data_;
+
+ if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), data->base))
{
- base_kind bk;
+ if (!data->binfo)
+ {
+ 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;
- bk = lookup_base_r (base_binfo, base,
- access,
- is_virtual || BINFO_VIRTUAL_P (base_binfo),
- binfo_ptr);
+ if (data->want_any && !data->via_virtual)
+ /* If this is a non-virtual base, then we can't do
+ better. */
+ return binfo;
- switch (bk)
+ return dfs_skip_bases;
+ }
+ else
{
- case bk_ambig:
- if (access != ba_any)
- return bk;
- found = bk;
- break;
-
- case bk_same_type:
- bk = bk_proper_base;
- /* Fall through. */
- case bk_proper_base:
- gcc_assert (found == bk_not_base);
- found = bk;
- break;
-
- case bk_via_virtual:
- if (found != bk_ambig)
- found = bk;
- break;
-
- case bk_not_base:
- break;
-
- default:
- abort ();
+ gcc_assert (binfo != data->binfo);
+
+ /* We've found more than one matching binfo. */
+ if (!data->want_any)
+ {
+ /* This is immediately ambiguous. */
+ data->binfo = NULL_TREE;
+ data->ambiguous = true;
+ return error_mark_node;
+ }
+
+ /* Prefer one via a non-virtual path. */
+ if (!binfo_via_virtual (binfo, data->t))
+ {
+ data->binfo = binfo;
+ data->via_virtual = false;
+ return binfo;
+ }
+
+ /* There must be repeated bases, otherwise we'd have stopped
+ on the first base we found. */
+ return dfs_skip_bases;
}
}
- return found;
+
+ 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. */
public typedef created in the scope of every class. */
decl = TYPE_FIELDS (base);
while (!DECL_SELF_REFERENCE_P (decl))
- decl = TREE_CHAIN (decl);
+ decl = DECL_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
tree
lookup_base (tree t, tree base, base_access access, base_kind *kind_ptr)
{
- tree binfo = NULL_TREE; /* The binfo we've found so far. */
- tree t_binfo = NULL_TREE;
+ tree binfo;
+ tree t_binfo;
base_kind bk;
-
+
if (t == error_mark_node || base == error_mark_node)
{
if (kind_ptr)
return error_mark_node;
}
gcc_assert (TYPE_P (base));
-
+
if (!TYPE_P (t))
{
t_binfo = t;
t = BINFO_TYPE (t);
}
- else
+ else
{
t = complete_type (TYPE_MAIN_VARIANT (t));
t_binfo = TYPE_BINFO (t);
}
-
- base = complete_type (TYPE_MAIN_VARIANT (base));
- if (t_binfo)
- bk = lookup_base_r (t_binfo, base, access, 0, &binfo);
+ base = TYPE_MAIN_VARIANT (base);
+
+ /* If BASE is incomplete, it can't be a base of T--and instantiating it
+ might cause an error. */
+ if (t_binfo && CLASS_TYPE_P (base) && COMPLETE_OR_OPEN_TYPE_P (base))
+ {
+ struct lookup_base_data_s data;
+
+ data.t = t;
+ data.base = base;
+ data.binfo = NULL_TREE;
+ data.ambiguous = data.via_virtual = false;
+ data.repeated_base = CLASSTYPE_REPEATED_BASE_P (t);
+ data.want_any = access == ba_any;
+
+ 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)
+ bk = bk_same_type;
+ else if (data.via_virtual)
+ bk = bk_via_virtual;
+ else
+ bk = bk_proper_base;
+ }
else
- bk = bk_not_base;
+ {
+ binfo = NULL_TREE;
+ bk = bk_not_base;
+ }
/* Check that the base is unambiguous and accessible. */
if (access != ba_any)
break;
case bk_ambig:
- binfo = NULL_TREE;
if (!(access & ba_quiet))
{
- error ("`%T' is an ambiguous base of `%T'", base, t);
+ error ("%qT is an ambiguous base of %qT", base, t);
binfo = error_mark_node;
}
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,
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))
{
- error ("`%T' is an inaccessible base of `%T'", base, t);
+ error ("%qT is an inaccessible base of %qT", base, t);
binfo = error_mark_node;
}
else
if (kind_ptr)
*kind_ptr = bk;
-
+
return binfo;
}
-/* Worker function for get_dynamic_cast_base_type. */
+/* Data for dcast_base_hint walker. */
-static int
-dynamic_cast_base_recurse (tree subtype, tree binfo, bool is_via_virtual,
- tree *offset_ptr)
+struct dcast_data_s
{
- VEC (tree) *accesses;
- tree base_binfo;
- int i;
- int worst = -2;
-
- if (BINFO_TYPE (binfo) == subtype)
+ tree subtype; /* The base type we're looking for. */
+ int virt_depth; /* Number of virtual bases encountered from most
+ derived. */
+ tree offset; /* Best hint offset discovered so far. */
+ bool repeated_base; /* Whether there are repeated bases in the
+ hierarchy. */
+};
+
+/* Worker for dcast_base_hint. Search for the base type being cast
+ from. */
+
+static tree
+dfs_dcast_hint_pre (tree binfo, void *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 (is_via_virtual)
- return -1;
+ if (data->virt_depth)
+ {
+ data->offset = ssize_int (-1);
+ return data->offset;
+ }
+ if (data->offset)
+ data->offset = ssize_int (-3);
else
- {
- *offset_ptr = BINFO_OFFSET (binfo);
- return 0;
- }
+ data->offset = BINFO_OFFSET (binfo);
+
+ return data->repeated_base ? dfs_skip_bases : data->offset;
}
-
- accesses = BINFO_BASE_ACCESSES (binfo);
- for (i = 0; BINFO_BASE_ITERATE (binfo, i, base_binfo); i++)
- {
- tree base_access = VEC_index (tree, accesses, i);
- int rval;
-
- if (base_access != access_public_node)
- continue;
- rval = dynamic_cast_base_recurse
- (subtype, base_binfo,
- is_via_virtual || BINFO_VIRTUAL_P (base_binfo), offset_ptr);
- if (worst == -2)
- worst = rval;
- else if (rval >= 0)
- worst = worst >= 0 ? -3 : worst;
- else if (rval == -1)
- worst = -1;
- else if (rval == -3 && worst != -1)
- worst = -3;
- }
- return worst;
+
+ return NULL_TREE;
+}
+
+/* Worker for dcast_base_hint. Track the virtual depth. */
+
+static tree
+dfs_dcast_hint_post (tree binfo, void *data_)
+{
+ struct dcast_data_s *data = (struct dcast_data_s *) data_;
+
+ if (BINFO_VIRTUAL_P (binfo))
+ data->virt_depth--;
+
+ return NULL_TREE;
}
/* The dynamic cast runtime needs a hint about how the static SUBTYPE type
BOFF == -3, SUBTYPE occurs as multiple public non-virtual bases. */
tree
-get_dynamic_cast_base_type (tree subtype, tree target)
+dcast_base_hint (tree subtype, tree target)
{
- tree offset = NULL_TREE;
- int boff = dynamic_cast_base_recurse (subtype, TYPE_BINFO (target),
- false, &offset);
-
- if (!boff)
- return offset;
- offset = ssize_int (boff);
- return offset;
+ struct dcast_data_s data;
+
+ data.subtype = subtype;
+ 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);
}
/* Search for a member with name NAME in a multiple inheritance
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
The TYPE_FIELDS of TYPENAME_TYPE is its TYPENAME_TYPE_FULLNAME. */
return NULL_TREE;
- if (TYPE_NAME (type)
- && DECL_LANG_SPECIFIC (TYPE_NAME (type))
- && DECL_SORTED_FIELDS (TYPE_NAME (type)))
+ if (CLASSTYPE_SORTED_FIELDS (type))
{
- tree *fields = &DECL_SORTED_FIELDS (TYPE_NAME (type))->elts[0];
- int lo = 0, hi = DECL_SORTED_FIELDS (TYPE_NAME (type))->len;
+ tree *fields = &CLASSTYPE_SORTED_FIELDS (type)->elts[0];
+ int lo = 0, hi = CLASSTYPE_SORTED_FIELDS (type)->len;
int i;
while (lo < hi)
#ifdef GATHER_STATISTICS
n_calls_lookup_field_1++;
#endif /* GATHER_STATISTICS */
- for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
+ for (field = TYPE_FIELDS (type); field; field = DECL_CHAIN (field))
{
#ifdef GATHER_STATISTICS
n_fields_searched++;
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;
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
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
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. */
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))
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
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)
{
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);
/* Note the access to DECL in TYPE. */
SET_BINFO_ACCESS (binfo, access);
- /* Mark TYPE as visited so that if we reach it again we do not
- duplicate our efforts here. */
- BINFO_MARKED (binfo) = 1;
-
return NULL_TREE;
}
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
each node with the most lenient access. */
- dfs_walk_real (binfo, 0, dfs_access_in_type, unmarkedp, decl);
- dfs_walk (binfo, dfs_unmark, markedp, 0);
+ dfs_walk_once (binfo, NULL, dfs_access_in_type, decl);
return BINFO_ACCESS (binfo);
}
-/* Called from accessible_p via dfs_walk. */
-
-static tree
-dfs_accessible_queue_p (tree derived, int ix, void *data ATTRIBUTE_UNUSED)
-{
- tree binfo = BINFO_BASE_BINFO (derived, ix);
-
- if (BINFO_MARKED (binfo))
- return NULL_TREE;
-
- /* If this class is inherited via private or protected inheritance,
- then we can't see it, unless we are a friend of the derived class. */
- if (BINFO_BASE_ACCESS (derived, ix) != access_public_node
- && !is_friend (BINFO_TYPE (derived), current_scope ()))
- return NULL_TREE;
-
- return binfo;
-}
-
-/* Called from accessible_p via dfs_walk. */
-
-static tree
-dfs_accessible_p (tree binfo, void *data ATTRIBUTE_UNUSED)
-{
- access_kind access;
-
- BINFO_MARKED (binfo) = 1;
- access = BINFO_ACCESS (binfo);
- if (access != ak_none
- && is_friend (BINFO_TYPE (binfo), current_scope ()))
- return binfo;
-
- return NULL_TREE;
-}
-
/* Returns nonzero if it is OK to access DECL through an object
indicated by BINFO in the context of DERIVED. */
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.
-
- 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
- does not change.
+ class P derived from N, where m as a member of P is public, private
+ or protected.
- Note that I believe that the passage above is wrong, and should read
- "...is private or protected or public"; otherwise you get bizarre results
- whereby a public using-decl can prevent you from accessing a protected
- member of a base. (jason 2000/02/28) */
+ Here DERIVED is a possible P, DECL is m and BINFO_TYPE (binfo) is N. */
- /* If DERIVED isn't derived from m's class, then it can't be a P. */
- if (!DERIVED_FROM_P (context_for_name_lookup (decl), derived))
+ /* If DERIVED isn't derived from N, then it can't be a P. */
+ if (!DERIVED_FROM_P (BINFO_TYPE (binfo), derived))
return 0;
access = access_in_type (derived, decl);
/* 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
tree t = binfo;
while (BINFO_INHERITANCE_CHAIN (t))
t = BINFO_INHERITANCE_CHAIN (t);
-
+
if (!DERIVED_FROM_P (derived, BINFO_TYPE (t)))
return 0;
}
if (protected_accessible_p (decl, TREE_VALUE (t), binfo))
return 1;
- /* Nested classes are implicitly friends of their enclosing types, as
- per core issue 45 (this is a change from the standard). */
+ /* Nested classes have the same access as their enclosing types, as
+ per DR 45 (this is a change from the standard). */
if (TYPE_P (scope))
for (t = TYPE_CONTEXT (scope); t && TYPE_P (t); t = TYPE_CONTEXT (t))
if (protected_accessible_p (decl, t, 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;
return ret;
}
}
- else if (CLASSTYPE_TEMPLATE_INFO (scope))
+
+ return 0;
+}
+
+/* Called via dfs_walk_once_accessible from accessible_p */
+
+static tree
+dfs_accessible_post (tree binfo, void *data ATTRIBUTE_UNUSED)
+{
+ if (BINFO_ACCESS (binfo) != ak_none)
{
- 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;
+ tree scope = current_scope ();
+ if (scope && TREE_CODE (scope) != NAMESPACE_DECL
+ && is_friend (BINFO_TYPE (binfo), scope))
+ return binfo;
}
- return 0;
+ return NULL_TREE;
}
/* DECL is a declaration from a base class of TYPE, which was the
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;
/* 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))
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);
-
- /* Now, loop through the classes of which we are a friend. */
- if (!protected_ok)
- protected_ok = friend_accessible_p (scope, decl, 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);
+ }
/* Standardize the binfo that access_in_type will use. We don't
need to know what path was chosen from this point onwards. */
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 (binfo, dfs_accessible_p, dfs_accessible_queue_p, 0);
- /* Clear any mark bits. Note that we have to walk the whole tree
- here, since we have aborted the previous walk from some point
- deep in the tree. */
- dfs_walk (binfo, dfs_unmark, 0, 0);
- 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 {
const char *errstr;
};
-/* Returns nonzero if BINFO is not hidden by the value found by the
- lookup so far. If BINFO is hidden, then there's no need to look in
- it. DATA is really a struct lookup_field_info. Called from
- lookup_field via breadth_first_search. */
-
-static tree
-lookup_field_queue_p (tree derived, int ix, void *data)
-{
- tree binfo = BINFO_BASE_BINFO (derived, ix);
- struct lookup_field_info *lfi = (struct lookup_field_info *) data;
-
- /* Don't look for constructors or destructors in base classes. */
- if (IDENTIFIER_CTOR_OR_DTOR_P (lfi->name))
- 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 && original_binfo (binfo, lfi->rval_binfo))
- return NULL_TREE;
-
- /* If this is a dependent base, don't look in it. */
- if (BINFO_DEPENDENT_BASE_P (binfo))
- return NULL_TREE;
-
- return binfo;
-}
-
-/* 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 <typename T> struct S { S* sp; }
-
- Returns nonzero if DECL is such a declaration in a class TYPE. */
-
-static int
-template_self_reference_p (tree type, tree decl)
-{
- return (CLASSTYPE_USE_TEMPLATE (type)
- && PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (type))
- && TREE_CODE (decl) == TYPE_DECL
- && DECL_ARTIFICIAL (decl)
- && DECL_NAME (decl) == constructor_name (type));
-}
-
/* Nonzero for a class member means that it is shared between all objects
of that class.
This function checks that T contains no nonstatic members. */
-static int
+int
shared_member_p (tree t)
{
if (TREE_CODE (t) == VAR_DECL || TREE_CODE (t) == TYPE_DECL \
return 1;
if (is_overloaded_fn (t))
{
+ t = get_fns (t);
for (; t; t = OVL_NEXT (t))
{
tree fn = OVL_CURRENT (t);
is_subobject_of_p (tree parent, tree binfo)
{
tree probe;
-
+
for (probe = parent; probe; probe = BINFO_INHERITANCE_CHAIN (probe))
{
if (probe == binfo)
tree type = BINFO_TYPE (binfo);
tree nval = NULL_TREE;
+ /* 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
+ && !BINFO_VIRTUAL_P (binfo))
+ return dfs_skip_bases;
+
/* First, look for a function. There can't be a function and a data
member with the same name, and if there's a function and a type
with the same name, the type is hidden by the function. */
/* If there is no declaration with the indicated name in this type,
then there's nothing to do. */
if (!nval)
- return NULL_TREE;
+ goto done;
/* If we're looking up a type (as with an elaborated type specifier)
we ignore all non-types we find. */
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
- return NULL_TREE;
+ else
+ goto done;
}
}
- /* You must name a template base class with a template-id. */
- if (!same_type_p (type, lfi->type)
- && template_self_reference_p (type, nval))
- return NULL_TREE;
-
/* If the lookup already found a match, and the new value doesn't
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. */
/* 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 = G_("request for member %qD is ambiguous");
}
}
else
lfi->rval_binfo = binfo;
}
+ done:
+ /* Don't look for constructors or destructors in base classes. */
+ if (IDENTIFIER_CTOR_OR_DTOR_P (lfi->name))
+ return dfs_skip_bases;
return NULL_TREE;
}
const char *errstr = 0;
+ if (name == error_mark_node)
+ return NULL_TREE;
+
gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
if (TREE_CODE (xbasetype) == TREE_BINFO)
}
else
{
- gcc_assert (IS_AGGR_TYPE_CODE (TREE_CODE (xbasetype)));
+ if (!RECORD_OR_UNION_CODE_P (TREE_CODE (xbasetype)))
+ return NULL_TREE;
type = xbasetype;
xbasetype = NULL_TREE;
}
lfi.type = type;
lfi.name = name;
lfi.want_type = want_type;
- bfs_walk (basetype_path, &lookup_field_r, &lookup_field_queue_p, &lfi);
+ dfs_walk_all (basetype_path, &lookup_field_r, NULL, &lfi);
rval = lfi.rval;
rval_binfo = lfi.rval_binfo;
if (rval_binfo)
just return NULL_TREE. */
if (!protect && lfi.ambiguous)
return NULL_TREE;
-
- if (protect == 2)
+
+ if (protect == 2)
{
if (lfi.ambiguous)
return lfi.ambiguous;
/* [class.access]
In the case of overloaded function names, access control is
- applied to the function selected by overloaded resolution. */
- if (rval && protect && !is_overloaded_fn (rval))
- perform_or_defer_access_check (basetype_path, rval);
+ applied to the function selected by overloaded resolution.
+
+ We cannot check here, even if RVAL is only a single non-static
+ member function, since we do not know what the "this" pointer
+ will be. For:
+
+ class A { protected: void f(); };
+ class B : public A {
+ void g(A *p) {
+ f(); // OK
+ p->f(); // Not OK.
+ }
+ };
+
+ only the first call to "f" is valid. However, if the function is
+ static, we can check. */
+ if (rval && protect
+ && !really_overloaded_fn (rval)
+ && !(TREE_CODE (rval) == FUNCTION_DECL
+ && DECL_NONSTATIC_MEMBER_FUNCTION_P (rval)))
+ perform_or_defer_access_check (basetype_path, rval, rval);
if (errstr && protect)
{
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));
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)))
{
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)
{
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. */
}
/* TYPE is a class type. Return the index of the fields within
- the method vector with name NAME, or -1 is no such field exists. */
+ the method vector with name NAME, or -1 if no such field exists. */
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;
lazily_declare_fn (sfk_constructor, type);
if (CLASSTYPE_LAZY_COPY_CTOR (type))
lazily_declare_fn (sfk_copy_constructor, type);
+ if (CLASSTYPE_LAZY_MOVE_CTOR (type))
+ lazily_declare_fn (sfk_move_constructor, type);
}
- else if (name == ansi_assopname(NOP_EXPR)
- && CLASSTYPE_LAZY_ASSIGNMENT_OP (type))
- lazily_declare_fn (sfk_assignment_operator, type);
+ else if (name == ansi_assopname (NOP_EXPR))
+ {
+ if (CLASSTYPE_LAZY_COPY_ASSIGN (type))
+ lazily_declare_fn (sfk_copy_assignment, type);
+ if (CLASSTYPE_LAZY_MOVE_ASSIGN (type))
+ lazily_declare_fn (sfk_move_assignment, 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);
return -1;
}
+/* TYPE is a class type. Return the field within the method vector with
+ name NAME, or NULL_TREE if no such field exists. */
+
+tree
+lookup_fnfields_slot (tree type, tree name)
+{
+ int ix = lookup_fnfields_1 (type, name);
+ if (ix < 0)
+ return NULL_TREE;
+ return VEC_index (tree, CLASSTYPE_METHOD_VEC (type), ix);
+}
+
+/* Like lookup_fnfields_1, except that the name is extracted from
+ FUNCTION, which is a FUNCTION_DECL or a TEMPLATE_DECL. */
+
+int
+class_method_index_for_fn (tree class_type, tree function)
+{
+ gcc_assert (TREE_CODE (function) == FUNCTION_DECL
+ || DECL_FUNCTION_TEMPLATE_P (function));
+
+ return lookup_fnfields_1 (class_type,
+ DECL_CONSTRUCTOR_P (function) ? ctor_identifier :
+ DECL_DESTRUCTOR_P (function) ? dtor_identifier :
+ DECL_NAME (function));
+}
+
+
/* DECL is the result of a qualified name lookup. QUALIFYING_SCOPE is
the class or namespace used to qualify the name. CONTEXT_CLASS is
the class corresponding to the object in which DECL will be used.
`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 && context_class != error_mark_node
+ && CLASS_TYPE_P (context_class)
+ && CLASS_TYPE_P (qualifying_scope)
&& DERIVED_FROM_P (qualifying_scope, context_class)
&& BASELINK_P (decl))
{
tree base;
- gcc_assert (CLASS_TYPE_P (context_class));
-
/* Look for the QUALIFYING_SCOPE as a base of the CONTEXT_CLASS.
Because we do not yet know which function will be chosen by
overload resolution, we cannot yet check either accessibility
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);
}
}
}
\f
-/* Walk the class hierarchy dominated by TYPE. FN is called for each
- type in the hierarchy, in a breadth-first preorder traversal.
- If it ever returns a non-NULL value, that value is immediately
- returned and the walk is terminated. At each node, FN is passed a
- BINFO indicating the path from the currently visited base-class to
- TYPE. Before each base-class is walked QFN is called. If the
- value returned is nonzero, the base-class is walked; otherwise it
- is not. If QFN is NULL, it is treated as a function which always
- returns 1. Both FN and QFN are passed the DATA whenever they are
- called.
-
- Implementation notes: Uses a circular queue, which starts off on
- the stack but gets moved to the malloc arena if it needs to be
- enlarged. The underflow and overflow conditions are
- indistinguishable except by context: if head == tail and we just
- moved the head pointer, the queue is empty, but if we just moved
- the tail pointer, the queue is full.
- Start with enough room for ten concurrent base classes. That
- will be enough for most hierarchies. */
-#define BFS_WALK_INITIAL_QUEUE_SIZE 10
+/* Walk the class hierarchy within BINFO, in a depth-first traversal.
+ PRE_FN is called in preorder, while POST_FN is called in postorder.
+ If PRE_FN returns DFS_SKIP_BASES, child binfos will not be
+ walked. If PRE_FN or POST_FN returns a different non-NULL value,
+ that value is immediately returned and the walk is terminated. One
+ of PRE_FN and POST_FN can be NULL. At each node, PRE_FN and
+ POST_FN are passed the binfo to examine and the caller's DATA
+ value. All paths are walked, thus virtual and morally virtual
+ binfos can be multiply walked. */
+
+tree
+dfs_walk_all (tree binfo, tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *), void *data)
+{
+ tree rval;
+ unsigned ix;
+ tree base_binfo;
+
+ /* Call the pre-order walking function. */
+ if (pre_fn)
+ {
+ rval = pre_fn (binfo, data);
+ if (rval)
+ {
+ if (rval == dfs_skip_bases)
+ goto skip_bases;
+ return rval;
+ }
+ }
+
+ /* Find the next child binfo to walk. */
+ for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++)
+ {
+ rval = dfs_walk_all (base_binfo, pre_fn, post_fn, data);
+ if (rval)
+ return rval;
+ }
+
+ skip_bases:
+ /* Call the post-order walking function. */
+ if (post_fn)
+ {
+ rval = post_fn (binfo, data);
+ gcc_assert (rval != dfs_skip_bases);
+ return rval;
+ }
+
+ return NULL_TREE;
+}
+
+/* Worker for dfs_walk_once. This behaves as dfs_walk_all, except
+ that binfos are walked at most once. */
static tree
-bfs_walk (tree binfo,
- tree (*fn) (tree, void *),
- tree (*qfn) (tree, int, void *),
- void *data)
+dfs_walk_once_r (tree binfo, tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *), void *data)
{
- tree rval = NULL_TREE;
+ tree rval;
+ unsigned ix;
+ tree base_binfo;
- tree bases_initial[BFS_WALK_INITIAL_QUEUE_SIZE];
- /* A circular queue of the base classes of BINFO. These will be
- built up in breadth-first order, except where QFN prunes the
- search. */
- size_t head, tail;
- size_t base_buffer_size = BFS_WALK_INITIAL_QUEUE_SIZE;
- tree *base_buffer = bases_initial;
+ /* Call the pre-order walking function. */
+ if (pre_fn)
+ {
+ rval = pre_fn (binfo, data);
+ if (rval)
+ {
+ if (rval == dfs_skip_bases)
+ goto skip_bases;
- head = tail = 0;
- base_buffer[tail++] = binfo;
+ return rval;
+ }
+ }
- while (head != tail)
+ /* Find the next child binfo to walk. */
+ for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++)
{
- int n_bases, ix;
- tree binfo = base_buffer[head++];
- if (head == base_buffer_size)
- head = 0;
+ if (BINFO_VIRTUAL_P (base_binfo))
+ {
+ if (BINFO_MARKED (base_binfo))
+ continue;
+ BINFO_MARKED (base_binfo) = 1;
+ }
- /* Is this the one we're looking for? If so, we're done. */
- rval = fn (binfo, data);
+ rval = dfs_walk_once_r (base_binfo, pre_fn, post_fn, data);
if (rval)
- goto done;
+ return rval;
+ }
+
+ skip_bases:
+ /* Call the post-order walking function. */
+ if (post_fn)
+ {
+ rval = post_fn (binfo, data);
+ 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++)
+ {
+ if (BINFO_VIRTUAL_P (base_binfo))
+ {
+ if (!BINFO_MARKED (base_binfo))
+ continue;
+ BINFO_MARKED (base_binfo) = 0;
+ }
+ /* Only walk, if it can contain more virtual bases. */
+ if (CLASSTYPE_VBASECLASSES (BINFO_TYPE (base_binfo)))
+ dfs_unmark_r (base_binfo);
+ }
+}
+
+/* Like dfs_walk_all, except that binfos are not multiply walked. For
+ non-diamond shaped hierarchies this is the same as dfs_walk_all.
+ For diamond shaped hierarchies we must mark the virtual bases, to
+ avoid multiple walks. */
+
+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;
- n_bases = BINFO_N_BASE_BINFOS (binfo);
- for (ix = 0; ix != n_bases; ix++)
+ 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. */
+ rval = dfs_walk_all (binfo, pre_fn, post_fn, data);
+ else
+ {
+ rval = dfs_walk_once_r (binfo, pre_fn, post_fn, data);
+ 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,gc) *vbases;
+ unsigned ix;
tree base_binfo;
-
- if (qfn)
- base_binfo = (*qfn) (binfo, ix, data);
- else
- base_binfo = BINFO_BASE_BINFO (binfo, ix);
-
- if (base_binfo)
- {
- base_buffer[tail++] = base_binfo;
- if (tail == base_buffer_size)
- tail = 0;
- if (tail == head)
- {
- tree *new_buffer = xmalloc (2 * base_buffer_size
- * sizeof (tree));
- memcpy (&new_buffer[0], &base_buffer[0],
- tail * sizeof (tree));
- memcpy (&new_buffer[head + base_buffer_size],
- &base_buffer[head],
- (base_buffer_size - head) * sizeof (tree));
- if (base_buffer_size != BFS_WALK_INITIAL_QUEUE_SIZE)
- free (base_buffer);
- base_buffer = new_buffer;
- head += base_buffer_size;
- base_buffer_size *= 2;
- }
- }
+
+ for (vbases = CLASSTYPE_VBASECLASSES (BINFO_TYPE (binfo)), ix = 0;
+ VEC_iterate (tree, vbases, ix, base_binfo); ix++)
+ BINFO_MARKED (base_binfo) = 0;
}
+ else
+ dfs_unmark_r (binfo);
}
- done:
- if (base_buffer_size != BFS_WALK_INITIAL_QUEUE_SIZE)
- free (base_buffer);
+ active--;
+
return rval;
}
-/* Exactly like bfs_walk, except that a depth-first traversal is
- performed, and PREFN is called in preorder, while POSTFN is called
- in postorder. */
+/* Worker function for dfs_walk_once_accessible. Behaves like
+ dfs_walk_once_r, except (a) FRIENDS_P is true if special
+ access given by the current context should be considered, (b) ONCE
+ indicates whether bases should be marked during traversal. */
-tree
-dfs_walk_real (tree binfo,
- tree (*prefn) (tree, void *),
- tree (*postfn) (tree, void *),
- tree (*qfn) (tree, int, void *),
- void *data)
+static tree
+dfs_walk_once_accessible_r (tree binfo, bool friends_p, bool once,
+ tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *), void *data)
{
- int i;
- tree base_binfo;
tree rval = NULL_TREE;
+ unsigned ix;
+ tree base_binfo;
/* Call the pre-order walking function. */
- if (prefn)
+ if (pre_fn)
{
- rval = (*prefn) (binfo, data);
+ rval = pre_fn (binfo, data);
if (rval)
- return rval;
+ {
+ if (rval == dfs_skip_bases)
+ goto skip_bases;
+
+ return rval;
+ }
}
- /* Process the basetypes. */
- for (i = 0; BINFO_BASE_ITERATE (binfo, i, base_binfo); i++)
+ /* Find the next child binfo to walk. */
+ for (ix = 0; BINFO_BASE_ITERATE (binfo, ix, base_binfo); ix++)
{
- if (qfn)
+ bool mark = once && BINFO_VIRTUAL_P (base_binfo);
+
+ 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)
{
- base_binfo = (*qfn) (binfo, i, data);
- if (!base_binfo)
+ tree scope;
+ if (!friends_p)
+ continue;
+ scope = current_scope ();
+ if (!scope
+ || TREE_CODE (scope) == NAMESPACE_DECL
+ || !is_friend (BINFO_TYPE (binfo), scope))
continue;
}
- rval = dfs_walk_real (base_binfo, prefn, postfn, qfn, data);
+
+ if (mark)
+ BINFO_MARKED (base_binfo) = 1;
+
+ rval = dfs_walk_once_accessible_r (base_binfo, friends_p, once,
+ pre_fn, post_fn, data);
if (rval)
return rval;
}
+ skip_bases:
/* Call the post-order walking function. */
- if (postfn)
- rval = (*postfn) (binfo, data);
-
- return rval;
+ if (post_fn)
+ {
+ rval = post_fn (binfo, data);
+ gcc_assert (rval != dfs_skip_bases);
+ return rval;
+ }
+
+ return NULL_TREE;
}
-/* Exactly like bfs_walk, except that a depth-first post-order traversal is
- performed. */
+/* Like dfs_walk_once except that only accessible bases are walked.
+ FRIENDS_P indicates whether friendship of the local context
+ should be considered when determining accessibility. */
-tree
-dfs_walk (tree binfo,
- tree (*fn) (tree, void *),
- tree (*qfn) (tree, int, void *),
- void *data)
+static tree
+dfs_walk_once_accessible (tree binfo, bool friends_p,
+ tree (*pre_fn) (tree, void *),
+ tree (*post_fn) (tree, void *), void *data)
{
- return dfs_walk_real (binfo, 0, fn, qfn, data);
+ 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,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;
+ }
+ else
+ dfs_unmark_r (binfo);
+ }
+ return rval;
}
/* 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);
{
/* 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);
}
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,
- ba_check | ba_quiet, NULL);
+ /* Strictly speaking, the standard requires the return type to be
+ complete even if it only differs in cv-quals, but that seems
+ like a bug in the wording. */
+ if (!same_type_ignoring_top_level_qualifiers_p (base_return, over_return))
+ {
+ tree binfo = lookup_base (over_return, base_return,
+ ba_check | ba_quiet, NULL);
- if (!binfo)
- fail = 1;
+ if (!binfo)
+ fail = 1;
+ }
}
else if (!pedantic
&& can_convert (TREE_TYPE (base_type), TREE_TYPE (over_type)))
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;
{
if (fail == 1)
{
- cp_error_at ("invalid covariant return type for `%#D'", overrider);
- cp_error_at (" overriding `%#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 `%#D'",
- overrider);
- cp_error_at (" overriding `%#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))
+ if (!comp_except_specs (base_throw, over_throw, ce_derived))
+ {
+ error ("looser throw specifier for %q+#F", overrider);
+ error (" overriding %q+#F", basefn);
+ DECL_INVALID_OVERRIDER_P (overrider) = 1;
+ return 0;
+ }
+
+ /* Check for conflicting type attributes. */
+ if (!targetm.comp_type_attributes (over_type, base_type))
{
- cp_error_at ("looser throw specifier for `%#F'", overrider);
- cp_error_at (" overriding `%#F'", basefn);
+ error ("conflicting type attributes specified for %q+#D", overrider);
+ error (" overriding %q+#D", basefn);
DECL_INVALID_OVERRIDER_P (overrider) = 1;
return 0;
}
-
+
+ if (DECL_DELETED_FN (basefn) != DECL_DELETED_FN (overrider))
+ {
+ if (DECL_DELETED_FN (overrider))
+ {
+ error ("deleted function %q+D", overrider);
+ error ("overriding non-deleted function %q+D", basefn);
+ maybe_explain_implicit_delete (overrider);
+ }
+ else
+ {
+ error ("non-deleted function %q+D", overrider);
+ error ("overriding deleted function %q+D", basefn);
+ }
+ 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. */
int ix;
int found = 0;
+ /* A constructor for a class T does not override a function T
+ in a base class. */
+ if (DECL_CONSTRUCTOR_P (fndecl))
+ return 0;
+
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;
}
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;
}
}
{
/* A static member function cannot match an inherited
virtual member function. */
- cp_error_at ("`%#D' cannot be declared", fndecl);
- cp_error_at (" since `%#D' declared in base class", fn);
+ error ("%q+#D cannot be declared", fndecl);
+ error (" since %q+#D declared in base class", fn);
}
else
{
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)))
- CLASSTYPE_PURE_VIRTUALS (type)
- = tree_cons (NULL_TREE, BV_FN (virtuals),
- CLASSTYPE_PURE_VIRTUALS (type));
+ VEC_safe_push (tree, gc, CLASSTYPE_PURE_VIRTUALS (type),
+ BV_FN (virtuals));
}
-
- BINFO_MARKED (binfo) = 1;
return NULL_TREE;
}
void
get_pure_virtuals (tree type)
{
- unsigned ix;
- tree binfo;
- VEC (tree) *vbases;
-
/* Clear the CLASSTYPE_PURE_VIRTUALS list; whatever is already there
is going to be overridden. */
- CLASSTYPE_PURE_VIRTUALS (type) = NULL_TREE;
+ CLASSTYPE_PURE_VIRTUALS (type) = NULL;
/* Now, run through all the bases which are not primary bases, and
collect the pure virtual functions. We look at the vtable in
each class to determine what pure virtual functions are present.
(A primary base is not interesting because the derived class of
which it is a primary base will contain vtable entries for the
pure virtuals in the base class. */
- dfs_walk (TYPE_BINFO (type), dfs_get_pure_virtuals, unmarkedp, type);
- dfs_walk (TYPE_BINFO (type), dfs_unmark, markedp, type);
-
- /* Put the pure virtuals in dfs order. */
- CLASSTYPE_PURE_VIRTUALS (type) = nreverse (CLASSTYPE_PURE_VIRTUALS (type));
-
- for (vbases = CLASSTYPE_VBASECLASSES (type), ix = 0;
- VEC_iterate (tree, vbases, ix, binfo); ix++)
- {
- tree virtuals;
-
- for (virtuals = BINFO_VIRTUALS (binfo); virtuals;
- virtuals = TREE_CHAIN (virtuals))
- {
- tree base_fndecl = BV_FN (virtuals);
- if (DECL_NEEDS_FINAL_OVERRIDER_P (base_fndecl))
- error ("`%#D' needs a final overrider", base_fndecl);
- }
- }
+ dfs_walk_once (TYPE_BINFO (type), NULL, dfs_get_pure_virtuals, type);
}
-\f
-/* DEPTH-FIRST SEARCH ROUTINES. */
-
-tree
-markedp (tree derived, int ix, void *data ATTRIBUTE_UNUSED)
-{
- tree binfo = BINFO_BASE_BINFO (derived, ix);
-
- return BINFO_MARKED (binfo) ? binfo : NULL_TREE;
-}
-
-tree
-unmarkedp (tree derived, int ix, void *data ATTRIBUTE_UNUSED)
-{
- tree binfo = BINFO_BASE_BINFO (derived, ix);
-
- return !BINFO_MARKED (binfo) ? binfo : NULL_TREE;
-}
-
-/* The worker functions for `dfs_walk'. These do not need to
- test anything (vis a vis marking) if they are paired with
- a predicate function (above). */
-
-tree
-dfs_unmark (tree binfo, void *data ATTRIBUTE_UNUSED)
-{
- BINFO_MARKED (binfo) = 0;
- return NULL_TREE;
-}
-
\f
/* Debug info for C++ classes can get very large; try to avoid
emitting it everywhere.
/* 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))
{
tree t = BINFO_TYPE (binfo);
+ if (CLASSTYPE_DEBUG_REQUESTED (t))
+ return dfs_skip_bases;
+
CLASSTYPE_DEBUG_REQUESTED (t) = 1;
return NULL_TREE;
}
-/* Returns BINFO if we haven't already noted that we want debugging
- info for this base class. */
-
-static tree
-dfs_debug_unmarkedp (tree derived, int ix, void *data ATTRIBUTE_UNUSED)
-{
- tree binfo = BINFO_BASE_BINFO (derived, ix);
-
- return (!CLASSTYPE_DEBUG_REQUESTED (BINFO_TYPE (binfo))
- ? binfo : NULL_TREE);
-}
-
/* Write out the debugging information for TYPE, whose vtable is being
emitted. Also walk through our bases and note that we want to
write out information for them. This avoids the problem of not
rest_of_type_compilation (type, toplevel_bindings_p ());
}
- dfs_walk (TYPE_BINFO (type), dfs_debug_mark, dfs_debug_unmarkedp, 0);
+ dfs_walk_all (TYPE_BINFO (type), dfs_debug_mark, NULL, 0);
}
\f
void
}
/* Helper for lookup_conversions_r. TO_TYPE is the type converted to
- by a conversion op in base BINFO. VIRTUAL_DEPTH is non-zero if
- BINFO is morally virtual, and VIRTUALNESS is non-zero if virtual
+ by a conversion op in base BINFO. VIRTUAL_DEPTH is nonzero if
+ BINFO is morally virtual, and VIRTUALNESS is nonzero if virtual
bases have been encountered already in the tree walk. PARENT_CONVS
is the list of lists of conversion functions that could hide CONV
and OTHER_CONVS is the list of lists of conversion functions that
could hide or be hidden by CONV, should virtualness be involved in
the hierarchy. Merely checking the conversion op's name is not
enough because two conversion operators to the same type can have
- different names. Return non-zero if we are visible. */
+ different names. Return nonzero if we are visible. */
static int
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;
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)
/* Helper for lookup_conversions_r. PARENT_CONVS is a list of lists
of conversion functions, the first slot will be for the current
binfo, if MY_CONVS is non-NULL. CHILD_CONVS is the list of lists
- of conversion functions from childen of the current binfo,
- concatenated with conversions from elsewhere in the heirarchy --
+ of conversion functions from children of the current binfo,
+ concatenated with conversions from elsewhere in the hierarchy --
that list begins with OTHER_CONVS. Return a single list of lists
containing only conversions from the current binfo and its
children. */
{
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
}
else
my_convs = child_convs;
-
+
return my_convs;
}
/* Worker for lookup_conversions. Lookup conversion functions in
- BINFO and its children. VIRTUAL_DEPTH is non-zero, if BINFO is in
- a morally virtual base, and VIRTUALNESS is non-zero, if we've
+ BINFO and its children. VIRTUAL_DEPTH is nonzero, if BINFO is in
+ a morally virtual base, and VIRTUALNESS is nonzero, if we've
encountered virtual bases already in the tree walk. PARENT_CONVS &
PARENT_TPL_CONVS are lists of list of conversions within parent
binfos. OTHER_CONVS and OTHER_TPL_CONVS are conversions found
elsewhere in the tree. Return the conversions found within this
- portion of the graph in CONVS and TPL_CONVS. Return non-zero is we
+ portion of the graph in CONVS and TPL_CONVS. Return nonzero is we
encountered virtualness. We keep template and non-template
conversions separate, to avoid unnecessary type comparisons.
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)
{
{
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))
{
if (!IDENTIFIER_MARKED (name))
{
tree type = DECL_CONV_FN_TYPE (cur);
-
+
if (check_hidden_convs (binfo, virtual_depth, virtualness,
type, parent_convs, other_convs))
{
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++)
{
child_convs, other_convs);
*tpl_convs = split_conversions (my_tpl_convs, parent_tpl_convs,
child_tpl_convs, other_tpl_convs);
-
+
return my_virtualness;
}
{
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))
{
list = probe;
}
}
-
+
for (; tpl_convs; tpl_convs = TREE_CHAIN (tpl_convs))
{
tree probe, next;
list = probe;
}
}
-
- return list;
-}
-
-struct overlap_info
-{
- tree compare_type;
- int found_overlap;
-};
-
-/* Check whether the empty class indicated by EMPTY_BINFO is also present
- at offset 0 in COMPARE_TYPE, and set found_overlap if so. */
-static tree
-dfs_check_overlap (tree empty_binfo, void *data)
-{
- struct overlap_info *oi = (struct overlap_info *) data;
- tree binfo;
-
- for (binfo = TYPE_BINFO (oi->compare_type);
- ;
- binfo = BINFO_BASE_BINFO (binfo, 0))
- {
- if (BINFO_TYPE (binfo) == BINFO_TYPE (empty_binfo))
- {
- oi->found_overlap = 1;
- break;
- }
- else if (!BINFO_N_BASE_BINFOS (binfo))
- break;
- }
-
- return NULL_TREE;
-}
-
-/* Trivial function to stop base traversal when we find something. */
-
-static tree
-dfs_no_overlap_yet (tree derived, int ix, void *data)
-{
- tree binfo = BINFO_BASE_BINFO (derived, ix);
- struct overlap_info *oi = (struct overlap_info *) data;
-
- return !oi->found_overlap ? binfo : NULL_TREE;
-}
-
-/* Returns nonzero if EMPTY_TYPE or any of its bases can also be found at
- offset 0 in NEXT_TYPE. Used in laying out empty base class subobjects. */
-
-int
-types_overlap_p (tree empty_type, tree next_type)
-{
- struct overlap_info oi;
-
- if (! IS_AGGR_TYPE (next_type))
- return 0;
- oi.compare_type = next_type;
- oi.found_overlap = 0;
- dfs_walk (TYPE_BINFO (empty_type), dfs_check_overlap,
- dfs_no_overlap_yet, &oi);
- return oi.found_overlap;
+ return list;
}
/* Returns the binfo of the first direct or indirect virtual base derived
tree
binfo_via_virtual (tree binfo, tree limit)
{
- for (; binfo && (!limit || !same_type_p (BINFO_TYPE (binfo), 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))
{
if (BINFO_VIRTUAL_P (binfo))
copied_binfo (tree binfo, tree here)
{
tree result = NULL_TREE;
-
+
if (BINFO_VIRTUAL_P (binfo))
{
tree t;
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 (BINFO_TYPE (base_binfo) == BINFO_TYPE (binfo))
+ if (SAME_BINFO_TYPE_P (BINFO_TYPE (base_binfo), BINFO_TYPE (binfo)))
{
result = base_binfo;
break;
}
else
{
- gcc_assert (BINFO_TYPE (here) == BINFO_TYPE (binfo));
+ gcc_assert (SAME_BINFO_TYPE_P (BINFO_TYPE (here), BINFO_TYPE (binfo)));
result = here;
}
{
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 (BINFO_TYPE (binfo) == base)
+ if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), base))
return binfo;
return NULL;
}
original_binfo (tree binfo, tree here)
{
tree result = NULL;
-
- if (BINFO_TYPE (binfo) == BINFO_TYPE (here))
+
+ if (SAME_BINFO_TYPE_P (BINFO_TYPE (binfo), BINFO_TYPE (here)))
result = here;
else if (BINFO_VIRTUAL_P (binfo))
result = (CLASSTYPE_VBASECLASSES (BINFO_TYPE (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 (BINFO_TYPE (base_binfo) == BINFO_TYPE (binfo))
+ if (SAME_BINFO_TYPE_P (BINFO_TYPE (base_binfo),
+ BINFO_TYPE (binfo)))
{
result = base_binfo;
break;
}
}
}
-
+
return result;
}