From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 7C9033835839; Fri, 22 Jul 2022 05:40:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7C9033835839 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10160] c++: defaulted friend op== [PR106361] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: bbf4c8820a75ccace739d2739348128a85c67c41 X-Git-Newrev: 1503d946c06e2005c860f56231d2ea582a8a340f Message-Id: <20220722054058.7C9033835839@sourceware.org> Date: Fri, 22 Jul 2022 05:40:58 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2022 05:40:58 -0000 https://gcc.gnu.org/g:1503d946c06e2005c860f56231d2ea582a8a340f commit r11-10160-g1503d946c06e2005c860f56231d2ea582a8a340f Author: Jason Merrill Date: Wed Jul 20 20:00:58 2022 -0400 c++: defaulted friend op== [PR106361] Now non-member functions can be defaulted, so this assert is wrong. move_signature_fn_p already checks for ctor or op=. PR c++/106361 gcc/cp/ChangeLog: * decl.c (move_fn_p): Remove assert. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/spaceship-eq14.C: New test. Diff: --- gcc/cp/decl.c | 2 -- gcc/testsuite/g++.dg/cpp2a/spaceship-eq14.C | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 052378a2e75..514d4c1bc20 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -14689,8 +14689,6 @@ copy_fn_p (const_tree d) bool move_fn_p (const_tree d) { - gcc_assert (DECL_FUNCTION_MEMBER_P (d)); - if (cxx_dialect == cxx98) /* There are no move constructors if we are in C++98 mode. */ return false; diff --git a/gcc/testsuite/g++.dg/cpp2a/spaceship-eq14.C b/gcc/testsuite/g++.dg/cpp2a/spaceship-eq14.C new file mode 100644 index 00000000000..896e5232bf6 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/spaceship-eq14.C @@ -0,0 +1,17 @@ +// PR c++/106361 +// { dg-do compile { target c++20 } } + +struct foo { + int x; +}; + +struct bar { + foo f; // { dg-error "operator==" } + friend bool operator==(const bar& a, const bar& b); +}; + +bool operator==(const bar& a, const bar& b) = default; + +int main() { + return bar{} == bar{}; // { dg-error "deleted" } +}