From patchwork Thu Jun 1 15:56:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 102062 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp433665vqr; Thu, 1 Jun 2023 08:57:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70OboSG8hUjVS0ulvYaNrqvuYMEGHFJQU8Mrl9K1VcL1GXW4nS4h/4rreHuk7ckBLnOZGm X-Received: by 2002:a17:907:1c20:b0:973:e9c1:69f3 with SMTP id nc32-20020a1709071c2000b00973e9c169f3mr2557333ejc.15.1685635072263; Thu, 01 Jun 2023 08:57:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685635072; cv=none; d=google.com; s=arc-20160816; b=bNLfquxbByclT4BTFtIC+cIUQiBBQmHkKtdxymYjqVWLHZ+tNcaZsqL/x6iUoR/WVB 4coiyUsZtmiw0jMgxILE1G2NxBdQakF0gYQ3e+E9sXYdnMtoIHMNDnNTtyNErOhXVLCP 1jttzATZ7VAwqae9cRj/rqu05/uBAcH8AkLf0leAQXxtJ86qwMd0NilQxu2SBTdDlebk bUxVBSES3PY2Mib74y5/H55zVils2o27VGFonFoRuH+UEtjcN32MwturzXWyg+PFgw9B 8dnNkojvgGY44Hbwoe9/OA1WngGmzn6tStAE1O5ipc/GgX4YoIBTAxmAulyQHzwLR1jM XvlQ== 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:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=MVd2IUXFiRdfnje5GtAjULKBKOyQcXjZjysIFhdqgvM=; b=LGzq6+ihRJ5uYDmXsjFlf4WYCkSIeBNHRZr78Bvwf1KTMGCt/ryBQeRZm3Oj5OWsxG BoA/TFJPddiZxBVgFwdLjdm1LrziOKBKc5dh2nyMfm6C6rn27B391xkADLzCD+vUpNj3 BK++jVJ6NkMk6h+s/9SMJO1hxz5kM8PeILplkGaGm+eOxLdl9DBUbEnW9ggzAuHsSon7 bYb8Ng+tj6gMTtkAS43tkSgyp2AOzg1Ed0Xhn5Kpfg0+XWM1b0mk6I6Y9czxbilPr9AL f2HpFCMsjAICdgLRzYRdHcXDRty2ayrXrAzU8NIjjvKYOAkqOjZMkBYy8CPvkabT/mFP eoMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=MVrLoO7X; 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 de8-20020a1709069bc800b009745730e7b4si135380ejc.265.2023.06.01.08.57.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 08:57:52 -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=MVrLoO7X; 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 B1DF23856600 for ; Thu, 1 Jun 2023 15:57:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B1DF23856600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685635059; bh=MVd2IUXFiRdfnje5GtAjULKBKOyQcXjZjysIFhdqgvM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=MVrLoO7Xo7mdNCDlntV20FkDYQCcqYdJpRZECG75ZZXgmuFtkOfEpSOxaFFrsMlnI 158zdOCORNzXDvpvkFKrUNquWN+kfk8jihc/V86Dg03JDOeDas9iu0FapyNYXZKErX XCy76RTjrUsiUJZS1XOI7MBvai3B6e3tk+XqAsLc= 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 4F2A23857016 for ; Thu, 1 Jun 2023 15:56:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4F2A23857016 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-JOatvzk4P9qloNb3zMPgDQ-1; Thu, 01 Jun 2023 11:56:52 -0400 X-MC-Unique: JOatvzk4P9qloNb3zMPgDQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FB6F811E91; Thu, 1 Jun 2023 15:56:52 +0000 (UTC) Received: from localhost (unknown [10.42.28.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5917B40CFD45; Thu, 1 Jun 2023 15:56:52 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Thomas Rodgers Subject: [committed] libstdc++: Fix PSTL test that fails in C++20 Date: Thu, 1 Jun 2023 16:56:51 +0100 Message-Id: <20230601155651.305379-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely 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?1767516481446669223?= X-GMAIL-MSGID: =?utf-8?q?1767516481446669223?= Tested x86_64-linux. Pushed to trunk, will backport too. Tom, this will require rebasing your PSTL rebase patch, but it should be trivial. -- >8 -- This test fails in C++20 and later due to a warning: warning: C++20 says that these are ambiguous, even though the second is reversed: note: candidate 1: 'bool MyClass::operator==(const MyClass&)' note: candidate 2: 'bool MyClass::operator==(const MyClass&)' (reversed) note: try making the operator a 'const' member function FAIL: 26_numerics/pstl/numeric_ops/transform_reduce.cc (test for excess errors) libstdc++-v3/ChangeLog: * testsuite/26_numerics/pstl/numeric_ops/transform_reduce.cc: Add const to equality operator. --- .../testsuite/26_numerics/pstl/numeric_ops/transform_reduce.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/transform_reduce.cc b/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/transform_reduce.cc index ec020b42bbb..bec1c141278 100644 --- a/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/transform_reduce.cc +++ b/libstdc++-v3/testsuite/26_numerics/pstl/numeric_ops/transform_reduce.cc @@ -68,7 +68,7 @@ class MyClass } friend MyClass operator*(const MyClass& x, const MyClass& y) { return MyClass(x.my_field * y.my_field); } bool - operator==(const MyClass& in) + operator==(const MyClass& in) const { return my_field == in.my_field; }