From nobody Fri May 29 23:01:08 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 4gRzP06gLvz6gDkj for ; Fri, 29 May 2026 23:01:08 +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 4gRzP04v4jz4Phg for ; Fri, 29 May 2026 23:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095668; 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=ihgKTugkycgei/NmFem4BwcZP51NGVHH5CcuPeGdBdU=; b=LQcAARwuiVHe8EYijvlCGM6lH4W5QewCHg8FvVeDOwi+851EEyjBT1Gx8lmLYVOF+EPnRE 9WoUWMVoz+ka8oHP3v9PZq3XuMmaUjeZBWQrI96XoIeBOmw7qBthWH9l8hU9Mvn40E+QxT zQZ8atqiIWk1/uvXAJyCP2zRsAENpa1hPByMhwkLpDTgRrD7ZV0GJeRpCketse3xwm8pdT p/7fslR28J0uD1v/lrmASuz07h7sVs/AtY2HYdeShf68m3Zy5eiH+ySOHqhHoMuUcYZFq4 puI1dAPGOB02n2HU9HBIA8Tt1eVeUhbcRc+H28J1kR1Qf6LaGt4fRUgWiJkyJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095668; a=rsa-sha256; cv=none; b=vrdT9HLkJlvrWvnx4OCiVmaqKFDm9NfS/dY7HUTrIu42sy8j2Gnv5e0NoYyPIUcMU4JmtG pwabJ9q7d0Xb6U0eZG4lQ3vAvu4kdDb6G3U45skxx8Ep0HoUxOxWsYF8UiJ5JJK0nMT74I TAEbytf+HiS+GbGgeJO1Kq3i6OzZ53FLoT2HhI3BWN1lKxvPKuS09684JDLBCAp+n2NfzJ Na4d80YBGyQQmbe2tk5WoqbKGsQ5vDYfGp1B7NQxnx5vyVUmTNeWWtuTgikhniZUaMQFNX pZwJDVnY6QdpZ7jVkc+gv0xTK5gbWNry01vSUxImMKV4GCPZYL9Ktsl8jeM0Qw== 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=1780095668; 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=ihgKTugkycgei/NmFem4BwcZP51NGVHH5CcuPeGdBdU=; b=mmHOulmUOhL2sCDwW/E1iGL9cz+T7DDTM6kUpA+TXt+ziI87dXQtZ7ifhNsfOipvEG70lS Ry5s0BFN4etf/ey0gSWar5BzgUkNf1WJnX4AfH8US//tocm/X4wVQ7OKXLQuFTzm2QuBSn yJ5rP6ifwJVCCYYgsrxkkOOHFsgJXEsNhvuKYprnEK6lyoM+2T27wOCzbqzqrsZH1k+LIA K8H9q+r/QSajMy8PUJqVBRpH/Eu8dda2j0LxmlbBa/XnjqL1ykcd0uJqJAqvRA92hd8p0E qdAkrlzaNSLu8p3Bfwws3FXT8udDFU2kXnNyJ+ckYrOFMkSCFFfv7bxm3PeakQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzP04KsvztR4 for ; Fri, 29 May 2026 23:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41426 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:01:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: f5fe24ba5805 - stable/15 - Revert "libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5:" 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: f5fe24ba58054e425688458ad641364338dd9393 Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:01:08 +0000 Message-Id: <6a1a1ab4.41426.3150c969@gitrepo.freebsd.org> The branch stable/15 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f5fe24ba58054e425688458ad641364338dd9393 commit f5fe24ba58054e425688458ad641364338dd9393 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:16 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:57:29 +0000 Revert "libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5:" This reverts commit 6933315cf57fc3f505431bff7a0075df471d7453, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month (cherry picked from commit f3b0cac70b80116e691ad1e6daa5110186233206) --- .../libcxx/include/__type_traits/is_enum.h | 10 +++++++ .../libcxx/include/__type_traits/is_scoped_enum.h | 33 ---------------------- .../llvm-project/libcxx/include/module.modulemap | 1 - contrib/llvm-project/libcxx/include/type_traits | 4 --- 4 files changed, 10 insertions(+), 38 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h index 77ca3ea10874..2fab6db2c8d5 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h @@ -26,6 +26,16 @@ template inline constexpr bool is_enum_v = __is_enum(_Tp); #endif +#if _LIBCPP_STD_VER >= 23 + +template +struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; + +template +inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); + +#endif // _LIBCPP_STD_VER >= 23 + _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP___TYPE_TRAITS_IS_ENUM_H diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h deleted file mode 100644 index cb3e25cf5733..000000000000 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h +++ /dev/null @@ -1,33 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H -#define _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H - -#include <__config> -#include <__type_traits/integral_constant.h> - -#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) -# pragma GCC system_header -#endif - -_LIBCPP_BEGIN_NAMESPACE_STD - -#if _LIBCPP_STD_VER >= 23 - -template -struct _LIBCPP_TEMPLATE_VIS is_scoped_enum : bool_constant<__is_scoped_enum(_Tp)> {}; - -template -inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp); - -#endif // _LIBCPP_STD_VER >= 23 - -_LIBCPP_END_NAMESPACE_STD - -#endif // _LIBCPP___TYPE_TRAITS_IS_SCOPED_ENUM_H diff --git a/contrib/llvm-project/libcxx/include/module.modulemap b/contrib/llvm-project/libcxx/include/module.modulemap index d76659664f75..13d0dce34d97 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -2013,7 +2013,6 @@ module std_private_type_traits_is_scalar [system header "__type_traits/is_scalar.h" export std_private_type_traits_is_null_pointer } -module std_private_type_traits_is_scoped_enum [system] { header "__type_traits/is_scoped_enum.h" } module std_private_type_traits_is_signed [system] { header "__type_traits/is_signed.h" } module std_private_type_traits_is_signed_integer [system] { header "__type_traits/is_signed_integer.h" } module std_private_type_traits_is_specialization [system] { header "__type_traits/is_specialization.h" } diff --git a/contrib/llvm-project/libcxx/include/type_traits b/contrib/llvm-project/libcxx/include/type_traits index ffa137338b6a..7f231cd09df5 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -514,10 +514,6 @@ namespace std # include <__type_traits/unwrap_ref.h> #endif -#if _LIBCPP_STD_VER >= 23 -# include <__type_traits/is_scoped_enum.h> -#endif - #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)