From nobody Sat Apr 25 14:20:11 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 4g2sRc0RgGz6bZN8 for ; Sat, 25 Apr 2026 14:20:12 +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 4g2sRb4PVzz3HsT for ; Sat, 25 Apr 2026 14:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126811; 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=yKVvATa0HqQSrc/k55pZjBjHhQdEUk5X22im77b38pM=; b=nXrlIYUwqjUsaV5NPM9II28Cif9Xn4yeJ7CJyLJcp4qLLoTk2OLDQPyETRfsdlxDzM6qW0 22JSYyg0ryU1CnJSd4wQwjKXvalwcuTrmoPqTGFb+EQaOg+g8cpljei8Ed7GJIrZILss2J ANQBDgr9WqE2u/5wjnHOwyZeCLqQm4xvoJfmfo8x2V7FTIplv+Jn8dYGPRIGcmNj6qRE3g zUGDs7HJlwTeSp88CT/WIENZ31CnbNmPqJg8cTge36qYFxw/CEFfDWgmVgkbX1H9JFJCK8 EHZMKmzoGahMipQ3fH1WCAgfV33EKQTVW5oaog7+Yo134jKamsrqQ2f2IqQjVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126811; a=rsa-sha256; cv=none; b=kbmujl3qT01ptDktukr6N3q7acKpFfIwYg0mBve8WN1b8QrMJSL/+pRsrxVfqq9ZezOMLT uRvvbTRFLUCplXo01SQKfvathDJdQC/i25g0PvE8rEkd6lAd9sYRYElZPyTUjvC+nbZ7I8 gN7SoH4E2vkxXfo+VjsRsdWy5UppZ8dIQ/mEGIu3Nmpw803bQDrTCub4hcY6gYkO6r7+zv i1CCb7ea31oC5FdJ+IUVp1xH4mu0anIprJKxBAYTu7vTL7qWsE56b2HdRBa4CP4tLzdgfW IjGEPVuRXeR0yaTwX918ffC81qa7T7khCFVfoRsfdndvWzOsZ0dYNpueNIXqWg== 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=1777126811; 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=yKVvATa0HqQSrc/k55pZjBjHhQdEUk5X22im77b38pM=; b=u13euKAXvfAsedK0e6pXWHBFjg2Ew2eXtmwFZPftvfXmVk6Tt7sHM/R+aWdeOtSpY5nkq2 rvST1ahoRNqM4BjmM2H2LFlkCbof8q9bgC5sWP6oFhuj30izHeLCKdzEbm5Xr8B0qwEQjn 4SvkZt5ugwJK4+yYW7GRtOcVEyZ4HGH2VfpeXxWzjrYme09amZkwVF5Q1KOmVOBEAYxPzt bBsApZLlhg0Q6JImBKlCbRMGU7+IYzWo15xsPwpvPwVqKSFmAXCf7WVE7QGLXfsj3Pyo3o rO7yUdjnAiSaALjsUPuQR2FLhQFhDdeA5RFlIB8Ib3h6apcRZIwskZRto0cxNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRb3vpLzdQp for ; Sat, 25 Apr 2026 14:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 376e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:11 +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: 035396ceda49 - main - libcxx-compat: revert llvmorg-21-init-10154-ge43e8ec7afbd: 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: 035396ceda495f456ca570fb715b04a7fc3b25c2 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:11 +0000 Message-Id: <69eccd9b.376e2.541b0e28@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=035396ceda495f456ca570fb715b04a7fc3b25c2 commit 035396ceda495f456ca570fb715b04a7fc3b25c2 Author: Dimitry Andric AuthorDate: 2026-01-05 19:55:12 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:20 +0000 libcxx-compat: revert llvmorg-21-init-10154-ge43e8ec7afbd: [libc++] Remove dead implementation of is_nothrow_convertible and merge the remaining code into is_convertible.h (#137717) We can use the `__is_nothrow_convertible` builtin unconditionally now, which makes the implementation very simple, so there isn't much of a need to keep a separate header around. This is part of making libc++ 21 build with clang 18. PR: 292067 MFC after: 1 month --- .../libcxx/include/__type_traits/is_convertible.h | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h index f0a859f9cc16..56f26ffaec71 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h @@ -10,6 +10,9 @@ #define _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H #include <__config> +#include <__type_traits/conjunction.h> +#include <__type_traits/disjunction.h> +#include <__type_traits/lazy.h> #include <__type_traits/integral_constant.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -28,12 +31,35 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_convertible_v = __is_convert #if _LIBCPP_STD_VER >= 20 +# if __has_builtin(__is_nothrow_convertible) + template struct _LIBCPP_NO_SPECIALIZATIONS is_nothrow_convertible : bool_constant<__is_nothrow_convertible(_Tp, _Up)> {}; template _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_convertible_v = __is_nothrow_convertible(_Tp, _Up); +# else // __has_builtin(__is_nothrow_convertible) + +template +void __test_noexcept(_Tp) noexcept; + +template +bool_constant(std::declval<_Fm>()))> __is_nothrow_convertible_test(); + +template +struct __is_nothrow_convertible_helper : decltype(std::__is_nothrow_convertible_test<_Fm, _To>()) {}; + +template +struct is_nothrow_convertible + : _Or<_And, is_void<_Fm>>, + _Lazy<_And, is_convertible<_Fm, _To>, __is_nothrow_convertible_helper<_Fm, _To> > >::type {}; + +template +inline constexpr bool is_nothrow_convertible_v = is_nothrow_convertible<_Fm, _To>::value; + +# endif // __has_builtin(__is_nothrow_convertible) + #endif // _LIBCPP_STD_VER >= 20 _LIBCPP_END_NAMESPACE_STD