From nobody Sat Apr 25 14:18:39 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 4g2sPq5Vlkz6bZCg for ; Sat, 25 Apr 2026 14:18:39 +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 4g2sPq37Mxz3FP5 for ; Sat, 25 Apr 2026 14:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126719; 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=F+746Oj5VHYU0GnlSxjRKvShIhviaqh2r+yV8y95H/w=; b=pOg3ffzA26vepjfczXF06jlbdyCC+OdamsLytGT+QYk/ljzbd97cokHVb+97izfbTcRBrI JLMxZvNnKKIl8frxgHdsuUcY6h2vO+KFycYqbk0SxwI7I4c9VeJvvXEg14NlPzaNpk8UHn oUEyIYpEK/aNhhmRwlEyZWnv6EsneWGf2VwAfENIBYFr8jpTodT5bZcnMyM99xblUFYEiO kL896aA/B2wKaN6ql0evWGUJB026jFfSAukR4KUCTBo2L21gkYkz1e6jvwnN0K6a/rem+j SYQDSIwORPlS4JV6tF4IRiwc+Hk9f7yxdW4Wz7QGQ7b1gbYDYp2e0WVHRewXqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126719; a=rsa-sha256; cv=none; b=D80VEgKCdx4BCEuen6TOGbtsk0OZwX1MQfz2OjbWbPwxCpTxo9LN+EmMQl/IXS77ckj95m mGJ833baHoNDRIcD1xG4FlcdpZNVlLv5ocit4fK86Txt13lDvpvRdh17ddcfTAeiwlmFCO 0YoRoxRR1wP1uPm8nVaMXfzzABHDmyQYUk8um595WHHwxd6O9TR+BTkMKMJ8MIzcA7Xaoi JJXHLQMjEmvigVetKqG5Aa3nJrWk2tDdLYcf1WMEwTj0Mu459+dO+t4AkJJbeWoQs3UyF+ Pu03T0TIpehFd5kVrrTg5XrLeQfgm6VDsjzK6FY7GnLgFV5vTZtjvOrbbtlg6w== 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=1777126719; 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=F+746Oj5VHYU0GnlSxjRKvShIhviaqh2r+yV8y95H/w=; b=sapmDpEq6xFYAmWznOcEYHcndpuWMyEhMpWfmrSmXh0i3vT3p6yG0oOkcv8HYOnCT5QOQA Ih+IYg9TfwVm/ktrl4xt+pruQzuF7CeHpMcmDMLkFe/5XJXBHOfZhk9qSivXqt+xakKj55 SMUNYZEhFQnUx6GnOD2Sc6PF1f1WHjs63dlnvJwErrYi2+4kxbnszdEIRv2XXEHPHuQyky t3RHHnZx1QR83U7hxDvyLyLTw0w69yblNU9I3uBkyFscUjTzxX1OlCmvtBS+T7hpSukrDK 5sl6xHoNMrkBXeUjBEyRTYeAlNnCPL7BXlDMxwy6wrvNp4u7uuud/VqzCRF7xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPq2kcHzdQd for ; Sat, 25 Apr 2026 14:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36a52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 1f9c1cd08dba - main - Revert "libcxx-compat: revert llvmorg-19-init-17727-g0eebb48fcfbc:" 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: 1f9c1cd08dba0c46c1e1cea43b3bbea23af4fbaa Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:39 +0000 Message-Id: <69eccd3f.36a52.679e603b@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1f9c1cd08dba0c46c1e1cea43b3bbea23af4fbaa commit 1f9c1cd08dba0c46c1e1cea43b3bbea23af4fbaa 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-17727-g0eebb48fcfbc:" This reverts commit f12b6acbe1ea1c425c0e21d80097115e4ad33017, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month --- .../libcxx/include/__type_traits/invoke.h | 3 +-- .../__type_traits/is_member_function_pointer.h | 31 ---------------------- .../__type_traits/is_member_object_pointer.h | 31 ---------------------- .../include/__type_traits/is_member_pointer.h | 12 +++++++++ .../llvm-project/libcxx/include/module.modulemap | 2 -- contrib/llvm-project/libcxx/include/type_traits | 2 -- 6 files changed, 13 insertions(+), 68 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/invoke.h b/contrib/llvm-project/libcxx/include/__type_traits/invoke.h index a0281f5b2006..71db32ae6a3c 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/invoke.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/invoke.h @@ -17,8 +17,7 @@ #include <__type_traits/integral_constant.h> #include <__type_traits/is_base_of.h> #include <__type_traits/is_core_convertible.h> -#include <__type_traits/is_member_function_pointer.h> -#include <__type_traits/is_member_object_pointer.h> +#include <__type_traits/is_member_pointer.h> #include <__type_traits/is_reference_wrapper.h> #include <__type_traits/is_same.h> #include <__type_traits/is_void.h> diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h deleted file mode 100644 index 037d5ca04ab0..000000000000 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_function_pointer.h +++ /dev/null @@ -1,31 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H -#define _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H - -#include <__config> -#include <__type_traits/integral_constant.h> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -_LIBCPP_BEGIN_NAMESPACE_STD - -template -struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer : _BoolConstant<__is_member_function_pointer(_Tp)> {}; - -# if _LIBCPP_STD_VER >= 17 -template -inline constexpr bool is_member_function_pointer_v = __is_member_function_pointer(_Tp); -# endif - -_LIBCPP_END_NAMESPACE_STD - -#endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h deleted file mode 100644 index 555794bfe038..000000000000 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_object_pointer.h +++ /dev/null @@ -1,31 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_OBJECT_POINTER_H -#define _LIBCPP___TYPE_TRAITS_IS_MEMBER_OBJECT_POINTER_H - -#include <__config> -#include <__type_traits/integral_constant.h> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -_LIBCPP_BEGIN_NAMESPACE_STD - -template -struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer : _BoolConstant<__is_member_object_pointer(_Tp)> {}; - -# if _LIBCPP_STD_VER >= 17 -template -inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_Tp); -# endif - -_LIBCPP_END_NAMESPACE_STD - -#endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_FUNCTION_POINTER_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h index 149634fde758..cc125e318cf9 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_member_pointer.h @@ -21,9 +21,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD template struct _LIBCPP_TEMPLATE_VIS is_member_pointer : _BoolConstant<__is_member_pointer(_Tp)> {}; +template +struct _LIBCPP_TEMPLATE_VIS is_member_object_pointer : _BoolConstant<__is_member_object_pointer(_Tp)> {}; + +template +struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer : _BoolConstant<__is_member_function_pointer(_Tp)> {}; + # if _LIBCPP_STD_VER >= 17 template inline constexpr bool is_member_pointer_v = __is_member_pointer(_Tp); + +template +inline constexpr bool is_member_object_pointer_v = __is_member_object_pointer(_Tp); + +template +inline constexpr bool is_member_function_pointer_v = __is_member_function_pointer(_Tp); # endif _LIBCPP_END_NAMESPACE_STD diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap index 8e0ba6eebac4..d76659664f75 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -1976,8 +1976,6 @@ module std_private_type_traits_is_implicitly_default_constructible [system } module std_private_type_traits_is_integral [system] { header "__type_traits/is_integral.h" } module std_private_type_traits_is_literal_type [system] { header "__type_traits/is_literal_type.h" } -module std_private_type_traits_is_member_function_pointer [system] { header "__type_traits/is_member_function_pointer.h" } -module std_private_type_traits_is_member_object_pointer [system] { header "__type_traits/is_member_object_pointer.h" } module std_private_type_traits_is_member_pointer [system] { header "__type_traits/is_member_pointer.h" } module std_private_type_traits_is_nothrow_assignable [system] { header "__type_traits/is_nothrow_assignable.h" } module std_private_type_traits_is_nothrow_constructible [system] { diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index 08badb6aa06e..ffa137338b6a 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -453,8 +453,6 @@ namespace std #include <__type_traits/is_fundamental.h> #include <__type_traits/is_integral.h> #include <__type_traits/is_literal_type.h> -#include <__type_traits/is_member_function_pointer.h> -#include <__type_traits/is_member_object_pointer.h> #include <__type_traits/is_member_pointer.h> #include <__type_traits/is_nothrow_assignable.h> #include <__type_traits/is_nothrow_constructible.h>