From nobody Sat Apr 25 14:18:33 2026 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 4g2sPk6b9gz6bZHj for ; Sat, 25 Apr 2026 14:18:34 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2sPk05s4z3FQc for ; Sat, 25 Apr 2026 14:18:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126714; 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=WIYlz9AA8Gma36NNZE2DBFkJBY6LI3nn27iKGNxO24M=; b=fVIifXHNZ7wTiXXJnksfRoKpN6+c3KUGr5BHx11TbkaC2qCsNft5dtq/f8A2QPb6oiTkDo 26t1xlZ1qhebHLzxMO8cL02rQceG+ONcrDdlgK0TxnAXnUgULC746jWdErexdnZ7SKIG25 6he0dk7wTMLUzGunuQqjqzrWASkJs9iOwU4xwzepmUQ8NbHRTtneqTnm2phtabhBqAOkj2 nP4mEaOvwfvsUKun+QFk5qAgR19AxXg3z1n3+8MWOvl249bohdEv87dKNCHygP3U1CW23S 9hloFzRxm6gxqycyj5s89x48ir3WQ++EokqJenz2W4SsKAF60JtOyLGa3fQTvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126714; a=rsa-sha256; cv=none; b=GUPeTPcZrCsjZzWblsl4upyokQcDw0DCujua2aRvaQSmL8bo9NLJoA0Azi5dLJXIWFDLX1 4rp3owJobOY0+yKyPINm2WTn1FHW8l7wJK7W+nVAFyWfBD3cdxfgTXRZKRzaGx8Go+vmP0 a7iWl75wBFKsyA1u7LWN+LaX4T+ZpTfDJYyRtOykksBtFQtmQr8gXjLAedhzj3W3ezuAHd Ih3D64OM8GxVLhQlhxsgqDERSMJYbjViLi+qTUkSOm0iBKp0oaJu8upcNdZvY9b9KTHe71 +awevGPXLR4vXa1Xbex4esaIMNmP9YD12OWpJO12HMsVY5z0KV0/EEyZaTVg7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126714; 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=WIYlz9AA8Gma36NNZE2DBFkJBY6LI3nn27iKGNxO24M=; b=eCuipfAV8B/5MTnnqAyaa0Jct0XoY9ci2CPiKYOSTENsJxCB4jrMUQrOSlYOrwb69xywJE ecw2RqX8fp7fjjdP97ZgF2KGDhaVf3G8JvUeeZAeS6hFjDhMuu4rPQ7AdTq+MqywCyPdy6 orcEoRT5v6DSSti6yJZgzEDbmOf+Y88Jdgz4aDMBNdP9PcLvSyavjmg5yy7+0rruLjsXAk CvRUhKhmmjVvMvkMqk8bbYNVNam/wdhgeHKBukuD3MoOIusUnJpZetrf20ZVMufgjR6EKs 4qq7bvNgWPo0k0u939k+rOhr1SSV+Ss6c37tRM83jXObXLg10qktYN3DcMOCpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPj6gF3zdQb for ; Sat, 25 Apr 2026 14:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3771c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a24406d2e0e8 - main - Revert "libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1:" 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: a24406d2e0e8eee8db03ed8d1ae7fb482cf912ab Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:33 +0000 Message-Id: <69eccd39.3771c.7631c168@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a24406d2e0e8eee8db03ed8d1ae7fb482cf912ab commit a24406d2e0e8eee8db03ed8d1ae7fb482cf912ab Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:07:41 +0000 Revert "libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1:" This reverts commit fd17362f6225085e60eabed8af7421838100b457, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month --- .../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 c4bf612794bd..8e1c04336432 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cv.h @@ -19,22 +19,17 @@ _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 = __remove_cv(_Tp); +using __remove_cv_t = typename remove_cv<_Tp>::type; #else template -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> >; +using __remove_cv_t = __remove_cv(_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 e8e8745ab096..55f894dbd1d8 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_cvref.h @@ -20,21 +20,26 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__remove_cvref) && !defined(_LIBCPP_COMPILER_GCC) +#if defined(_LIBCPP_COMPILER_GCC) template -using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); +struct __remove_cvref_gcc { + using type = __remove_cvref(_Tp); +}; + +template +using __remove_cvref_t _LIBCPP_NODEBUG = typename __remove_cvref_gcc<_Tp>::type; #else template -using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cv_t<__libcpp_remove_reference_t<_Tp> >; +using __remove_cvref_t _LIBCPP_NODEBUG = __remove_cvref(_Tp); #endif // __has_builtin(__remove_cvref) template -struct __is_same_uncvref : _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up> > {}; +using __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_t<_Tp>; + using type _LIBCPP_NODEBUG = __remove_cvref(_Tp); }; template