OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/5682 (ICE in build_secondary_vtable) 

cp:
	PR c++/5682
	* cp-tree.h (BINFO_PRIMARY_P): Explain meaning better.
	(dfs_skip_nonprimary_vbases_unmarkedp): Remove.
	(dfs_skip_nonprimary_vbases_markedp): Remove.
	* search.c (get_shared_vbase_if_not_primary): Remove.
	(dfs_skip_nonprimary_vbases_unmarkedp): Remove.
	(dfs_skip_nonprimary_vbases_markedp): Remove.
	(dfs_unmarked_real_bases_queue_p): Just get the canonical binfo.
	(dfs_marked_real_bases_queue_p): Likewise.
testsuite:
	* g++.dg/abi/vbase9.C: New test.

From-SVN: r51395
This commit is contained in:
Nathan Sidwell 2002-03-26 18:36:17 +00:00 committed by Nathan Sidwell
parent 61cca464b7
commit a2cbcfe560
4 changed files with 46 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcc/cp/ChangeLog
View File

@ -1,3 +1,15 @@
2002-03-26 Nathan Sidwell <nathan@codesourcery.com>
PR c++/5682
* cp-tree.h (BINFO_PRIMARY_P): Explain meaning better.
(dfs_skip_nonprimary_vbases_unmarkedp): Remove.
(dfs_skip_nonprimary_vbases_markedp): Remove.
* search.c (get_shared_vbase_if_not_primary): Remove.
(dfs_skip_nonprimary_vbases_unmarkedp): Remove.
(dfs_skip_nonprimary_vbases_markedp): Remove.
(dfs_unmarked_real_bases_queue_p): Just get the canonical binfo.
(dfs_marked_real_bases_queue_p): Likewise.
2002-03-26 Mark Mitchell <mark@codesourcery.com>
PR c++/4884.

10
gcc/cp/cp-tree.h
View File

