From nobody Sun Dec 01 12:54:10 2024 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 4Y1Rgl5YFJz5fZvZ; Sun, 01 Dec 2024 12:54:11 +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 4Y1Rgl14Zcz4P8L; Sun, 1 Dec 2024 12:54:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733057651; 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=I2pucoWsLcbfpkD8GGYkh7QEce8F7WCzVqrBW+sbrqA=; b=TVaFG90FovwY62GqYe/5tOBFnPpuWuHYIgJCD6JIoTRAAiRSaNpotOxht53eBE8z+8C2Xg eaFp4+dHmzCc3cDXTiGwJtxcJonOCS3H/Yi5RVzZTQASJoc+HaUKu0AvI9OdNLksDpEtrB BjVqBENcd+iQ3Nhytutn8gESHwk5MsbaAgYMDm8xxseVTA/N22uIsPzutw6oYjKJgU7WD8 vShzqapxjd6Fz54htsyHJNDu8LtCl7PJI+UbWWNTgfDl9LRVpYx9lUpI6BKC5FfzpUhwOV 9Oa2+fmLOHBV5ZEzSF2dh0huLFXK+UD+/P5YIe5v7aQhBB70fKsvMBfnvhaGxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733057651; 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=I2pucoWsLcbfpkD8GGYkh7QEce8F7WCzVqrBW+sbrqA=; b=XcSTOFErQE4feQ+p44gBl7NX9YM0nFUxqiE+kQQ8QwCIEM3Ojh6tsY7w1Lj4Y+sAAedcMG bfsTSNchWHST4SPbIU+0WMBJnHv1j/I8UaN9JTqwiaQDRVJSZoRj9fsTH+zFCrLMQLfb/0 cktzlsdoyOMiHOeBoDtqqF1IxBsgF+BmotlVKkz451K90LVEbcc+in7BwbFvkqHuI8Q2xl xLRM65gtKScK5g16VuZiTdJN9h3AByIbwDTQH8ky/HsaqjSJapGxN7XoqCBpXLsMNhkFt2 fOgBUjFihyJxcrNBalJDipeaircfetbzKBnDAzC5RzWEHnpsyXWLyH81ADkwmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733057651; a=rsa-sha256; cv=none; b=cPNfm0dfN6iZ+PlnXRwUngg0tB7tTFYn0S7K1IX1m0K1/Q9ZbD7xEDAGTXHF4h71ZXVqmP rXawSAhameEZ/CscpuJJL2OgwUwDNwLAbX+wXoEjbZ8Ezep+tPcMh4V9xn6xfgYWuQd89I oyGk+fXSs3yncyYooGdwJFGtTOYHP1H30c3gtTxe6NJHA+i3He7l+cjh/UXsvJDsj4H6gq 6hOn5D5XEg1vxwpYP2phJXW2Dy03FTi+rqVsNK47VXBV36rFm2E0ztxosMJvIGmkpv25Fb uF+tqSspveXTnBSP651QBZY2JiH9LMAT6nKpQPHeLh14OjdgEZ2/gtLLLZJcBA== 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 4Y1Rgl0ZHVztn6; Sun, 1 Dec 2024 12:54:11 +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 4B1CsAUW093669; Sun, 1 Dec 2024 12:54:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1CsAjA093666; Sun, 1 Dec 2024 12:54:10 GMT (envelope-from git) Date: Sun, 1 Dec 2024 12:54:10 GMT Message-Id: <202412011254.4B1CsAjA093666@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: 6a3478b85758 - stable/13 - libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a3478b857586892c38db0d0f423f6a8964e837c Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3478b857586892c38db0d0f423f6a8964e837c commit 6a3478b857586892c38db0d0f423f6a8964e837c Author: Dimitry Andric AuthorDate: 2024-08-05 20:17:17 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 12:32:39 +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