From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 037B23858D39; Tue, 19 Oct 2021 21:51:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 037B23858D39 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4517] libstdc++: Implement LWG 3549 changes to ranges::enable_view X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/master X-Git-Oldrev: c6a1fdd6dde3a95997731c8339d70970aca67594 X-Git-Newrev: 53b1c382d5a6fe8dec394a7ff820d77cda02af81 Message-Id: <20211019215114.037B23858D39@sourceware.org> Date: Tue, 19 Oct 2021 21:51:14 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Oct 2021 21:51:14 -0000 https://gcc.gnu.org/g:53b1c382d5a6fe8dec394a7ff820d77cda02af81 commit r12-4517-g53b1c382d5a6fe8dec394a7ff820d77cda02af81 Author: Patrick Palka Date: Tue Oct 19 17:50:56 2021 -0400 libstdc++: Implement LWG 3549 changes to ranges::enable_view This patch also reverts r11-3504 since that workaround is now obsolete after this resolution. libstdc++-v3/ChangeLog: * include/bits/ranges_base.h (view_interface): Forward declare. (__detail::__is_derived_from_view_interface_fn): Declare. (__detail::__is_derived_from_view_interface): Define as per LWG 3549. (enable_view): Adjust as per LWG 3549. * include/bits/ranges_util.h (view_interface): Don't derive from view_base. * include/std/ranges (filter_view): Revert r11-3504 change. (transform_view): Likewise. (take_view): Likewise. (take_while_view): Likewise. (drop_view): Likewise. (drop_while_view): Likewise. (join_view): Likewise. (lazy_split_view): Likewise. (split_view): Likewise. (reverse_view): Likewise. * testsuite/std/ranges/adaptors/sizeof.cc: Update expected sizes. * testsuite/std/ranges/view.cc (test_view::test_view): Remove this default ctor since views no longer need to be default initable. (test01): New test. Diff: --- libstdc++-v3/include/bits/ranges_base.h | 21 +++++++++- libstdc++-v3/include/bits/ranges_util.h | 2 +- libstdc++-v3/include/std/ranges | 45 +++++++++++----------- .../testsuite/std/ranges/adaptors/sizeof.cc | 6 +-- libstdc++-v3/testsuite/std/ranges/view.cc | 28 ++++++++++++-- 5 files changed, 70 insertions(+), 32 deletions(-) diff --git a/libstdc++-v3/include/bits/ranges_base.h b/libstdc++-v3/include/bits/ranges_base.h index 01d0c35f4b4..7801b2fd023 100644 --- a/libstdc++-v3/include/bits/ranges_base.h +++ b/libstdc++-v3/include/bits/ranges_base.h @@ -614,12 +614,31 @@ namespace ranges template using range_size_t = decltype(ranges::size(std::declval<_Range&>())); + template + requires is_class_v<_Derived> && same_as<_Derived, remove_cv_t<_Derived>> + class view_interface; // defined in + + namespace __detail + { + template + requires (!same_as<_Tp, view_interface<_Up>>) + void __is_derived_from_view_interface_fn(const _Tp&, + const view_interface<_Up>&); // not defined + + // Returns true iff _Tp has exactly one public base class that's a + // specialization of view_interface. + template + concept __is_derived_from_view_interface + = requires (_Tp __t) { __is_derived_from_view_interface_fn(__t, __t); }; + } + /// [range.view] The ranges::view_base type. struct view_base { }; /// [range.view] The ranges::enable_view boolean. template - inline constexpr bool enable_view = derived_from<_Tp, view_base>; + inline constexpr bool enable_view = derived_from<_Tp, view_base> + || __detail::__is_derived_from_view_interface<_Tp>; /// [range.view] The ranges::view concept. template diff --git a/libstdc++-v3/include/bits/ranges_util.h b/libstdc++-v3/include/bits/ranges_util.h index 7e7b958d274..aaa7e8c6a9b 100644 --- a/libstdc++-v3/include/bits/ranges_util.h +++ b/libstdc++-v3/include/bits/ranges_util.h @@ -61,7 +61,7 @@ namespace ranges /// The ranges::view_interface class template template requires is_class_v<_Derived> && same_as<_Derived, remove_cv_t<_Derived>> - class view_interface : public view_base + class view_interface { private: constexpr _Derived& _M_derived() noexcept diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 18bd087985c..6c998925a81 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1483,9 +1483,9 @@ namespace views::__adaptor { return __y.__equal(__x); } }; + _Vp _M_base = _Vp(); [[no_unique_address]] __detail::__box<_Pred> _M_pred; [[no_unique_address]] __detail::_CachedPosition<_Vp> _M_cached_begin; - _Vp _M_base = _Vp(); public: filter_view() requires (default_initializable<_Vp> @@ -1494,7 +1494,7 @@ namespace views::__adaptor constexpr filter_view(_Vp __base, _Pred __pred) - : _M_pred(std::move(__pred)), _M_base(std::move(__base)) + : _M_base(std::move(__base)), _M_pred(std::move(__pred)) { } constexpr _Vp @@ -1850,8 +1850,8 @@ namespace views::__adaptor friend _Sentinel; }; - [[no_unique_address]] __detail::__box<_Fp> _M_fun; _Vp _M_base = _Vp(); + [[no_unique_address]] __detail::__box<_Fp> _M_fun; public: transform_view() requires (default_initializable<_Vp> @@ -1860,7 +1860,7 @@ namespace views::__adaptor constexpr transform_view(_Vp __base, _Fp __fun) - : _M_fun(std::move(__fun)), _M_base(std::move(__base)) + : _M_base(std::move(__base)), _M_fun(std::move(__fun)) { } constexpr _Vp @@ -1987,15 +1987,15 @@ namespace views::__adaptor friend _Sentinel; }; - range_difference_t<_Vp> _M_count = 0; _Vp _M_base = _Vp(); + range_difference_t<_Vp> _M_count = 0; public: take_view() requires default_initializable<_Vp> = default; constexpr take_view(_Vp base, range_difference_t<_Vp> __count) - : _M_count(std::move(__count)), _M_base(std::move(base)) + : _M_base(std::move(base)), _M_count(std::move(__count)) { } constexpr _Vp @@ -2171,8 +2171,8 @@ namespace views::__adaptor friend _Sentinel; }; - [[no_unique_address]] __detail::__box<_Pred> _M_pred; _Vp _M_base = _Vp(); + [[no_unique_address]] __detail::__box<_Pred> _M_pred; public: take_while_view() requires (default_initializable<_Vp> @@ -2181,7 +2181,7 @@ namespace views::__adaptor constexpr take_while_view(_Vp base, _Pred __pred) - : _M_pred(std::move(__pred)), _M_base(std::move(base)) + : _M_base(std::move(base)), _M_pred(std::move(__pred)) { } constexpr _Vp @@ -2252,8 +2252,8 @@ namespace views::__adaptor class drop_view : public view_interface> { private: - range_difference_t<_Vp> _M_count = 0; _Vp _M_base = _Vp(); + range_difference_t<_Vp> _M_count = 0; // ranges::next(begin(base), count, end(base)) is O(1) if _Vp satisfies // both random_access_range and sized_range. Otherwise, cache its result. @@ -2269,7 +2269,7 @@ namespace views::__adaptor constexpr drop_view(_Vp __base, range_difference_t<_Vp> __count) - : _M_count(__count), _M_base(std::move(__base)) + : _M_base(std::move(__base)), _M_count(__count) { __glibcxx_assert(__count >= 0); } constexpr _Vp @@ -2376,9 +2376,9 @@ namespace views::__adaptor class drop_while_view : public view_interface> { private: + _Vp _M_base = _Vp(); [[no_unique_address]] __detail::__box<_Pred> _M_pred; [[no_unique_address]] __detail::_CachedPosition<_Vp> _M_cached_begin; - _Vp _M_base = _Vp(); public: drop_while_view() requires (default_initializable<_Vp> @@ -2387,7 +2387,7 @@ namespace views::__adaptor constexpr drop_while_view(_Vp __base, _Pred __pred) - : _M_pred(std::move(__pred)), _M_base(std::move(__base)) + : _M_base(std::move(__base)), _M_pred(std::move(__pred)) { } constexpr _Vp @@ -2723,9 +2723,9 @@ namespace views::__adaptor friend _Sentinel; }; + _Vp _M_base = _Vp(); [[no_unique_address]] __detail::__non_propagating_cache> _M_inner; - _Vp _M_base = _Vp(); public: join_view() requires default_initializable<_Vp> = default; @@ -3161,12 +3161,12 @@ namespace views::__adaptor { ranges::iter_swap(__x._M_i_current(), __y._M_i_current()); } }; + _Vp _M_base = _Vp(); _Pattern _M_pattern = _Pattern(); // XXX: _M_current is "present only if !forward_range" [[no_unique_address]] __detail::__maybe_present_t, __detail::__non_propagating_cache>> _M_current; - _Vp _M_base = _Vp(); public: @@ -3176,7 +3176,7 @@ namespace views::__adaptor constexpr lazy_split_view(_Vp __base, _Pattern __pattern) - : _M_pattern(std::move(__pattern)), _M_base(std::move(__base)) + : _M_base(std::move(__base)), _M_pattern(std::move(__pattern)) { } template @@ -3184,8 +3184,8 @@ namespace views::__adaptor && constructible_from<_Pattern, single_view>> constexpr lazy_split_view(_Range&& __r, range_value_t<_Range> __e) - : _M_pattern(views::single(std::move(__e))), - _M_base(views::all(std::forward<_Range>(__r))) + : _M_base(views::all(std::forward<_Range>(__r))), + _M_pattern(views::single(std::move(__e))) { } constexpr _Vp @@ -3283,9 +3283,9 @@ namespace views::__adaptor class split_view : public view_interface> { private: + _Vp _M_base = _Vp(); _Pattern _M_pattern = _Pattern(); __detail::__non_propagating_cache>> _M_cached_begin; - _Vp _M_base = _Vp(); struct _Iterator; struct _Sentinel; @@ -3297,8 +3297,7 @@ namespace views::__adaptor constexpr split_view(_Vp __base, _Pattern __pattern) - : _M_pattern(std::move(__pattern)), - _M_base(std::move(__base)) + : _M_base(std::move(__base)), _M_pattern(std::move(__pattern)) { } template @@ -3306,8 +3305,8 @@ namespace views::__adaptor && constructible_from<_Pattern, single_view>> constexpr split_view(_Range&& __r, range_value_t<_Range> __e) - : _M_pattern(views::single(std::move(__e))), - _M_base(views::all(std::forward<_Range>(__r))) + : _M_base(views::all(std::forward<_Range>(__r))), + _M_pattern(views::single(std::move(__e))) { } constexpr _Vp @@ -3630,11 +3629,11 @@ namespace views::__adaptor && sized_sentinel_for, iterator_t<_Vp>>); + _Vp _M_base = _Vp(); [[no_unique_address]] __detail::__maybe_present_t<_S_needs_cached_begin, __detail::_CachedPosition<_Vp>> _M_cached_begin; - _Vp _M_base = _Vp(); public: reverse_view() requires default_initializable<_Vp> = default; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc index 219e2a61f07..61524d4c0ad 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/sizeof.cc @@ -42,11 +42,11 @@ static_assert(sizeof(ranges::drop_while_view) == 4*ptr); static_assert(sizeof(ranges::transform_view) == 3*ptr); static_assert(sizeof(ranges::filter_view) == 3*ptr); -static_assert(sizeof(ranges::take_while_view) == 3*ptr); +static_assert(sizeof(ranges::take_while_view) == 2*ptr); static_assert(sizeof(ranges::drop_while_view) == 3*ptr); -static_assert(sizeof(ranges::transform_view) == 3*ptr); +static_assert(sizeof(ranges::transform_view) == 2*ptr); static_assert(sizeof(ranges::lazy_split_view) == 4*ptr); static_assert - (sizeof(ranges::reverse_view>) == 4*ptr); + (sizeof(ranges::reverse_view>) == 3*ptr); diff --git a/libstdc++-v3/testsuite/std/ranges/view.cc b/libstdc++-v3/testsuite/std/ranges/view.cc index dd8258220ed..98a162ec866 100644 --- a/libstdc++-v3/testsuite/std/ranges/view.cc +++ b/libstdc++-v3/testsuite/std/ranges/view.cc @@ -52,10 +52,7 @@ static_assert(!std::ranges::view<__gnu_test::test_random_access_range>); template struct test_view : __gnu_test::test_random_access_range, std::ranges::view_base -{ - // views must be default-initializable: - test_view() : __gnu_test::test_random_access_range(nullptr, nullptr) { } -}; +{ }; static_assert(std::ranges::view>); @@ -63,3 +60,26 @@ template<> constexpr bool std::ranges::enable_view> = false; static_assert(!std::ranges::view>); + +void +test01() +{ + // Verify LWG 3549 changes to ranges::enable_view. + using std::ranges::view_interface; + + struct v1 + : __gnu_test::test_random_access_range, view_interface { }; + static_assert(!std::derived_from); + static_assert(std::ranges::enable_view); + + struct v2 : v1, view_interface { }; + static_assert(!std::derived_from); + static_assert(!std::ranges::enable_view); + + struct v3 : __gnu_test::test_random_access_range { }; + static_assert(!std::derived_from); + static_assert(!std::ranges::enable_view); + + struct v4 { }; + static_assert(!std::ranges::enable_view>); +}