From nobody Wed Oct 23 18:30:42 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 4XYd023rHMz5ZWx6; Wed, 23 Oct 2024 18:30:42 +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 4XYd021vbNz59Sj; Wed, 23 Oct 2024 18:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708242; 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=CxeAZboXZd+eqj3zdCf6ZUP+isYT1ghj4/fAtfpbmpo=; b=SvMpqGDvanxbUsur33AucWvpVz/jqzXicd6eH7I/AUEzSbfifkaNdzO/msSgezS4PxlPMY WeKIzt3CKRAthrrEgM5OzFy62WswUaZcqmtXgrelNUz26SuLR/EKWm6MHEEFa56u0IZd1g 63vaNBseLPpc7n82sTMBg9WPlWGwb8sU5WcvFcgsMMUCj925BTpZ5J6fMS9yjpwv7DDx6Y XeeCekNZJr6XuKUGbl9S/rQacxnB2k4QxB3JKYPbTrjC6JW7wT8Gdhc0ClOh2Yigo5+AX+ r/R3hidq/pb8zb+h+4eNIXV/8ng0c8JrY5TPEAbsX1EKXnb1Mv+mhpH30h+91g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729708242; 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=CxeAZboXZd+eqj3zdCf6ZUP+isYT1ghj4/fAtfpbmpo=; b=vMz9B0ELyM6d5lNcXGDiD6/OqJgIML/a3t8nWF7oqwW8kKfayBgF3uQJ+AeToN5masMyz1 wTo5MRUkc2rX40cvLwNsdy0CdrEkeXaZCmZSAQ99WGYq9cH6QAt3W2mgGEIaW1oBh8orB5 tHZT8QcZkOH6ywo74Wzj/L4aSmoFttPmpnk9coOIti2fMW+Gra0fhMo4Sy0Y89OjbBURPH DjR8539+Cz53HP8p2IUodNvt7b7KCeLTixGUoVnKtq9gXOjF5UcDUtoz7zdPnxuM1SQFTj 70OoZNhzHpRLz2UEeuIhXeImjfInWIx0hQCrSqWI84nmlOH8DVPgqhUXN6FfWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729708242; a=rsa-sha256; cv=none; b=ohwXFVseq0YX5ww1RuZjMOfGDNPXB75u4evogUxfXECBTkMtaQbpI98tOHdQ5EkO9FOhP+ tDL91PGhmSzZ8w7Bhz5Nn2mz71KCG8R0BBYaUlw2GynHdmxtk4e9iaBbfyHBw1Dlv81lOX XDBnpGBAHJ7GQ5USG5hSXXUut02TUDNbX+Xymvw5uPJRPsekgkfEZkyUBlgMN6x/DWfN1d 04JP5WMkI/L8Q63bq9iHEVZVJgf0rdgiUDzWX3OmXp8njJNLxf0XbEORoobL+n2GlJtU0L wnETqsd2XIqGcgGihSZibJ5TcOowSj28B5EUwBcvhCf7vHg8W0T3gsSQeA7Y8A== 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 4XYd021StLz17w8; Wed, 23 Oct 2024 18:30:42 +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 49NIUgV2070473; Wed, 23 Oct 2024 18:30:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NIUgpl070461; Wed, 23 Oct 2024 18:30:42 GMT (envelope-from git) Date: Wed, 23 Oct 2024 18:30:42 GMT Message-Id: <202410231830.49NIUgpl070461@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: a7b2d7f261b8 - main - libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83: 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: a7b2d7f261b81d141195c4204fdc4a0dc97a146e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a7b2d7f261b81d141195c4204fdc4a0dc97a146e commit a7b2d7f261b81d141195c4204fdc4a0dc97a146e Author: Dimitry Andric AuthorDate: 2024-08-05 20:26:58 +0000 Commit: Dimitry Andric CommitDate: 2024-10-23 18:26:45 +0000 libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83: [libc++] Simplify the implementation of remove_reference (#85207) GCC 13 introduced the type trait `__remove_reference`. We can simplify the implementation of `remove_reference` a bit by using it. PR: 280562 MFC after: 1 month --- .../libcxx/include/__type_traits/remove_reference.h | 14 +++++++------- contrib/llvm-project/libcxx/include/cwchar | 4 ---- contrib/llvm-project/libcxx/include/execution | 4 ---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h index ba67891758ad..fd66417bd84f 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h @@ -10,6 +10,7 @@ #define _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H #include <__config> +#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -25,16 +26,15 @@ struct remove_reference { template using __libcpp_remove_reference_t = __remove_reference_t(_Tp); -#elif __has_builtin(__remove_reference) -template -struct remove_reference { - using type _LIBCPP_NODEBUG = __remove_reference(_Tp); -}; +#else +// clang-format off +template struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG _Tp type;}; +template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG _Tp type;}; +template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG _Tp type;}; +// clang-format on template using __libcpp_remove_reference_t = typename remove_reference<_Tp>::type; -#else -# error "remove_reference not implemented!" #endif // __has_builtin(__remove_reference_t) #if _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/cwchar b/contrib/llvm-project/libcxx/include/cwchar index dd16eaeaa07f..7abcc3440947 100644 --- a/contrib/llvm-project/libcxx/include/cwchar +++ b/contrib/llvm-project/libcxx/include/cwchar @@ -258,8 +258,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_wmemchr(_Tp _LIBCPP_END_NAMESPACE_STD -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -#endif - #endif // _LIBCPP_CWCHAR diff --git a/contrib/llvm-project/libcxx/include/execution b/contrib/llvm-project/libcxx/include/execution index 94d434b2e460..822ffa1fd3eb 100644 --- a/contrib/llvm-project/libcxx/include/execution +++ b/contrib/llvm-project/libcxx/include/execution @@ -142,8 +142,4 @@ _LIBCPP_END_NAMESPACE_STD #endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_PSTL) && _LIBCPP_STD_VER >= 17 -#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 -# include -#endif - #endif // _LIBCPP_EXECUTION