@ -1632,12 +1632,10 @@ struct lang_type
#define SET_BINFO_PUSHDECLS_MARKED(NODE) SET_BINFO_VTABLE_PATH_MARKED (NODE)
#define CLEAR_BINFO_PUSHDECLS_MARKED(NODE) CLEAR_BINFO_VTABLE_PATH_MARKED (NODE)
/* Nonzero if this BINFO is a primary base class.
/* Nonzero if this BINFO is a primary base class. Note, this can be
set for non-canononical virtual bases. For a virtual primary base
you might also need to check whether it is canonical. */
In the TYPE_BINFO hierarchy, this flag is never set for a base
class of a non-primary virtual base. This flag is only valid for
paths (given by BINFO_INHERITANCE_CHAIN) that really exist in the
final object. */
#define BINFO_PRIMARY_P(NODE) \
(BINFO_PRIMARY_BASE_OF (NODE) != NULL_TREE)
@ -4094,8 +4092,6 @@ extern tree dfs_walk_real PARAMS ((tree,
extern tree dfs_unmark PARAMS ((tree, void *));
extern tree markedp PARAMS ((tree, void *));
extern tree unmarkedp PARAMS ((tree, void *));
extern tree dfs_skip_nonprimary_vbases_unmarkedp PARAMS ((tree, void *));
extern tree dfs_skip_nonprimary_vbases_markedp PARAMS ((tree, void *));
extern tree dfs_unmarked_real_bases_queue_p PARAMS ((tree, void *));
extern tree dfs_marked_real_bases_queue_p PARAMS ((tree, void *));
extern tree dfs_skip_vbases PARAMS ((tree, void *));

99
gcc/cp/search.c
View File

@ -127,7 +127,6 @@ static int protected_accessible_p PARAMS ((tree, tree, tree));
static int friend_accessible_p PARAMS ((tree, tree, tree));
static void setup_class_bindings PARAMS ((tree, int));
static int template_self_reference_p PARAMS ((tree, tree));
static tree get_shared_vbase_if_not_primary PARAMS ((tree, void *));
static tree dfs_find_vbase_instance PARAMS ((tree, void *));
static tree dfs_get_pure_virtuals PARAMS ((tree, void *));
static tree dfs_build_inheritance_graph_order PARAMS ((tree, void *));
@ -1952,81 +1951,30 @@ look_for_overrides_r (type, fndecl)
return look_for_overrides (type, fndecl);
}
/* A queue function for dfs_walk that skips any nonprimary virtual
bases and any already marked bases. */
tree
dfs_skip_nonprimary_vbases_unmarkedp (binfo, data)
tree binfo;
void *data ATTRIBUTE_UNUSED;
{
if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_P (binfo))
/* This is a non-primary virtual base. Skip it. */
return NULL_TREE;
return unmarkedp (binfo, NULL);
}
/* A queue function for dfs_walk that skips any nonprimary virtual
bases and any unmarked bases. */
tree
dfs_skip_nonprimary_vbases_markedp (binfo, data)
tree binfo;
void *data ATTRIBUTE_UNUSED;
{
if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_P (binfo))
/* This is a non-primary virtual base. Skip it. */
return NULL_TREE;
return markedp (binfo, NULL);
}
/* If BINFO is a non-primary virtual baseclass (in the hierarchy
dominated by TYPE), and no primary copy appears anywhere in the
hierarchy, return the shared copy. If a primary copy appears
elsewhere, return NULL_TREE. Otherwise, return BINFO itself; it is
either a non-virtual base or a primary virtual base. */
static tree
get_shared_vbase_if_not_primary (binfo, data)
tree binfo;
void *data;
{
if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_P (binfo))
{
tree type = (tree) data;
if (TREE_CODE (type) == TREE_LIST)
type = TREE_PURPOSE (type);
/* This is a non-primary virtual base. If there is no primary
version, get the shared version. */
binfo = binfo_for_vbase (BINFO_TYPE (binfo), type);
if (BINFO_PRIMARY_P (binfo))
return NULL_TREE;
}
return binfo;
}
/* A queue function to use with dfs_walk that prevents travel into any
nonprimary virtual base, or its baseclasses. DATA should be the
type of the complete object, or a TREE_LIST whose TREE_PURPOSE is
the type of the complete object. By using this function as a queue
function, you will walk over exactly those BINFOs that actually
exist in the complete object, including those for virtual base
classes. If you SET_BINFO_MARKED for each binfo you process, you
are further guaranteed that you will walk into each virtual base
class exactly once. */
/* A queue function to use with dfs_walk that only walks into
canonical bases. DATA should be the type of the complete object,
or a TREE_LIST whose TREE_PURPOSE is the type of the complete
object. By using this function as a queue function, you will walk
over exactly those BINFOs that actually exist in the complete
object, including those for virtual base classes. If you
SET_BINFO_MARKED for each binfo you process, you are further
guaranteed that you will walk into each virtual base class exactly
once. */
tree
dfs_unmarked_real_bases_queue_p (binfo, data)
tree binfo;
void *data;
{
binfo = get_shared_vbase_if_not_primary (binfo, data);
return binfo ? unmarkedp (binfo, NULL) : NULL_TREE;
if (TREE_VIA_VIRTUAL (binfo))
{
tree type = (tree) data;
if (TREE_CODE (type) == TREE_LIST)
type = TREE_PURPOSE (type);
binfo = binfo_for_vbase (BINFO_TYPE (binfo), type);
}
return unmarkedp (binfo, NULL);
}
/* Like dfs_unmarked_real_bases_queue_p but walks only into things
@ -2037,8 +1985,15 @@ dfs_marked_real_bases_queue_p (binfo, data)
tree binfo;
void *data;
{
binfo = get_shared_vbase_if_not_primary (binfo, data);
return binfo ? markedp (binfo, NULL) : NULL_TREE;
if (TREE_VIA_VIRTUAL (binfo))
{
tree type = (tree) data;
if (TREE_CODE (type) == TREE_LIST)
type = TREE_PURPOSE (type);
binfo = binfo_for_vbase (BINFO_TYPE (binfo), type);
}
return markedp (binfo, NULL);
}
/* A queue function that skips all virtual bases (and their

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2002-03-26 Nathan Sidwell <nathan@codesourcery.com>
* g++.dg/abi/vbase9.C: New test.
2002-03-26 Mark Mitchell <mark@codesourcery.com>
* g++.dg/init/new1.C: New test.