From nobody Sat Apr 25 14:18:36 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 4g2sPm5Jwcz6bZHq for ; Sat, 25 Apr 2026 14:18:36 +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 4g2sPm1QqRz3FNW for ; Sat, 25 Apr 2026 14:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126716; 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=zOO8HKq9a86nR7PrgZV7lw3VNUj/Gi5p76PA3sYaz+E=; b=iCcrPzs3xe92KdGVp7EeSN4AF1qlB2nt8QUVgdkgQgsqiFQomUUEX+X8vRBXHLqWRoJjQc K2M2SfiKdYfSo//aio0kTCtTWmDAf0kw2n82K5GVe87muyJFI3NY7g/WthBb6A3hdGV9Ji 7aMh7b6oNLfcjkifzH+Ts5CTClBQiHVLqEp5KNibyMU6FGuxbztYbPIf/43mO+jNSZg0th bXXIBPpTRVYqYxdUugd/ByX8YDPMUB76WtFzDhapliJWER2CE874O5K9OHX3HUYk8WFyg9 eF977FNPA4bWvCFR9Wv86r/A4OAW2r+YKVTcQLPIkybpx1rbVI9QJldoeovimA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126716; a=rsa-sha256; cv=none; b=Fgf5qVIIbswHTe9tqMTsdtBvFITRin+fdWm4vhvgmkuqcjnk531xMIju/ciLQ766RheSJA yAKP6Mee6xMZ8KiAHnLWCWcZ5zGi1UeELhD9wpw0l4LW17w++8LFb9/b6jiPSUYOnXGqne YCyvW4tJaubs/p1M6HFxC+bSLELF5FDQX3/RuvP4AK2GMNNAfLZdDxfoJEMxHpQdPkN+hV d+Nw09nJ8yKS2mVM9oV1goFAlpVPHc76gChUBeSDBGoTxue3JDtzmx+eN0yDs9LSLIEbzn rLt+Z/0nv6YM7Z4ad9ufVunU77FK2pEVDpdY/7LVTAt2UBpiaJZhl09OBAjElQ== 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=1777126716; 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=zOO8HKq9a86nR7PrgZV7lw3VNUj/Gi5p76PA3sYaz+E=; b=E0VOtMF39j8EH+hU1Dv+A8G4tG/RqoRwtc2gWqKqgvWtxIgf8wxmuFD+IXk2CJ8o//8FOP LaFFLek/2/l93wmua2oeZyTOAOlETzXU+QNstMrJ2+kEb9kpSbOzhrGrK4tjFS0ZQu9EIo ES2vU+CasBRF1kclmQMyN9p/k/bQuMEGIKukXk6+1Pn4qMeLizh1bvZz9MFWaeCE7+W02B ey0Lg9b3NfelLEY6j91pubW5rT2DKPIUDvQxHC2zKwR68EvedvW0CSwSdENZl9KWRM5vpe oDATFtFm6JAhFrbUgSeByvdtc54XU8dURhpkiyNC5Pf63dAAOKQfLXp4FIN23w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPm0nCLzcqr for ; Sat, 25 Apr 2026 14:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3771d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3ac42330b1da - main - Revert "libcxx-compat: revert llvmorg-19-init-5639-ga10aa4485e83:" 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: 3ac42330b1da72d68cc6d7c3f65e24a882ccfd47 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:36 +0000 Message-Id: <69eccd3c.3771d.d496602@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ac42330b1da72d68cc6d7c3f65e24a882ccfd47 commit 3ac42330b1da72d68cc6d7c3f65e24a882ccfd47 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-5639-ga10aa4485e83:" This reverts commit 267fa9ab814c23ca97b8b7e1740f4da51485ac72, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month --- .../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