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

search.c (convert_pointer_to_single_level): Reimplement without using get_binfo.

Browse Source 
* search.c (convert_pointer_to_single_level): Reimplement without
	using get_binfo.

From-SVN: r27394
This commit is contained in:
Mark Mitchell 1999-06-07 13:28:06 +00:00 committed by Mark Mitchell
parent 505e038544
commit bfec1a842f
3 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/cp/ChangeLog
View File

@ -1,3 +1,13 @@
1999-06-07 Mark Mitchell <mark@codesourcery.com>
* search.c (convert_pointer_to_single_level): Reimplement without
using get_binfo.
1999-06-06 Mark Mitchell <mark@codesourcery.com>
* method.c (is_back_referenceable_type): Back-reference bools when
not squangling.
1999-06-07 Dave Brolley <brolley@cygnus.com>
* lex.c (real_yylex): Replace unused bytes from bad multibyte char.

26
gcc/cp/search.c
View File

@ -2057,17 +2057,29 @@ static tree
convert_pointer_to_single_level (to_type, expr)
tree to_type, expr;
{
tree derived;
tree binfo_of_derived;
tree last;
int i;
binfo_of_derived = TYPE_BINFO (TREE_TYPE (TREE_TYPE (expr)));
last = get_binfo (to_type, TREE_TYPE (TREE_TYPE (expr)), 0);
my_friendly_assert (BINFO_INHERITANCE_CHAIN (last) == binfo_of_derived,
980827);
derived = TREE_TYPE (TREE_TYPE (expr));
binfo_of_derived = TYPE_BINFO (derived);
my_friendly_assert (BINFO_INHERITANCE_CHAIN (binfo_of_derived) == NULL_TREE,
980827);
return build_vbase_path (PLUS_EXPR, build_pointer_type (to_type), expr,
last, 1);
for (i = CLASSTYPE_N_BASECLASSES (derived) - 1; i >= 0; --i)
{
tree binfo = BINFO_BASETYPE (binfo_of_derived, i);
my_friendly_assert (BINFO_INHERITANCE_CHAIN (binfo) == binfo_of_derived,
980827);
if (same_type_p (BINFO_TYPE (binfo), to_type))
return build_vbase_path (PLUS_EXPR,
build_pointer_type (to_type),
expr, binfo, 1);
}
my_friendly_abort (19990607);
/* NOTREACHED */
return NULL_TREE;
}
tree markedp (binfo, data)

20
gcc/testsuite/g++.old-deja/g++.other/virtual5.C Normal file
View File

@ -0,0 +1,20 @@
// Build don't link:
// Special g++ Options: -w
// Origin: Derived from code by Andris Pavenis <andris@stargate.astr.lu.lv>
class vector {};
class V
{
};
class A : public vector
{
};
class B : public A, virtual V, public vector
{
B() {}
};