From nobody Fri May 29 23:00:59 2026 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 4gRzNr1YvJz6gDbY for ; Fri, 29 May 2026 23:01:00 +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 4gRzNq6GcXz4PgB for ; Fri, 29 May 2026 23:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095659; 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=1gv3uCQiIJ9g6F2ETL4LvLtN2zSnLeaEgP5rOWDN6Lg=; b=eUn5scuebRIw+elFI4/z2gbUFc4WY/gNkmjzWkbceLnpx9YGLQfEB0FPPgfj5wioAsAEIV M9N4xAHSKFo7nbLnu0WkxQBqZKdxHBxEFd0NToQQ04n15I2yyFEjsgCe+Pn6FtAJtbwUZi EAOnAWitVxe4LYiTmDYKn4j+hGphAbqIPiXP/9Yyth78EJOsd9LEf1RUKpYM6pY/L8R5JC AE14agbFWgnMsPnvi/BJFB7VRSiUgx6tRFQ5UwVTvrgb0HiE741VcnPz9SeNS6E2rzdRgL LLLLMmV00btYAgi6ODT4MIX3OWZhVaVu+2wQtSomBFewEJgWoX0g0jNaF53foQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095659; a=rsa-sha256; cv=none; b=xpEN6PEM1/ILmsQHK149YtCJUuhhky6bgEB9gmkgYeKaEyHKUPW+6JyJlCtbHoNjyhMutv cDGO6t+XF3T5VHDFX+lJ7fQAh8jWCv22hcl1zFz+QEebWEEPXs1hdk2cDtUjy8gS/8kkje U2KDBWq4O37dJHqxmXpFRHTeAqzsHBmyI6Ft5LLJLBayd5VmFbaQhrh38l0wy89b7zlkH6 wciggSpjPuCLo/CzqpmK1QuYZKZ+P6X2MVXz1n5T9/ijG9cX7QhT/m1jBX4aNg2fVP20Vv xE4pmzHQcXca3vBSrlcJkgHUgYF/cvlVm6gkl1gpMg7thF+i29PkvbdpMgRUqw== 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=1780095659; 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=1gv3uCQiIJ9g6F2ETL4LvLtN2zSnLeaEgP5rOWDN6Lg=; b=QyFOE9lJKPXsmuX9dpY7QBH54VokEuKH+Ru/4XWl+f6EEf09XBAp9EHExkGJIbog3y9t/M S8mABu84sy458uFVcUd+d/ixsWnc+05RRbhVqXgYm9rRQopQIU+pQSxiQMxLNaxGlInDkf KIsnn37PZCi95JGipdqMGs4L3WseS09rmEk+RZer0mRbMk8UWozKVbinE37louZLW3uIOe AtYE+Ru8wpKK9Gy8Xksd5TMQHe3LlcnHyqQFj1JLLwJtaCqiFFht0ouBYS97ILmZ1C6N7E uxK+OWPMmXhXm39capgWqMdwDG74b1ceh4bOurVIV9fkD2cfCc5EY7X7KeOE7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzNq5qq1ztCb for ; Fri, 29 May 2026 23:00:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4042b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:00:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 78f59ae2f017 - stable/15 - Revert "libcxx-compat: revert llvmorg-19-init-4003-g55357160d0e1:" 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 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/15 X-Git-Reftype: branch X-Git-Commit: 78f59ae2f0171ac918884fcf80b431f71bbf1001 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:00:59 +0000 Message-Id: <6a1a1aab.4042b.30d824a1@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=78f59ae2f0171ac918884fcf80b431f71bbf1001 commit 78f59ae2f0171ac918884fcf80b431f71bbf1001 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:57:28 +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