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

PR libstdc++/85843 - warning in logic_error copy constructor. 

* class.c (type_has_user_nondefault_constructor): Check for a
	user-provided ctor, not user-declared.

From-SVN: r260432
This commit is contained in:
Jason Merrill 2018-05-20 23:53:00 -04:00 committed by Jason Merrill
parent 777083bb80
commit f3f7cefecc
3 changed files with 23 additions and 2 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 @@
2018-05-20 Jason Merrill <jason@redhat.com>
PR libstdc++/85843 - warning in logic_error copy constructor.
* class.c (type_has_user_nondefault_constructor): Check for a
user-provided ctor, not user-declared.
2018-05-19 Jason Merrill <jason@redhat.com>
* pt.c (tsubst_pack_expansion): Sorry rather than abort

4
gcc/cp/class.c
View File

@ -4884,7 +4884,7 @@ default_ctor_p (tree fn)
&& sufficient_parms_p (FUNCTION_FIRST_USER_PARMTYPE (fn)));
}
/* Returns true iff class T has a user-defined constructor that can be called
/* Returns true iff class T has a user-provided constructor that can be called
with more than zero arguments. */
bool
@ -4896,7 +4896,7 @@ type_has_user_nondefault_constructor (tree t)
for (ovl_iterator iter (CLASSTYPE_CONSTRUCTORS (t)); iter; ++iter)
{
tree fn = *iter;
if (!DECL_ARTIFICIAL (fn)
if (user_provided_p (fn)
&& (TREE_CODE (fn) == TEMPLATE_DECL
|| (skip_artificial_parms_for (fn, DECL_ARGUMENTS (fn))
!= NULL_TREE)))

15
gcc/testsuite/g++.dg/warn/Wextra-4.C Normal file
View File

@ -0,0 +1,15 @@
// PR libstdc++/85843
// { dg-do compile { target c++11 } }
// { dg-additional-options -Wextra }
struct A
{
A();
A(const A&) = default;
};
struct B : A
{
B(): A() { }
B(const B&) { }
};