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 D033E3858D28 for ; Tue, 11 Apr 2023 15:07:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D033E3858D28 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=1681225623; 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=d/8mUVxgiiWgqXCLIq1TXyt1OFfgBxUgsXFzzK7dtGk=; b=Mip0GkNhYK+9S5jPYLzA0wr5ZUZZQ7iFQ0Lp6BukM7lIIHtfFLEE7kWEd5tLKPefqhy2YB +bHzaEewu8jJxQ7zoUWqIlyewBQTAxBPEdkSnlVhyNfg5m9oSclcMKefl3/d3gXht9nTox bk/J1s3BiukyLtlwQEVV4RspOs88BgY= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-508-XRAxsFP8MB-akDltlzvpqw-1; Tue, 11 Apr 2023 11:06:59 -0400 X-MC-Unique: XRAxsFP8MB-akDltlzvpqw-1 Received: by mail-lf1-f71.google.com with SMTP id a27-20020a195f5b000000b004e8706b0c72so3222696lfj.21 for ; Tue, 11 Apr 2023 08:06:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681225617; 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=d/8mUVxgiiWgqXCLIq1TXyt1OFfgBxUgsXFzzK7dtGk=; b=Ra6Wmc2JmPu/S/L0IsawfXInEht8e+VWnsKo2u3e82zN7YF7IeSDGkFeDgJMwtJcFb tdFX+v9rVhAUztINR4HYA2LrSFp5u1DeO9qODLTfwK+vdjkufJp9I3peudgmDsK1YXL5 3N7+tnLj3nllEeMcXYY/670o/IRZo6+p1DdIxmU6v9ngdgIf8JmKZGrq6e2ecaNgeFHh CNjRswaxZ2Wu4mQi5c8Pr9OiZPCUxwuzncxTAoxD+J4v1NbJMB1PVf1gp5laJP3YsuuL qD4Gb9IP47XU5BtzwiOEpHBV0L1A5KrKcT79FOhOHqR2GMwXq/NrYlOPG6dSysOLdAS+ Vb6Q== X-Gm-Message-State: AAQBX9e8LvotU/1OjvlpoOFiwK4VJwnHdJEFoaej5fksgHdltPm6JwAO 3JBE5PKhWF+j+AGnkFPtKJvcQTcu7lxr4hAMlPMIY+ubx+Rbso4jrNypoquZyh+24rmv262loyh su9dmSTwJeJbaIz4w15H/zm5kJPNtAa8AYA== X-Received: by 2002:ac2:4858:0:b0:4eb:c3c:ce33 with SMTP id 24-20020ac24858000000b004eb0c3cce33mr4002176lfy.8.1681225617604; Tue, 11 Apr 2023 08:06:57 -0700 (PDT) X-Google-Smtp-Source: AKy350ZFVFw/grtH/npu9GYlVYDke8tAmUPvy9B+JdQhO+H8iFPTH5eUq3XL03Rs/vMuAZ4//asCIb2MsZi2bd8MjmI= X-Received: by 2002:ac2:4858:0:b0:4eb:c3c:ce33 with SMTP id 24-20020ac24858000000b004eb0c3cce33mr4002165lfy.8.1681225617269; Tue, 11 Apr 2023 08:06:57 -0700 (PDT) MIME-Version: 1.0 References: <20230411145831.2862333-1-ppalka@redhat.com> In-Reply-To: <20230411145831.2862333-1-ppalka@redhat.com> From: Jonathan Wakely Date: Tue, 11 Apr 2023 16:06:50 +0100 Message-ID: Subject: Re: [PATCH] libstdc++: Implement LWG 3904 change to lazy_split_view's iterator To: Patrick Palka Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-12.2 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 List-Id: On Tue, 11 Apr 2023 at 15:58, Patrick Palka via Libstdc++ wrote: > > Tested on x86_64-pc-linux-gnu, does this look OK for trunk/12? OK for all, thanks. (This hasn't been approved by LWG yet, but it should be soon.) > > libstdc++-v3/ChangeLog: > > * include/std/ranges (lazy_split_view::_OuterIter::_OuterIter): > Propagate _M_trailing_empty in the const-converting constructor > as per LWG 3904. > * testsuite/std/ranges/adaptors/adjacent/1.cc (test04): Correct > assertion. > * testsuite/std/ranges/adaptors/lazy_split.cc (test12): New test. > --- > libstdc++-v3/include/std/ranges | 3 ++- > .../testsuite/std/ranges/adaptors/adjacent/1.cc | 2 +- > .../testsuite/std/ranges/adaptors/lazy_split.cc | 16 ++++++++++++++++ > 3 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges > index b230ebefcf5..26a9f2a6872 100644 > --- a/libstdc++-v3/include/std/ranges > +++ b/libstdc++-v3/include/std/ranges > @@ -3209,7 +3209,8 @@ namespace views::__adaptor > _OuterIter(_OuterIter __i) > requires _Const > && convertible_to, iterator_t<_Base>> > - : _M_parent(__i._M_parent), _M_current(std::move(__i._M_current)) > + : _M_parent(__i._M_parent), _M_current(std::move(__i._M_current)), > + _M_trailing_empty(__i._M_trailing_empty) > { } > > constexpr value_type > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc > index 443c1fbf450..19640abfe93 100644 > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/adjacent/1.cc > @@ -107,7 +107,7 @@ test04() > // PR libstdc++/106798 > auto r = views::single(0) | views::lazy_split(0) | views::pairwise; > decltype(ranges::cend(r)) s = r.end(); > - VERIFY( r.begin() == s ); > + VERIFY( r.begin() != s ); > > return true; > } > diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc > index 9df6b3b66a6..4e5c0dc3ed5 100644 > --- a/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc > +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/lazy_split.cc > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -218,6 +219,20 @@ test11() > static_assert(ranges::distance(views::lazy_split("text"sv, ""sv)) == 4); > } > > +constexpr bool > +test12() > +{ > + // LWG 3904 > + auto r = views::single(0) | views::lazy_split(0); > + auto i = r.begin(); > + ++i; > + VERIFY( i != r.end() ); > + decltype(std::as_const(r).begin()) j = i; > + VERIFY( j != r.end() ); > + > + return true; > +} > + > int > main() > { > @@ -232,4 +247,5 @@ main() > test09(); > test10(); > test11(); > + static_assert(test12()); > } > -- > 2.40.0.315.g0607f793cb >