From nobody Sun Dec 1 11:18:38 2024 X-Original-To: dev-commits-src-branches@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 4Y1PYX0zvFz5fTCZ; Sun, 01 Dec 2024 11: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1PYW350Fz42jZ; Sun, 1 Dec 2024 11: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=1733051919; 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=SrPWr1UBVSLwjWeAjsaHKLO6n/W89+lyKcyIfUrW/1M=; b=d8nBgvSt5lppEMO1rJ8BCG6ICERJkSgB6wIjbI/s3Y7/bOOG2OK3Wh8qmyGYjKIWO3t6gO rJpxYQ729+CTT4SPjqBubeCtkUVzLe9GtKPzwBb6YR0phyM0E8t1sV38Fz8YBmb3q4DQF0 XYp07P7AbZDoXTffdjgsrtqmckX3p1RTuOiklKa3k6+1ugFsVQX6HlijyxBXflEJJM5UQd NDd2koV1CdWJ2oMkaNXFFAxbkr5Niozc1QoL6mASEsBvH5aQkYPUEF61PISDN606rDDpzn 4kcnX+XbzBGHJpi/Ml9DYarvpNLpxmy0EcWQF3bMEkztamf2A+7oemj7pFVyJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051919; 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=SrPWr1UBVSLwjWeAjsaHKLO6n/W89+lyKcyIfUrW/1M=; b=K2tYZttBhraMHbAMGOim95FB9DObwxz5iQUbkhQUk7u2XtYLMhJXJyFALRda+1raZeqdui Y+vxMhpEWSKx6TI5Iw8oIQGqgbccL3JdhPDInrB9S+Dh2qe8EGFZCMg5yfc8sI7G8osHwM bZJCmTVrLBK9d1MgkbvfXMvj+P7mSmbElY/k6zkCzv6lWi9hxrZXIVEGdmC2WCci21zN5g tzvWX51a41E3iFicvIkiUwVVpPL2qE2UIa0GhWN0w5p3IK33BacEh35Ev2UTrUScggYLqU xR4YEoaK+sfIKTouRrYbg8nMaK4hwRS+qS5u/LO7EEwiMFE/3Gi3mV7WRKpxUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733051919; a=rsa-sha256; cv=none; b=r/MS82nrg23khj9JtZwRX7SzpRahmIJma2bKE5YXCRceJYObenNq6Y4yDbH4rrlBWvQ1I8 vg16iZbyCkObZk6V5k4tF1G4CKy6FPcKa2oDHtjYZ3Eayoc2OqlVbB4JBoluhGtBs/93fR 8+7ogQucFTtCziARxZTHGxK9PXYxLCDqyQqv3hOVBjmSUwfWKilCwedDmtfCFGqNOGlx7H JZFAq1OEnop0WAjHiOLUVcheT6edkIcx+ggZCySZAjAUIlvvAWzy8U5lvmudy/WdlXa9Qg Qy2UvEcZwC7CAr3X/YolSnqTLZsmIs2kVbjiCOOZMenFd6YbhupKLPwSsme6Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1PYV6mP3zqjn; Sun, 1 Dec 2024 11:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B1BIcw2008072; Sun, 1 Dec 2024 11:18:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1BIcat008069; Sun, 1 Dec 2024 11:18:38 GMT (envelope-from git) Date: Sun, 1 Dec 2024 11:18:38 GMT Message-Id: <202412011118.4B1BIcat008069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: fc4f83b1d007 - stable/14 - libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: fc4f83b1d0072a36c469684e9738a99735075c92 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fc4f83b1d0072a36c469684e9738a99735075c92 commit fc4f83b1d0072a36c469684e9738a99735075c92 Author: Dimitry Andric AuthorDate: 2024-08-05 20:17:17 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 11:17:09 +0000 libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: [libc++] Simplify std::is_void (#99033) PR: 280562 MFC after: 1 month (cherry picked from commit e8054e44f4caf9c3968dcbf2d16bba37e987237b) --- .../libcxx/include/__type_traits/is_void.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 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 46316b0d3a53..4c27060530c8 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h @@ -11,6 +11,8 @@ #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 @@ -18,14 +20,28 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__is_void) + template -struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_same(__remove_cv(_Tp), void)> {}; +struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_void(_Tp)> {}; # if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_void_v = __is_same(__remove_cv(_Tp), void); +inline constexpr bool is_void_v = __is_void(_Tp); # 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