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.129.124]) by sourceware.org (Postfix) with ESMTPS id 7E7EB38A8150 for ; Mon, 12 Sep 2022 16:45:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7E7EB38A8150 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=1663001143; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x4ZYrG2d13Kk/6s+RjiiA6vGLL0TbNaWFHnV4B78tfo=; b=dlo6nEsLWLcs3DjJlswJu9mauy4rYmrjBPj+r4iq1Q66ETCkdKXYDbbjnrZb4FtR35PRvX ZyHUEXiIvdYAvjldqXzKDtsgrYMFtj0Z37i2T1eyT9xkJZpT/Jq1CLBshiVdePQRkRsd4f B8PV2AafgxZU7iJLJpHe29pGavzZrak= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-599-i2KkW1iHObGQLkVyr5mj8A-1; Mon, 12 Sep 2022 12:45:42 -0400 X-MC-Unique: i2KkW1iHObGQLkVyr5mj8A-1 Received: by mail-qt1-f198.google.com with SMTP id ff27-20020a05622a4d9b00b0034306b77c08so7623892qtb.6 for ; Mon, 12 Sep 2022 09:45:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=x4ZYrG2d13Kk/6s+RjiiA6vGLL0TbNaWFHnV4B78tfo=; b=bNbCi0kTHLIf+ZmyhwcEHFvXYIGfiC6Bo1UYEZw+OgpTa8FY2w1Gy3/v846IOmplfw jOjl4sGoKfD8K9qXDOzAKsnhfMBwNytIA1vD8rIARcl51xL9YdXRfWQCI4o6jIuoQC6C LwhtilkuiRqM+ZPaFofMqBeZgDhVnoXUACw9unqVKSJqNaqmMwu+WZ3z1e30+089NmmF T5f9wpQ/Vn5x2liYTwhTkoobZPdbxnVWB24PYtNaXnKBICqH57uIwXrQoocAyRMZsK18 +/M/vm3VJ8hzkgyvVtTYi0zP2XNnTLq2UHxrt/It5vyWQ1SYvuut/7dCD/sjTiysyagl BBaw== X-Gm-Message-State: ACgBeo1/lb0VMWvXfnN4r1JrekFBMF4SJNBaQtE2wG74aaVdTSgKkLda 65AV4IUpX3u2+usbHf/SJoUdAQ1eUXJduTPF89gtse7cfGTczOdvC2uEBK1vo5LJhCUOmu3jtUv AxZmpRwLoLbeGw+8= X-Received: by 2002:a05:620a:124f:b0:6cd:ef55:544c with SMTP id a15-20020a05620a124f00b006cdef55544cmr9030242qkl.158.1663001141491; Mon, 12 Sep 2022 09:45:41 -0700 (PDT) X-Google-Smtp-Source: AA6agR72NXdqShNtPq4UkzFp+xc+mdTURWXWI/oW1dTRfmrC322S5Zqacw+TbOyUY9y/dkotlDURtQ== X-Received: by 2002:a05:620a:124f:b0:6cd:ef55:544c with SMTP id a15-20020a05620a124f00b006cdef55544cmr9030231qkl.158.1663001141230; Mon, 12 Sep 2022 09:45:41 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id 17-20020ac85651000000b0035ba48c032asm6667350qtt.25.2022.09.12.09.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 09:45:40 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH 2/4] libstdc++: Implement LWG 3569 changes to join_view::_Iterator Date: Mon, 12 Sep 2022 12:45:29 -0400 Message-Id: <20220912164531.1742034-2-ppalka@redhat.com> X-Mailer: git-send-email 2.37.3.542.gdd3f6c4cae In-Reply-To: <20220912164531.1742034-1-ppalka@redhat.com> References: <20220912164531.1742034-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.3 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,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: Tested on x86_64-pc-linux-gnu, does this look OK for trunk only? libstdc++-v3/ChangeLog: * include/std/ranges (join_view::_Iterator::_M_satisfy): Adjust resetting _M_inner as per LWG 3569. (join_view::_Iterator::_M_inner): Wrap in std::optional as per LWG 3569. (join_view::_Iterator::_Iterator): Relax constraints as per LWG 3569. (join_view::_Iterator::operator*): Adjust as per LWG 3569. (join_view::_Iterator::operator->): Likewise. (join_view::_Iterator::operator++): Likewise. (join_view::_Iterator::operator--): Likewise. (join_view::_Iterator::iter_move): Likewise. (join_view::_Iterator::iter_swap): Likewise. * testsuite/std/ranges/adaptor/join.cc (test14): New test. --- libstdc++-v3/include/std/ranges | 28 +++++++++---------- .../testsuite/std/ranges/adaptors/join.cc | 17 +++++++++++ 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 20eb4e82ac8..6297ce7cee3 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -2746,7 +2746,7 @@ namespace views::__adaptor } if constexpr (_S_ref_is_glvalue) - _M_inner = _Inner_iter(); + _M_inner.reset(); } static constexpr auto @@ -2769,7 +2769,7 @@ namespace views::__adaptor using _Inner_iter = join_view::_Inner_iter<_Const>; _Outer_iter _M_outer = _Outer_iter(); - _Inner_iter _M_inner = _Inner_iter(); + optional<_Inner_iter> _M_inner; _Parent* _M_parent = nullptr; public: @@ -2780,9 +2780,7 @@ namespace views::__adaptor = common_type_t, range_difference_t>>; - _Iterator() requires (default_initializable<_Outer_iter> - && default_initializable<_Inner_iter>) - = default; + _Iterator() requires default_initializable<_Outer_iter> = default; constexpr _Iterator(_Parent* __parent, _Outer_iter __outer) @@ -2801,7 +2799,7 @@ namespace views::__adaptor constexpr decltype(auto) operator*() const - { return *_M_inner; } + { return **_M_inner; } // _GLIBCXX_RESOLVE_LIB_DEFECTS // 3500. join_view::iterator::operator->() is bogus @@ -2809,7 +2807,7 @@ namespace views::__adaptor operator->() const requires __detail::__has_arrow<_Inner_iter> && copyable<_Inner_iter> - { return _M_inner; } + { return *_M_inner; } constexpr _Iterator& operator++() @@ -2820,7 +2818,7 @@ namespace views::__adaptor else return *_M_parent->_M_inner; }(); - if (++_M_inner == ranges::end(__inner_range)) + if (++*_M_inner == ranges::end(__inner_range)) { ++_M_outer; _M_satisfy(); @@ -2850,9 +2848,9 @@ namespace views::__adaptor { if (_M_outer == ranges::end(_M_parent->_M_base)) _M_inner = ranges::end(*--_M_outer); - while (_M_inner == ranges::begin(*_M_outer)) - _M_inner = ranges::end(*--_M_outer); - --_M_inner; + while (*_M_inner == ranges::begin(*_M_outer)) + *_M_inner = ranges::end(*--_M_outer); + --*_M_inner; return *this; } @@ -2879,14 +2877,14 @@ namespace views::__adaptor friend constexpr decltype(auto) iter_move(const _Iterator& __i) - noexcept(noexcept(ranges::iter_move(__i._M_inner))) - { return ranges::iter_move(__i._M_inner); } + noexcept(noexcept(ranges::iter_move(*__i._M_inner))) + { return ranges::iter_move(*__i._M_inner); } friend constexpr void iter_swap(const _Iterator& __x, const _Iterator& __y) - noexcept(noexcept(ranges::iter_swap(__x._M_inner, __y._M_inner))) + noexcept(noexcept(ranges::iter_swap(*__x._M_inner, *__y._M_inner))) requires indirectly_swappable<_Inner_iter> - { return ranges::iter_swap(__x._M_inner, __y._M_inner); } + { return ranges::iter_swap(*__x._M_inner, *__y._M_inner); } friend _Iterator; template friend struct _Sentinel; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc index 530ab6663b5..afc11d4bd7a 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -217,6 +218,21 @@ test13() std::vector> v{{5, 6, 7}}; v | l | std::views::join; } + +void +test14() +{ + // LWG 3569: join_view fails to support ranges of ranges with + // non-default_initializable iterators + auto ss = std::istringstream{"1 2 3"}; + auto v = views::single(views::istream(ss)); + using inner = ranges::range_reference_t; + static_assert(ranges::input_range + && !ranges::forward_range + && !std::default_initializable>); + VERIFY( ranges::equal(v | views::join, (int[]){1, 2, 3}) ); +} + int main() { @@ -233,4 +249,5 @@ main() test11(); test12(); test13(); + test14(); } -- 2.37.3.542.gdd3f6c4cae