From: Patrick Palka Date: Wed, 15 Sep 2021 17:54:53 +0000 (-0400) Subject: c++: default ctor that's also a list ctor [PR102050] X-Git-Tag: basepoints/gcc-13~4758 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ab5c3d5457f0d480c6423ee7ac52ce1f98592c9;p=thirdparty%2Fgcc.git c++: default ctor that's also a list ctor [PR102050] In grok_special_member_properties we need to set TYPE_HAS_COPY_CTOR, TYPE_HAS_DEFAULT_CONSTRUCTOR and TYPE_HAS_LIST_CTOR independently from each other because a constructor can be both a default and list constructor (as in the first testcase), or both a default and copy constructor (as in the second testcase). PR c++/102050 gcc/cp/ChangeLog: * decl.c (grok_special_member_properties): Set TYPE_HAS_COPY_CTOR, TYPE_HAS_DEFAULT_CONSTRUCTOR and TYPE_HAS_LIST_CTOR independently from each other. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/initlist125.C: New test. * g++.dg/cpp0x/initlist126.C: New test. --- diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 9ad9446e262e..c0f1496636fd 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -14847,9 +14847,11 @@ grok_special_member_properties (tree decl) if (ctor > 1) TYPE_HAS_CONST_COPY_CTOR (class_type) = 1; } - else if (sufficient_parms_p (FUNCTION_FIRST_USER_PARMTYPE (decl))) + + if (sufficient_parms_p (FUNCTION_FIRST_USER_PARMTYPE (decl))) TYPE_HAS_DEFAULT_CONSTRUCTOR (class_type) = 1; - else if (is_list_ctor (decl)) + + if (is_list_ctor (decl)) TYPE_HAS_LIST_CTOR (class_type) = 1; if (DECL_DECLARED_CONSTEXPR_P (decl) diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist125.C b/gcc/testsuite/g++.dg/cpp0x/initlist125.C new file mode 100644 index 000000000000..49dee1c0ccd2 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist125.C @@ -0,0 +1,12 @@ +// PR c++/102050 +// { dg-do compile { target c++11 } } + +#include + +struct A { + A(std::initializer_list = {}); +}; + +A x{0}; +A y{1, 2, 3}; +A z; diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist126.C b/gcc/testsuite/g++.dg/cpp0x/initlist126.C new file mode 100644 index 000000000000..0a8fb998be68 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist126.C @@ -0,0 +1,17 @@ +// PR c++/102050 +// { dg-do compile { target c++11 } } + +#include + +extern struct A a; + +struct A { + A(const A& = a); + A(std::initializer_list) = delete; +}; + +void f(A); + +int main() { + f({}); // { dg-bogus "deleted" } +}