From nobody Fri May 29 23:03:37 2026 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 4gRzRs6Cd6z6gFYY for ; Fri, 29 May 2026 23:03:37 +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 4gRzRs2nLYz3GCc for ; Fri, 29 May 2026 23:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095817; 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=4tm0i/dcDLtCBxUf/t3zEyohnWdEYpE6SbKVSMjqbdU=; b=teKSMHwTHEDzrWzjjgeSJAjm2SXeErL7U109A1IvCj4FafPLt+ZaRqQ+3GDc9mEZ3tYzZo 98/+kDcFivAAKMEMBy75HGhgm97yqTRY6C2Ry/cBKyWl/UDPdZHYiBb4uFauJISrH4bknh B2YrBhcbh7WIuDpDnNMICw/UpSiAZ20hsJ9ExlaLgd5nc78MkSoKt40jSg9klguVVyxVtk w1+wkzcnyQOizowPoeYjcJagRmsY+MrhrEdzk9aORS1Mhw2lf9cqi1oHXBqJvl//NbCDs6 Smt5rsRzq9C9/Q0VbQv8JreRlmp2Rvz9ljLJuySqWnpZn0Y36HpxrqtQLsI6/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095817; a=rsa-sha256; cv=none; b=bfJXkVAMMMUEMbxtFJIY7lUESEBHpi2OtMixUHjZ0n2e0ZZGcxN9IXMtbohG+QnNY5oAaU DrF4HEilqvBU2Latv8bmOnKpxBJ8yAN6pgHcKvto+iUkfSq4I9ibPZXP5HpIGGLkxi374i VSRfj29liJVHf9/P+ZrLB4JBI7I8+c3ifcQvgawIku5Xl7U69wL7QM625tOUXpzziYohLA eR23W5bXR89AcIULAEOWkyp824IhKtjUfjDSKXOd5h4F7aCyMxWv0dsbxd+DnUsP96yzGK 4D3rku7K4Dhd0gKkYPlwL0ojEHUmneB2Rqu503rLDEArpGC57Ec/EpYH9eMqqw== 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=1780095817; 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=4tm0i/dcDLtCBxUf/t3zEyohnWdEYpE6SbKVSMjqbdU=; b=d/z8I8mxfcGyS5H6pBzTNWdhnTORoBiBXojCj9cqI49hNDuP7HskedpFOHwQyWh0xUYEUu QjOEFIYyi/XYvsrTDAR7F6T9C/Nv/BCrolw1Vi12MCUF2EPFsJVuj/7kyDhSu5hZQWGHxv J6OuomXl1OBawQgapWOddF5nM9EbcUdTvUONvh4wDVtUWygxjwQbrSpWupyX2wCcCD/Q/E Xk3zIqOxjp+nSX1HTtGuPjWE0q7pdUucqEBbPwHe35gLeN0MDZdOJ5/ZpXdFPY1M6c8uOp NNBL9tvWloW8zoNkJPR6xfEvanV95w5jBd2gg7KgUepaBXxhBq7ZUNknIsKm1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzRs1ppjztSy for ; Fri, 29 May 2026 23:03:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40ce3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:03:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4fb4b137e977 - stable/14 - Revert "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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 4fb4b137e9773550af58d77be0390cd6d45fb8bf Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:03:37 +0000 Message-Id: <6a1a1b49.40ce3.494a1988@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4fb4b137e9773550af58d77be0390cd6d45fb8bf commit 4fb4b137e9773550af58d77be0390cd6d45fb8bf Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:33 +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 (cherry picked from commit a24406d2e0e8eee8db03ed8d1ae7fb482cf912ab) --- .../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