From nobody Sat Apr 25 14:18:41 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 4g2sPs6tv0z6bZGb for ; Sat, 25 Apr 2026 14:18:41 +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 4g2sPs4RZzz3FTS for ; Sat, 25 Apr 2026 14:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1paDf0E+9rvriyI66a9L3f9wbmRZJm3EjAmCPfLqMc=; b=nCWSzfM505gwkw43jQjAm3uOudXl6OBgId0MftN3r8ypBHUqXFdOA7X0JzEn6xrSXhXk3n Jm8vSLWu47FJDStxUjzzac+xl1xmqRPdL1r0KZh2IcQL2zTjgqgfKGs9tF02yGbZfizyra x7ua9qC+rbjIF9IxIjP98cpM1o1tzMmII1OXEELef8P/en2ZIzavtz4dbTwA3pMEHVksUg LpCD/rjhM6gd7cR2miATn6C84C6OR7//D1+hIs7isBYwLllPM+xsPkJmc10MCBDf+ZwBQg b3FJBqlxPkN/MftENUNWnq6UNd6c5NmN5ATupszSQAZxbmkWbOAPLOuGiIdP0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126721; a=rsa-sha256; cv=none; b=ZEMRf1mZhglh92nTJbjp+W+eMBAOf6iFGngxQbudruzl3Fjk1xymD8YY7QYfZag9IpQ57y vX7bnEaHC2emQIY//Th/msrOIqRRO+NB8PIjNgiO7k0w2lXCQdBtx4tMVCOO0SfExGNYXq wvDn8UOlhTDYALeg3OMIwjchHJ1zRrF7gdIXMAPWeWYSrZIuNGUwTmf9H4q7xv+TzbE5SF Lxc/Zh/6PV4QH32cU9BARcl16lDwd1PfOrx7DT3ccqNvD04/G+O7pE932TfId+wiTJ7L+R l+EW6+5fDpOvvpD5G/NuidYpQrDI+McVo76jyVYY5t59h9gkcokawo+SUUDIIw== 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=1777126721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R1paDf0E+9rvriyI66a9L3f9wbmRZJm3EjAmCPfLqMc=; b=WbBevuTWDHzgf12z+Oo+nGHcAxJBsdZokphpVkhcpL7a8FuTGFaCxzSO9wARlEGCF5rwlf CEagfTOO/7QhAN+346+zUrVLVGauFBd1GSb2rF1IdYeuusAeLNrboWLmzEvaxn1gEzIIEc n+TQCrmo5T+AlqjWne386kY9j3smL6d3jNchJYiMvaKcJiDIKLosyEC9Tl/kyI4hcajAx4 PumLn1RLSm5ckFxK3oaXs8jqpagz24auCUaAkZyQE8cjqzHX4ea2iMKaKNsJDvCemp5mJB 8ADb+HRqslDMNpQbjDIzEwfuPGDh7NZPCT/5WJbzmZzzZ/4tt71oSdTL89iTQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPs3wZjzclJ for ; Sat, 25 Apr 2026 14:18:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 376b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3b0a0e64bd9f - main - Revert "libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7:" 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: 3b0a0e64bd9f0a65f0dd62dc157597e6d9ecc933 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:41 +0000 Message-Id: <69eccd41.376b1.5393a58b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0a0e64bd9f0a65f0dd62dc157597e6d9ecc933 commit 3b0a0e64bd9f0a65f0dd62dc157597e6d9ecc933 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:07:43 +0000 Revert "libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7:" This reverts commit 2facc097b9b28a81b925c924f27f09b40f29fd4d, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month --- .../libcxx/include/__type_traits/is_void.h | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h index 4c27060530c8..46316b0d3a53 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h @@ -11,8 +11,6 @@ #include <__config> #include <__type_traits/integral_constant.h> -#include <__type_traits/is_same.h> -#include <__type_traits/remove_cv.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -20,28 +18,14 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__is_void) - template -struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_void(_Tp)> {}; +struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_same(__remove_cv(_Tp), void)> {}; # if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_void_v = __is_void(_Tp); +inline constexpr bool is_void_v = __is_same(__remove_cv(_Tp), void); # endif -#else - -template -struct _LIBCPP_TEMPLATE_VIS is_void : public is_same<__remove_cv_t<_Tp>, void> {}; - -# if _LIBCPP_STD_VER >= 17 -template -inline constexpr bool is_void_v = is_void<_Tp>::value; -# endif - -#endif // __has_builtin(__is_void) - _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_VOID_H