From nobody Sun Dec 1 11:18:44 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 4Y1PYc72d7z5fTGZ; Sun, 01 Dec 2024 11:18:44 +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 4Y1PYc53f6z434M; Sun, 1 Dec 2024 11:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051924; 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=qTfH4AYGKY7rsexS65As2QvLBlfQpf1I6O4YYs4A7bU=; b=Ey/YWkcGG9AzX0TP7HuBcT/I9owExrg8o5fKKNixJVbY8qqAzK4DQqdYiwRSC0LH4AldtY Z7WJle/zsA1iGy2S/B+ULUgRrdQ9QWM47oodcd9U6zka6nptg5zHuW4/+RALjm+mLfxDu4 7iwQVtm3MaNJQJp1PjFS99S8zNN46ZLcxO6Q8hoEeLQ9+CtfCmg2ZMniDtQMQb9KgrBEk9 WTfzUFVsZplC351Nv48EjE9+7P72dUuk9sWAgLFC6olBTB8BFVqvsDHlt3rIgzGfLqntxH I+m6kLxMPMuThjLaS571mvmDHpMcFjTGWgAsX1pWA1WOLiZRgi44JxmZ0X3l6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051924; 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=qTfH4AYGKY7rsexS65As2QvLBlfQpf1I6O4YYs4A7bU=; b=e99Jb+ovbeprTDvtTIJSmLtPpQY/sqc8+GrUYYYZPO4IjcCKOAYBmdwrJO3/BbY+yJexKq /pE3KCgpC3SK58WWgWXyUgcxc7SvqPVKrLwFZyvLMjqyWPwp/cHZUNadKNVIpX43NdumCn DB9z06tFC4oaXH9r7pI+WQhocywHtsG0ypgCUhIlkv7+G+0AGf4IxfXrMOSrEfJuik6hRA ZZ1P3gD5N7RK+aACIPu2oZUrsrnBnHnUCR294JjuhW/ADfMNxhOq7LEasYJIscTE3X3nI6 sHOLHZtkJhoYnVJ0L9opMLMiLoTqzJI8tQdhXvzuvBW/J8Ev3DimYHtMB8yiTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733051924; a=rsa-sha256; cv=none; b=SQBWlPekmFbhLGMr8bQjI95Lk45ktZKO5P01AfCGP4tqRv63wS3+k9s6oAYPgP591z/ibU nudQksMl1c3pDSUu3cQEJhh7rAo3UBWlVNSW/cRNwkRoBoNjU1WeH6Tgz+l7I5fI68xeS3 AgGf3fbE1pJntRGi2vlJxG5CdwEJKJ+dYg4dCFaEcNowBjWbzej3rPGzyByXJld75CR3PH Jo3NGzVVg8h11UOin9ENi9/UAAR9hLVeviJwrwBiLVo/vhVtp7EP4WADyHJEDkLLIooRi+ 17mem4lf3YRxOXPhqhb7pVyubpAMwTWNONuLqbsl0s5QF4L/9nf2Bq8MzMe3ng== 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 4Y1PYc3Hxqzqy3; Sun, 1 Dec 2024 11:18:44 +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 4B1BIiBI008262; Sun, 1 Dec 2024 11:18:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1BIijC008259; Sun, 1 Dec 2024 11:18:44 GMT (envelope-from git) Date: Sun, 1 Dec 2024 11:18:44 GMT Message-Id: <202412011118.4B1BIijC008259@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: 87d2d3765f94 - stable/14 - libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83: 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: 87d2d3765f9481be9022e36121758937d864b7c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=87d2d3765f9481be9022e36121758937d864b7c4 commit 87d2d3765f9481be9022e36121758937d864b7c4 Author: Dimitry Andric AuthorDate: 2024-08-05 20:26:58 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 11:17:11 +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 (cherry picked from commit a7b2d7f261b81d141195c4204fdc4a0dc97a146e) --- .../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