procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/60532 (r208573 causes Firefox build failure)

Browse source 
PR c++/60532
	PR c++/58678
	* search.c (get_pure_virtuals): Handle abstract dtor here.
	(dfs_get_pure_virtuals): Not here.

From-SVN: r208586
This commit is contained in:
Jason Merrill 2014-03-14 21:39:03 -04:00 • committed by Jason Merrill
parent 265a9ea763
commit 47b5d284dd
3 changed files with 31 additions and 16 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-03-14 Jason Merrill <jason@redhat.com>
PR c++/60532
PR c++/58678
* search.c (get_pure_virtuals): Handle abstract dtor here.
(dfs_get_pure_virtuals): Not here.
PR c++/58678
* search.c (dfs_get_pure_virtuals): Treat the destructor of an
abstract class as pure.

32
gcc/cp/search.c
View file

@ -2096,22 +2096,6 @@ dfs_get_pure_virtuals (tree binfo, void *data)
if (DECL_PURE_VIRTUAL_P (BV_FN (virtuals)))
vec_safe_push (CLASSTYPE_PURE_VIRTUALS (type), BV_FN (virtuals));
}
/* Treat a virtual destructor in an abstract class as pure even if it
isn't declared as pure; there is no way it would be called through the
vtable except during construction, which causes undefined behavior. */
if (binfo == TYPE_BINFO (type)
&& CLASSTYPE_PURE_VIRTUALS (type)
&& TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type))
{
tree dtor = CLASSTYPE_DESTRUCTORS (type);
if (DECL_VIRTUAL_P (dtor) && !DECL_PURE_VIRTUAL_P (dtor))
{
tree clone;
DECL_PURE_VIRTUAL_P (dtor) = true;
FOR_EACH_CLONE (clone, dtor)
DECL_PURE_VIRTUAL_P (clone) = true;
}
}
return NULL_TREE;
}
@ -2131,6 +2115,22 @@ get_pure_virtuals (tree type)
which it is a primary base will contain vtable entries for the
pure virtuals in the base class. */
dfs_walk_once (TYPE_BINFO (type), NULL, dfs_get_pure_virtuals, type);
/* Treat a virtual destructor in an abstract class as pure even if it
isn't declared as pure; there is no way it would be called through the
vtable except during construction, which causes undefined behavior. */
if (CLASSTYPE_PURE_VIRTUALS (type)
&& TYPE_HAS_NONTRIVIAL_DESTRUCTOR (type))
{
tree dtor = CLASSTYPE_DESTRUCTORS (type);
if (dtor && DECL_VIRTUAL_P (dtor) && !DECL_PURE_VIRTUAL_P (dtor))
{
tree clone;
DECL_PURE_VIRTUAL_P (dtor) = true;
FOR_EACH_CLONE (clone, dtor)
DECL_PURE_VIRTUAL_P (clone) = true;
}
}
}
/* Debug info for C++ classes can get very large; try to avoid

10
gcc/testsuite/g++.dg/other/abstract6.C Normal file
View file

@ -0,0 +1,10 @@
// PR c++/60532
class A
{
~A ();
};
class B : A
{
virtual void m () = 0;
};