From nobody Sat Apr 25 14:18:40 2026 X-Original-To: dev-commits-src-main@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 4g2sPr6jYXz6bZ7T for ; Sat, 25 Apr 2026 14:18:40 +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 4g2sPr3fWKz3FWV for ; Sat, 25 Apr 2026 14:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126720; 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=GGynZf07QikU5wpli+2ttVyWqmjoqEZ3ckLRjvEc0DE=; b=jnp9/9iRYt1sBwoBEQmz6Wu4kzObUu0jCzncCkfcJ/JDdKuI8DSA9GfRLIUcfrZpz9oNvv eRAq1ZKDGfTI9bXAzHgp+5UFMQztv2LpluaL0r6fyGke9ImZfCo3uX6bWbo8djVeiW7DJS 7iY1Wa6uddve6vfTF8yKY7rrQThIhk4qqLMrqpVzMambPuZt6vV3lL3zOeIr5/DY21ytr4 V3MY0sr7baCvCNPz97tK+ySce6/dMrhjBCuc4uyyj/1cVaPOsIGrJCt0OSxeRUJi8/jbhi 9+JsCub8nOXH+zm5Mk1eY9aF4tBRWA8uhk9d4vzgUWU42Q+OJMJDqAABM1vo6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126720; a=rsa-sha256; cv=none; b=fWuo6En5qctfpygU/nbD10eZpbapNUDE/DJMIATRUFdH2Z2sYTBJ2yK1lEs0PGPQXxbX4e 6PWUJZ/Sz8DOWCUpYsYYlOBuxVogrxtXRqz2qU+IyOq6v/yxUWj6eAUWL88rNv8Lh0GzZV M47l3iHcuddABMrzVqXGusCRNs2e98C5hkKsWihemvU1W7QYdzcKkBXHXmZGNAhp7IkTcm 7g38fcY3RPaLdq6nMxH614rUDzkBiBS2LqqFU/UznbV7TAtAc1pwCPS4or2zzQAe0PEnw2 4fVdtd4ADlAUryTtytUOoTGJkR9YkHvT1eYQflKZHBFKrs1teCNqcV3nns4vnw== 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=1777126720; 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=GGynZf07QikU5wpli+2ttVyWqmjoqEZ3ckLRjvEc0DE=; b=TLPqKpOEGWa3s99J6bW8RqLfAnx2jDTJ6lF016FTcBXgfXlxG4IxkvAd2j/b/mN3KVTbG5 CaepctvSQM5v+gwDToEEzMZINDMSwP2zlpOUH7/uaMwzvsZKZGrLni0G7/E0kEzOUX0FYE PTYm7hHiytujWpi/b765EfBf4WIfMBe2cdBICJnYrvD28ihPlyVgusP5AfegcE9Vq94ZqX /KnHU157VhDaYi0LUITWnpfuyxmWFeFv/axPIAxhszsQbrPamCvzi8DQVvoEXHRe+4usP8 efMOXN8adeznW8tksPMQrNh6pLEbrsW8UahRUXRecBYBhPBoPECqm3c4ZrM2AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPr38JWzd0b for ; Sat, 25 Apr 2026 14:18:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 348f8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f8152c67d427 - main - Revert "libcxx-compat: revert llvmorg-19-init-17728-g30cc12cd818d:" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f8152c67d4272e155460e4b3057b41924df8af1c Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:40 +0000 Message-Id: <69eccd40.348f8.49eaeefe@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f8152c67d4272e155460e4b3057b41924df8af1c commit f8152c67d4272e155460e4b3057b41924df8af1c Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:07:42 +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 --- .../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