From patchwork Mon Oct 31 20:33:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 59699 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4AC043857419 for ; Mon, 31 Oct 2022 20:33:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4AC043857419 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667248438; bh=IEA5iqBXSNVOOt9ZxUNVQQzsnUXSNmNt2e/V4W4FHsk=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=BWsYkOaqptSmgkz+2bS16ZmKlu4SA+m5WWFJ99z2Al8YuLz8aa5VzS8f2w35nWIdg /uE+tSYDJECLjHAfFDj6RUKP3LV5FCeOOnqAz0bBhyLM3GDcjdYZvlhpMNov0sjZ1U fjsF7vrK5kXhspx1EUvH+P9+a8pUinGr2eak6v2I= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id A99FA3858418 for ; Mon, 31 Oct 2022 20:33:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A99FA3858418 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-581-lBwZfpIhMZiG7sg_MV9hkg-1; Mon, 31 Oct 2022 16:33:25 -0400 X-MC-Unique: lBwZfpIhMZiG7sg_MV9hkg-1 Received: by mail-qk1-f198.google.com with SMTP id q14-20020a05620a0d8e00b006ef0350dae1so10393169qkl.12 for ; Mon, 31 Oct 2022 13:33:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=IEA5iqBXSNVOOt9ZxUNVQQzsnUXSNmNt2e/V4W4FHsk=; b=fq05U2riQ0LHb9Y1aBGwzcY+3msnk8OBcPoSiyv9W3kUzEGY+91DcRO4eHSt7eOW4n MVTRRJaXZqF3Dvqhmz67X6/Egl3aHFzH7QmD5+bU0Yx26pb31YuC0suyciwx8gzXiKNU JcBy4gYFI1+MTCO25TiIyuzFgKY1utcRwJ6eXpbRGZvNRmcy6OkwzR2spOIJu6r0pKbc d9e1EDLRzG2iLIfI3I1KES3r+vGw49E18fnDRSvMIWDgY9P7C5ikV0/JVJ4mFpKH5HHV ikddocE21ac6maFjvDuc0IpV4ycqCLYo3oNd0gY7ikqYT6II8oMeY88JcdczUq/mFQHq p7tQ== X-Gm-Message-State: ACrzQf2uqqNGVxt9O+AKdlz38lbJEQ3yd395RNQa5LvtOZdQ435j1vZ0 PaAXLpzPFY/PbFy9ImYurq2EF/NPuiVBaPslEc33AvoCBlR60Txy97IsHo5xamKadlaWxaeJuaz /uyqk/FFUdBzpvZSFJJ2IH3sAcYF1G5JyABjLxyyE6FR1/SeXsfF5zoc3sDJCPGWiLqw= X-Received: by 2002:a05:622a:6097:b0:3a5:f2:4b4c with SMTP id hf23-20020a05622a609700b003a500f24b4cmr12288154qtb.364.1667248403994; Mon, 31 Oct 2022 13:33:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Dp5EjqkTMZM6ybL1iNjGy807a3l2yf4K75zCoduEsBGvy33iCLl0v6sl7XjNlMaX9NygmXg== X-Received: by 2002:a05:622a:6097:b0:3a5:f2:4b4c with SMTP id hf23-20020a05622a609700b003a500f24b4cmr12288120qtb.364.1667248403687; Mon, 31 Oct 2022 13:33:23 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id bi23-20020a05620a319700b006eeca296c00sm5254688qkb.104.2022.10.31.13.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 13:33:23 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Implement ranges::as_rvalue_view from P2446R2 Date: Mon, 31 Oct 2022 16:33:10 -0400 Message-Id: <20221031203310.852924-1-ppalka@redhat.com> X-Mailer: git-send-email 2.38.1.381.gc03801e19c MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-14.1 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, 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 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Cc: libstdc++@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested on x86_64-pc-linux-gnu, does this look OK for trunk? libstdc++-v3/ChangeLog: * include/std/ranges (as_rvalue_view): Define. (enable_borrowed_range): Define. (views::__detail::__can_as_rvalue_view): Define. (views::_AsRvalue, views::as_rvalue): Define. * testsuite/std/ranges/adaptors/as_rvalue/1.cc: New test. --- libstdc++-v3/include/std/ranges | 88 +++++++++++++++++++ .../std/ranges/adaptors/as_rvalue/1.cc | 47 ++++++++++ 2 files changed, 135 insertions(+) create mode 100644 libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 959886a1a55..239b3b61d30 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -8486,6 +8486,94 @@ namespace views::__adaptor inline constexpr _CartesianProduct cartesian_product; } + + template + requires view<_Vp> + class as_rvalue_view : public view_interface> + { + _Vp _M_base = _Vp(); + + public: + as_rvalue_view() requires default_initializable<_Vp> = default; + + constexpr explicit + as_rvalue_view(_Vp __base) + : _M_base(std::move(__base)) + { } + + constexpr _Vp + base() const& requires copy_constructible<_Vp> { return _M_base; } + + constexpr _Vp + base() && { return std::move(_M_base); } + + constexpr auto + begin() requires (!__detail::__simple_view<_Vp>) + { return move_iterator(ranges::begin(_M_base)); } + + constexpr auto + begin() const requires range + { return move_iterator(ranges::begin(_M_base)); } + + constexpr auto + end() requires (!__detail::__simple_view<_Vp>) + { + if constexpr (common_range<_Vp>) + return move_iterator(ranges::end(_M_base)); + else + return move_sentinel(ranges::end(_M_base)); + } + + constexpr auto + end() const requires range + { + if constexpr (common_range) + return move_iterator(ranges::end(_M_base)); + else + return move_sentinel(ranges::end(_M_base)); + } + + constexpr auto + size() requires sized_range<_Vp> + { return ranges::size(_M_base); } + + constexpr auto + size() const requires sized_range + { return ranges::size(_M_base); } + }; + + template + as_rvalue_view(_Range&&) -> as_rvalue_view>; + + template + inline constexpr bool enable_borrowed_range> + = enable_borrowed_range<_Tp>; + + namespace views + { + namespace __detail + { + template + concept __can_as_rvalue_view = requires { as_rvalue_view(std::declval<_Tp>()); }; + } + + struct _AsRvalue : __adaptor::_RangeAdaptorClosure + { + template + requires __detail::__can_as_rvalue_view<_Range> + constexpr auto + operator() [[nodiscard]] (_Range&& __r) const + { + if constexpr (same_as, + range_reference_t<_Range>>) + return views::all(std::forward<_Range>(__r)); + else + return as_rvalue_view(std::forward<_Range>(__r)); + } + }; + + inline constexpr _AsRvalue as_rvalue; + } #endif // C++23 } // namespace ranges diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc new file mode 100644 index 00000000000..8ca4f50e9d2 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/as_rvalue/1.cc @@ -0,0 +1,47 @@ +// { dg-options "-std=gnu++23" } +// { dg-do run { target c++23 } } + +#include +#include +#include +#include +#include + +namespace ranges = std::ranges; +namespace views = std::views; + +constexpr bool +test01() +{ + + std::unique_ptr a[3] = { std::make_unique(1), + std::make_unique(2), + std::make_unique(3) }; + std::unique_ptr b[3]; + auto v = a | views::as_rvalue; + ranges::copy(v, b); + VERIFY( ranges::all_of(a, [](auto& p) { return p.get() == nullptr; }) ); + VERIFY( ranges::equal(b | views::transform([](auto& p) { return *p; }), (int[]){1, 2, 3}) ); + + return true; +} + +void +test02() +{ + std::unique_ptr x = std::make_unique(42); + std::unique_ptr y; + __gnu_test::test_input_range rx(&x, &x+1); + auto v = rx | views::as_rvalue; + static_assert(!ranges::common_range); + ranges::copy(v, &y); + VERIFY( x.get() == nullptr ); + VERIFY( *y == 42 ); +} + +int +main() +{ + static_assert(test01()); + test02(); +}