From nobody Fri May 29 23:01:01 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 4gRzNt4g0Cz6gDrH for ; Fri, 29 May 2026 23:01:02 +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 4gRzNt1G4vz4PR8 for ; Fri, 29 May 2026 23:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095662; 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=tqLNDURBpdmt5rRJizz2eQYNaVey8yjDhv/HM+nXMAw=; b=RsaoUxloBRfNxlV+/kctEsk7F9F0l/5r4oiukrK2M49AuD93SEG6yZ7kWD6A9OtFEO3LRP W0CcJyyVuLqBu6cs+mOH5qK/oUpcYjD0FTZH2kg+7HqtqoF9WOaLnV0l6pifwFTHctaZMR KPIEolfDSmYaxr/3iC2YUkggOZQfZt2h6wLITnjW+SkEVPs/zzyRjfEc4oWmLDOxHmGkst 92ULzED/EtIOhoNBxh2rkkVL94N2ysIUvqVoU3X1ysLJpPDlUQCN2Eo8zxXnphAMtxAdCl BfkwbkrVtf3mS5JjKFqMs5sNl0OYOB9uAcuoyy/Aky7XvnNUHFlVBFUeloXyGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095662; a=rsa-sha256; cv=none; b=KC0jN90axjc/ZV0xpJR1P0RccR17A7stcxnRHJcIT5/ZHhLZhTbu3uAEpm2KEHqOa3llz2 rCXFPZJqQrtuoFxhKrGDztLguKeaz2bA3taKkmI4IT5mgrFZ9RX7dyGtpLL9HHqCfAK6sK bZE49+NtT+ylcUlWlPl2QLTh1DUN3bBBd1TPXR7pCe3T0fd5r+4EVAsZljjntU31QWUL8M IwhXpcfgSCfm+86ItjKRbIH9OJawLkmMQs7YRgFDb6DsCJGsrCtwZRRz3Z76hjBU8rcY78 Q5yHaoCofjIquxOchJSnaVEm2X56UFr6Yn1E3+2GtjcDT19Lq3K1cX/OWOPgLw== 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=1780095662; 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=tqLNDURBpdmt5rRJizz2eQYNaVey8yjDhv/HM+nXMAw=; b=fOVJ8B45a7Y8rJy96odXu+FVglIi4OzpU35zHiVQOwEMzheYQ258YueHSUGr40eR6s9lJb 4GG58vN0juYl/ZwJiCmWNdFLuqUHlPKozOOxmqKoAKoH5HBT7j4+UhvGVR0a6bgFEECzBy pHvrTHJgcnE+THSPU0E7On8Ucd+aBr5zYiP64aF3uV0/vgX66LHwIqOGjEAPNuecnwEzpB a5+Czxv/8TFxN5wartGlj2YaIgttbSw+f9JdCkfI4Zxl+rkwIwDjoJOhTExWc8JECxQTWp bME99GD3xoOZXGlEJ5WIOewQ6yi2MEb/yfk7nduVJ/xjtd3Dw1mwQ/HCusaAmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzNs72LHzskj for ; Fri, 29 May 2026 23:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4241a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:01:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b247a3c78f11 - stable/15 - Revert "libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83:" 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/15 X-Git-Reftype: branch X-Git-Commit: b247a3c78f115a47b3f8978e48a0df6c1798e48b Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:01:01 +0000 Message-Id: <6a1a1aad.4241a.6c99a00@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b247a3c78f115a47b3f8978e48a0df6c1798e48b commit b247a3c78f115a47b3f8978e48a0df6c1798e48b 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-5639-ga10aa4485e83:" This reverts commit 267fa9ab814c23ca97b8b7e1740f4da51485ac72, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month (cherry picked from commit 3ac42330b1da72d68cc6d7c3f65e24a882ccfd47) --- .../libcxx/include/__type_traits/remove_reference.h | 14 +++++++------- contrib/llvm-project/libcxx/include/cwchar | 4 ++++ contrib/llvm-project/libcxx/include/execution | 4 ++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h index fd66417bd84f..ba67891758ad 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_reference.h @@ -10,7 +10,6 @@ #define _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H #include <__config> -#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -26,15 +25,16 @@ struct remove_reference { template using __libcpp_remove_reference_t = __remove_reference_t(_Tp); -#else -// clang-format off -template struct _LIBCPP_TEMPLATE_VIS remove_reference {typedef _LIBCPP_NODEBUG _Tp type;}; -template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&> {typedef _LIBCPP_NODEBUG _Tp type;}; -template struct _LIBCPP_TEMPLATE_VIS remove_reference<_Tp&&> {typedef _LIBCPP_NODEBUG _Tp type;}; -// clang-format on +#elif __has_builtin(__remove_reference) +template +struct remove_reference { + using type _LIBCPP_NODEBUG = __remove_reference(_Tp); +}; template using __libcpp_remove_reference_t = typename remove_reference<_Tp>::type; +#else +# error "remove_reference not implemented!" #endif // __has_builtin(__remove_reference_t) #if _LIBCPP_STD_VER >= 14 diff --git a/contrib/llvm-project/libcxx/include/cwchar b/contrib/llvm-project/libcxx/include/cwchar index 7abcc3440947..dd16eaeaa07f 100644 --- a/contrib/llvm-project/libcxx/include/cwchar +++ b/contrib/llvm-project/libcxx/include/cwchar @@ -258,4 +258,8 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_wmemchr(_Tp _LIBCPP_END_NAMESPACE_STD +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +#endif + #endif // _LIBCPP_CWCHAR diff --git a/contrib/llvm-project/libcxx/include/execution b/contrib/llvm-project/libcxx/include/execution index 822ffa1fd3eb..94d434b2e460 100644 --- a/contrib/llvm-project/libcxx/include/execution +++ b/contrib/llvm-project/libcxx/include/execution @@ -142,4 +142,8 @@ _LIBCPP_END_NAMESPACE_STD #endif // !defined(_LIBCPP_HAS_NO_INCOMPLETE_PSTL) && _LIBCPP_STD_VER >= 17 +#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include +#endif + #endif // _LIBCPP_EXECUTION