From nobody Fri May 29 23:03:43 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 4gRzS024mSz6gFWN for ; Fri, 29 May 2026 23:03:44 +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 4gRzRz5pP7z3GDM for ; Fri, 29 May 2026 23:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095823; 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=ZQqWIUXzDeRVoID7QFA/yC8plInzUr0hX1PVBNEErp0=; b=FLD3oRtgRdZx+CRC4d2+OOW7yuqe24P3YVBz+12ECqx3GXSjlkjtcVm+sAy7psMA5qp/27 LyS+nl6H9/LYoXW+gyBZ5CTXnZXz3IZMnLr8c9oW3OqX8EJ135odYqmXC+mT1WElv4KrCD ShsWmN/HL6Islnf1Z9W2Hlp0bIMfYQsgPF4FWSjH4FeWPW6aj3+A97ALMvRXt104hR62Dl 7SkVAbTa3xU53qfg/LprOtrIajXHbMgAooxHbFZy9UySvZgP2QnPuSmvSSbO5jAgNFUahT XZQ6IVQWrk6fj66vGEmNUdVIh+zahyqAophTgwbON0JYWzu75kl5mD0MYWbQCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095823; a=rsa-sha256; cv=none; b=yMsBulriqP2l0ARmdc5UI5UErZ1HbIjQNwroFdoN8UJh6o/F4y0y4ZIkPAK7ZhmGLYhak2 4q2G6atG9Eha0QooOFz3QfN/1dQvu2L2/v1oDoojPP7p7vE+QiSUw8VQauNczZFdo5eh2L OdSvaJbgInnsynPWtLiK5pwlhBb8G9LlqAqNIxUNJzALz8AlojQyVd4Y9sEZ7L81DP4WUS nRkysU8fsmmVYoDzpQoRJES/0h9hWYPTrcSkvqUv7cIUw43ofX3BXT5QimvGAvXhL7HMM8 V5qMRl7MuWJ9VfjyvuPVGlm8HcYZ/Nwikhb4vBbJWRL5FP25TsRAzLAAAYzsyw== 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=1780095823; 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=ZQqWIUXzDeRVoID7QFA/yC8plInzUr0hX1PVBNEErp0=; b=FTZD05XKn0S9KID/5CASzMpRG5pAfi2InAi05IM8o0q81U3+3a7wPn/M+3dClvrSRwEXdA aqVzm1459Z27iiKc5C+7Jk/Pf+5KbWDTEzy4mQ25xrNSwGTNgEQMejQj479JbmUhl39ESn 5K4kHDi8Fq7ehRSf7ONsvInMqPqk+MXV/tSjiqU+wiqGVmgWiY9HucyNmeriq+GFPdZGjC vEj8ufBsL2acw/1EfxG42sygt1ep+fbFTVQWDh9YimhzjxbHwrKqdo4dZG8RiVTX2wDqhW cgH2Z1nxqFFFyAfCzUHEgSeOYlsY6auDmcwsUhRXIqIXzBU7N2KJw2STmiGi9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzRz5QYCztH5 for ; Fri, 29 May 2026 23:03:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c91 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:03:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 938fce67e007 - stable/14 - Revert "libcxx-compat: revert llvmorg-19-init-17728-g30cc12cd818d:" 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: 938fce67e0071e996cec36ae8f0fe7bd765f9eb7 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:03:43 +0000 Message-Id: <6a1a1b4f.42c91.37c90816@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=938fce67e0071e996cec36ae8f0fe7bd765f9eb7 commit 938fce67e0071e996cec36ae8f0fe7bd765f9eb7 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:33 +0000 Revert "libcxx-compat: revert llvmorg-19-init-17728-g30cc12cd818d:" This reverts commit 198b947ebc6834eade6acc52c5441a38693b8822, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month (cherry picked from commit f8152c67d4272e155460e4b3057b41924df8af1c) --- .../libcxx/include/__type_traits/is_fundamental.h | 2 +- .../libcxx/include/__type_traits/is_null_pointer.h | 12 +++--------- .../llvm-project/libcxx/include/__type_traits/is_scalar.h | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h b/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h index 57206e0d9deb..55f8e41f75f4 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_fundamental.h @@ -34,7 +34,7 @@ inline constexpr bool is_fundamental_v = __is_fundamental(_Tp); template struct _LIBCPP_TEMPLATE_VIS is_fundamental - : public integral_constant::value || __is_nullptr_t<_Tp>::value || is_arithmetic<_Tp>::value> {}; + : public integral_constant::value || __is_null_pointer_v<_Tp> || is_arithmetic<_Tp>::value> {}; # if _LIBCPP_STD_VER >= 17 template diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h index c666f5f24759..9f5697e23268 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_null_pointer.h @@ -11,7 +11,6 @@ #include <__config> #include <__type_traits/integral_constant.h> -#include <__type_traits/remove_cv.h> #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -21,20 +20,15 @@ _LIBCPP_BEGIN_NAMESPACE_STD template -struct __is_nullptr_t_impl : public false_type {}; -template <> -struct __is_nullptr_t_impl : public true_type {}; - -template -struct _LIBCPP_TEMPLATE_VIS __is_nullptr_t : public __is_nullptr_t_impl<__remove_cv_t<_Tp> > {}; +inline const bool __is_null_pointer_v = __is_same(__remove_cv(_Tp), nullptr_t); #if _LIBCPP_STD_VER >= 14 template -struct _LIBCPP_TEMPLATE_VIS is_null_pointer : public __is_nullptr_t_impl<__remove_cv_t<_Tp> > {}; +struct _LIBCPP_TEMPLATE_VIS is_null_pointer : integral_constant> {}; # if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_null_pointer_v = is_null_pointer<_Tp>::value; +inline constexpr bool is_null_pointer_v = __is_null_pointer_v<_Tp>; # endif #endif // _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h b/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h index 15f1c71554f2..455200de4720 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_scalar.h @@ -49,7 +49,7 @@ struct _LIBCPP_TEMPLATE_VIS is_scalar bool, is_arithmetic<_Tp>::value || is_member_pointer<_Tp>::value || is_pointer<_Tp>::value || - __is_nullptr_t<_Tp>::value || + __is_null_pointer_v<_Tp> || __is_block<_Tp>::value || is_enum<_Tp>::value> {}; // clang-format on