From nobody Sat Apr 25 14:20:08 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRY4PCNz6bZKC for ; Sat, 25 Apr 2026 14:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2sRX5wbJz3J3q for ; Sat, 25 Apr 2026 14:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126808; 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; bh=jzlzjK4YdADf7N+dtKAZ0LJ1w85D3HckoO5nLq7WJNE=; b=eWKO8P6qiSBF4HVHJtWKYBrbCtNY7DLQfOruDh97bYFJ1GQUdcAnHJOjBq+awKFvGIR8LL YZFeP3aRsfLYqHrLoI6PhslklbpbOVF9JHwoNiyW6S6qvyZF2/PxUAT5nIeB2GkSEArzZm WtruRgdP6vIFs4LplmJJCgPhUyd6/D784UUwhcsufPZRJ/Bj4vbbyikt4zMdeZmEoJ+vxi fokX2hlWAZpj5pBYtwV/sY4781qKfdp6oj3XwSh5qe5W9/89pANyMwNNCGUrtXFGRPbwcy KmeadL5fWWPcTeYNRKYFa7DUM0VRnmQfLU09HBncg+lJY00/GF/Ee29J8rZLzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126808; a=rsa-sha256; cv=none; b=j7eBXyuI+xYj/15MBira/yOaUyzQ9fZDsxVG+9AKqMCni0rysqmg73Y1qEoz4oMz1NRqi0 vjr9tIDXxHVcvByxScIbuA9dHlwpZ2jePX2NMiXG9IarKV1UZWd6X4jjyNjZi7JCEwp234 jITXl2jZ3Bsbrqss0+LvzcW6XAGoy/yAzJSHz5rxBGMZEd8FQDOyqKF0qplVkpJsnjboQl +taSuMf9OQycIU7zeSc58f+qSsWTcTkSUV8JtbXU+rbr02gCOoXzGOlq5LOuIcehHyLSoS SkHH0qEFe4TC2wUXCoNrMFD2mN8AINMVkO1G0gDS6QNnvHC9quyjSYYKKHRZIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126808; 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; bh=jzlzjK4YdADf7N+dtKAZ0LJ1w85D3HckoO5nLq7WJNE=; b=wR0YA6zXyMC4bPIhlO5iAssaeEs1BOJZih+bfOK6y8V6t2KzsG1i/AqLIjAB3zENuuYfEV KBACA/370YPhpER5PkMjMUC2FI7kr3gbb9+cC/xN5vKp3plqp1+t1AWzdqaE72Fr/3zSIX ynQc/abfyfYA8c6wlfuMdSpwO2tL+UqQz1YTWh5l3/E1xD0PV9UX9qeEoRMw8s4gOrM3wl bkkA1Ec5EuuTwVwNatAUB6sFQ9WL9bV3HyK7e5Cavt+Tq6IB9dEHWZyoc7S5IfJ0ujbIDo naW1Z26dPFx6cTE4hkfw4nheyuRkKmQsACvzVY7WJBAi9BB4Bn3m7AiirAoNSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRX2lZ9zdD5 for ; Sat, 25 Apr 2026 14:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3871d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: 821fc643b3ca - main - libcxx-compat: revert llvmorg-21-init-9130-g9e3982d9ae81: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 821fc643b3cad922e5438760eed9cad0d6d9b3b0 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:08 +0000 Message-Id: <69eccd98.3871d.3360220f@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=821fc643b3cad922e5438760eed9cad0d6d9b3b0 commit 821fc643b3cad922e5438760eed9cad0d6d9b3b0 Author: Dimitry Andric AuthorDate: 2026-01-04 19:43:38 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:19 +0000 libcxx-compat: revert llvmorg-21-init-9130-g9e3982d9ae81: [libc++] Replace __libcpp_{ctz, clz} with __builtin_{ctzg, clzg} (#133920) `__libcpp_{ctz, clz}` were previously used as fallbacks for `__builtin_{ctzg, clzg}` to ensure compatibility with older compilers (Clang 18 and earlier), as `__builtin_{ctzg, clzg}` became available in Clang 19. Now that support for Clang 18 has been officially dropped in #130142, we can now safely replace all instances of `__libcpp_{ctz, clz}` with `__count{l,r}_zero` (which internally call `__builtin_{ctzg, clzg}` and eliminate the fallback logic. Closes #131179. This is part of making libc++ 21 build with clang 18. PR: 292067 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__bit/countl.h | 28 ++++++++++++++++++ contrib/llvm-project/libcxx/include/__bit/countr.h | 33 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/__bit/countl.h b/contrib/llvm-project/libcxx/include/__bit/countl.h index 075914020879..11de5f214682 100644 --- a/contrib/llvm-project/libcxx/include/__bit/countl.h +++ b/contrib/llvm-project/libcxx/include/__bit/countl.h @@ -9,6 +9,7 @@ #ifndef _LIBCPP___BIT_COUNTL_H #define _LIBCPP___BIT_COUNTL_H +#include <__bit/rotate.h> #include <__config> #include <__type_traits/integer_traits.h> #include @@ -25,7 +26,34 @@ _LIBCPP_BEGIN_NAMESPACE_STD template _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 int __countl_zero(_Tp __t) _NOEXCEPT { static_assert(__is_unsigned_integer_v<_Tp>, "__countl_zero requires an unsigned integer type"); +#if __has_builtin(__builtin_clzg) return __builtin_clzg(__t, numeric_limits<_Tp>::digits); +#else // __has_builtin(__builtin_clzg) + if (__t == 0) + return numeric_limits<_Tp>::digits; + + if (sizeof(_Tp) <= sizeof(unsigned int)) + return __builtin_clz(static_cast(__t)) - + (numeric_limits::digits - numeric_limits<_Tp>::digits); + else if (sizeof(_Tp) <= sizeof(unsigned long)) + return __builtin_clzl(static_cast(__t)) - + (numeric_limits::digits - numeric_limits<_Tp>::digits); + else if (sizeof(_Tp) <= sizeof(unsigned long long)) + return __builtin_clzll(static_cast(__t)) - + (numeric_limits::digits - numeric_limits<_Tp>::digits); + else { + int __ret = 0; + int __iter = 0; + const unsigned int __ulldigits = numeric_limits::digits; + while (true) { + __t = std::__rotl(__t, __ulldigits); + if ((__iter = std::__countl_zero(static_cast(__t))) != __ulldigits) + break; + __ret += __iter; + } + return __ret + __iter; + } +#endif // __has_builtin(__builtin_clzg) } #if _LIBCPP_STD_VER >= 20 diff --git a/contrib/llvm-project/libcxx/include/__bit/countr.h b/contrib/llvm-project/libcxx/include/__bit/countr.h index f6c98695d3d0..2179eeae9e3d 100644 --- a/contrib/llvm-project/libcxx/include/__bit/countr.h +++ b/contrib/llvm-project/libcxx/include/__bit/countr.h @@ -22,10 +22,43 @@ _LIBCPP_PUSH_MACROS _LIBCPP_BEGIN_NAMESPACE_STD +// A constexpr implementation for C++11 and later (using clang extensions for constexpr support) +// Precondition: __t != 0 (the caller __countr_zero handles __t == 0 as a special case) +template +[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR int __countr_zero_impl(_Tp __t) _NOEXCEPT { + _LIBCPP_ASSERT_INTERNAL(__t != 0, "__countr_zero_impl called with zero value"); + static_assert(__is_unsigned_integer_v<_Tp>, "__countr_zero_impl only works with unsigned types"); + if _LIBCPP_CONSTEXPR (sizeof(_Tp) <= sizeof(unsigned int)) { + return __builtin_ctz(static_cast(__t)); + } else if _LIBCPP_CONSTEXPR (sizeof(_Tp) <= sizeof(unsigned long)) { + return __builtin_ctzl(static_cast(__t)); + } else if _LIBCPP_CONSTEXPR (sizeof(_Tp) <= sizeof(unsigned long long)) { + return __builtin_ctzll(static_cast(__t)); + } else { +#if _LIBCPP_STD_VER == 11 + unsigned long long __ull = static_cast(__t); + const unsigned int __ulldigits = numeric_limits::digits; + return __ull == 0ull ? __ulldigits + std::__countr_zero_impl<_Tp>(__t >> __ulldigits) : __builtin_ctzll(__ull); +#else + int __ret = 0; + const unsigned int __ulldigits = numeric_limits::digits; + while (static_cast(__t) == 0uLL) { + __ret += __ulldigits; + __t >>= __ulldigits; + } + return __ret + __builtin_ctzll(static_cast(__t)); +#endif + } +} + template [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR int __countr_zero(_Tp __t) _NOEXCEPT { static_assert(__is_unsigned_integer_v<_Tp>, "__countr_zero only works with unsigned types"); +#if __has_builtin(__builtin_ctzg) // TODO (LLVM 21): This can be dropped once we only support Clang >= 19. return __builtin_ctzg(__t, numeric_limits<_Tp>::digits); +#else + return __t != 0 ? std::__countr_zero_impl(__t) : numeric_limits<_Tp>::digits; +#endif } #if _LIBCPP_STD_VER >= 20