From nobody Fri May 29 23:04:35 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 4gRzSz6xHfz6gFlr for ; Fri, 29 May 2026 23:04:35 +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 4gRzSz2F0jz3HS4 for ; Fri, 29 May 2026 23:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095875; 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=NpsKhGZmHrD9aTZJzd4mElJejYBOwkOodHQVwRNHM98=; b=aIiAisSwjvdPe5SIHF+gEKGIQi/oo35oDlKQc2fFYGcBCUM81xTuLYnT0t6hns/ovTs04t lrzgrCd8YVSuDcoyIEpaQzogWpKUfFMaTfCzoRVEmuFiQVy7XTvA4ciDKa/pNq41QrxxY5 8PiprTsTHH7RpNVaX/0o0bifBvu9cF7EQuaS/gG73XXtIS6l6zPqbRQkx5teu/IHS3+Nm2 uDKnWMviRi8lQz8ieYgTP2H7RZtDFDyTEhKGoqtBe906A5Ea4CronHEf5rqv+0N5FH21PO oKd7Pq6R2wtHecFNLWS4TO0gLj86/C9yIphHEV+P2KLAGR6cFFmeMB/76G1hqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095875; a=rsa-sha256; cv=none; b=cEq3jsuL0bjwCk15vHGUQq+iFkP56NT1yRnzutusOYy2Z3vCsNSdRqSfVJeFcag5v8OeSh CTAsJ0vdjgXkfD+LeHnmJh0nYd/Jxl6qeyBpnrXt5Cd/wWHSNj2BVDV+vgzbPD9e0SeK8d l/fLV4X6u0I9IGQmg90SIwS6AFVc/2FUxFQD3YE3trIIuZ7pSAUu4Do+YZ4CEkZXsba9tC ECqlaV3NWBvdPxYUE2a8Nb+P21k8k2NdWP8UbrhWNC0uupxLRfgg68MT1gNyRYnxrEvod5 fOrUP2UFUY6yHH/OXAc/Mojk2asrz1AHuTbWG2D5amuN45lkHcJOBw36EmZWBw== 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=1780095875; 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=NpsKhGZmHrD9aTZJzd4mElJejYBOwkOodHQVwRNHM98=; b=s0f2EbXqYVY7HmI4Pkhdz1wo4wjRHTomx1siPSR8sudbepXpKn9dGF8TX9l4SfG3aPsX1e oAvYiGL+bSraMnNKkpz2STN0rojSmlqlzhYZlVarDDQCDtJmrG+G/yLM6cWpmt7gWHtvxF JNdHVvk2DRxoY0WTpGEEmrq5nIbuDR5vARHCOxKgJ8LjNfbJi39YCkc1OgqI9FJmI7MGU3 RlaLCYBQq2/LhYE6orL4VTOvvSePwYs7KLoqHELpQomDaOk2lJj47n5Thso/4v0L5rYcQj 2YOOmDyu3pa1AKlll/f2fSb96FNF+MJ+ITOfVVTcWKY6G9YcQgcLzdwpADckOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzSz1Zdyzttd for ; Fri, 29 May 2026 23:04:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 417c0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:04:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: bdeece20378e - stable/14 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: bdeece20378ef7976fbd61b1a4f1cfaec0ccbf69 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:04:35 +0000 Message-Id: <6a1a1b83.417c0.398a785d@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bdeece20378ef7976fbd61b1a4f1cfaec0ccbf69 commit bdeece20378ef7976fbd61b1a4f1cfaec0ccbf69 Author: Dimitry Andric AuthorDate: 2026-01-05 19:55:12 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:36 +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 (cherry picked from commit 035396ceda495f456ca570fb715b04a7fc3b25c2) --- .../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