From nobody Wed Oct 23 18:30:36 2024 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 4XYczx08zlz5ZWXH; Wed, 23 Oct 2024 18:30:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYczw68cfz59F2; Wed, 23 Oct 2024 18:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; 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=vGbN48ooqCVM2epeuKEN5H0wzEFgAhhi0Nnx990MqoE=; b=p4WuvdGo4noObfmXhxj+NBreX27D+oSKUsbpjWJpJX7pnCvs02SdZ4/FoCAClJZ+sbuo+W vc0P+6bah4V1lHtnZilli0JvTnG/vZh8x72607eK6kEUjwJMYPKe/h1DpD2TgYsJArqi0m 8iUCfTG6mOf9QZ3f51IZUDTlTyW0WbgJQ7JJXsM98cWa3C7qRfRCQXEfiaBuR/wX6aKNvw 7Rj2kdlp6er5GsDMPICpL62qd+gdVGj0l0zptaEmHIrstffaLBtzWGdpA8KzXv2XkZJA+j 18g8Hi+c0mchAJSJJp6/uKQn/l6oM6jadx5VOWULXLKsURf2VjS+z0g68YXAnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708236; 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=vGbN48ooqCVM2epeuKEN5H0wzEFgAhhi0Nnx990MqoE=; b=nNniA6lFTHTmu556TiuLACvKSBP2/pmqVo0/mLXs3KU2ep6YYA7lapFqjSZbBVM9darmeJ DmmUlUzqikC6aMXjOJx8nWujQoAuVrJN3he7eJqFx91GzBSlhKPLKARQ/mz3PVmBKlXFKE mE5JdediRKea7cPV6860A3fnIFSreOblnTXBfYII+P558hwYQ/6R8d4B88/OWwqFufQ5c/ hKKzqWDSmF6eE2ooaKW4dHvL+qh/2lRQQSe7TaV0+24sb4mEJban7y4qgNVuStI4YnvSv6 zaSVaHMZHRW//1VTHjS1+0JTRCLS5CFB6tEeibmvzhjMoiw+uPgybebWHlSg+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708236; a=rsa-sha256; cv=none; b=B9NY7+mLa4s0t98COy4/B0/nMP0pz+5W7fDjumFO39I2SQTWBZe8DAUn/hXQuJCsIP5P8V yhVIgt4C8UZNQu8ewdmDLJhzqgXslHrfzxUEVc89K403KdrBecjNB31KJw9F5l+NCTJeUE pmN1WoG4iliDJlvHE97+JKypm7ASI4EmtP9Ds2OVcJJ9MEMpUj5tjvJm8kX4XsvkJ3dxEE oLHjme4+FRrn9EGD7KiRgs0veX8xlJzPMQsVbat0TjYniezXXTmhxmzyPfBWLfUOwgPnSp XCq4bUlmHzCwDXw269T+MHxynhtBgVcankn+CCjrSxc0zGEuvZ9fNQYF4QO9Yw== 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 4XYczw5RdPz17yP; Wed, 23 Oct 2024 18:30:36 +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 49NIUaBx069315; Wed, 23 Oct 2024 18:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUail069312; Wed, 23 Oct 2024 18:30:36 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:36 GMT Message-Id: <202410231830.49NIUail069312@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e8054e44f4ca - main - libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: 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: e8054e44f4caf9c3968dcbf2d16bba37e987237b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e8054e44f4caf9c3968dcbf2d16bba37e987237b commit e8054e44f4caf9c3968dcbf2d16bba37e987237b Author: Dimitry Andric AuthorDate: 2024-08-05 20:17:17 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:41 +0000 libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7: [libc++] Simplify std::is_void (#99033) PR: 280562 MFC after: 1 month --- .../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