From patchwork Mon May 17 16:17:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1479624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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@gcc.gnu.org; receiver=) Authentication-Results: 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=d31hfcmu; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4FkPRw4RQbz9rx6 for ; Tue, 18 May 2021 02:17:47 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E311B3833000; Mon, 17 May 2021 16:17:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E311B3833000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1621268264; bh=cJMUfskiqQKMBq4OzGRmPTn3J0hHW8vQ40q+Z3ORlSI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=d31hfcmu09kjdNRubtRZ3MoxGVi2dS2RkrTGI00XQeSfH+2hoNwecTNYMcXahooFy 3WUnm65Oi6lWMLzSrMynlES7a2CuYZdufCcVIyPdL4vbzvoGzDX4n+i52+lsrPJhGk y05A21sbqOZhN6QYMVKuJ1vqi7c6S09gkDifUIqY= 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 ESMTP id 8144B385380B for ; Mon, 17 May 2021 16:17:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8144B385380B Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-vHl_3AVaP6-qF7HIEwEIvg-1; Mon, 17 May 2021 12:17:39 -0400 X-MC-Unique: vHl_3AVaP6-qF7HIEwEIvg-1 Received: by mail-qt1-f200.google.com with SMTP id w15-20020ac857cf0000b02901e11cd2e82fso5543676qta.12 for ; Mon, 17 May 2021 09:17:39 -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:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cJMUfskiqQKMBq4OzGRmPTn3J0hHW8vQ40q+Z3ORlSI=; b=ZhAZunKkvCHdY8WLkbLusABfhTMemobbVJ8/0EJEnNA8f5hvirX3ctbmRGeN1z2n6T npXZK2NjfYnASV7bokvKsikQoXLYxdptJP+xKK9MpS2BAxAT0d7242a0vTthq/dRn074 pRBxh8nzDYAtO1nhTQYvIonOWV85m78XC7K++fabkb4eyHZeGPbGLb0qXDGfWIU7arZd QWAp+F8GuukQNmtFNqgUQNDmZO94REN5z08ziuuFrVlbqs/fXj05FU8EI1jXLb0f1W6Q cjioiiQ0bEWujuyKKFrAa2J7WPgNA8WVB7XRkIAUhnBvg0SIK73LewbbC9RaOFytBm0T knhw== X-Gm-Message-State: AOAM530AOAc6PyhyonnS6GnKPhywEPbKOGsziZwtQrjoFA2MyMcBZ61X f7TfGfxoWdU5+gLsSjRdzf+tiqrbiQQQgWN/X861I7bSgb+fCaGphEO8OMWdAIJ/7MkhYSTDFQx VsGNArlA0fRUfShpDJ2rA32T0rcD23UGdceivU6h2MgI3p4bXrew+cgHmeYjf2YGB03w= X-Received: by 2002:a05:620a:146d:: with SMTP id j13mr575151qkl.493.1621268258755; Mon, 17 May 2021 09:17:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgjv0plCDDYKU4g/c/s4eTOO3gJsHF+jO/Wjo6uMkBD+aJReaTTFmJJAne9nfAbnpaycCkJQ== X-Received: by 2002:a05:620a:146d:: with SMTP id j13mr575124qkl.493.1621268258440; Mon, 17 May 2021 09:17:38 -0700 (PDT) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id 90sm6751739qtg.9.2021.05.17.09.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 09:17:38 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] libstdc++: Fix access issues in elements_view::_Sentinel [PR100631] Date: Mon, 17 May 2021 12:17:36 -0400 Message-Id: <20210517161736.870316-1-ppalka@redhat.com> X-Mailer: git-send-email 2.31.1.621.g97eea85a0a MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-16.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_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: 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@gcc.gnu.org Sender: "Gcc-patches" Tested on x86_64-pc-linux-gnu, does this look OK for 10/11/trunk? libstdc++-v3/ChangeLog: PR libstdc++/100631 * include/std/ranges (elements_view::_Iterator): Befriend _Sentinel. (elements_view::_Sentinel::_M_equal): Templatize. (elements_view::_Sentinel::_M_distance_from): Split out from ... (elements_view::_Sentinel::operator-): Here. * testsuite/std/ranges/adaptors/elements.cc (test06, test07): New tests. --- libstdc++-v3/include/std/ranges | 15 ++++++--- .../testsuite/std/ranges/adaptors/elements.cc | 31 +++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index fe6379fb858..bf52074ca05 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -3749,15 +3749,22 @@ namespace views::__adaptor { return __x._M_current - __y._M_current; } friend _Sentinel<_Const>; + friend _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>(); @@ -3800,7 +3807,7 @@ namespace views::__adaptor requires sized_sentinel_for, iterator_t<_Base2>> friend constexpr range_difference_t<_Base> 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..27aba2c0ff0 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 = std::views::iota(0) + | std::views::filter([](int){ return true; }) + | std::views::take(42) + | std::views::reverse + | std::views::transform([](int) { return std::make_pair(42, "hello"); }) + | std::views::take(42) + | std::views::keys; + auto b = r.begin(); + auto e = r.end(); + e - b; +} + +void +test07() +{ + // PR libstdc++/100631 comment #2 + auto r = std::views::iota(0) + | std::views::transform([](int) { return std::make_pair(42, "hello"); }) + | std::views::keys; + auto b = std::ranges::cbegin(r); + auto e = std::end(r); + b.base() == e.base(); + b == e; +} + int main() { @@ -123,4 +152,6 @@ main() test03(); test04(); test05(); + test06(); + test07(); }