From 4db9ca8624e902b668ef394cf81e68e4ed5faa89 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 12 Jun 2018 20:20:11 +0000 Subject: [PATCH] Core issue 1331 - const mismatch with defaulted copy constructor Core issue 1331 - const mismatch with defaulted copy constructor * class.c (check_bases_and_members): When checking a defaulted function, mark it as deleted rather than giving an error. * g++.dg/cpp0x/defaulted15.C (struct F): Remove dg-error. * g++.dg/cpp0x/defaulted52.C: New test. * g++.dg/cpp0x/defaulted53.C: New test. * g++.dg/cpp0x/defaulted54.C: New test. * g++.dg/cpp0x/defaulted55.C: New test. * g++.dg/cpp0x/defaulted56.C: New test. * g++.dg/cpp0x/defaulted57.C: New test. * g++.dg/cpp0x/defaulted58.C: New test. * g++.dg/cpp0x/defaulted59.C: New test. * g++.dg/cpp0x/defaulted60.C: New test. From-SVN: r261526 --- gcc/cp/ChangeLog | 6 ++++ gcc/cp/class.c | 6 ++-- gcc/testsuite/ChangeLog | 14 ++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted15.C | 3 +- gcc/testsuite/g++.dg/cpp0x/defaulted52.C | 20 ++++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted53.C | 35 ++++++++++++++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted54.C | 18 ++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted55.C | 19 +++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted56.C | 25 +++++++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted57.C | 25 +++++++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted58.C | 22 +++++++++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted59.C | 12 ++++++++ gcc/testsuite/g++.dg/cpp0x/defaulted60.C | 18 ++++++++++++ 13 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted52.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted53.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted54.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted55.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted56.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted57.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted58.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted59.C create mode 100644 gcc/testsuite/g++.dg/cpp0x/defaulted60.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 585f111655a..726fd7f6c43 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2018-06-12 Marek Polacek + + Core issue 1331 - const mismatch with defaulted copy constructor + * class.c (check_bases_and_members): When checking a defaulted + function, mark it as deleted rather than giving an error. + 2018-06-11 Jason Merrill PR c++/85792 -Wctor-dtor-privacy and inherited constructor. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index fbf39035e18..b6e78c6377d 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5660,9 +5660,9 @@ check_bases_and_members (tree t) if (fn_const_p && !imp_const_p) /* If the function is defaulted outside the class, we just - give the synthesis error. */ - error ("%q+D declared to take const reference, but implicit " - "declaration would take non-const", fn); + give the synthesis error. Core Issue #1331 says this is + no longer ill-formed, it is defined as deleted instead. */ + DECL_DELETED_FN (fn) = true; } defaulted_late_check (fn); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6acc3589141..e69ab64178c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2018-06-12 Marek Polacek + + Core issue 1331 - const mismatch with defaulted copy constructor + * g++.dg/cpp0x/defaulted15.C (struct F): Remove dg-error. + * g++.dg/cpp0x/defaulted52.C: New test. + * g++.dg/cpp0x/defaulted53.C: New test. + * g++.dg/cpp0x/defaulted54.C: New test. + * g++.dg/cpp0x/defaulted55.C: New test. + * g++.dg/cpp0x/defaulted56.C: New test. + * g++.dg/cpp0x/defaulted57.C: New test. + * g++.dg/cpp0x/defaulted58.C: New test. + * g++.dg/cpp0x/defaulted59.C: New test. + * g++.dg/cpp0x/defaulted60.C: New test. + 2018-06-12 David Malcolm PR other/69968 diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted15.C b/gcc/testsuite/g++.dg/cpp0x/defaulted15.C index fabcc23a150..1e0b3545840 100644 --- a/gcc/testsuite/g++.dg/cpp0x/defaulted15.C +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted15.C @@ -48,8 +48,7 @@ struct F struct G: public F { - // Can't be const because F copy ctor isn't. - G(const G&) = default; // { dg-error "const" } + G(const G&) = default; }; struct H diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted52.C b/gcc/testsuite/g++.dg/cpp0x/defaulted52.C new file mode 100644 index 00000000000..c617230b493 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted52.C @@ -0,0 +1,20 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M(); + // So that W wouldn't have had "const W&" copy ctor if it were + // implicitly declared. + M(M&); +}; + +template struct W +{ + W(); + // This should now compile and be =deleted. + W(const W&) = default; + T t; +}; + +W w; diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted53.C b/gcc/testsuite/g++.dg/cpp0x/defaulted53.C new file mode 100644 index 00000000000..8147e7e2ad1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted53.C @@ -0,0 +1,35 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M& operator=(M&); +}; + +struct R +{ + R& operator=(R&) = default; + M m; +}; + +struct S +{ + S& operator=(const S&) = default; + M m; +}; + +struct T +{ + // If F is an assignment operator, and the return type of T1 + // differs from the return type of T2 the program is ill-formed. + T operator=(T&) = default; // { dg-error "defaulted" } + M m; +}; + +struct U +{ + // If F is an assignment operator, and T1's parameter type is + // not a reference, the program is ill-formed. + U& operator=(U) = default; // { dg-error "defaulted" } + M m; +}; diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted54.C b/gcc/testsuite/g++.dg/cpp0x/defaulted54.C new file mode 100644 index 00000000000..f8ddc4e47ce --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted54.C @@ -0,0 +1,18 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M(); + M(M&); +}; + +template struct W +{ + W(); + W(const W&) = default; // { dg-error "binding" } + T t; +}; + +W w; +W w2 = w; // { dg-error "use of deleted function" } diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted55.C b/gcc/testsuite/g++.dg/cpp0x/defaulted55.C new file mode 100644 index 00000000000..04cfc172000 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted55.C @@ -0,0 +1,19 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M(); + M(M&); +}; + +template struct W +{ + W(); + W(W&) = default; + // T1 and T2 may have differing ref-qualifiers (copy assign op). + constexpr W& operator=(const W&) && = default; // { dg-error "defaulted" "" { target c++11_down } } + T t; +}; + +W w; diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted56.C b/gcc/testsuite/g++.dg/cpp0x/defaulted56.C new file mode 100644 index 00000000000..e7ce12c5566 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted56.C @@ -0,0 +1,25 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +// If T2 (what would be the implicit declaration) has a parameter of +// type const C&, the corresponding parameter of T1 may be of type C&. + +struct S +{ + constexpr S(S &) = default; +}; + +struct T +{ + constexpr T(volatile T &) = default; // { dg-error "defaulted" } +}; + +struct U +{ + constexpr U(const volatile U &) = default; // { dg-error "defaulted" } +}; + +struct V +{ + constexpr V(const V &) = default; +}; diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted57.C b/gcc/testsuite/g++.dg/cpp0x/defaulted57.C new file mode 100644 index 00000000000..37fb7dd6e1d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted57.C @@ -0,0 +1,25 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +// If T2 (what would be the implicit declaration) has a parameter of +// type const C&, the corresponding parameter of T1 may be of type C&. + +struct S +{ + S& operator=(S &) = default; +}; + +struct T +{ + T& operator=(volatile T &) = default; // { dg-error "defaulted" } +}; + +struct U +{ + U& operator=(const volatile U &) = default; // { dg-error "defaulted" } +}; + +struct V +{ + V& operator=(const V &) = default; +}; diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted58.C b/gcc/testsuite/g++.dg/cpp0x/defaulted58.C new file mode 100644 index 00000000000..920a4ad0c6d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted58.C @@ -0,0 +1,22 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M() = default; + M& operator=(M&); +}; + +template struct W +{ + W() = default; + W& operator=(const W&) = default; // { dg-error "binding" } + T t; +}; + +int +main () +{ + W w1, w2; + w1 = w2; // { dg-error "use of deleted function" } +} diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted59.C b/gcc/testsuite/g++.dg/cpp0x/defaulted59.C new file mode 100644 index 00000000000..4f871d7f5b1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted59.C @@ -0,0 +1,12 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M(M&) = default; +}; + +struct W : public M +{ + W(const W&) = default; +}; diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted60.C b/gcc/testsuite/g++.dg/cpp0x/defaulted60.C new file mode 100644 index 00000000000..ad025236cce --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/defaulted60.C @@ -0,0 +1,18 @@ +// Core Issue #1331 (const mismatch with defaulted copy constructor) +// { dg-do compile { target c++11 } } + +struct M +{ + M(M&); +}; + +struct W +{ + W(); + W(const W&); + M m; +}; + +// Not first declaration. +W::W(const W&) = default; // { dg-error "binding" } +W w; -- 2.30.2