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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id BAF30383D03D for ; Tue, 18 May 2021 04:42:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BAF30383D03D Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-499-S8booEfaMzyvAJKQKuj6Jw-1; Tue, 18 May 2021 00:42:03 -0400 X-MC-Unique: S8booEfaMzyvAJKQKuj6Jw-1 Received: by mail-qk1-f198.google.com with SMTP id u126-20020a3792840000b02902e769005fe1so6345798qkd.2 for ; Mon, 17 May 2021 21:42:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:mime-version; bh=ofhaOCr1nKwrqhDIq4jut8ov/qLt2C1Zi4i3BlAUCt4=; b=o5LS9LsPcY1Hi+qU+11QtC7Sn1+/ndfSpvjjPHS9Eawq0Hy9/unsAtX2PmB8BkwHkg 05ZFfPRr/pRSDDhScX10XuqNy+tlatLeX7kifl2T+ZiP9wU19/cyBF72Hq6ibjHuzSYM S/gTWkqa/tjecmRaNXlEUPvRbn5fJezZrXNfwz/OIck3xMFBzmBhMSHf9CdGv8KxnaEN o90rRnC1MGWW/828uykTPvzvUg+NNeJGXLQsjj1F+2J48bSi8bX2Ybk1Ny82xsvitxUH 7bV1qX6KmW6c/wjGBrz76Dh7nSrNM6952Yvyc/DM0Rd8UY45z+Jt0TrLdD5m8eln7cVt 5Uxg== X-Gm-Message-State: AOAM531Qs1dSU3jxIZuNBs7IWqE16OcnzOngNoYexwLUJk8ZCKrTyPaJ WoZWVzqZfTo0ILXYQzTnEn1LTiUPE8x0RJy+5ypw+uv6bNqnIc5xmI1Sm8Mgm0jBkJl/qoOpZr+ +PwCN8046nunu/cg= X-Received: by 2002:ac8:5ecc:: with SMTP id s12mr2910917qtx.349.1621312922895; Mon, 17 May 2021 21:42:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvkd0H7QPQqbvSW6VnTGrFQcipqQidj2FFixwva9WHarEVY69qqiqGiVYHQo+REQYlSqa9yQ== X-Received: by 2002:ac8:5ecc:: with SMTP id s12mr2910899qtx.349.1621312922649; Mon, 17 May 2021 21:42:02 -0700 (PDT) Received: from [192.168.1.130] (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id c9sm5861019qke.8.2021.05.17.21.42.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 21:42:02 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Tue, 18 May 2021 00:42:01 -0400 (EDT) To: Tim Song cc: Patrick Palka , gcc-patches , libstdc++ Subject: Re: [PATCH] libstdc++: Fix access issues in elements_view::_Sentinel [PR100631] In-Reply-To: Message-ID: References: <20210517161736.870316-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-16.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_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 04:42:08 -0000 On Mon, 17 May 2021, Tim Song wrote: > On Mon, May 17, 2021 at 12:21 PM Patrick Palka via Gcc-patches > wrote: > > > > using _Base = elements_view::_Base<_Const>; > > sentinel_t<_Base> _M_end = sentinel_t<_Base>(); > > @@ -3800,7 +3807,7 @@ namespace views::__adaptor > > requires sized_sentinel_for, iterator_t<_Base2>> > > friend constexpr range_difference_t<_Base> > > Preexisting, but this one should be _Base2 - we always want to get the > difference type from the iterator being used. Patch committed with this as a drive-by change. Thanks! -- >8 -- Subject: [PATCH] libstdc++: Fix miscellaneous issues with elements_view::_Sentinel [PR100631] libstdc++-v3/ChangeLog: PR libstdc++/100631 * include/std/ranges (elements_view::_Iterator): Also befriend _Sentinel. (elements_view::_Sentinel::_M_equal): Templatize. (elements_view::_Sentinel::_M_distance_from): Split out from ... (elements_view::_Sentinel::operator-): ... here. Depend on _Base2 instead of _Base in the return type. * testsuite/std/ranges/adaptors/elements.cc (test06, test07): New tests. --- libstdc++-v3/include/std/ranges | 18 +++++++---- .../testsuite/std/ranges/adaptors/elements.cc | 31 +++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 48100e9d7f2..36bccd6b33b 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3634,16 +3634,22 @@ namespace views::__adaptor requires sized_sentinel_for, iterator_t<_Base>> { return __x._M_current - __y._M_current; } - friend _Sentinel<_Const>; + template friend struct _Sentinel; }; template struct _Sentinel { private: - constexpr bool - _M_equal(const _Iterator<_Const>& __x) const - { return __x._M_current == _M_end; } + template + constexpr bool + _M_equal(const _Iterator<_Const2>& __x) const + { return __x._M_current == _M_end; } + + template + constexpr auto + _M_distance_from(const _Iterator<_Const2>& __i) const + { return _M_end - __i._M_current; } using _Base = elements_view::_Base<_Const>; sentinel_t<_Base> _M_end = sentinel_t<_Base>(); @@ -3684,9 +3690,9 @@ namespace views::__adaptor template> requires sized_sentinel_for, iterator_t<_Base2>> - friend constexpr range_difference_t<_Base> + friend constexpr range_difference_t<_Base2> operator-(const _Sentinel& __x, const _Iterator<_Const2>& __y) - { return __x._M_end - __y._M_current; } + { return __x._M_distance_from(__y); } friend _Sentinel; }; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc index 134afd6a873..c6839e38ce5 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/elements.cc @@ -115,6 +115,35 @@ test05() VERIFY( r2[0] == 1 && r2[1] == 3 ); } +void +test06() +{ + // PR libstdc++/100631 + auto r = views::iota(0) + | views::filter([](int){ return true; }) + | views::take(42) + | views::reverse + | views::transform([](int) { return std::make_pair(42, "hello"); }) + | views::take(42) + | views::keys; + auto b = r.begin(); + auto e = r.end(); + e - b; +} + +void +test07() +{ + // PR libstdc++/100631 comment #2 + auto r = views::iota(0) + | views::transform([](int) { return std::make_pair(42, "hello"); }) + | views::keys; + auto b = ranges::cbegin(r); + auto e = ranges::end(r); + b.base() == e.base(); + b == e; +} + int main() { @@ -123,4 +152,6 @@ main() test03(); test04(); test05(); + test06(); + test07(); } -- 2.31.1.621.g97eea85a0a