From nobody Fri May 29 23:01:06 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 4gRzNy6Tv4z6gDrS for ; Fri, 29 May 2026 23:01:06 +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 4gRzNy33jNz4Pjt for ; Fri, 29 May 2026 23:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095666; 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=sAE5nshCqN6LluzLv8sD66Vw/0VFQfQSXzoMKmOgNRk=; b=kVp7ejWfGB/Gs3PFd9kD6OhxubW0k8O9dv6IgUFd5x+jicDn9QJN3uarZ9fZ7TkD/fuUKE YZlDlva9n/IpM55Vif61WOGgLAEkM8rD+mCY3ZDJb0tLPwHIfSuuH+5iyEXU5TsgfmkDlf uLrYTHyUbZCbZF3lhIEZI5i/247KBW2NVYdraFdeXLg+hn/nlIlkZl4FyqwTWk5C6E4nIJ QszfjanDUzxVqgaJocIX8QVMf301ybxrTm9wMpbZY7w9AabXDv/34/jYpAS6L4AmVDaC+q cyH7+T39b2tTUc36cbx2GrB3qawd65iAcfgKShZvwHL/oWyM2Pbjj99kWR/QuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095666; a=rsa-sha256; cv=none; b=Lo6y/7EfcWRLvmPUsxxMrm8vrb8KaG35NzTxZWkJuS5MfY1lgmmg5mg0xzcnNi8PkiCSII GY3iu0MuerALPIDA/S2PcjnJkJijc/5YKUsCwFYe0iIv00duagqDixArkjT15s1zG1/tU5 FTw0g/IzNMz0QzWfrjIAC7bZMxhzWTLpCcjZ/lZ53bqEqcd6JJpjnSmdVr3LnqHiI6gGhO QfV0UuXlnOi7b4u7odJY/uYl7dDIUw9/6uduwXFwLKeNFXkSubxxvUXitlXB1sBscr4p3A 5Lutg3BXFZ1FtGbFSia41Ie9n0q/Y/0g5MK+YJ1GDLHzHQ1+b/zDlOpd53hsPw== 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=1780095666; 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=sAE5nshCqN6LluzLv8sD66Vw/0VFQfQSXzoMKmOgNRk=; b=uWaYu1/1RtPG/r4YQn767QbTd0e0oOubaLERMqwukZB4BAZRHKMhwRBBPAu8egkiSIV3LU tJzL96UPV8nhcF95Bb8BUeWqMvw2VCsizfNNKWrlFLqqBkmg6C2hK36TlAki4jQIp5Sbut j/WtUgAqfUTyUr7nlAM1xbQYAes2jrzgk1ZB+0h+x8Fog1qpOoPgZOdU5HeHklOGadnpjH +BTy/mNid0nUSAYtPR7O4QN6qyRtHre3z6gccxuVsHrv9c3wbQf5xVRyzWjhNoJq947v3j GCN+iJKiSNGiN1fFpza8gGdwiGcJ3c7WYHL6/LrPxqM1slvCdvw1a/LxlEuVUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzNy2d5gztRr for ; Fri, 29 May 2026 23:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4192e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:01:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ef16f2c6dcfe - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: ef16f2c6dcfe68ff30efe31a497cfd90d8cad715 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:01:06 +0000 Message-Id: <6a1a1ab2.4192e.ecac110@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ef16f2c6dcfe68ff30efe31a497cfd90d8cad715 commit ef16f2c6dcfe68ff30efe31a497cfd90d8cad715 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:57:29 +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