From patchwork Wed Mar 8 15:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 66320 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp413044wrd; Wed, 8 Mar 2023 07:54:15 -0800 (PST) X-Google-Smtp-Source: AK7set+iJLRjquDgwyMm+lQXm1eWviv69u0KdsoC2hFw2IRMPvrxSHkIY2xbn/hgxd/YJqqIlBcu X-Received: by 2002:a17:907:16a4:b0:8af:3fcc:2b05 with SMTP id hc36-20020a17090716a400b008af3fcc2b05mr23829792ejc.12.1678290855486; Wed, 08 Mar 2023 07:54:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678290855; cv=none; d=google.com; s=arc-20160816; b=DgEc/nyy0iJlk/k6csindA+F/zJJXTvWlyXeb+HM/sbp9Q8bFR5Mu/bWmWqfltGRM4 FQbozAVA41ox06wIzTuuWsc9luPh4GQlLpO020qmV2jlz/vRE+yZbJwWIrq4Ao1DjK3R O8ZL/35nTcdoeALbK1LIsdhKUK0Zw1y1DXrbmuLD3taF0b+/Xmm0NbMb5Dv/SfS3pRyo TaqAWgEFHYwq3vSJoycS9zGgScF6Y1oQmhGZl2K+qBpXFTbzXypk2xjkloxVdwhYQmzX +nNJU4pG5qR/W8A6V36ajelaMVEHjQt66rQwBtKCqa3ghaGk4lsTMOaQELNv43WlWIUt Utgg== 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=Y31FiglGowuTapLicp2+rV/Qx7pdnoZNkhvafPZYNDA=; b=w9WVDtJ8yhqgvs5zjhSlBUiw/3+SG1S2r1ieSqWQGN8s5rVlx3b1ms1xhFklZWgDpw jGgjLsK5gYJdyVYRMPs0r4UiMkw1Mx/QxxqLQmnsuWMQLvH+8WpkHFTKAGBD+5MoPBUj PqOAAQIWc+3LYqjDTCe0b9f+Tzw3YP+05oB/JfJylBHfrgIcpbGHXBqXgT0LWppQ+lEy YcTVizrXn6hmT7LU0NKuL/dNXiKBwwMbPbzqLxd+Hhbuo48JpMDnKB0CMLWfdTWzbiFJ lLzwt3IVBmnMyqkiHymczcc7Mu70dj6xjEdYw0YJTIs6BKYmV4Mla5vtFXX9Ah8ilbBb yoJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ai+ZJY3W; 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 ji17-20020a170907981100b008dd83608273si4227561ejc.370.2023.03.08.07.54.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 07:54:15 -0800 (PST) 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=ai+ZJY3W; 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 9FBC83850202 for ; Wed, 8 Mar 2023 15:54:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9FBC83850202 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678290843; bh=Y31FiglGowuTapLicp2+rV/Qx7pdnoZNkhvafPZYNDA=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ai+ZJY3WInTdmd37W5DbkjQnk4WKk4ifiyh1ONEciTvNnDubkDukjf6RXBUqI7xpQ D2KXu3iL0oV5aT26jgfAby490kp5iN0FR+vPIGfP3WXljiRg+8scETXq6Jm9HzzRY9 qCPK95G6jfsRsR++aDZmCxf5zMKAJujS0uDal4qs= 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 3C5AC3858289 for ; Wed, 8 Mar 2023 15:53:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C5AC3858289 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-vIk_wBehPw6KmEOc0WYAJQ-1; Wed, 08 Mar 2023 10:53:17 -0500 X-MC-Unique: vIk_wBehPw6KmEOc0WYAJQ-1 Received: by mail-qv1-f71.google.com with SMTP id l13-20020ad44d0d000000b004c74bbb0affso9417883qvl.21 for ; Wed, 08 Mar 2023 07:53:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678290796; 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=Y31FiglGowuTapLicp2+rV/Qx7pdnoZNkhvafPZYNDA=; b=vbySNCkDN6avkvnYzuZ+6nYWDfXlTEuZdoBEFpAbZaH+cP2Eeme5qkCga+U2vCfODl VBEdvWb3EKKsTvTIQuK5cIjSoHFTGpOAUIMiXRupgleqn8TpOTlhE9nPVl930QyGf2Gi CxTaNkFcyQmymZqWD0VDbAfcZ5c/WV4SWR8BzPvPITOEa9LDdfkwreqaioPuUhUYl38a 70jLxf+J4GPZvVATX7UXCI262Ou+5ohnDkJNREuJZW1Zix90JzB3l9lG1rsUSb+gL75L FNvESSlgRx8+Vy9N9WGwkj587CHwKBSocGDqYXgkT3ASgkryscxB8GHJk9B7A1bUB6iM ELFA== X-Gm-Message-State: AO0yUKWjxlGlU5YTmHSJ0dYLMGVpQS2ZB8ZNQ6FnewEhNkctLk1kjVlC YjzaQqq/LwKjfH5UKKMwggdzzupNuCtu+ar9acxBQvz/jJbOKokwVFp8l7E4I3FBIK2AvMzXxn1 AsdILv1XTACKHKsSR0snmcPcB4O6aeJmIoB+pjAPiWfW0GcM/6C+buB0/mKYF6At6Bs639pvjo7 A= X-Received: by 2002:a05:6214:1cc8:b0:572:5a3a:f55 with SMTP id g8-20020a0562141cc800b005725a3a0f55mr28481578qvd.33.1678290796481; Wed, 08 Mar 2023 07:53:16 -0800 (PST) X-Received: by 2002:a05:6214:1cc8:b0:572:5a3a:f55 with SMTP id g8-20020a0562141cc800b005725a3a0f55mr28481539qvd.33.1678290796087; Wed, 08 Mar 2023 07:53:16 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id s133-20020a37a98b000000b00729b7d71ac7sm11611542qke.33.2023.03.08.07.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 07:53:15 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Implement LWG 3715 changes to view_interface::empty Date: Wed, 8 Mar 2023 10:53:06 -0500 Message-Id: <20230308155306.257241-1-ppalka@redhat.com> X-Mailer: git-send-email 2.40.0.rc0.57.g454dfcbddf MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka 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?1759815512382867092?= X-GMAIL-MSGID: =?utf-8?q?1759815512382867092?= Tested on x86_64-pc-linux-gnu, does this look OK for trunk? libstdc++-v3/ChangeLog: * include/bits/ranges_util.h (view_interface::empty): Add preferred overloads that use ranges::size when the range is sized as per LWG 3715. * testsuite/std/ranges/adaptors/lwg3715.cc: New test. --- libstdc++-v3/include/bits/ranges_util.h | 16 +++++++-- .../testsuite/std/ranges/adaptors/lwg3715.cc | 33 +++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h index e4643e31a20..880a0ce0143 100644 --- a/libstdc++-v3/include/bits/ranges_util.h +++ b/libstdc++-v3/include/bits/ranges_util.h @@ -97,15 +97,27 @@ namespace ranges constexpr bool empty() noexcept(noexcept(_S_empty(_M_derived()))) - requires forward_range<_Derived> + requires forward_range<_Derived> && (!sized_range<_Derived>) { return _S_empty(_M_derived()); } + constexpr bool + empty() + noexcept(noexcept(ranges::size(_M_derived()) == 0)) + requires sized_range<_Derived> + { return ranges::size(_M_derived()) == 0; } + constexpr bool empty() const noexcept(noexcept(_S_empty(_M_derived()))) - requires forward_range + requires forward_range && (!sized_range) { return _S_empty(_M_derived()); } + constexpr bool + empty() const + noexcept(noexcept(ranges::size(_M_derived()) == 0)) + requires sized_range + { return ranges::size(_M_derived()) == 0; } + constexpr explicit operator bool() noexcept(noexcept(ranges::empty(_M_derived()))) requires requires { ranges::empty(_M_derived()); } diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc new file mode 100644 index 00000000000..96ee7087be0 --- /dev/null +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lwg3715.cc @@ -0,0 +1,33 @@ +// { dg-options "-std=gnu++23" } +// { dg-do run { target c++23 } } + +// Verify LWG 3715 changes. + +#include +#include +#include + +void +test01() +{ + std::istringstream ints("0 1 2 3 4"); + auto i = std::views::istream(ints); + auto r4 = std::views::counted(i.begin(), 4) | std::views::chunk(2); + VERIFY( !r4.empty() ); +} + +void +test02() +{ + std::istringstream ints("0 1 2 3 4"); + auto i = std::views::istream(ints); + auto r0 = std::views::counted(i.begin(), 0) | std::views::chunk(2); + VERIFY( r0.empty() ); +} + +int +main() +{ + test01(); + test02(); +}