From nobody Sun Dec 01 11:18:46 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 4Y1PYg35pfz5fTJ7; Sun, 01 Dec 2024 11:18:47 +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 4Y1PYf689cz4307; Sun, 1 Dec 2024 11:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051927; 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=la8Pp2wc9J2J3PEIsZ4t9GD8iId0GGC6XCW4LjVa8aQ=; b=pS+QV61sj1a5KCPrUBMLJ0fwi8oPVUIRTv8ZuBd3zuJ21eGVL7Y+12m38SfAhXxH0O3S1d 1Lk58nQq0fKHl9lC65dzpBArLaqxv8F9YZaHlTYuyzxbkn8TcPVw+pXzCQzdEudPyZAk5H sF/fad/jmuem4aRTv3jmnhlbJFOQORknvspm3gVnrRo9h5Qyl1nvSsMbqyA0VRnoFcalWv e9WMHUGfEl6B64hcLB5Dfny7Rzpc4eo14HNhQpLrJo7cJ0loKWW+hIQcpz8P6w3YDFFH7E JdYfDtcdnyhi1IQQKG/3kbMtQOIXX3FuwgQOx5h6i5R+u+Rd06JydnfNaZpTXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051927; 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=la8Pp2wc9J2J3PEIsZ4t9GD8iId0GGC6XCW4LjVa8aQ=; b=EZnoXL4Z8V5bmDFyNL61ph2cc5FYZaZvqpVf+hVWwZMJhsu9+EmZw6nSb8LqLvY4PJ9+0i 3RZdEMIjjiQAZQvC7tKkSrofnrrcTI60YU/ICeCiv4pjHFcpn/qBfpg67rR1wmyzd8LGgl vcg/dLeI3EGXO8jEqZbbuySQre+SRjzJ+6/Q7k3Q0UqlQ1x8vNeQga34Ga52JSFKOCGAGK 8Rj3IxAqV+f671gZsmYPc+sbgAWwaMh1ur9oX/JAihHvcNqnoXuFGd/rs3zvVNeBw66Jju doLxoiAQ25OUjEBiWAFO1r1IA2tt0AkzqGXsuayJ9GlKtAr4q2qnzcB6gE9iRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733051927; a=rsa-sha256; cv=none; b=u3E5gcYkewk3xLgeAMM6AjX8tJesD2/caTROpKTwPc4KIq7ZAe5d2phtLF5n7D9qjbHDlN qyHBx9d0/ucX5xatxCcL+x2koFExLD5cGlzS8cYhBYWVmx4jqgBx0+jnlLKA3bgizSgRen 8fZdYG+WpBbSMpG/vqQhFovF0ehL2CzH6zkGGLEGqOX4RmKe/8BRwobtmnv97vINVBisU6 GycsCi6gQuB9kV/F5S/82SAGLvSXbQ0HKgmB9R1+sKzn43v/p68hQpwqTyC6IHRKI+zLBl 8yHuzOHNctJ7Z13l0OBhYC0OKpPJnvc7aRgLACBepnMIc36/KcTUoj5SWX4S4g== 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 4Y1PYf5Dv8zqng; Sun, 1 Dec 2024 11:18:46 +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 4B1BIkg9008361; Sun, 1 Dec 2024 11:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1BIkq9008358; Sun, 1 Dec 2024 11:18:46 GMT (envelope-from git) Date: Sun, 1 Dec 2024 11:18:46 GMT Message-Id: <202412011118.4B1BIkq9008358@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: 0b8644b07303 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 0b8644b0730322aac0f9cc465b7905841b0b6118 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0b8644b0730322aac0f9cc465b7905841b0b6118 commit 0b8644b0730322aac0f9cc465b7905841b0b6118 Author: Dimitry Andric AuthorDate: 2024-08-05 20:27:51 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 11:17:11 +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