mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-19 03:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/12881 (ICE in make_thunk)

Browse Source 
PR c++/12881
	* method.c (make_thunk): Deal with thunk aliases when searching
	for a thunk. Robustify assertion.

From-SVN: r74571
This commit is contained in:
Nathan Sidwell 2003-12-12 14:06:53 +00:00 committed by Nathan Sidwell
parent a7bc3cdc85
commit 90d46c28f2
4 changed files with 93 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2003-12-12 Nathan Sidwell <nathan@codesourcery.com>
PR c++/12881
* method.c (make_thunk): Deal with thunk aliases when searching
for a thunk. Robustify assertion.
2003-12-11 Nathan Sidwell <nathan@codesourcery.com>
* mangle.c (conv_type_names): Holds IDENTIFIER_NODEs only.

59
gcc/cp/method.c
View File

@ -124,20 +124,61 @@ make_thunk (tree function, bool this_adjusting,
thunks VIRTUAL_OFFSET will be an INTEGER_CST, for covariant thunks it
will be a BINFO. */
for (thunk = DECL_THUNKS (function); thunk; thunk = TREE_CHAIN (thunk))
if (DECL_THIS_THUNK_P (thunk) == this_adjusting
&& THUNK_FIXED_OFFSET (thunk) == d
&& (this_adjusting
? (!THUNK_VIRTUAL_OFFSET (thunk) == !virtual_offset
&& (!virtual_offset
|| tree_int_cst_equal (THUNK_VIRTUAL_OFFSET (thunk),
virtual_offset)))
: THUNK_VIRTUAL_OFFSET (thunk) == virtual_offset))
return thunk;
{
if (DECL_THIS_THUNK_P (thunk) != this_adjusting
|| THUNK_FIXED_OFFSET (thunk) != d)
/*not me*/;
else if (this_adjusting)
{
if (!virtual_offset)
{
/* We want a non-virtual covariant thunk. */
if (!THUNK_VIRTUAL_OFFSET (thunk))
return thunk;
}
else if (THUNK_VIRTUAL_OFFSET (thunk))
{
if (tree_int_cst_equal (THUNK_VIRTUAL_OFFSET (thunk),
virtual_offset))
return thunk;
}
}
else
{
if (!virtual_offset)
{
/* We want a non-virtual covariant thunk. */
if (!THUNK_VIRTUAL_OFFSET (thunk))
return thunk;
}
else if (!THUNK_VIRTUAL_OFFSET (thunk))
/*not me*/;
else if (THUNK_ALIAS_P (thunk))
{
/* We have already determined the thunks for FUNCTION,
and there is a virtual covariant thunk alias. We
must compare the vbase offsets of the binfo we have
been given, and the binfo of the thunk. */
tree binfo = THUNK_VIRTUAL_OFFSET (THUNK_ALIAS (thunk));
if (tree_int_cst_equal (BINFO_VPTR_FIELD (virtual_offset),
BINFO_VPTR_FIELD (binfo)))
return THUNK_ALIAS (thunk);
}
else if (THUNK_VIRTUAL_OFFSET (thunk) == virtual_offset)
return thunk;
}
}
/* All thunks must be created before FUNCTION is actually emitted;
the ABI requires that all thunks be emitted together with the
function to which they transfer control. */
my_friendly_assert (!TREE_ASM_WRITTEN (function), 20021025);
/* Likewise, we can only be adding thunks to a function declared in
the class currently being laid out. */
my_friendly_assert (TYPE_SIZE (DECL_CONTEXT (function))
&& TYPE_BEING_DEFINED (DECL_CONTEXT (function)),
20031211);
thunk = build_decl (FUNCTION_DECL, NULL_TREE, TREE_TYPE (function));
DECL_LANG_SPECIFIC (thunk) = DECL_LANG_SPECIFIC (function);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-12 Nathan Sidwell <nathan@codesourcery.com>
PR c++/12881
* g++.dg/abi/covariant2.C: New.
2003-12-12 Neil Booth <neil@daikokuya.co.uk>
* testsuite/gcc.dg/cpp/trad/macro.c: New tests.

32
gcc/testsuite/g++.dg/abi/covariant2.C Normal file
View File

@ -0,0 +1,32 @@
// { dg-do compile }
// Copyright (C) 2003 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 12 Dec 2003 <nathan@codesourcery.com>
// Origin: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
// PR c++/12881. ICE in thunk generation
struct c1 {};
struct c3 : virtual c1
{
virtual c1* f6() {};
int i;
};
struct c6 : virtual c3 { };
struct c7 : c3
{
virtual c3* f6() {};
};
struct c24 : virtual c7
{
virtual c6* f6();
};
c6* c24::f6() { return 0; }
struct c31 : c24 {};