From patchwork Thu Jan 11 00:26:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1885287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hzMKuu1l; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T9QV71QzGz1yPp for ; Thu, 11 Jan 2024 11:27:27 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DE7EE38582AC for ; Thu, 11 Jan 2024 00:27:24 +0000 (GMT) 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 CE67A3858C41 for ; Thu, 11 Jan 2024 00:26:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CE67A3858C41 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CE67A3858C41 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704932793; cv=none; b=ihRu+PUph7B6XIUN1D0egAbaSrbHWvCtRwGnXiPrSErJxSoRYWLRsAP+9Muye5ozkI48fsOqv1cNwpGviZv8NXi5wBBMoE9dLg54Eiyc/D4/dLWS88VnEBPZqkEsuKta1vwDwTf4GtHFcQ49zjVL913Y6MR0KZ5GSs76yKdX+Ts= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704932793; c=relaxed/simple; bh=MhKkHpTLj1LhqbJE5hpHQs8m5oROyx03++4j8j2JVsg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=YGSEMpH8TvkAjWLtZ5PGPu13ryE1Zayeoa1Gu/duPVGL0iyTW5/7ex/FqVtMn2r0lU/HNLk05erSGtA+gfIENWDi5Y8G4pKeCCswEF7iJ/NoEaTjhSoWsv/6Ns3N9C2qYJ2Kj5HKoBtdLz01vZqiq5O2f6w2aTxz2NNWIbBPVNI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704932791; 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: content-transfer-encoding:content-transfer-encoding; bh=ltZLakSIFAnP8ePa8xCSs8OhA5xc4Zpca8zOivqHZZc=; b=hzMKuu1lTwIR0G6+1HlQ/naw4FvdDmlsWamAJy0CGzetgLNBFgLjaCO8Nh5V6iz2rTF823 9W95YHaxZ5sa/bZRXqdtWlp8dhNbpBX6Z9JKo7ARDiEUGWq72Ja/WwduuYlGoSbtGD5CMY +FW2aD1IT5qP6bzOHanYT3jbiI11PXQ= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-372-gRwrXn2pMb-RgdgNbzFq1Q-1; Wed, 10 Jan 2024 19:26:27 -0500 X-MC-Unique: gRwrXn2pMb-RgdgNbzFq1Q-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-68104661bbdso62588866d6.3 for ; Wed, 10 Jan 2024 16:26:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704932786; x=1705537586; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ltZLakSIFAnP8ePa8xCSs8OhA5xc4Zpca8zOivqHZZc=; b=pwTArjsSncdP5s17B58uXZLmrwuxBVOep0M63XTpjaRvLfUJc/EIDcFM2Nzz6QHlPz ymZlRQRdEd2fzeUKW8PhpT8mJ9lakc/wSw2AVm+eYiywu9ICtbRD/9mUK7DymHhKg5oy dzeDw7lY86u+Ukd7DSLJeQhEM74pPoxM9zooKjsPGVmcOXABp2omKKvbpltntI/Ig/4S SVP+ts44uNnJalJli4fEp/dwC6AHbleQda8xMFSMDI8wrzoun2z83+BGPFjLuJO89lhr y60Dz9guMCdQk4X90YMMrTqNbprdeppzNdNA59w37Qe788WS3LUdcC4j3ro/C504aOMs 06/w== X-Gm-Message-State: AOJu0YyuHTeBAd/8MdY5cccQqzep29ohOL3hckOjIjoTSjEdQnAjlPgL n+q9LOQ2ME3HK62Mwe4HWa8ha5pi38MrRMW/3KQ+Vw4sHum725hRIXLEhYuor94rmPPo60gCnFF 9yLQxVEbl94HryV6nN8lImahGPYnM/KJ7wAxYdf3TysxQ0Vd/Mf9n9Uj5HHLKW4lRKvVowG/a6m Rg300AmbQ= X-Received: by 2002:ad4:5c89:0:b0:681:24a2:2551 with SMTP id o9-20020ad45c89000000b0068124a22551mr365736qvh.12.1704932786129; Wed, 10 Jan 2024 16:26:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IECR8BlWtWhggF7aKCprdrmJpWzR0I38tsgolrazu8ISMO9GKR4OA09pDgcXJWUq+4CkmfofA== X-Received: by 2002:ad4:5c89:0:b0:681:24a2:2551 with SMTP id o9-20020ad45c89000000b0068124a22551mr365723qvh.12.1704932785815; Wed, 10 Jan 2024 16:26:25 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id dz20-20020ad45894000000b00681348887d1sm6909qvb.66.2024.01.10.16.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 16:26:25 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++/ranges: Use C++23 deducing this for _Pipe and _Partial Date: Wed, 10 Jan 2024 19:26:23 -0500 Message-ID: <20240111002623.2514687-1-ppalka@redhat.com> X-Mailer: git-send-email 2.43.0.283.ga54a84b333 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.5 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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, URI_HEX autolearn=unavailable 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- This simplifies the operator() of the _Pipe and _Partial range adaptor closure objects using C++23 deducing this, allowing us to condense multiple operator() overloads into one. The new __like_t alias template is similar to the expositional one from P0847R6, except it's implemented in terms of forward_like instead of vice versa, and thus ours always yields a reference, so e.g. __like_t is char&&. This shouldn't make a difference in practice, I think.. libstdc++-v3/ChangeLog: * include/bits/move.h (__like_t): Define. * include/std/ranges (views::__adaptor::Partial::operator()): Implement using C++23 deducing this when available. (views::__adaptor::_Pipe::operator()): Likewise. * testsuite/std/ranges/adaptors/100577.cc: Adjust testcase to accept "no match for call" errors issued in C++23 mode instead of "use of deleted function". * testsuite/std/ranges/adaptors/lazy_split_neg.cc: Likewise. --- libstdc++-v3/include/bits/move.h | 3 ++ libstdc++-v3/include/std/ranges | 37 ++++++++++++++++++- .../testsuite/std/ranges/adaptors/100577.cc | 18 ++++----- .../std/ranges/adaptors/lazy_split_neg.cc | 2 +- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/include/bits/move.h b/libstdc++-v3/include/bits/move.h index 4e741bcdeb0..bb200c95964 100644 --- a/libstdc++-v3/include/bits/move.h +++ b/libstdc++-v3/include/bits/move.h @@ -110,6 +110,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return static_cast<_Up&>(__x); } } + + template + using __like_t = decltype(std::forward_like<_Tp>(std::declval<_Up>())); #endif /** diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 0734daa42bf..8d2649cf5b9 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1016,7 +1016,19 @@ namespace views::__adaptor // Invoke _Adaptor with arguments __r, _M_args... according to the // value category of this _Partial object. - // TODO: use explicit object functions ("deducing this"). +#if __cpp_explicit_this_parameter + template + requires __adaptor_invocable<_Adaptor, _Range, __like_t<_Self, _Args>...> + constexpr auto + operator()(this _Self&& __self, _Range&& __r) + { + auto __forwarder = [&__r] (auto&&... __args) { + return _Adaptor{}(std::forward<_Range>(__r), + std::forward(__args)...); + }; + return std::apply(__forwarder, std::forward<_Self>(__self)._M_args); + } +#else template requires __adaptor_invocable<_Adaptor, _Range, const _Args&...> constexpr auto @@ -1042,6 +1054,7 @@ namespace views::__adaptor template constexpr auto operator()(_Range&& __r) const && = delete; +#endif }; // A lightweight specialization of the above primary template for @@ -1058,6 +1071,14 @@ namespace views::__adaptor : _M_arg(std::forward<_Tp>(__arg)) { } +#if __cpp_explicit_this_parameter + template + requires __adaptor_invocable<_Adaptor, _Range, __like_t<_Self, _Arg>> + constexpr auto + operator()(this _Self&& __self, _Range&& __r) + { return _Adaptor{}(std::forward<_Range>(__r), + std::forward<_Self>(__self)._M_arg); } +#else template requires __adaptor_invocable<_Adaptor, _Range, const _Arg&> constexpr auto @@ -1073,6 +1094,7 @@ namespace views::__adaptor template constexpr auto operator()(_Range&& __r) const && = delete; +#endif }; // Partial specialization of the primary template for the case where the extra @@ -1154,7 +1176,17 @@ namespace views::__adaptor // Invoke _M_rhs(_M_lhs(__r)) according to the value category of this // range adaptor closure object. - // TODO: use explicit object functions ("deducing this"). +#if __cpp_explicit_this_parameter + template + requires __pipe_invocable<__like_t<_Self, _Lhs>, __like_t<_Self, _Rhs>, _Range> + constexpr auto + operator()(this _Self&& __self, _Range&& __r) + { + return (std::forward<_Self>(__self)._M_rhs + (std::forward<_Self>(__self)._M_lhs + (std::forward<_Range>(__r)))); + } +#else template requires __pipe_invocable constexpr auto @@ -1170,6 +1202,7 @@ namespace views::__adaptor template constexpr auto operator()(_Range&& __r) const && = delete; +#endif }; // A partial specialization of the above primary template for the case where diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc index 69072d69fec..3a52f5b4ce0 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/100577.cc @@ -98,28 +98,28 @@ test02() (views::take_while(badarg) | views::all)(x); // { dg-error "no match" } (views::drop_while(badarg) | views::all)(x); // { dg-error "no match" } - // In practice, range adaptor closures with non-simple operator() are + // In C++20 mode, range adaptor closures with non-simple operator() are // implemented using a fallback deleted overload, so when a call is // ill-formed overload resolution succeeds but selects the deleted overload // (but only when the closure is invoked as an rvalue). - views::lazy_split(badarg)(x); // { dg-error "deleted function" } - (views::lazy_split(badarg) | views::all)(x); // { dg-error "deleted function" } + views::lazy_split(badarg)(x); // { dg-error "deleted function|no match" } + (views::lazy_split(badarg) | views::all)(x); // { dg-error "deleted function|no match" } auto a0 = views::lazy_split(badarg); a0(x); // { dg-error "no match" }; auto a1 = a0 | views::all; a1(x); // { dg-error "no match" } - views::split(badarg)(x); // { dg-error "deleted function" } - (views::split(badarg) | views::all)(x); // { dg-error "deleted function" } + views::split(badarg)(x); // { dg-error "deleted function|no match" } + (views::split(badarg) | views::all)(x); // { dg-error "deleted function|no match" } auto a0a = views::split(badarg); a0a(x); // { dg-error "no match" }; auto a1a = a0a | views::all; a1a(x); // { dg-error "no match" } - views::take(badarg)(x); // { dg-error "deleted" } - views::drop(badarg)(x); // { dg-error "deleted" } - (views::take(badarg) | views::all)(x); // { dg-error "deleted" } - (views::drop(badarg) | views::all)(x); // { dg-error "deleted" } + views::take(badarg)(x); // { dg-error "deleted|no match" } + views::drop(badarg)(x); // { dg-error "deleted|no match" } + (views::take(badarg) | views::all)(x); // { dg-error "deleted|no match" } + (views::drop(badarg) | views::all)(x); // { dg-error "deleted|no match" } } void diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc index 683ea76da07..85632759fcc 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split_neg.cc @@ -38,7 +38,7 @@ test02() { using namespace std::literals; auto x = "the quick brown fox"sv; - auto v1 = views::lazy_split(std::initializer_list{' ', ' '})(x); // { dg-error "deleted" } + auto v1 = views::lazy_split(std::initializer_list{' ', ' '})(x); // { dg-error "deleted|no match" } auto v2 = x | views::lazy_split(std::initializer_list{' ', ' '}); // { dg-error "no match" } }