From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 492633858C20 for ; Sat, 18 Mar 2023 09:55:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 492633858C20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679133347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=X8KPSYiLWRUg0ifzNYx5GHCGKDuM8FPV3op6pd2KjBo=; b=KG9zunZV0Skk05mgAMSnWsb4qJ+TcsP8jCiQPejUH2zrQSG4IK2Nv/00ZAdA1dgo2RHxQu a6A8HSJLhn/KDglD4gLPM4ETRLIGkooQLKWix/JNZknQs+tg1CsG20oRD32kwpWPXv2png b44wp9WkT/VIlaXoC33vm5Xn+4+ZqX8= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-p4-STHsrMU-ULnxDQzgg8A-1; Sat, 18 Mar 2023 05:55:44 -0400 X-MC-Unique: p4-STHsrMU-ULnxDQzgg8A-1 Received: by mail-lf1-f69.google.com with SMTP id h16-20020a0565123c9000b004e83f2f56e2so3013424lfv.22 for ; Sat, 18 Mar 2023 02:55:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679133342; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jggW3Q+ZJU7g+Evu2tzpfdYtaI0py0m2bMT2H/eqLLM=; b=N28xfZnKe2Axp9tbjUvmzoAqpN+ulHROrx9SnaZeKCuogWUWx2JzuwXEcLLknA0OFg CObSaoXfITuAnkxHIMEn3aWMj4nCFr8ngYhRyDO1fZbCX0S9+JiYkGQaXUH0Arm4TxoD xhn+GZU/qWl9nd98wsXmqDUv4q1m1Z9uyAkO+01s662f0Zkte225MGv1uMC7ebJFgl3K WowWiE+mBiX+7U88n5gqoqKGhAzu9ikhcThO0MAS0GiXltZGbHS1OZ2i/CM+77BdoqLR phQmLtehhHw6Lx2WKzPrWgyTr088EVb89yPOI3qVP9Xbiq0Es2z9o/AmKM51MHslqk8j gikA== X-Gm-Message-State: AO0yUKVVzc900c/7DlvXwWLhEuGuLmSAdKpxTX8TMKfjPF0ah1Rw7xEA X8mePiAKVbDIcUs7ABMdR2o3XPkiFHykXbjXx/ifpQuLsol21M2i6j4LmvTN9x6u9K0FTlT7JfZ BBtH8DdtBRzeBTnZ2f6JjRVZZImuq1zEeZg== X-Received: by 2002:a2e:8e33:0:b0:298:72a8:c6c4 with SMTP id r19-20020a2e8e33000000b0029872a8c6c4mr4177617ljk.9.1679133342625; Sat, 18 Mar 2023 02:55:42 -0700 (PDT) X-Google-Smtp-Source: AK7set9ghJK8teRzO0AV4vaDFjDZuBxeHvutt69B+qgUcQKwQkKICY/PzvfuXcaBXB4ImOkGpGe3Hs71HilikjHUDuw= X-Received: by 2002:a2e:8e33:0:b0:298:72a8:c6c4 with SMTP id r19-20020a2e8e33000000b0029872a8c6c4mr4177613ljk.9.1679133342251; Sat, 18 Mar 2023 02:55:42 -0700 (PDT) MIME-Version: 1.0 References: <20230317203601.55027-1-jwakely@redhat.com> In-Reply-To: From: Jonathan Wakely Date: Sat, 18 Mar 2023 09:55:31 +0000 Message-ID: Subject: Re: [committed] libstdc++: Add const to hash>::operator() [PR109165] To: Nathaniel Shead Cc: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="000000000000655b6f05f729b2c4" X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000655b6f05f729b2c4 Content-Type: multipart/alternative; boundary="000000000000655b6d05f729b2c2" --000000000000655b6d05f729b2c2 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, 18 Mar 2023 at 00:49, Nathaniel Shead wrote: > On Sat, Mar 18, 2023 at 7:36=E2=80=AFAM Jonathan Wakely via Libstdc++ > wrote: > > > > Tested x86_64-linux. Pushed to trunk. gcc-12 backport needed too. > > > > -- >8 -- > > > > libstdc++-v3/ChangeLog: > > > > PR libstdc++/109165 > > * include/std/coroutine (hash<>::operator()): Add const. > > * testsuite/18_support/coroutines/hash.cc: New test. > > --- > > libstdc++-v3/include/std/coroutine | 2 +- > > .../testsuite/18_support/coroutines/hash.cc | 22 +++++++++++++++++++ > > 2 files changed, 23 insertions(+), 1 deletion(-) > > create mode 100644 libstdc++-v3/testsuite/18_support/coroutines/hash.cc > > > > diff --git a/libstdc++-v3/include/std/coroutine > b/libstdc++-v3/include/std/coroutine > > index f6e65566f10..b0ca18949db 100644 > > --- a/libstdc++-v3/include/std/coroutine > > +++ b/libstdc++-v3/include/std/coroutine > > @@ -345,7 +345,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > struct hash> > > { > > size_t > > - operator()(const coroutine_handle<_Promise>& __h) noexcept > > + operator()(const coroutine_handle<_Promise>& __h) const noexcept > > { > > return reinterpret_cast(__h.address()); > > } > > diff --git a/libstdc++-v3/testsuite/18_support/coroutines/hash.cc > b/libstdc++-v3/testsuite/18_support/coroutines/hash.cc > > new file mode 100644 > > index 00000000000..68e5e640477 > > --- /dev/null > > +++ b/libstdc++-v3/testsuite/18_support/coroutines/hash.cc > > @@ -0,0 +1,22 @@ > > +// { dg-options "-std=3Dgnu++2a" } > > +// { dg-do run { target c++2a } } > > + > > +#include > > +#include > > + > > +void > > +test01() > > +{ > > + std::hash h; > > + std::size_t v =3D h(std::noop_coroutine()); > > + > > + const auto& ch =3D h; > > + std::size_t v2 =3D h(std::noop_coroutine()); // PR libstdc++/109165 > > Is this supposed to be `std::size_t v2 =3D ch(...)`? > > Doh! Yes, thanks. Fixed by the attached change. Tested x86_64-linux, pushed to trunk. --000000000000655b6d05f729b2c2-- --000000000000655b6f05f729b2c4 Content-Type: text/plain; charset="US-ASCII"; name="patch.txt" Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lfdsmieu0 Y29tbWl0IDliODNkNDc1NWE3ZGEwMmYyNTc4OGZjZTE0YmVjOTQ5ZTcwNDVm OGYKQXV0aG9yOiBKb25hdGhhbiBXYWtlbHkgPGp3YWtlbHlAcmVkaGF0LmNv bT4KRGF0ZTogICBGcmkgTWFyIDE3IDExOjM5OjU1IDIwMjMKCiAgICBsaWJz dGRjKys6IEZpeCB0ZXN0IGZvciBoYXNoPGNvcm91dGluZV9oYW5kbGU8UD4+ OjpvcGVyYXRvcigpIFtQUjEwOTE2NV0KICAgIAogICAgbGlic3RkYysrLXYz L0NoYW5nZUxvZzoKICAgIAogICAgICAgICAgICBQUiBsaWJzdGRjKysvMTA5 MTY1CiAgICAgICAgICAgICogdGVzdHN1aXRlLzE4X3N1cHBvcnQvY29yb3V0 aW5lcy9oYXNoLmNjOiBVc2UgY29uc3Qgb2JqZWN0CiAgICAgICAgICAgIGlu IHNlY29uZCBjYWxsLgoKZGlmZiAtLWdpdCBhL2xpYnN0ZGMrKy12My90ZXN0 c3VpdGUvMThfc3VwcG9ydC9jb3JvdXRpbmVzL2hhc2guY2MgYi9saWJzdGRj KystdjMvdGVzdHN1aXRlLzE4X3N1cHBvcnQvY29yb3V0aW5lcy9oYXNoLmNj CmluZGV4IDY4ZTVlNjQwNDc3Li44MWI2OGY4MjQ2YSAxMDA2NDQKLS0tIGEv bGlic3RkYysrLXYzL3Rlc3RzdWl0ZS8xOF9zdXBwb3J0L2Nvcm91dGluZXMv aGFzaC5jYworKysgYi9saWJzdGRjKystdjMvdGVzdHN1aXRlLzE4X3N1cHBv cnQvY29yb3V0aW5lcy9oYXNoLmNjCkBAIC03LDExICs3LDEyIEBACiB2b2lk CiB0ZXN0MDEoKQogeworICBhdXRvIGNvcm8gPSBzdGQ6Om5vb3BfY29yb3V0 aW5lKCk7CiAgIHN0ZDo6aGFzaDxzdGQ6Om5vb3BfY29yb3V0aW5lX2hhbmRs ZT4gaDsKLSAgc3RkOjpzaXplX3QgdiA9IGgoc3RkOjpub29wX2Nvcm91dGlu ZSgpKTsKKyAgc3RkOjpzaXplX3QgdiA9IGgoY29ybyk7CiAKICAgY29uc3Qg YXV0byYgY2ggPSBoOwotICBzdGQ6OnNpemVfdCB2MiA9IGgoc3RkOjpub29w X2Nvcm91dGluZSgpKTsgLy8gUFIgbGlic3RkYysrLzEwOTE2NQorICBzdGQ6 OnNpemVfdCB2MiA9IGNoKGNvcm8pOyAvLyBQUiBsaWJzdGRjKysvMTA5MTY1 CiAKICAgVkVSSUZZKCB2MiA9PSB2ICk7CiB9Cg== --000000000000655b6f05f729b2c4--