From patchwork Thu Jul 21 21:21:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 111 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e252:0:0:0:0:0 with SMTP id bl18csp1646578wrb; Thu, 21 Jul 2022 14:23:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tv2AFStcNnfHZf6f+pyWhRF251vlQ/2rPj4oew3v7Kb6wp5qR+GpVrJL17ygt/u3+rYz91 X-Received: by 2002:a05:6402:1d4c:b0:43b:c85f:5c95 with SMTP id dz12-20020a0564021d4c00b0043bc85f5c95mr307624edb.213.1658438581021; Thu, 21 Jul 2022 14:23:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658438581; cv=none; d=google.com; s=arc-20160816; b=dVH905lum2Ejhs4ohIKFr9U/dtJv0aAlRgrTjgKPerNyTbSjV4ENvz/ZC/t+70r9TB v1NbXL05qvnrOYBH5A9KWjhutWdTyYozK+dM+Ds3x3yuBiIA71uQOEUiv0sdhZ2h/+Kn ais8abzqJTogDM4rzNwrEhri173/mvonaCHyz2U+Jq++OLzjX3K5PlHjlNsQ9Qau/tAS e4X4vysAV4dFje3nzRTYcOh3QZLef3iaibuuQEXGk8MiG1ZBCVaYbmLPQ4F7zGT1kqMM 9krd/bgQkDKRs6HGM2QkGsyQWzyIUoWezVTWVC6Wko0rK2xcG9ZcIT/3B3HdMbCC6wC1 sUGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=EfmgqOHxflPmPZwApH9QnHbKbXzzn50ebEx4IA7wwK4=; b=zonPbVPPrYU3I2jgV95tH1j/ATylea8JbXCXiLXLCw54DIxXz8K+BoJm05wxbcottg +dgxVOEFgCpDs05gDoQ3p5bo3M3Pjg9C+vhZpyR76ecatRDUlmM2rmUZDExSFEfgdfyh NJoCg3XXGIL7uwZwd536qJgX8KGZiyHM9I2GNC5ou5SurWvvN0vRsGmLAbTpTyCT5EJk 8wpEA8NTC079CcGUMB60ldVh29bUTyMfmi/O6aWXLiZu557v9usIxMU8LzJA7ChNT6IZ zdyrky4jsEQ0BlPLPQGUinu7eDmE8LXlPHFmosj/lL40TKuuEjso7KYuSJH/2zfKWpuP rl2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=P0hD3O3o; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id o15-20020a056402438f00b0043a75d68ae3si4178259edc.417.2022.07.21.14.23.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 14:23:01 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=P0hD3O3o; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EE08F3834E4D for ; Thu, 21 Jul 2022 21:22:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EE08F3834E4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658438553; bh=EfmgqOHxflPmPZwApH9QnHbKbXzzn50ebEx4IA7wwK4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=P0hD3O3ogCNSDjfH2148szD7PvQGtrn5Ig684+egrSluY9FQeh6BkUw17Bt4GHHkU TM6xl989EZlH2dg7kdBclT5kxBDV206Tk3fj3fspWq1S+8ZuIa9eyOtxoaJ2GpK9vA FoD63CvcbszeB6fFWqxl7/9K1nyH3JyfbbYW/Bzc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id C22533835416 for ; Thu, 21 Jul 2022 21:21:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C22533835416 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-226-_JvVHi3iPtaTyJyV396ycQ-1; Thu, 21 Jul 2022 17:21:48 -0400 X-MC-Unique: _JvVHi3iPtaTyJyV396ycQ-1 Received: by mail-qk1-f199.google.com with SMTP id h8-20020a05620a284800b006b5c98f09fbso2258399qkp.21 for ; Thu, 21 Jul 2022 14:21:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=EfmgqOHxflPmPZwApH9QnHbKbXzzn50ebEx4IA7wwK4=; b=RxEEQa3prXcHQo2xwOuCP/iZucAnH2zM7u05/edbkUjLq/2I6+RnyZr5D4RvXGOUcG 4S41kayOGFwJkoiqnI/7FHpc2XSKGmUUUy+6rQ9ZuEubKNzuIB1jVhFMixrNXWfpMAGd 9v4Qk5n6wzofJCahfFTJabnYMn4b+HAsCjbqOgtclPGV4Dt48fi0I1XpkvZqrBsj6da2 lBxJn9FxWELFEdmAhKjwlQQZi0gverSP23SjWxPeU6T9YrDIGAVT0qMv2GOyQhNZ3o/f GT204wHB4WDU4B2UFN6eTjO7BXy14y869lF0GO8OKH960ned459VzbjSIMO+Z2QUZsd/ 7o/Q== X-Gm-Message-State: AJIora93ujgH7pGhEny1FQyEmxVvzNxOp9IJh4gp5TYqh+UjeiXaFjyF KRMs1xKHLBlauVSyh8sDunKFMh9iV+pi9FYNMpeXTzQmeW11r7LfqYPbtV1dk3NUITwPZ/cWHI9 PncSvCNilaA58iOZP7qQlkc18ECnR3C1XRHmdw50w9/s2MFs7sGhYjLGxjHFNInbwQA== X-Received: by 2002:a05:622a:1892:b0:31f:1e13:856 with SMTP id v18-20020a05622a189200b0031f1e130856mr537866qtc.396.1658438507466; Thu, 21 Jul 2022 14:21:47 -0700 (PDT) X-Received: by 2002:a05:622a:1892:b0:31f:1e13:856 with SMTP id v18-20020a05622a189200b0031f1e130856mr537844qtc.396.1658438506999; Thu, 21 Jul 2022 14:21:46 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id z11-20020ae9c10b000000b006a3325fd985sm1963637qki.13.2022.07.21.14.21.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jul 2022 14:21:46 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: defaulted friend op== [PR106361] Date: Thu, 21 Jul 2022 17:21:44 -0400 Message-Id: <20220721212144.467961-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1738998893412728734?= X-GMAIL-MSGID: =?utf-8?q?1738998893412728734?= Now non-member functions can be defaulted, so this assert is wrong. move_signature_fn_p already checks for ctor or op=. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/106361 gcc/cp/ChangeLog: * decl.cc (move_fn_p): Remove assert. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/spaceship-eq14.C: New test. --- gcc/cp/decl.cc | 2 -- gcc/testsuite/g++.dg/cpp2a/spaceship-eq14.C | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/spaceship-eq14.C base-commit: df118d7ba138cacb17203d4a1b5f27730347cc77 diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index aa6cf3c6c2e..70ad681467e 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -15022,8 +15022,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" } +}