From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 641E83857027; Sat, 21 Oct 2023 11:14:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 641E83857027 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697886871; bh=u/iTw66YPrJXIpDJBNEGIic5w6ngB4kWbUfP2Ko4Ylc=; h=From:To:Subject:Date:From; b=v1Wger92UfphZC0ieV44rdBKaAb5by1Nln7FlGdodSQXeYvorL7XdNIwAqqDelIel cCVgV5VS8Wfynh4aktSi0tjzVfJHYkX6Pqa/NblFCePGZ68H6zlQm+q39qhyGSGP7h J5yRRFIqPSyDeQHOiwB+EUJm/PDUrfmjI/hUof58= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-4816] libstdc++: Workaround for LLVM-61763 in X-Act-Checkin: gcc X-Git-Author: Benjamin Brock X-Git-Refname: refs/heads/master X-Git-Oldrev: 59a7d38997ec4d8a606c97b00e1a8b697edd1316 X-Git-Newrev: be34a8b538c0f04b11a428bd1a9340eb19dec13f Message-Id: <20231021111431.641E83857027@sourceware.org> Date: Sat, 21 Oct 2023 11:14:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:be34a8b538c0f04b11a428bd1a9340eb19dec13f commit r14-4816-gbe34a8b538c0f04b11a428bd1a9340eb19dec13f Author: Benjamin Brock Date: Fri Oct 20 18:07:50 2023 +0100 libstdc++: Workaround for LLVM-61763 in 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 libstdc++-v3/ChangeLog: * include/std/ranges (zip_view, adjacent_view): Implement workaround for LLVM-61763. Diff: --- libstdc++-v3/include/std/ranges | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 1d529a886bec..7893e3a84c9a 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>...> _M_current; constexpr explicit @@ -4652,11 +4655,13 @@ namespace views::__adaptor return input_iterator_tag{}; } +#ifndef __clang__ // LLVM-61763 workaround template requires (view<_Ws> && ...) && (sizeof...(_Ws) > 0) && is_object_v<_Fp> && regular_invocable<_Fp&, range_reference_t<_Ws>...> && std::__detail::__can_reference...>> friend class zip_transform_view; +#endif public: // iterator_category defined in __zip_view_iter_cat @@ -5327,6 +5332,9 @@ namespace views::__adaptor template class adjacent_view<_Vp, _Nm>::_Iterator { +#ifdef __clang__ // LLVM-61763 workaround + public: +#endif using _Base = __detail::__maybe_const_t<_Const, _Vp>; array, _Nm> _M_current = array, _Nm>(); @@ -5367,12 +5375,14 @@ namespace views::__adaptor friend class adjacent_view; +#ifndef __clang__ // LLVM-61763 workaround template requires view<_Wp> && (_Mm > 0) && is_object_v<_Fp> && regular_invocable<__detail::__unarize<_Fp&, _Mm>, range_reference_t<_Wp>> && std::__detail::__can_reference, range_reference_t<_Wp>>> friend class adjacent_transform_view; +#endif public: using iterator_category = input_iterator_tag;