diff options
| author | Benjamin Brock <brock@cs.berkeley.edu> | 2023-10-20 18:07:50 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-10-21 11:54:00 +0100 |
| commit | be34a8b538c0f04b11a428bd1a9340eb19dec13f (patch) | |
| tree | c651c17d4d1024b4670e9930b7c9d451f7e8e7c5 /libstdc++-v3 | |
| parent | 59a7d38997ec4d8a606c97b00e1a8b697edd1316 (diff) | |
| download | gcc-be34a8b538c0f04b11a428bd1a9340eb19dec13f.zip gcc-be34a8b538c0f04b11a428bd1a9340eb19dec13f.tar.gz gcc-be34a8b538c0f04b11a428bd1a9340eb19dec13f.tar.bz2 | |
libstdc++: Workaround for LLVM-61763 in <ranges>
This patch adds a small workaround that avoids declaring constrained
friends when compiling with Clang, instead making some members public.
MSVC's standard library has implemented a similar workaround.
Signed-off-by: Benjamin Brock <brock@cs.berkeley.edu>
libstdc++-v3/ChangeLog:
* include/std/ranges (zip_view, adjacent_view): Implement
workaround for LLVM-61763.
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/include/std/ranges | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 1d529a8..7893e3a 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -4632,6 +4632,9 @@ namespace views::__adaptor class zip_view<_Vs...>::_Iterator : public __detail::__zip_view_iter_cat<_Const, _Vs...> { +#ifdef __clang__ // LLVM-61763 workaround + public: +#endif __detail::__tuple_or_pair_t<iterator_t<__detail::__maybe_const_t<_Const, _Vs>>...> _M_current; constexpr explicit @@ -4652,11 +4655,13 @@ namespace views::__adaptor return input_iterator_tag{}; } +#ifndef __clang__ // LLVM-61763 workaround template<move_constructible _Fp, input_range... _Ws> requires (view<_Ws> && ...) && (sizeof...(_Ws) > 0) && is_object_v<_Fp> && regular_invocable<_Fp&, range_reference_t<_Ws>...> && std::__detail::__can_reference<invoke_result_t<_Fp&, range_reference_t<_Ws>...>> friend class zip_transform_view; +#endif public: // iterator_category defined in __zip_view_iter_cat @@ -5327,6 +5332,9 @@ namespace views::__adaptor template<bool _Const> class adjacent_view<_Vp, _Nm>::_Iterator { +#ifdef __clang__ // LLVM-61763 workaround + public: +#endif using _Base = __detail::__maybe_const_t<_Const, _Vp>; array<iterator_t<_Base>, _Nm> _M_current = array<iterator_t<_Base>, _Nm>(); @@ -5367,12 +5375,14 @@ namespace views::__adaptor friend class adjacent_view; +#ifndef __clang__ // LLVM-61763 workaround template<forward_range _Wp, move_constructible _Fp, size_t _Mm> requires view<_Wp> && (_Mm > 0) && is_object_v<_Fp> && regular_invocable<__detail::__unarize<_Fp&, _Mm>, range_reference_t<_Wp>> && std::__detail::__can_reference<invoke_result_t<__detail::__unarize<_Fp&, _Mm>, range_reference_t<_Wp>>> friend class adjacent_transform_view; +#endif public: using iterator_category = input_iterator_tag; |