From nobody Fri May 29 23:01:07 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 4gRzNz6Lgsz6gDdx for ; Fri, 29 May 2026 23:01:07 +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 4gRzNz44QSz4PGV for ; Fri, 29 May 2026 23:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095667; 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=Y5Z8fOzpzpNTRPbCzs3+9z6ahuhuqx+zETgbksTmNL0=; b=DcpZvzm9cgXowYfBbxAxjXuxmAxmAU8LLyNiJM59RlKvvqIx8/qyGGpDtyM43m4ZowxVZj ViFsA9y5hil5griryC7nmYvtfY8hxG0a4hnfX05fiMKfs46KPeTOygzxsp74xoEwkrZT3o Orvsi+eu35+kfKjQeG13iReTyLeendSwC76Jk1B46+bZ2+gfTixtOkZBd6oy5dnxsG6KaB t/2lT8bP6Tqzpje67DM69jFuYk6cAdMQ4i7RPiSKNsvZp+66i6HvxzNr0TbXgjZ+ReuJqq wRd2KqxRBomLOJ8rPjFkjx8CCa60MlW1I5JM9DCYUBkgIB17ljNIgVB4H8wPFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095667; a=rsa-sha256; cv=none; b=rw2Iso/266bopdaTMsh6d+89UgjEs3AVTyABuyzP4iQZ8ZCW70zl5VXqL4tupsEUHqbIn2 z5fVqrJMp1Htq0Lzh0hPTHQPOQ6Tz5gotoLEHV3sVSS1kDK9BLTIJrKwsc8VSkmQYavOGE 96iBun+PQVnlr8JpmPRIV1GFawc32yTn6xg6DFZ7u5bSKaVC8CgCxHQ26DkpRH1ZsKQC8O MuaxtLwJYdSh/+EOeFothiOpKsg/cJuc9ScQfK/LoZbWqfVl/bJzIV5OuygLCg3/Du+h+h oaPWUbLYEN4i5Ww4brp8QaSqld6pWeWD1BW3ItdG7uj2vskpcjQsRnwQdbVvBg== 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=1780095667; 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=Y5Z8fOzpzpNTRPbCzs3+9z6ahuhuqx+zETgbksTmNL0=; b=OHX9Y8o48xjo/RGXCygdqO5BT9B9AYIcN3JqinK7hNV7OLWTSNjnD7Y5b0VM+2bvlVMwyv TRk1a+qU4T42Ke1Lk3AJPuaDhsevm92MeKgr1MazDees5tVxI+H4f/P8rxnq4WToEjFE6a RdYOUpcd1nUMw85M4OYi6rBeR8fYYq+yIRl9zEFkgL0McRfh0bvW15P6z84DSmLXzb1O9V qJsi3tSsKTFnGCVRa/ilZm/ICNI5476NKyV56qEyRCjmjn+v+h6Pj5dx2PoaE6LqvAGMeH fsQr0jsh/lY26RInpe6hbvljHikcYeioWi9L4rPbFHjl+bemursliwvB8LcYrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzNz3TS2ztFl for ; Fri, 29 May 2026 23:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42754 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:01:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4c339767d627 - stable/15 - Revert "libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7:" 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: 4c339767d6273154dcfd7a39bccf8d871be411ca Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:01:07 +0000 Message-Id: <6a1a1ab3.42754.32a8498a@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4c339767d6273154dcfd7a39bccf8d871be411ca commit 4c339767d6273154dcfd7a39bccf8d871be411ca Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:57:29 +0000 Revert "libcxx-compat: revert llvmorg-19-init-17853-g578c6191eff7:" This reverts commit 2facc097b9b28a81b925c924f27f09b40f29fd4d, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month (cherry picked from commit 3b0a0e64bd9f0a65f0dd62dc157597e6d9ecc933) --- .../libcxx/include/__type_traits/is_void.h | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h index 4c27060530c8..46316b0d3a53 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_void.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_void.h @@ -11,8 +11,6 @@ #include <__config> #include <__type_traits/integral_constant.h> -#include <__type_traits/is_same.h> -#include <__type_traits/remove_cv.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header @@ -20,28 +18,14 @@ _LIBCPP_BEGIN_NAMESPACE_STD -#if __has_builtin(__is_void) - template -struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_void(_Tp)> {}; +struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_same(__remove_cv(_Tp), void)> {}; # if _LIBCPP_STD_VER >= 17 template -inline constexpr bool is_void_v = __is_void(_Tp); +inline constexpr bool is_void_v = __is_same(__remove_cv(_Tp), void); # endif -#else - -template -struct _LIBCPP_TEMPLATE_VIS is_void : public is_same<__remove_cv_t<_Tp>, void> {}; - -# if _LIBCPP_STD_VER >= 17 -template -inline constexpr bool is_void_v = is_void<_Tp>::value; -# endif - -#endif // __has_builtin(__is_void) - _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_VOID_H