From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7934) id AEA9F3858D3C; Fri, 9 Feb 2024 18:12:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AEA9F3858D3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1707502332; bh=ixWQ2CjubPaOM7YYiud3cbQNmBdE6cLzyVQaU/k8Vdo=; h=From:To:Subject:Date:From; b=tJ/YehK+DufdUK7b1RzXNOqeZ6IXJgSlbVvUs7SEPwL6s8na5JmUxiMc5ZmX36m+R UxwfwnjrKpB7u2+B6ISoSLlSTVLFlhYed62Kxuw2yv4wWFjO8hz5CfltcNb4uevkFG kCq479WUut3QS1pXLx7Vyq4SJA2SevL8M0cqBEMU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Ken Matsui To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-8901] libstdc++: Use _GLIBCXX_USE_BUILTIN_TRAIT for is_same X-Act-Checkin: gcc X-Git-Author: Ken Matsui X-Git-Refname: refs/heads/master X-Git-Oldrev: f931bd7725f5cea948dd55ac370b5b9fd9a00198 X-Git-Newrev: 41a6d2560500a202708e7b661b8b2ad432aee3a6 Message-Id: <20240209181212.AEA9F3858D3C@sourceware.org> Date: Fri, 9 Feb 2024 18:12:12 +0000 (GMT) List-Id: https://gcc.gnu.org/g:41a6d2560500a202708e7b661b8b2ad432aee3a6 commit r14-8901-g41a6d2560500a202708e7b661b8b2ad432aee3a6 Author: Ken Matsui Date: Thu Feb 8 00:12:07 2024 -0800 libstdc++: Use _GLIBCXX_USE_BUILTIN_TRAIT for is_same Since is_same has a fallback native implementation, and _GLIBCXX_HAVE_BUILTIN_IS_SAME does not support toggling which implementation to use, we remove the _GLIBCXX_HAVE_BUILTIN_IS_SAME definition and use _GLIBCXX_USE_BUILTIN_TRAIT instead. libstdc++-v3/ChangeLog: * include/bits/c++config (_GLIBCXX_HAVE_BUILTIN_IS_SAME): Removed. * include/std/type_traits (is_same): Use _GLIBCXX_USE_BUILTIN_TRAIT instead of _GLIBCXX_HAVE_BUILTIN_IS_SAME. (is_same_v): Likewise. Signed-off-by: Ken Matsui Reviewed-by: Patrick Palka Reviewed-by: Jonathan Wakely Diff: --- libstdc++-v3/include/bits/c++config | 4 ---- libstdc++-v3/include/std/type_traits | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index ad07ce92d5f4..b57e3f338e92 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -845,10 +845,6 @@ namespace __gnu_cxx # define _GLIBCXX_HAVE_BUILTIN_IS_AGGREGATE 1 #endif -#if _GLIBCXX_HAS_BUILTIN(__is_same) -# define _GLIBCXX_HAVE_BUILTIN_IS_SAME 1 -#endif - #if _GLIBCXX_HAS_BUILTIN(__builtin_launder) # define _GLIBCXX_HAVE_BUILTIN_LAUNDER 1 #endif diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index a9bb2806ca9c..21402fd8c132 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1470,16 +1470,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Type relations. /// is_same +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_same) template struct is_same -#ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME : public __bool_constant<__is_same(_Tp, _Up)> + { }; #else + template + struct is_same : public false_type -#endif { }; -#ifndef _GLIBCXX_HAVE_BUILTIN_IS_SAME template struct is_same<_Tp, _Tp> : public true_type @@ -3496,7 +3497,7 @@ template template inline constexpr size_t extent_v<_Tp[], _Idx> = extent_v<_Tp, _Idx - 1>; -#ifdef _GLIBCXX_HAVE_BUILTIN_IS_SAME +#if _GLIBCXX_USE_BUILTIN_TRAIT(__is_same) template inline constexpr bool is_same_v = __is_same(_Tp, _Up); #else