From nobody Sat Apr 25 14:18:42 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 4g2sPv0Q1Fz6bZ9Y for ; Sat, 25 Apr 2026 14:18:43 +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 4g2sPt4l1fz3FRt for ; Sat, 25 Apr 2026 14:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126722; 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=7OXYoPqgTQe0Js+HV6JLpmz+QUlos1NqcPRmAYvAydM=; b=bguQIO1iJP+2Ta6yUQg4pKXPGGG2I0TJgZaeHFp9YU6XtNPFuzFqKP5PtnG6nAlKHJ/0h+ nY6h6n1Sn/HD6t/JzGiaFD/SC8dmhCM2FVRNv7ln5xR8cBgDWnQMJ7N5KSZgaRiAzgD+rE Z+EeulJG4qV2yFNMrKjoT9NjDL5W559sxvT6SmT6NybIHedbhKTpnr2BxRNt1dvaG4JUz7 PBsQ8zlisxQjcTNX27kbS5Cm4GiGye92BWowS3h5mCeJv4TyUysslImpZfB6W7TuQ4/og3 U1t3iDYyGD+Eywqe7Uumg3bDypnUuuonQ/AWfs4mzm4TsMwToP1Uaw+V2dkXig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126722; a=rsa-sha256; cv=none; b=HpzhrImZmq5nqoj10/XwJo+A2x27zHXh7h+k5ivEU5Q8bVlayDJebpR5TGyLc/s2eu11KZ jyJwWkUg7X/S1DVe9nJaZmQUPvxRooW4cp9JidTPlRfelSjLfrqdj0jkMZxJ7TyzgUXd4b nbOaaHdypmoD/YXEt4F2ac2HH7PBCXCiF6Tr+5+LkLylDjHh8aZJa6DDVgx9BAnUHEzo0u lrpY88YIH3KduId7fXqRHaw+AyoO88UlaJsFxL3+VG6Gq92i5rgVoLZg6TVcYrSaeN4gih mviu6RYIy1GVG1tDh4tgZgGJaPTL6dMyUQ7EOIgybAun3yiEPO87vYNZMcXZnA== 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=1777126722; 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=7OXYoPqgTQe0Js+HV6JLpmz+QUlos1NqcPRmAYvAydM=; b=M8x0m/1iPdLLjije0OY/we93pHVJHY5MmL32c900HFWjjk0nW/etRN0lYAv7AGvMYVk1Ik W0YUuR7LVRtCdwt9hC/76u/gHvT5NZDjud8XkN8CMSs3h5XHVwKeeU5TScenxBFkNL7EM+ d74i1JvP/gusA24Q0DfLbjHFY0R1kvV7oRbHLT+uRKpnN+hsUtp6ajwFSEQTQ/zVUQjCYw Xg30xRyro68CbOkfXEPBzvsryTHH51enI8IhKGp5wVbfLb0vWIe6bSS8Gk6gRC6+mvpKNG CXzg1sAT/Uf6RVK5kxnWSjYHtVqmizxCScJFytSnIuAk8K+J+kpl3/egftTu3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPt4Jgwzcqs for ; Sat, 25 Apr 2026 14:18:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: f3b0cac70b80 - main - Revert "libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5:" 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: f3b0cac70b80116e691ad1e6daa5110186233206 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:42 +0000 Message-Id: <69eccd42.366d2.12b358fa@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f3b0cac70b80116e691ad1e6daa5110186233206 commit f3b0cac70b80116e691ad1e6daa5110186233206 Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:16 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:07:43 +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 --- .../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)