From patchwork Wed Oct 20 18:17:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1544005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=Wkz6C6qz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HZJlJ1vJCz9s1l for ; Thu, 21 Oct 2021 05:18:36 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6FE373857C67 for ; Wed, 20 Oct 2021 18:18:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FE373857C67 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1634753913; bh=klsBwvsAHvd60euBHokxECXpLWl3vgMFfA6NtXM8W7E=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Wkz6C6qz0CBa3CNRfhDMbUtTtQnhHKWWiD/+caDVH+Owhd2y82B3ZPHsMZd8ms01H Ce05MjwSo6ca5FodcOj5H01jydtBHLwcENUbSKwSvvyLOW7xKIN30as86BfgTmdU0D BjG9pfxBH0j2QRRyC32ge8gfzfXK7zxlBg344Big= 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 081D53858409 for ; Wed, 20 Oct 2021 18:17:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 081D53858409 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-602-D9DX-SGYNHmswQGb84wbdg-1; Wed, 20 Oct 2021 14:17:30 -0400 X-MC-Unique: D9DX-SGYNHmswQGb84wbdg-1 Received: by mail-qk1-f200.google.com with SMTP id b18-20020a05620a119200b0045ff23bd078so2777523qkk.13 for ; Wed, 20 Oct 2021 11:17:30 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=klsBwvsAHvd60euBHokxECXpLWl3vgMFfA6NtXM8W7E=; b=C+5j4k+0t2UGR2c8ANHZVEOSExTBfBAFaVQvs/Vs136tZ9t3ZeNQRPZPgcIcjGs3nV gW+UdNJcHitDLI2Mn+Sa2xF1kvcPuAvbIIzjkud6pGIH5G13nI9tGOI8L+JgoHJIxyqo xhLF3QqaX2cJrr+5ELD0C/nBsHtLpLpNY86GimkNXkyToKo6c0pIHBUmo+G7/nN4ftV/ cCJU1opbcQpayqeWP4/0mvT92vgBU81tAI0z1KB7E8qkYHKYgkB71BNineoaK7hIEHP7 IoW6QPyglqxqRUVQLRPl7e0OtuDKwFwrS55KcQaYfVGnGwg9JoPIlLtNiCoV5OoMTeqp +S/g== X-Gm-Message-State: AOAM5300cLQ3BcpJVANDnvIk8JZnGa0qdIhN//Jdzv6SZEGVMbjsuF5v UkOtyus7FeMrVLAE2o/rBLXp8hV8pqYmk5flsjAuEgiNaWu6/ctJvLBZB2eoRlz9fgHlg+Mu+S1 EAaCQpQDvQqbL3+FaXOOID2K2Y4VfSqf+2lcMfx5p+x0joK2FHDg4YBsEp/oQEDnF/0Q= X-Received: by 2002:a37:c44:: with SMTP id 65mr645456qkm.278.1634753849558; Wed, 20 Oct 2021 11:17:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsZzLDoXclQ3GejTzEbqdj0f396QBkbp17aNtgTSUn8CJVhnolgRpKJ+mZaUYtKFxYt8MT2w== X-Received: by 2002:a37:c44:: with SMTP id 65mr645420qkm.278.1634753849139; Wed, 20 Oct 2021 11:17:29 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id bm16sm1371967qkb.86.2021.10.20.11.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Oct 2021 11:17:28 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Implement LWG 3590-3592 changes to split_view/lazy_split_view Date: Wed, 20 Oct 2021 14:17:22 -0400 Message-Id: <20211020181722.1862070-1-ppalka@redhat.com> X-Mailer: git-send-email 2.33.1.711.g9d530dc002 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-15.7 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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Tested on x86_64-pc-linux-gnu, does this look OK for trunk, and 11 after a while? libstdc++-v3/ChangeLog: * include/std/ranges (lazy_split_view::base): Add forward_range constraint as per LWG 3591. (lazy_split_view::begin, lazy_split_view::end): Also check simpleness of _Pattern as per LWG 3592. (split_view::base): Relax copyable constraint as per LWG 3590. --- libstdc++-v3/include/std/ranges | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index c1519c7dbd5..30ba0606869 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3137,7 +3137,7 @@ namespace views::__adaptor { return _M_i_current(); } constexpr iterator_t<_Base> - base() && + base() && requires forward_range<_Vp> { return std::move(_M_i_current()); } constexpr decltype(auto) @@ -3229,8 +3229,11 @@ namespace views::__adaptor begin() { if constexpr (forward_range<_Vp>) - return _OuterIter<__detail::__simple_view<_Vp>>{ - this, ranges::begin(_M_base)}; + { + constexpr bool __simple + = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>; + return _OuterIter<__simple>{this, ranges::begin(_M_base)}; + } else { _M_current = ranges::begin(_M_base); @@ -3247,8 +3250,9 @@ namespace views::__adaptor constexpr auto end() requires forward_range<_Vp> && common_range<_Vp> { - return _OuterIter<__detail::__simple_view<_Vp>>{ - this, ranges::end(_M_base)}; + constexpr bool __simple + = __detail::__simple_view<_Vp> && __detail::__simple_view<_Pattern>; + return _OuterIter<__simple>{this, ranges::end(_M_base)}; } constexpr auto @@ -3339,7 +3343,7 @@ namespace views::__adaptor { } constexpr _Vp - base() const& requires copyable<_Vp> + base() const& requires copy_constructible<_Vp> { return _M_base; } constexpr _Vp