aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2021-09-15 13:54:53 -0400
committerPatrick Palka <ppalka@redhat.com>2021-09-15 13:54:53 -0400
commit2ab5c3d5457f0d480c6423ee7ac52ce1f98592c9 (patch)
treed2875d738cd3ed3fa5dc448e369ebecb23a23103 /gcc
parent2709337c1181510e3d4f74e86bf75aa83f7b18aa (diff)
downloadgcc-2ab5c3d5457f0d480c6423ee7ac52ce1f98592c9.zip
gcc-2ab5c3d5457f0d480c6423ee7ac52ce1f98592c9.tar.gz
gcc-2ab5c3d5457f0d480c6423ee7ac52ce1f98592c9.tar.bz2
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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/decl.c6
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/initlist125.C12
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/initlist126.C17
3 files changed, 33 insertions, 2 deletions
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 9ad9446..c0f1496 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 0000000..49dee1c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist125.C
@@ -0,0 +1,12 @@
+// PR c++/102050
+// { dg-do compile { target c++11 } }
+
+#include <initializer_list>
+
+struct A {
+ A(std::initializer_list<int> = {});
+};
+
+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 0000000..0a8fb99
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/initlist126.C
@@ -0,0 +1,17 @@
+// PR c++/102050
+// { dg-do compile { target c++11 } }
+
+#include <initializer_list>
+
+extern struct A a;
+
+struct A {
+ A(const A& = a);
+ A(std::initializer_list<int>) = delete;
+};
+
+void f(A);
+
+int main() {
+ f({}); // { dg-bogus "deleted" }
+}