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

DR 1518

Browse source 
DR 1518
	* class.c (type_has_user_provided_or_explicit_constructor): New.
	(check_bases_and_members): Use it.
	* cp-tree.h: Declare it.

From-SVN: r229501
This commit is contained in:
Jason Merrill 2015-10-28 14:55:38 -04:00 • committed by Jason Merrill
parent d90ec4f2bc
commit a3320d62af
4 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2015-10-28 Jason Merrill <jason@redhat.com>
DR 1518
* class.c (type_has_user_provided_or_explicit_constructor): New.
(check_bases_and_members): Use it.
* cp-tree.h: Declare it.
2015-10-27 Cesar Philippidis <cesar@codesourcery.com>
Thomas Schwinge <thomas@codesourcery.com>
James Norris <jnorris@codesourcery.com>

30
gcc/cp/class.c
View file

@ -5150,6 +5150,33 @@ type_has_user_provided_constructor (tree t)
return false;
}
/* Returns true iff class T has a user-provided or explicit constructor. */
bool
type_has_user_provided_or_explicit_constructor (tree t)
{
tree fns;
if (!CLASS_TYPE_P (t))
return false;
if (!TYPE_HAS_USER_CONSTRUCTOR (t))
return false;
/* This can happen in error cases; avoid crashing. */
if (!CLASSTYPE_METHOD_VEC (t))
return false;
for (fns = CLASSTYPE_CONSTRUCTORS (t); fns; fns = OVL_NEXT (fns))
{
tree fn = OVL_CURRENT (fns);
if (user_provided_p (fn) || DECL_NONCONVERTING_P (fn))
return true;
}
return false;
}
/* Returns true iff class T has a non-user-provided (i.e. implicitly
declared or explicitly defaulted in the class body) default
constructor. */
@ -5735,7 +5762,8 @@ check_bases_and_members (tree t)
Again, other conditions for being an aggregate are checked
elsewhere. */
CLASSTYPE_NON_AGGREGATE (t)
|= (type_has_user_provided_constructor (t) || TYPE_POLYMORPHIC_P (t));
|= (type_has_user_provided_or_explicit_constructor (t)
|| TYPE_POLYMORPHIC_P (t));
/* This is the C++98/03 definition of POD; it changed in C++0x, but we
retain the old definition internally for ABI reasons. */
CLASSTYPE_NON_LAYOUT_POD_P (t)

1
gcc/cp/cp-tree.h
View file

@ -5574,6 +5574,7 @@ extern bool type_has_user_nondefault_constructor (tree);
extern tree in_class_defaulted_default_constructor (tree);
extern bool user_provided_p (tree);
extern bool type_has_user_provided_constructor (tree);
extern bool type_has_user_provided_or_explicit_constructor (tree);
extern bool type_has_non_user_provided_default_constructor (tree);
extern bool vbase_has_user_provided_move_assign (tree);
extern tree default_init_uninitialized_part (tree);

4
gcc/testsuite/g++.dg/cpp0x/explicit10.C
View file

@ -28,12 +28,12 @@ template<typename T> void g() {
int main()
{
f<A>(); // { dg-bogus "required from here" }
f<A>(); // { dg-message "required from here" }
f<B>(); // { dg-message "required from here" }
f<C>(); // { dg-message "required from here" }
f<D>(); // { dg-message "required from here" }
g<A>(); // { dg-bogus "required from here" }
g<A>(); // { dg-message "required from here" }
g<B>(); // { dg-message "required from here" }
g<C>(); // { dg-message "required from here" }
g<D>(); // { dg-message "required from here" }