From nobody Sun Dec 1 11:18:37 2024 X-Original-To: dev-commits-src-branches@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 4Y1PYV1ZFQz5fTKd; Sun, 01 Dec 2024 11:18:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1PYV0N8dz42QZ; Sun, 1 Dec 2024 11:18:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051918; 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=rifYFBeerGCuVKaxoTSP7b+YfUlNj54GhlKDNhe83aA=; b=P9MTTd0sYV9YbgqLMRI6SyRd3uEG96YddaedvuXQFT6MX8U6gvOPfTEAnBtJvHh3qJ1aB0 mbLRoJwnn7wwdUlTg8tqokUkv44K6FS9t2q7jC0gwjibFHo44TmoiPqgMDEY4ORjA5JmbJ 9UDNzOryeOn8Gkf0e075SBrs1b7iM90G8K/S2MsU81LYZ+fJ3uXe2j5GmFQAEfCbq3Dvi+ 6jUwlwYxgAjkMHiXFOwDJIUm+A1Dlu4j+BQUGOFtCTj6PWgoEsn+8l2HThHtGwYgYNdkaD 50Qo+QJpVfRGGPeSboyCtNX2a0NzJQWZxwazh1lhvyWhlVG9/BTRI+SxqTHuag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733051918; 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=rifYFBeerGCuVKaxoTSP7b+YfUlNj54GhlKDNhe83aA=; b=hAJOIwCt405pAh7THiDW80o4svjtLtA+D2ZI7KhHTXqyVK7TEARQGjEg+qXIrltXWEil1M BRNFAOYdUCYGxN1PIh4/4YyavKj+/2SHkumJr+v0S8WypIO4LHkjfZ/bkjBWoQWlU1rBur qc81Qj7VEJ5N81u5L9VtAkBMrtln3u59oONHhVT7QQspWBZ3rp71R5RCEzV5a5jXYHUnuK PKKlkFodVDMECpywAs9ehamgwcfgkR8eSuWAGeg0lF+9g0NBiSkNdtzIkO8NOXISm1YC/M us3yEPw0XHWNlXss+NfRDoE3XkcMa0wtSV+QAIxJCfcH+G+NzjCqO+1LfFI7SQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733051918; a=rsa-sha256; cv=none; b=w1s5afrEiLyJxt1XjOYImCI3vatBAjeGGzf021sRJFxWwaNagNWPQM90m6MSErNTfu1rQn 10FYYcriKR6KWNqEgGSpqMRMeFwSAgLctWpKllbJYUnWIBD1YfLgowF8xFbnNrQnZD83s+ jLtMjApjFrAIWOs1aEmabRS91r3HNAMj+vmtoYiS3xOzTn6WCZFT9c9AgIyfHdB+aAO/nl i+q3RY8quVBUAC3yNaYnAOoEfQajly1q6/FLbKHyWKoWT86Nr9LgFxe1BAiWFv8Ms5zVW0 30FFA/OYELR7mBuop2tpiYNDYQr7uDeulRf8u6mTPqS/Uvuy3vov2Scfdv/ZbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y1PYT5h5Zzqnf; Sun, 1 Dec 2024 11:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B1BIbRu008032; Sun, 1 Dec 2024 11:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B1BIbPi008029; Sun, 1 Dec 2024 11:18:37 GMT (envelope-from git) Date: Sun, 1 Dec 2024 11:18:37 GMT Message-Id: <202412011118.4B1BIbPi008029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: df90f45043a8 - stable/14 - libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5: List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: df90f45043a802ebccb9de62acfaec45db934813 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=df90f45043a802ebccb9de62acfaec45db934813 commit df90f45043a802ebccb9de62acfaec45db934813 Author: Dimitry Andric AuthorDate: 2024-08-05 20:16:04 +0000 Commit: Dimitry Andric CommitDate: 2024-12-01 11:17:09 +0000 libcxx-compat: revert llvmorg-19-init-18062-g4dfa75c663e5: [libc++] Merge is_scoped_enum.h into is_enum.h (#99458) PR: 280562 MFC after: 1 month (cherry picked from commit 04f5b79cfa4972b371e7751dee5bbfaa91f2f2fc) --- .../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, 38 insertions(+), 10 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 2fab6db2c8d5..77ca3ea10874 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_enum.h @@ -26,16 +26,6 @@ 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 new file mode 100644 index 000000000000..cb3e25cf5733 --- /dev/null +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_scoped_enum.h @@ -0,0 +1,33 @@ +//===----------------------------------------------------------------------===// +// +// 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 13d0dce34d97..d76659664f75 100644 --- a/contrib/llvm-project/libcxx/include/module.modulemap +++ b/contrib/llvm-project/libcxx/include/module.modulemap @@ -2013,6 +2013,7 @@ 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 7f231cd09df5..ffa137338b6a 100644 --- a/contrib/llvm-project/libcxx/include/type_traits +++ b/contrib/llvm-project/libcxx/include/type_traits @@ -514,6 +514,10 @@ 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)