mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 22:21:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/60347 (r208153 breaks Firefox build)

Browse Source 
PR c++/60347
	PR lto/53808
	* class.c (clone_function_decl): Don't note_vague_linkage_fn.
	* init.c (build_vtbl_address): Do it here.

From-SVN: r208184
This commit is contained in:
Jason Merrill 2014-02-26 16:32:41 -05:00 committed by Jason Merrill
parent ca7e759d96
commit c34396266f
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,5 +1,10 @@
2014-02-26 Jason Merrill <jason@redhat.com>
PR c++/60347
PR lto/53808
* class.c (clone_function_decl): Don't note_vague_linkage_fn.
* init.c (build_vtbl_address): Do it here.
PR c++/59231
PR c++/11586
PR c++/14710

4
gcc/cp/class.c
View File

@ -4584,10 +4584,6 @@ clone_function_decl (tree fn, int update_method_vec_p)
destructor. */
if (DECL_VIRTUAL_P (fn))
{
if (DECL_DEFAULTED_FN (fn) && flag_devirtualize)
/* Make sure the destructor gets synthesized so that it can be
inlined after devirtualization. */
note_vague_linkage_fn (fn);
clone = build_clone (fn, deleting_dtor_identifier);
if (update_method_vec_p)
add_method (DECL_CONTEXT (clone), clone, NULL_TREE);

8
gcc/cp/init.c
View File

@ -1123,7 +1123,13 @@ build_vtbl_address (tree binfo)
/* Figure out what vtable BINFO's vtable is based on, and mark it as
used. */
vtbl = get_vtbl_decl_for_binfo (binfo_for);
TREE_USED (vtbl) = 1;
if (tree dtor = CLASSTYPE_DESTRUCTORS (DECL_CONTEXT (vtbl)))
if (!TREE_USED (vtbl) && DECL_VIRTUAL_P (dtor) && DECL_DEFAULTED_FN (dtor))
/* Make sure the destructor gets synthesized so that it can be
inlined after devirtualization even if the vtable is never
emitted. */
note_vague_linkage_fn (dtor);
TREE_USED (vtbl) = true;
/* Now compute the address to use when initializing the vptr. */
vtbl = unshare_expr (BINFO_VTABLE (binfo_for));

12
gcc/testsuite/g++.dg/template/dtor9.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/60347
struct A;
template <class T>
struct B
{
T* p;
virtual ~B() { p->~T(); }
};
struct C: B<A> { };