From nobody Sun Dec 01 12:54:18 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 4Y1Rgv2phZz5fZvn; Sun, 01 Dec 2024 12:54:19 +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 4Y1Rgv0xTVz4PBm; Sun, 1 Dec 2024 12:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733057659; 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=mIf9OHus0UQspuh0g2FQ8bRdXbbjwPTDup+fl3OFkyE=; b=U5svyr5Dr8BAnqjvQiEoWnOWTelIaiSVgasrHebTqD+xdq+a9H4fYdf3hKcMw4TLZBHRES 7BpPYQ+VIWE5gZ0EQ0//M/qvK8BkYJNqGsPxvcds/CMo5Ho9jIKI0L8HWSjChuaHcHbRVP 2NZIQ+apftrbxnT4jOXZOLU0PstIyvvHrUsHniznV1mmkV7dy0a0JuxbayOmeOwnfIJPcc KiCKHYto0NzLFA8qXymMscnur5cqU3Phyzen+t8WzIqaX+MZdVsNCVlww9KZSctMd6jE5+ 8wJ+nSmRHZUPJwVTEDWWJ7PGEdCjzFCPGj12UYifXr/s6W04U54wUXwKjVJHeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733057659; 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=mIf9OHus0UQspuh0g2FQ8bRdXbbjwPTDup+fl3OFkyE=; b=JP1EiAa621w8kN9+3qK7IVbmDGzdsgFHx5Fp+4yq1jqnRC4eIKK1qkK9UUdF0aDlelJ3wp MLLu2fluo7dcdxIHiC3o6VB88CxRfoBuYChftJ6QE9hYGBIMoBj6Z02qy1tft4WxPxWhMm JIzfTeHMqod0KBV5qPEdTyYkg1pWc0sKEKEox3uwiqc6PQuTHhPXPtl+WVB4D2fP50c5G7 CSE9IWI6bRdDPc6WsRPezwq/9+w/7M/fzYeKZEZWr93K1lL/QZ0tTnURX5lDdfpcFPVjxW 8kMHwCkyPWHHCHUf55zwxOaVYjeKbIPC2OI/PVydwxkgGdrHPHvDSZEwabX+9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733057659; a=rsa-sha256; cv=none; b=GiAx4z8xc0Lzz/LtD9/S4S8nrjuUqNKTNEM6wiNDrCdkPOnJXuyW14RgmngbEy/eTDuNMj r19CRKaPw46gOz5rdXxNgWr9uduILGet1WpOAmAJLdJdjgs/HKSCtSQ+Tu5YcoPxeYN8d2 HdxxbckCXrLETCO8K1G4yJl2VqZ1er6Z9YZ0XMqTL7uZ8c/ohMFJJbwRC0ZtwMbii/DRem ZKJUtQcOIabcUP/3G3K8OSH6olWVwbmk/OSFYHrAJF3zqPGrDt+6nUx+aykqpETYxNfTgS fU9xaU3XF3XQPzqwUGVDr0S4UqPCmlVrnpB9m9iXVBrIXEMTA8sovsoajqZ5qA== 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 4Y1Rgt6zyhztNP; Sun, 1 Dec 2024 12:54:18 +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 4B1CsIV1093953; Sun, 1 Dec 2024 12:54:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1CsIVA093950; Sun, 1 Dec 2024 12:54:18 GMT (envelope-from git) Date: Sun, 1 Dec 2024 12:54:18 GMT Message-Id: <202412011254.4B1CsIVA093950@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: 718c82d22a1f - stable/13 - libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1: 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: 718c82d22a1ff385b3f1ea3aa13f692125613d6d Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=718c82d22a1ff385b3f1ea3aa13f692125613d6d commit 718c82d22a1ff385b3f1ea3aa13f692125613d6d Author: Dimitry Andric AuthorDate: 2024-08-05 20:27:51 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 12:32:41 +0000 libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1: [libc++] Use GCC type traits builtins for remove_cv and remove_cvref (#81386) They have been added recently to GCC without support for mangling. This patch uses them in structs and adds aliases to these structs instead of the builtins directly. PR: 280562 MFC after: 1 month (cherry picked from commit 072b5fb698abd61ab30bea70135758336b0de999) --- .../llvm-project/libcxx/include/__type_traits/remove_cv.h | 11 ++++++++--- .../libcxx/include/__type_traits/remove_cvref.h | 15 +++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h index 8e1c04336432..c4bf612794bd 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -19,17 +19,22 @@ _LIBCPP_BEGIN_NAMESPACE_STD +#if __has_builtin(__remove_cv) && !defined(_LIBCPP_COMPILER_GCC) template struct remove_cv { using type _LIBCPP_NODEBUG = __remove_cv(_Tp); }; -#if defined(_LIBCPP_COMPILER_GCC) template -using __remove_cv_t = typename remove_cv<_Tp>::type; +using __remove_cv_t = __remove_cv(_Tp); #else template -using __remove_cv_t = __remove_cv(_Tp); +struct _LIBCPP_TEMPLATE_VIS remove_cv { + typedef __remove_volatile_t<__remove_const_t<_Tp> > type; +}; + +template +using __remove_cv_t = __remove_volatile_t<__remove_const_t<_Tp> >; #endif // __has_builtin(__remove_cv) #if _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h index 55f894dbd1d8..e8e8745ab096 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h @@ -20,26 +20,21 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if defined(_LIBCPP_COMPILER_GCC) +#if __has_builtin(__remove_cvref) && !defined(_LIBCPP_COMPILER_GCC) template -struct __remove_cvref_gcc { - using type = __remove_cvref(_Tp); -}; - -template -using __remove_cvref_t _LIBCPP_NODEBUG = typename __remove_cvref_gcc<_Tp>::type; +using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); #else template -using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); +using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cv_t<__libcpp_remove_reference_t<_Tp> >; #endif // __has_builtin(__remove_cvref) template -using __is_same_uncvref = _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up> >; +struct __is_same_uncvref : _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up> > {}; #if _LIBCPP_STD_VER >= 20 template struct remove_cvref { - using type _LIBCPP_NODEBUG = __remove_cvref(_Tp); + using type _LIBCPP_NODEBUG = __remove_cvref_t<_Tp>; }; template