* [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-07-15 4:55 ` [PATCH v2 1/3] c++, libstdc++: Implement " Ken Matsui
@ 2023-07-15 4:55 ` Ken Matsui
2023-07-16 12:32 ` François Dumont
2023-08-08 20:09 ` Jonathan Wakely
2023-07-15 4:55 ` [PATCH v2 3/3] libstdc++: Optimize is_fundamental " Ken Matsui
` (3 subsequent siblings)
4 siblings, 2 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-15 4:55 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_arithmetic trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_arithmetic): Use __is_arithmetic
built-in trait.
(is_arithmetic_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..7ebbe04c77b 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
/// is_arithmetic
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_arithmetic
+ : public __bool_constant<__is_arithmetic(_Tp)>
+ { };
+#else
template<typename _Tp>
struct is_arithmetic
: public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
{ };
+#endif
/// is_fundamental
template<typename _Tp>
@@ -3198,8 +3205,15 @@ template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&> = true;
template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&&> = true;
+
+#if __has_builtin(__is_arithmetic)
+template <typename _Tp>
+ inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-07-15 4:55 ` [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
@ 2023-07-16 12:32 ` François Dumont
2023-07-17 4:48 ` Ken Matsui
2023-08-08 20:09 ` Jonathan Wakely
1 sibling, 1 reply; 41+ messages in thread
From: François Dumont @ 2023-07-16 12:32 UTC (permalink / raw)
To: Ken Matsui, gcc-patches; +Cc: libstdc++
On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> This patch optimizes the performance of the is_arithmetic trait by
> dispatching to the new __is_arithmetic built-in trait.
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_arithmetic): Use __is_arithmetic
> built-in trait.
> (is_arithmetic_v): Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> index 0e7a9c9c7f3..7ebbe04c77b 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> { };
>
> /// is_arithmetic
> +#if __has_builtin(__is_arithmetic)
> + template<typename _Tp>
> + struct is_arithmetic
> + : public __bool_constant<__is_arithmetic(_Tp)>
> + { };
> +#else
> template<typename _Tp>
> struct is_arithmetic
> : public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
> { };
> +#endif
>
> /// is_fundamental
> template<typename _Tp>
> @@ -3198,8 +3205,15 @@ template <typename _Tp>
> inline constexpr bool is_reference_v<_Tp&> = true;
> template <typename _Tp>
> inline constexpr bool is_reference_v<_Tp&&> = true;
> +
> +#if __has_builtin(__is_arithmetic)
> +template <typename _Tp>
> + inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
> +#else
> template <typename _Tp>
> inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
> +#endif
> +
> template <typename _Tp>
> inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
> template <typename _Tp>
Same remark as the one I did for __is_pointer in cpp_type_traits.h. You
could implement it as:
template<typename _Tp>
struct __is_arithmetic_t
: public __truth_type<__is_arithmetic(_Tp)>
{ };
François
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-07-16 12:32 ` François Dumont
@ 2023-07-17 4:48 ` Ken Matsui
2023-07-22 13:39 ` François Dumont
0 siblings, 1 reply; 41+ messages in thread
From: Ken Matsui @ 2023-07-17 4:48 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
On Sun, Jul 16, 2023 at 5:32 AM François Dumont <frs.dumont@gmail.com> wrote:
>
>
> On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > This patch optimizes the performance of the is_arithmetic trait by
> > dispatching to the new __is_arithmetic built-in trait.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/std/type_traits (is_arithmetic): Use __is_arithmetic
> > built-in trait.
> > (is_arithmetic_v): Likewise.
> >
> > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > ---
> > libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
> > 1 file changed, 14 insertions(+)
> >
> > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > index 0e7a9c9c7f3..7ebbe04c77b 100644
> > --- a/libstdc++-v3/include/std/type_traits
> > +++ b/libstdc++-v3/include/std/type_traits
> > @@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > { };
> >
> > /// is_arithmetic
> > +#if __has_builtin(__is_arithmetic)
> > + template<typename _Tp>
> > + struct is_arithmetic
> > + : public __bool_constant<__is_arithmetic(_Tp)>
> > + { };
> > +#else
> > template<typename _Tp>
> > struct is_arithmetic
> > : public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
> > { };
> > +#endif
> >
> > /// is_fundamental
> > template<typename _Tp>
> > @@ -3198,8 +3205,15 @@ template <typename _Tp>
> > inline constexpr bool is_reference_v<_Tp&> = true;
> > template <typename _Tp>
> > inline constexpr bool is_reference_v<_Tp&&> = true;
> > +
> > +#if __has_builtin(__is_arithmetic)
> > +template <typename _Tp>
> > + inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
> > +#else
> > template <typename _Tp>
> > inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
> > +#endif
> > +
> > template <typename _Tp>
> > inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
> > template <typename _Tp>
>
> Same remark as the one I did for __is_pointer in cpp_type_traits.h. You
> could implement it as:
>
> template<typename _Tp>
> struct __is_arithmetic_t
> : public __truth_type<__is_arithmetic(_Tp)>
> { };
>
> François
>
Thank you for your review! This is from the type_traits header, so the
name should be as-is.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-07-17 4:48 ` Ken Matsui
@ 2023-07-22 13:39 ` François Dumont
0 siblings, 0 replies; 41+ messages in thread
From: François Dumont @ 2023-07-22 13:39 UTC (permalink / raw)
To: Ken Matsui; +Cc: Ken Matsui, gcc-patches, libstdc++
On 17/07/2023 06:48, Ken Matsui wrote:
> On Sun, Jul 16, 2023 at 5:32 AM François Dumont <frs.dumont@gmail.com> wrote:
>>
>> On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
>>> This patch optimizes the performance of the is_arithmetic trait by
>>> dispatching to the new __is_arithmetic built-in trait.
>>>
>>> libstdc++-v3/ChangeLog:
>>>
>>> * include/std/type_traits (is_arithmetic): Use __is_arithmetic
>>> built-in trait.
>>> (is_arithmetic_v): Likewise.
>>>
>>> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>>> ---
>>> libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
>>> 1 file changed, 14 insertions(+)
>>>
>>> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>>> index 0e7a9c9c7f3..7ebbe04c77b 100644
>>> --- a/libstdc++-v3/include/std/type_traits
>>> +++ b/libstdc++-v3/include/std/type_traits
>>> @@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>> { };
>>>
>>> /// is_arithmetic
>>> +#if __has_builtin(__is_arithmetic)
>>> + template<typename _Tp>
>>> + struct is_arithmetic
>>> + : public __bool_constant<__is_arithmetic(_Tp)>
>>> + { };
>>> +#else
>>> template<typename _Tp>
>>> struct is_arithmetic
>>> : public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
>>> { };
>>> +#endif
>>>
>>> /// is_fundamental
>>> template<typename _Tp>
>>> @@ -3198,8 +3205,15 @@ template <typename _Tp>
>>> inline constexpr bool is_reference_v<_Tp&> = true;
>>> template <typename _Tp>
>>> inline constexpr bool is_reference_v<_Tp&&> = true;
>>> +
>>> +#if __has_builtin(__is_arithmetic)
>>> +template <typename _Tp>
>>> + inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
>>> +#else
>>> template <typename _Tp>
>>> inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
>>> +#endif
>>> +
>>> template <typename _Tp>
>>> inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
>>> template <typename _Tp>
>> Same remark as the one I did for __is_pointer in cpp_type_traits.h. You
>> could implement it as:
>>
>> template<typename _Tp>
>> struct __is_arithmetic_t
>> : public __truth_type<__is_arithmetic(_Tp)>
>> { };
>>
>> François
>>
> Thank you for your review! This is from the type_traits header, so the
> name should be as-is.
Here I meant that current libstdc++ implementation of
std::__is_arithmetic in cpp_type_traits.h should also make use of the
builtin __is_arithmetic that you are introducing. That is to say replace
this:
template<typename _Tp>
struct __is_arithmetic
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
by:
#if __has_builtin(__is_arithmetic)
template<typename _Tp>
struct __is_arithmetic_t
: public __truth_type<__is_arithmetic<_Tp>>
{ };
#else
template<typename _Tp>
struct __is_arithmetic_t
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
#endif
if you replace '__is_arithmetic' by '__is_arithmetic_t' for the
libstdc++, just adapt to the name you eventually adopt.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-07-15 4:55 ` [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
2023-07-16 12:32 ` François Dumont
@ 2023-08-08 20:09 ` Jonathan Wakely
2023-08-08 20:28 ` Jonathan Wakely
1 sibling, 1 reply; 41+ messages in thread
From: Jonathan Wakely @ 2023-08-08 20:09 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 1880 bytes --]
On Sat, 15 Jul 2023 at 05:57, Ken Matsui via Libstdc++ <
libstdc++@gcc.gnu.org> wrote:
> This patch optimizes the performance of the is_arithmetic trait by
> dispatching to the new __is_arithmetic built-in trait.
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_arithmetic): Use __is_arithmetic
> built-in trait.
> (is_arithmetic_v): Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>
OK for trunk (if the front-end changes are approved).
> ---
> libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> index 0e7a9c9c7f3..7ebbe04c77b 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> { };
>
> /// is_arithmetic
> +#if __has_builtin(__is_arithmetic)
> + template<typename _Tp>
> + struct is_arithmetic
> + : public __bool_constant<__is_arithmetic(_Tp)>
> + { };
> +#else
> template<typename _Tp>
> struct is_arithmetic
> : public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
> { };
> +#endif
>
> /// is_fundamental
> template<typename _Tp>
> @@ -3198,8 +3205,15 @@ template <typename _Tp>
> inline constexpr bool is_reference_v<_Tp&> = true;
> template <typename _Tp>
> inline constexpr bool is_reference_v<_Tp&&> = true;
> +
> +#if __has_builtin(__is_arithmetic)
> +template <typename _Tp>
> + inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
> +#else
> template <typename _Tp>
> inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
> +#endif
> +
> template <typename _Tp>
> inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
> template <typename _Tp>
> --
> 2.41.0
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-08-08 20:09 ` Jonathan Wakely
@ 2023-08-08 20:28 ` Jonathan Wakely
0 siblings, 0 replies; 41+ messages in thread
From: Jonathan Wakely @ 2023-08-08 20:28 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 2110 bytes --]
On Tue, 8 Aug 2023 at 21:09, Jonathan Wakely <jwakely@redhat.com> wrote:
>
>
> On Sat, 15 Jul 2023 at 05:57, Ken Matsui via Libstdc++ <
> libstdc++@gcc.gnu.org> wrote:
>
>> This patch optimizes the performance of the is_arithmetic trait by
>> dispatching to the new __is_arithmetic built-in trait.
>>
>> libstdc++-v3/ChangeLog:
>>
>> * include/std/type_traits (is_arithmetic): Use __is_arithmetic
>> built-in trait.
>> (is_arithmetic_v): Likewise.
>>
>> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>>
>
> OK for trunk (if the front-end changes are approved).
>
Oh, this is the v2 patch and there's a v4 ... but I think they're the same.
>
>
>
>
>> ---
>> libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
>> 1 file changed, 14 insertions(+)
>>
>> diff --git a/libstdc++-v3/include/std/type_traits
>> b/libstdc++-v3/include/std/type_traits
>> index 0e7a9c9c7f3..7ebbe04c77b 100644
>> --- a/libstdc++-v3/include/std/type_traits
>> +++ b/libstdc++-v3/include/std/type_traits
>> @@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> { };
>>
>> /// is_arithmetic
>> +#if __has_builtin(__is_arithmetic)
>> + template<typename _Tp>
>> + struct is_arithmetic
>> + : public __bool_constant<__is_arithmetic(_Tp)>
>> + { };
>> +#else
>> template<typename _Tp>
>> struct is_arithmetic
>> : public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
>> { };
>> +#endif
>>
>> /// is_fundamental
>> template<typename _Tp>
>> @@ -3198,8 +3205,15 @@ template <typename _Tp>
>> inline constexpr bool is_reference_v<_Tp&> = true;
>> template <typename _Tp>
>> inline constexpr bool is_reference_v<_Tp&&> = true;
>> +
>> +#if __has_builtin(__is_arithmetic)
>> +template <typename _Tp>
>> + inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
>> +#else
>> template <typename _Tp>
>> inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
>> +#endif
>> +
>> template <typename _Tp>
>> inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
>> template <typename _Tp>
>> --
>> 2.41.0
>>
>>
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-15 4:55 ` [PATCH v2 1/3] c++, libstdc++: Implement " Ken Matsui
2023-07-15 4:55 ` [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
@ 2023-07-15 4:55 ` Ken Matsui
2023-07-15 5:07 ` Ken Matsui
2023-07-16 12:41 ` François Dumont
2023-07-16 12:27 ` [PATCH v2 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait François Dumont
` (2 subsequent siblings)
4 siblings, 2 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-15 4:55 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_fundamental trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_fundamental_v): Use __is_arithmetic
built-in trait.
(is_fundamental): Likewise. Optimize the original implementation.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 7ebbe04c77b..cf24de2fcac 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
/// is_fundamental
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_fundamental
+ : public __bool_constant<__is_arithmetic(_Tp)
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
+ { };
+#else
template<typename _Tp>
struct is_fundamental
- : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
- is_null_pointer<_Tp>>::type
+ : public __bool_constant<is_arithmetic<_Tp>::value
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
{ };
+#endif
/// is_object
template<typename _Tp>
@@ -3209,13 +3219,16 @@ template <typename _Tp>
#if __has_builtin(__is_arithmetic)
template <typename _Tp>
inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+template <typename _Tp>
+ inline constexpr bool is_fundamental_v
+ = __is_arithmetic(_Tp) || is_void_v<_Tp> || is_null_pointer_v<_Tp>;
#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
-#endif
-
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_object_v = is_object<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-15 4:55 ` [PATCH v2 3/3] libstdc++: Optimize is_fundamental " Ken Matsui
@ 2023-07-15 5:07 ` Ken Matsui
2023-07-16 12:41 ` François Dumont
1 sibling, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-15 5:07 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
Hi,
Here are the benchmarks for this change:
* is_fundamental
https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental.md#fri-jul-14-091146-pm-pdt-2023
Time: -37.1619%
Peak Memory Usage: -29.4294%
Total Memory Usage: -29.4783%
* is_fundamental_v
https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental_v.md#fri-jul-14-091757-pm-pdt-2023
Time: -35.5446%
Peak Memory Usage: -30.0096%
Total Memory Usage: -30.6021%
* is_fundamental with bool_constant (on trunk
[18dac101678b8c0aed4bd995351e47f26cd54dec])
https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-bool_constant.md#fri-jul-14-094237-pm-pdt-2023
Time: -28.3908%
Peak Memory Usage: -18.5403%
Total Memory Usage: -19.9045%
---
It appears using bool_constant is better than disjunction. If my
understanding is correct, disjunction can avoid later instantiations
when short-circuiting, but might the evaluation of disjunction be more
expensive than evaluating is_void and is_null_pointer? Or my benchmark
might be just incorrect.
Sincerely,
Ken Matsui
On Fri, Jul 14, 2023 at 9:57 PM Ken Matsui <kmatsui@gcc.gnu.org> wrote:
>
> This patch optimizes the performance of the is_fundamental trait by
> dispatching to the new __is_arithmetic built-in trait.
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
> built-in trait.
> (is_fundamental): Likewise. Optimize the original implementation.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> index 7ebbe04c77b..cf24de2fcac 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #endif
>
> /// is_fundamental
> +#if __has_builtin(__is_arithmetic)
> + template<typename _Tp>
> + struct is_fundamental
> + : public __bool_constant<__is_arithmetic(_Tp)
> + || is_void<_Tp>::value
> + || is_null_pointer<_Tp>::value>
> + { };
> +#else
> template<typename _Tp>
> struct is_fundamental
> - : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
> - is_null_pointer<_Tp>>::type
> + : public __bool_constant<is_arithmetic<_Tp>::value
> + || is_void<_Tp>::value
> + || is_null_pointer<_Tp>::value>
> { };
> +#endif
>
> /// is_object
> template<typename _Tp>
> @@ -3209,13 +3219,16 @@ template <typename _Tp>
> #if __has_builtin(__is_arithmetic)
> template <typename _Tp>
> inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
> +template <typename _Tp>
> + inline constexpr bool is_fundamental_v
> + = __is_arithmetic(_Tp) || is_void_v<_Tp> || is_null_pointer_v<_Tp>;
> #else
> template <typename _Tp>
> inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
> -#endif
> -
> template <typename _Tp>
> inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
> +#endif
> +
> template <typename _Tp>
> inline constexpr bool is_object_v = is_object<_Tp>::value;
> template <typename _Tp>
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-15 4:55 ` [PATCH v2 3/3] libstdc++: Optimize is_fundamental " Ken Matsui
2023-07-15 5:07 ` Ken Matsui
@ 2023-07-16 12:41 ` François Dumont
2023-07-17 4:49 ` Ken Matsui
1 sibling, 1 reply; 41+ messages in thread
From: François Dumont @ 2023-07-16 12:41 UTC (permalink / raw)
To: Ken Matsui, gcc-patches; +Cc: libstdc++
On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> This patch optimizes the performance of the is_fundamental trait by
> dispatching to the new __is_arithmetic built-in trait.
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
> built-in trait.
> (is_fundamental): Likewise. Optimize the original implementation.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> index 7ebbe04c77b..cf24de2fcac 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #endif
>
> /// is_fundamental
> +#if __has_builtin(__is_arithmetic)
> + template<typename _Tp>
> + struct is_fundamental
> + : public __bool_constant<__is_arithmetic(_Tp)
> + || is_void<_Tp>::value
> + || is_null_pointer<_Tp>::value>
> + { };
What about doing this ?
template<typename _Tp>
struct is_fundamental
: public __bool_constant<__is_arithmetic(_Tp)
|| __or_<is_void<_Tp>,
is_null_pointer<_Tp>>::value>
{ };
Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-16 12:41 ` François Dumont
@ 2023-07-17 4:49 ` Ken Matsui
2023-07-18 6:24 ` Ken Matsui
0 siblings, 1 reply; 41+ messages in thread
From: Ken Matsui @ 2023-07-17 4:49 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
>
>
> On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > This patch optimizes the performance of the is_fundamental trait by
> > dispatching to the new __is_arithmetic built-in trait.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
> > built-in trait.
> > (is_fundamental): Likewise. Optimize the original implementation.
> >
> > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > ---
> > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> > 1 file changed, 17 insertions(+), 4 deletions(-)
> >
> > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > index 7ebbe04c77b..cf24de2fcac 100644
> > --- a/libstdc++-v3/include/std/type_traits
> > +++ b/libstdc++-v3/include/std/type_traits
> > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > #endif
> >
> > /// is_fundamental
> > +#if __has_builtin(__is_arithmetic)
> > + template<typename _Tp>
> > + struct is_fundamental
> > + : public __bool_constant<__is_arithmetic(_Tp)
> > + || is_void<_Tp>::value
> > + || is_null_pointer<_Tp>::value>
> > + { };
>
> What about doing this ?
>
> template<typename _Tp>
> struct is_fundamental
> : public __bool_constant<__is_arithmetic(_Tp)
> || __or_<is_void<_Tp>,
> is_null_pointer<_Tp>>::value>
> { };
>
> Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
>
Let me take a benchmark for this later.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-17 4:49 ` Ken Matsui
@ 2023-07-18 6:24 ` Ken Matsui
2023-07-18 6:26 ` Ken Matsui
` (2 more replies)
0 siblings, 3 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 6:24 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
Hi,
I took a benchmark for this.
https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
template<typename _Tp>
struct is_fundamental
: public std::bool_constant<__is_arithmetic(_Tp)
|| std::is_void<_Tp>::value
|| std::is_null_pointer<_Tp>::value>
{ };
is faster than:
template<typename _Tp>
struct is_fundamental
: public std::bool_constant<__is_arithmetic(_Tp)
|| std::disjunction<std::is_void<_Tp>,
std::is_null_pointer<_Tp>
>::value>
{ };
Time: -32.2871%
Peak Memory: -18.5071%
Total Memory: -20.1991%
Sincerely,
Ken Matsui
On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
> >
> >
> > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > > This patch optimizes the performance of the is_fundamental trait by
> > > dispatching to the new __is_arithmetic built-in trait.
> > >
> > > libstdc++-v3/ChangeLog:
> > >
> > > * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
> > > built-in trait.
> > > (is_fundamental): Likewise. Optimize the original implementation.
> > >
> > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > > ---
> > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> > > 1 file changed, 17 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > > index 7ebbe04c77b..cf24de2fcac 100644
> > > --- a/libstdc++-v3/include/std/type_traits
> > > +++ b/libstdc++-v3/include/std/type_traits
> > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > #endif
> > >
> > > /// is_fundamental
> > > +#if __has_builtin(__is_arithmetic)
> > > + template<typename _Tp>
> > > + struct is_fundamental
> > > + : public __bool_constant<__is_arithmetic(_Tp)
> > > + || is_void<_Tp>::value
> > > + || is_null_pointer<_Tp>::value>
> > > + { };
> >
> > What about doing this ?
> >
> > template<typename _Tp>
> > struct is_fundamental
> > : public __bool_constant<__is_arithmetic(_Tp)
> > || __or_<is_void<_Tp>,
> > is_null_pointer<_Tp>>::value>
> > { };
> >
> > Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
> >
> Let me take a benchmark for this later.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-18 6:24 ` Ken Matsui
@ 2023-07-18 6:26 ` Ken Matsui
2023-08-08 20:14 ` Jonathan Wakely
2023-07-22 13:45 ` François Dumont
2023-08-08 20:18 ` Jonathan Wakely
2 siblings, 1 reply; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 6:26 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
I will eventually work on disjunction to somehow optimize, but in the
meantime, this might be a better implementation. Of course, my
benchmark could be wrong.
On Mon, Jul 17, 2023 at 11:24 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> Hi,
>
> I took a benchmark for this.
>
> https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
>
> template<typename _Tp>
> struct is_fundamental
> : public std::bool_constant<__is_arithmetic(_Tp)
> || std::is_void<_Tp>::value
> || std::is_null_pointer<_Tp>::value>
> { };
>
> is faster than:
>
> template<typename _Tp>
> struct is_fundamental
> : public std::bool_constant<__is_arithmetic(_Tp)
> || std::disjunction<std::is_void<_Tp>,
> std::is_null_pointer<_Tp>
> >::value>
> { };
>
> Time: -32.2871%
> Peak Memory: -18.5071%
> Total Memory: -20.1991%
>
> Sincerely,
> Ken Matsui
>
> On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
> >
> > On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
> > >
> > >
> > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > > > This patch optimizes the performance of the is_fundamental trait by
> > > > dispatching to the new __is_arithmetic built-in trait.
> > > >
> > > > libstdc++-v3/ChangeLog:
> > > >
> > > > * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
> > > > built-in trait.
> > > > (is_fundamental): Likewise. Optimize the original implementation.
> > > >
> > > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > > > ---
> > > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> > > > 1 file changed, 17 insertions(+), 4 deletions(-)
> > > >
> > > > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > > > index 7ebbe04c77b..cf24de2fcac 100644
> > > > --- a/libstdc++-v3/include/std/type_traits
> > > > +++ b/libstdc++-v3/include/std/type_traits
> > > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > > #endif
> > > >
> > > > /// is_fundamental
> > > > +#if __has_builtin(__is_arithmetic)
> > > > + template<typename _Tp>
> > > > + struct is_fundamental
> > > > + : public __bool_constant<__is_arithmetic(_Tp)
> > > > + || is_void<_Tp>::value
> > > > + || is_null_pointer<_Tp>::value>
> > > > + { };
> > >
> > > What about doing this ?
> > >
> > > template<typename _Tp>
> > > struct is_fundamental
> > > : public __bool_constant<__is_arithmetic(_Tp)
> > > || __or_<is_void<_Tp>,
> > > is_null_pointer<_Tp>>::value>
> > > { };
> > >
> > > Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
> > >
> > Let me take a benchmark for this later.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-18 6:26 ` Ken Matsui
@ 2023-08-08 20:14 ` Jonathan Wakely
2023-08-31 13:47 ` Ken Matsui
0 siblings, 1 reply; 41+ messages in thread
From: Jonathan Wakely @ 2023-08-08 20:14 UTC (permalink / raw)
To: Ken Matsui; +Cc: François Dumont, Ken Matsui, gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 4093 bytes --]
On Tue, 18 Jul 2023 at 07:28, Ken Matsui via Libstdc++ <
libstdc++@gcc.gnu.org> wrote:
> I will eventually work on disjunction to somehow optimize, but in the
> meantime, this might be a better implementation. Of course, my
> benchmark could be wrong.
>
You should use __or_ internally in libstdc++ code, not std::disjunction.
Patrick already optimized both of those, and __or_ is slightly faster
(because it doesn't have to conform to the full requirements of
std::disjunction).
A compiler built-in for __or_ / __disjunction might perform better. But
eventually if we're going to have built-ins for all of __is_arithmetic,
__is_void, and __is_null_pointer, then we would want simply:
__is_arithmetic(T) || __is_void(T) || __is_null_pointer(T)
and so we wouldn't need to avoid instantiating any class templates at all.
>
> On Mon, Jul 17, 2023 at 11:24 PM Ken Matsui <kmatsui@cs.washington.edu>
> wrote:
> >
> > Hi,
> >
> > I took a benchmark for this.
> >
> >
> https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
> >
> > template<typename _Tp>
> > struct is_fundamental
> > : public std::bool_constant<__is_arithmetic(_Tp)
> > || std::is_void<_Tp>::value
> > || std::is_null_pointer<_Tp>::value>
> > { };
> >
> > is faster than:
> >
> > template<typename _Tp>
> > struct is_fundamental
> > : public std::bool_constant<__is_arithmetic(_Tp)
> > || std::disjunction<std::is_void<_Tp>,
> > std::is_null_pointer<_Tp>
> > >::value>
> > { };
> >
> > Time: -32.2871%
> > Peak Memory: -18.5071%
> > Total Memory: -20.1991%
> >
> > Sincerely,
> > Ken Matsui
> >
> > On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu>
> wrote:
> > >
> > > On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com>
> wrote:
> > > >
> > > >
> > > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > > > > This patch optimizes the performance of the is_fundamental trait by
> > > > > dispatching to the new __is_arithmetic built-in trait.
> > > > >
> > > > > libstdc++-v3/ChangeLog:
> > > > >
> > > > > * include/std/type_traits (is_fundamental_v): Use
> __is_arithmetic
> > > > > built-in trait.
> > > > > (is_fundamental): Likewise. Optimize the original
> implementation.
> > > > >
> > > > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > > > > ---
> > > > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> > > > > 1 file changed, 17 insertions(+), 4 deletions(-)
> > > > >
> > > > > diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> > > > > index 7ebbe04c77b..cf24de2fcac 100644
> > > > > --- a/libstdc++-v3/include/std/type_traits
> > > > > +++ b/libstdc++-v3/include/std/type_traits
> > > > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > > > #endif
> > > > >
> > > > > /// is_fundamental
> > > > > +#if __has_builtin(__is_arithmetic)
> > > > > + template<typename _Tp>
> > > > > + struct is_fundamental
> > > > > + : public __bool_constant<__is_arithmetic(_Tp)
> > > > > + || is_void<_Tp>::value
> > > > > + || is_null_pointer<_Tp>::value>
> > > > > + { };
> > > >
> > > > What about doing this ?
> > > >
> > > > template<typename _Tp>
> > > > struct is_fundamental
> > > > : public __bool_constant<__is_arithmetic(_Tp)
> > > > || __or_<is_void<_Tp>,
> > > > is_null_pointer<_Tp>>::value>
> > > > { };
> > > >
> > > > Based on your benches it seems that builtin __is_arithmetic is much
> better that std::is_arithmetic. But __or_ could still avoid instantiation
> of is_null_pointer.
> > > >
> > > Let me take a benchmark for this later.
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-08-08 20:14 ` Jonathan Wakely
@ 2023-08-31 13:47 ` Ken Matsui
0 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-08-31 13:47 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: François Dumont, Ken Matsui, gcc-patches, libstdc++
On Tue, Aug 8, 2023 at 1:14 PM Jonathan Wakely <jwakely@redhat.com> wrote:
>
>
>
> On Tue, 18 Jul 2023 at 07:28, Ken Matsui via Libstdc++ <libstdc++@gcc.gnu.org> wrote:
>>
>> I will eventually work on disjunction to somehow optimize, but in the
>> meantime, this might be a better implementation. Of course, my
>> benchmark could be wrong.
>
>
> You should use __or_ internally in libstdc++ code, not std::disjunction.
>
> Patrick already optimized both of those, and __or_ is slightly faster (because it doesn't have to conform to the full requirements of std::disjunction).
>
I will! Thank you!
> A compiler built-in for __or_ / __disjunction might perform better. But eventually if we're going to have built-ins for all of __is_arithmetic, __is_void, and __is_null_pointer, then we would want simply:
>
> __is_arithmetic(T) || __is_void(T) || __is_null_pointer(T)
>
> and so we wouldn't need to avoid instantiating any class templates at all.
>
I think we are not going to define built-ins for is_void and
is_null_pointer as their type trait implementations are already
optimal.
>
>>
>>
>> On Mon, Jul 17, 2023 at 11:24 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>> >
>> > Hi,
>> >
>> > I took a benchmark for this.
>> >
>> > https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
>> >
>> > template<typename _Tp>
>> > struct is_fundamental
>> > : public std::bool_constant<__is_arithmetic(_Tp)
>> > || std::is_void<_Tp>::value
>> > || std::is_null_pointer<_Tp>::value>
>> > { };
>> >
>> > is faster than:
>> >
>> > template<typename _Tp>
>> > struct is_fundamental
>> > : public std::bool_constant<__is_arithmetic(_Tp)
>> > || std::disjunction<std::is_void<_Tp>,
>> > std::is_null_pointer<_Tp>
>> > >::value>
>> > { };
>> >
>> > Time: -32.2871%
>> > Peak Memory: -18.5071%
>> > Total Memory: -20.1991%
>> >
>> > Sincerely,
>> > Ken Matsui
>> >
>> > On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>> > >
>> > > On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
>> > > >
>> > > >
>> > > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
>> > > > > This patch optimizes the performance of the is_fundamental trait by
>> > > > > dispatching to the new __is_arithmetic built-in trait.
>> > > > >
>> > > > > libstdc++-v3/ChangeLog:
>> > > > >
>> > > > > * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
>> > > > > built-in trait.
>> > > > > (is_fundamental): Likewise. Optimize the original implementation.
>> > > > >
>> > > > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>> > > > > ---
>> > > > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
>> > > > > 1 file changed, 17 insertions(+), 4 deletions(-)
>> > > > >
>> > > > > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>> > > > > index 7ebbe04c77b..cf24de2fcac 100644
>> > > > > --- a/libstdc++-v3/include/std/type_traits
>> > > > > +++ b/libstdc++-v3/include/std/type_traits
>> > > > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> > > > > #endif
>> > > > >
>> > > > > /// is_fundamental
>> > > > > +#if __has_builtin(__is_arithmetic)
>> > > > > + template<typename _Tp>
>> > > > > + struct is_fundamental
>> > > > > + : public __bool_constant<__is_arithmetic(_Tp)
>> > > > > + || is_void<_Tp>::value
>> > > > > + || is_null_pointer<_Tp>::value>
>> > > > > + { };
>> > > >
>> > > > What about doing this ?
>> > > >
>> > > > template<typename _Tp>
>> > > > struct is_fundamental
>> > > > : public __bool_constant<__is_arithmetic(_Tp)
>> > > > || __or_<is_void<_Tp>,
>> > > > is_null_pointer<_Tp>>::value>
>> > > > { };
>> > > >
>> > > > Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
>> > > >
>> > > Let me take a benchmark for this later.
>>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-18 6:24 ` Ken Matsui
2023-07-18 6:26 ` Ken Matsui
@ 2023-07-22 13:45 ` François Dumont
2023-08-08 20:18 ` Jonathan Wakely
2 siblings, 0 replies; 41+ messages in thread
From: François Dumont @ 2023-07-22 13:45 UTC (permalink / raw)
To: Ken Matsui; +Cc: Ken Matsui, gcc-patches, libstdc++
It seems rather logical cause std::disjunction is supposed to avoid
instantiations but in case of:
std::disjunction<std::is_void<_Tp>, std::is_null_pointer<_Tp>>
you'll avoid std::is_null_pointer instantiation only for 'void' type and
at the price of instantiating std::disjunction so 2 instantiations at
best but most of the time 3, clearly useless here.
On 18/07/2023 08:24, Ken Matsui wrote:
> Hi,
>
> I took a benchmark for this.
>
> https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
>
> template<typename _Tp>
> struct is_fundamental
> : public std::bool_constant<__is_arithmetic(_Tp)
> || std::is_void<_Tp>::value
> || std::is_null_pointer<_Tp>::value>
> { };
>
> is faster than:
>
> template<typename _Tp>
> struct is_fundamental
> : public std::bool_constant<__is_arithmetic(_Tp)
> || std::disjunction<std::is_void<_Tp>,
> std::is_null_pointer<_Tp>
> >::value>
> { };
>
> Time: -32.2871%
> Peak Memory: -18.5071%
> Total Memory: -20.1991%
>
> Sincerely,
> Ken Matsui
>
> On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>> On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
>>>
>>> On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
>>>> This patch optimizes the performance of the is_fundamental trait by
>>>> dispatching to the new __is_arithmetic built-in trait.
>>>>
>>>> libstdc++-v3/ChangeLog:
>>>>
>>>> * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
>>>> built-in trait.
>>>> (is_fundamental): Likewise. Optimize the original implementation.
>>>>
>>>> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>>>> ---
>>>> libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
>>>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>>>> index 7ebbe04c77b..cf24de2fcac 100644
>>>> --- a/libstdc++-v3/include/std/type_traits
>>>> +++ b/libstdc++-v3/include/std/type_traits
>>>> @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>>>> #endif
>>>>
>>>> /// is_fundamental
>>>> +#if __has_builtin(__is_arithmetic)
>>>> + template<typename _Tp>
>>>> + struct is_fundamental
>>>> + : public __bool_constant<__is_arithmetic(_Tp)
>>>> + || is_void<_Tp>::value
>>>> + || is_null_pointer<_Tp>::value>
>>>> + { };
>>> What about doing this ?
>>>
>>> template<typename _Tp>
>>> struct is_fundamental
>>> : public __bool_constant<__is_arithmetic(_Tp)
>>> || __or_<is_void<_Tp>,
>>> is_null_pointer<_Tp>>::value>
>>> { };
>>>
>>> Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
>>>
>> Let me take a benchmark for this later.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-18 6:24 ` Ken Matsui
2023-07-18 6:26 ` Ken Matsui
2023-07-22 13:45 ` François Dumont
@ 2023-08-08 20:18 ` Jonathan Wakely
2023-08-31 13:57 ` Ken Matsui
2 siblings, 1 reply; 41+ messages in thread
From: Jonathan Wakely @ 2023-08-08 20:18 UTC (permalink / raw)
To: Ken Matsui; +Cc: François Dumont, Ken Matsui, gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 3639 bytes --]
On Tue, 18 Jul 2023 at 07:25, Ken Matsui via Libstdc++ <
libstdc++@gcc.gnu.org> wrote:
> Hi,
>
> I took a benchmark for this.
>
>
> https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
>
> template<typename _Tp>
> struct is_fundamental
> : public std::bool_constant<__is_arithmetic(_Tp)
> || std::is_void<_Tp>::value
> || std::is_null_pointer<_Tp>::value>
> { };
>
> is faster than:
>
> template<typename _Tp>
> struct is_fundamental
> : public std::bool_constant<__is_arithmetic(_Tp)
> || std::disjunction<std::is_void<_Tp>,
> std::is_null_pointer<_Tp>
> >::value>
> { };
>
> Time: -32.2871%
> Peak Memory: -18.5071%
> Total Memory: -20.1991%
>
But what about the fallback implementation of is_fundamental where we don't
have the __is_arithmetic built-in?
- : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
- is_null_pointer<_Tp>>::type
+ : public __bool_constant<is_arithmetic<_Tp>::value
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
Here the use of __or_ means that for is_fundamental<int> we don't
instantiate is_void<int> and is_null_pointer<int>. Isn't that still
worthwhile?
>
> Sincerely,
> Ken Matsui
>
> On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu>
> wrote:
> >
> > On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com>
> wrote:
> > >
> > >
> > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > > > This patch optimizes the performance of the is_fundamental trait by
> > > > dispatching to the new __is_arithmetic built-in trait.
> > > >
> > > > libstdc++-v3/ChangeLog:
> > > >
> > > > * include/std/type_traits (is_fundamental_v): Use
> __is_arithmetic
> > > > built-in trait.
> > > > (is_fundamental): Likewise. Optimize the original
> implementation.
> > > >
> > > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > > > ---
> > > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> > > > 1 file changed, 17 insertions(+), 4 deletions(-)
> > > >
> > > > diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> > > > index 7ebbe04c77b..cf24de2fcac 100644
> > > > --- a/libstdc++-v3/include/std/type_traits
> > > > +++ b/libstdc++-v3/include/std/type_traits
> > > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > > > #endif
> > > >
> > > > /// is_fundamental
> > > > +#if __has_builtin(__is_arithmetic)
> > > > + template<typename _Tp>
> > > > + struct is_fundamental
> > > > + : public __bool_constant<__is_arithmetic(_Tp)
> > > > + || is_void<_Tp>::value
> > > > + || is_null_pointer<_Tp>::value>
> > > > + { };
> > >
> > > What about doing this ?
> > >
> > > template<typename _Tp>
> > > struct is_fundamental
> > > : public __bool_constant<__is_arithmetic(_Tp)
> > > || __or_<is_void<_Tp>,
> > > is_null_pointer<_Tp>>::value>
> > > { };
> > >
> > > Based on your benches it seems that builtin __is_arithmetic is much
> better that std::is_arithmetic. But __or_ could still avoid instantiation
> of is_null_pointer.
> > >
> > Let me take a benchmark for this later.
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-08-08 20:18 ` Jonathan Wakely
@ 2023-08-31 13:57 ` Ken Matsui
2023-08-31 15:01 ` Ken Matsui
0 siblings, 1 reply; 41+ messages in thread
From: Ken Matsui @ 2023-08-31 13:57 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: François Dumont, Ken Matsui, gcc-patches, libstdc++
On Tue, Aug 8, 2023 at 1:19 PM Jonathan Wakely <jwakely@redhat.com> wrote:
>
>
>
> On Tue, 18 Jul 2023 at 07:25, Ken Matsui via Libstdc++ <libstdc++@gcc.gnu.org> wrote:
>>
>> Hi,
>>
>> I took a benchmark for this.
>>
>> https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
>>
>> template<typename _Tp>
>> struct is_fundamental
>> : public std::bool_constant<__is_arithmetic(_Tp)
>> || std::is_void<_Tp>::value
>> || std::is_null_pointer<_Tp>::value>
>> { };
>>
>> is faster than:
>>
>> template<typename _Tp>
>> struct is_fundamental
>> : public std::bool_constant<__is_arithmetic(_Tp)
>> || std::disjunction<std::is_void<_Tp>,
>> std::is_null_pointer<_Tp>
>> >::value>
>> { };
>>
>> Time: -32.2871%
>> Peak Memory: -18.5071%
>> Total Memory: -20.1991%
>
>
> But what about the fallback implementation of is_fundamental where we don't have the __is_arithmetic built-in?
That fallback implementation would be this:
https://github.com/ken-matsui/gsoc23/blob/967e20770599f2a8925c9794669111faef11beb7/is_fundamental.cc#L11-L15.
The is_fundamental-disjunction.cc benchmark used the USE_BUILTIN
macro, but in this benchmark, I used it to just switch two different
implementations that use the __is_arithmetic built-in.
> - : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
> - is_null_pointer<_Tp>>::type
> + : public __bool_constant<is_arithmetic<_Tp>::value
> + || is_void<_Tp>::value
> + || is_null_pointer<_Tp>::value>
>
> Here the use of __or_ means that for is_fundamental<int> we don't instantiate is_void<int> and is_null_pointer<int>. Isn't that still worthwhile?
>
Let me take a benchmark with __or_ later! We may see a difference.
>
>
>
>>
>>
>> Sincerely,
>> Ken Matsui
>>
>> On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>> >
>> > On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
>> > >
>> > >
>> > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
>> > > > This patch optimizes the performance of the is_fundamental trait by
>> > > > dispatching to the new __is_arithmetic built-in trait.
>> > > >
>> > > > libstdc++-v3/ChangeLog:
>> > > >
>> > > > * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
>> > > > built-in trait.
>> > > > (is_fundamental): Likewise. Optimize the original implementation.
>> > > >
>> > > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>> > > > ---
>> > > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
>> > > > 1 file changed, 17 insertions(+), 4 deletions(-)
>> > > >
>> > > > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>> > > > index 7ebbe04c77b..cf24de2fcac 100644
>> > > > --- a/libstdc++-v3/include/std/type_traits
>> > > > +++ b/libstdc++-v3/include/std/type_traits
>> > > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> > > > #endif
>> > > >
>> > > > /// is_fundamental
>> > > > +#if __has_builtin(__is_arithmetic)
>> > > > + template<typename _Tp>
>> > > > + struct is_fundamental
>> > > > + : public __bool_constant<__is_arithmetic(_Tp)
>> > > > + || is_void<_Tp>::value
>> > > > + || is_null_pointer<_Tp>::value>
>> > > > + { };
>> > >
>> > > What about doing this ?
>> > >
>> > > template<typename _Tp>
>> > > struct is_fundamental
>> > > : public __bool_constant<__is_arithmetic(_Tp)
>> > > || __or_<is_void<_Tp>,
>> > > is_null_pointer<_Tp>>::value>
>> > > { };
>> > >
>> > > Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
>> > >
>> > Let me take a benchmark for this later.
>>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-08-31 13:57 ` Ken Matsui
@ 2023-08-31 15:01 ` Ken Matsui
0 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-08-31 15:01 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: François Dumont, Ken Matsui, gcc-patches, libstdc++
On Thu, Aug 31, 2023 at 6:57 AM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> On Tue, Aug 8, 2023 at 1:19 PM Jonathan Wakely <jwakely@redhat.com> wrote:
> >
> >
> >
> > On Tue, 18 Jul 2023 at 07:25, Ken Matsui via Libstdc++ <libstdc++@gcc.gnu.org> wrote:
> >>
> >> Hi,
> >>
> >> I took a benchmark for this.
> >>
> >> https://github.com/ken-matsui/gcc-benches/blob/main/is_fundamental-disjunction.md#mon-jul-17-105937-pm-pdt-2023
> >>
> >> template<typename _Tp>
> >> struct is_fundamental
> >> : public std::bool_constant<__is_arithmetic(_Tp)
> >> || std::is_void<_Tp>::value
> >> || std::is_null_pointer<_Tp>::value>
> >> { };
> >>
> >> is faster than:
> >>
> >> template<typename _Tp>
> >> struct is_fundamental
> >> : public std::bool_constant<__is_arithmetic(_Tp)
> >> || std::disjunction<std::is_void<_Tp>,
> >> std::is_null_pointer<_Tp>
> >> >::value>
> >> { };
> >>
> >> Time: -32.2871%
> >> Peak Memory: -18.5071%
> >> Total Memory: -20.1991%
> >
> >
> > But what about the fallback implementation of is_fundamental where we don't have the __is_arithmetic built-in?
>
> That fallback implementation would be this:
> https://github.com/ken-matsui/gsoc23/blob/967e20770599f2a8925c9794669111faef11beb7/is_fundamental.cc#L11-L15.
>
> The is_fundamental-disjunction.cc benchmark used the USE_BUILTIN
> macro, but in this benchmark, I used it to just switch two different
> implementations that use the __is_arithmetic built-in.
>
> > - : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
> > - is_null_pointer<_Tp>>::type
> > + : public __bool_constant<is_arithmetic<_Tp>::value
> > + || is_void<_Tp>::value
> > + || is_null_pointer<_Tp>::value>
> >
> > Here the use of __or_ means that for is_fundamental<int> we don't instantiate is_void<int> and is_null_pointer<int>. Isn't that still worthwhile?
> >
> Let me take a benchmark with __or_ later! We may see a difference.
>
Here is the benchmark result with __or_:
https://github.com/ken-matsui/gsoc23/blob/main/is_fundamental-disjunction.md#thu-aug-31-075127-am-pdt-2023
Time: -23.3935%
Peak Memory: -10.2915%
Total Memory: -14.4165%
Considering the following was with disjunction, __or_ is faster than
disjunction, but still just || seems much faster.
Time: -32.2871%
Peak Memory: -18.5071%
Total Memory: -20.1991%
> >
> >
> >
> >>
> >>
> >> Sincerely,
> >> Ken Matsui
> >>
> >> On Sun, Jul 16, 2023 at 9:49 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
> >> >
> >> > On Sun, Jul 16, 2023 at 5:41 AM François Dumont <frs.dumont@gmail.com> wrote:
> >> > >
> >> > >
> >> > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> >> > > > This patch optimizes the performance of the is_fundamental trait by
> >> > > > dispatching to the new __is_arithmetic built-in trait.
> >> > > >
> >> > > > libstdc++-v3/ChangeLog:
> >> > > >
> >> > > > * include/std/type_traits (is_fundamental_v): Use __is_arithmetic
> >> > > > built-in trait.
> >> > > > (is_fundamental): Likewise. Optimize the original implementation.
> >> > > >
> >> > > > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> >> > > > ---
> >> > > > libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
> >> > > > 1 file changed, 17 insertions(+), 4 deletions(-)
> >> > > >
> >> > > > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> >> > > > index 7ebbe04c77b..cf24de2fcac 100644
> >> > > > --- a/libstdc++-v3/include/std/type_traits
> >> > > > +++ b/libstdc++-v3/include/std/type_traits
> >> > > > @@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >> > > > #endif
> >> > > >
> >> > > > /// is_fundamental
> >> > > > +#if __has_builtin(__is_arithmetic)
> >> > > > + template<typename _Tp>
> >> > > > + struct is_fundamental
> >> > > > + : public __bool_constant<__is_arithmetic(_Tp)
> >> > > > + || is_void<_Tp>::value
> >> > > > + || is_null_pointer<_Tp>::value>
> >> > > > + { };
> >> > >
> >> > > What about doing this ?
> >> > >
> >> > > template<typename _Tp>
> >> > > struct is_fundamental
> >> > > : public __bool_constant<__is_arithmetic(_Tp)
> >> > > || __or_<is_void<_Tp>,
> >> > > is_null_pointer<_Tp>>::value>
> >> > > { };
> >> > >
> >> > > Based on your benches it seems that builtin __is_arithmetic is much better that std::is_arithmetic. But __or_ could still avoid instantiation of is_null_pointer.
> >> > >
> >> > Let me take a benchmark for this later.
> >>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v2 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-15 4:55 ` [PATCH v2 1/3] c++, libstdc++: Implement " Ken Matsui
2023-07-15 4:55 ` [PATCH v2 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
2023-07-15 4:55 ` [PATCH v2 3/3] libstdc++: Optimize is_fundamental " Ken Matsui
@ 2023-07-16 12:27 ` François Dumont
2023-07-17 4:46 ` Ken Matsui
2023-07-18 6:27 ` [PATCH v3 " Ken Matsui
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
4 siblings, 1 reply; 41+ messages in thread
From: François Dumont @ 2023-07-16 12:27 UTC (permalink / raw)
To: Ken Matsui, gcc-patches; +Cc: libstdc++
On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> This patch implements built-in trait for std::is_arithmetic.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_arithmetic.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
> * g++.dg/ext/is_arithmetic.C: New test.
> * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
> (____is_arithmetic): ... this.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
> (____is_arithmetic): ... this.
> * include/c_global/cmath: Use ____is_arithmetic instead.
> * include/c_std/cmath: Likewise.
> * include/tr1/cmath: Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> gcc/cp/constraint.cc | 3 ++
> gcc/cp/cp-trait.def | 1 +
> gcc/cp/semantics.cc | 4 ++
> gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
> gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
> libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
> libstdc++-v3/include/c_std/cmath | 24 +++++------
> libstdc++-v3/include/tr1/cmath | 24 +++++------
> 11 files changed, 99 insertions(+), 55 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..bd517d08843 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> + case CPTK_IS_ARITHMETIC:
> + inform (loc, " %qT is not an arithmetic type", t1);
> + break;
> case CPTK_IS_TRIVIALLY_COPYABLE:
> inform (loc, " %qT is not trivially copyable", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..a95aeeaf778 100644
> --- a/gcc/cp/cp-trait.def
> +++ b/gcc/cp/cp-trait.def
> @@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
> DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
> DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
> DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
> +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
> DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
> DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
> /* FIXME Added space to avoid direct usage in GCC 13. */
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index 8fb47fd179e..4531f047d73 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_UNION:
> return type_code1 == UNION_TYPE;
>
> + case CPTK_IS_ARITHMETIC:
> + return ARITHMETIC_TYPE_P (type1);
> +
> case CPTK_IS_ASSIGNABLE:
> return is_xible (MODIFY_EXPR, type1, type2);
>
> @@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_ENUM:
> case CPTK_IS_UNION:
> case CPTK_IS_SAME:
> + case CPTK_IS_ARITHMETIC:
> break;
>
> case CPTK_IS_LAYOUT_COMPATIBLE:
> diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> index f343e153e56..3d63b0101d1 100644
> --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> @@ -146,3 +146,6 @@
> #if !__has_builtin (__remove_cvref)
> # error "__has_builtin (__remove_cvref) failed"
> #endif
> +#if !__has_builtin (__is_arithmetic)
> +# error "__has_builtin (__is_arithmetic) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> new file mode 100644
> index 00000000000..fd35831f646
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> @@ -0,0 +1,33 @@
> +// { dg-do compile { target c++11 } }
> +
> +#include <testsuite_tr1.h>
> +
> +using namespace __gnu_test;
> +
> +#define SA(X) static_assert((X),#X)
> +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
> + SA(TRAIT(TYPE) == EXPECT); \
> + SA(TRAIT(const TYPE) == EXPECT); \
> + SA(TRAIT(volatile TYPE) == EXPECT); \
> + SA(TRAIT(const volatile TYPE) == EXPECT)
> +
> +SA_TEST_CATEGORY(__is_arithmetic, void, false);
> +
> +SA_TEST_CATEGORY(__is_arithmetic, char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
> +SA_TEST_CATEGORY(__is_arithmetic, short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, float, true);
> +SA_TEST_CATEGORY(__is_arithmetic, double, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long double, true);
> +
> +// Sanity check.
> +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..b16f7b685e7 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_arithmetic
> + struct ____is_arithmetic
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
> template<typename _Tp>
> struct __is_fundamental
> - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
> + : public __traitor<__is_void<_Tp>, ____is_arithmetic<_Tp> >
> { };
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<____is_arithmetic<_Tp>, __is_pointer<_Tp> >
> { };
> template<typename _Tp>
> struct __is_char
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..4329a6eb4e1 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> + template<typename _Tp> struct ____is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> };
> - template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> + template<typename _Tp> struct __is_scalar : public __traitor<____is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> };
> }
> namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
> index 4312f32a4e0..95c55433c81 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // An arithmetic type is an integer type or a floating point type
> //
> template<typename _Tp>
> - struct __is_arithmetic
> + struct ____is_arithmetic
I think Jonathan's remark about avoiding the 4 '_' also applies here.
So rather '__is_arithmetic_type' or even '__is_arithmetic_t'.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v2 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-16 12:27 ` [PATCH v2 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait François Dumont
@ 2023-07-17 4:46 ` Ken Matsui
0 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-17 4:46 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
On Sun, Jul 16, 2023 at 5:28 AM François Dumont <frs.dumont@gmail.com> wrote:
>
>
> On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote:
> > This patch implements built-in trait for std::is_arithmetic.
> >
> > gcc/cp/ChangeLog:
> >
> > * cp-trait.def: Define __is_arithmetic.
> > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
> > * semantics.cc (trait_expr_value): Likewise.
> > (finish_trait_expr): Likewise.
> >
> > gcc/testsuite/ChangeLog:
> >
> > * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
> > * g++.dg/ext/is_arithmetic.C: New test.
> > * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
> > (____is_arithmetic): ... this.
> > * g++.dg/torture/pr57107.C: Likewise.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
> > (____is_arithmetic): ... this.
> > * include/c_global/cmath: Use ____is_arithmetic instead.
> > * include/c_std/cmath: Likewise.
> > * include/tr1/cmath: Likewise.
> >
> > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > ---
> > gcc/cp/constraint.cc | 3 ++
> > gcc/cp/cp-trait.def | 1 +
> > gcc/cp/semantics.cc | 4 ++
> > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
> > gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
> > gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
> > gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> > libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
> > libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
> > libstdc++-v3/include/c_std/cmath | 24 +++++------
> > libstdc++-v3/include/tr1/cmath | 24 +++++------
> > 11 files changed, 99 insertions(+), 55 deletions(-)
> > create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
> >
> > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> > index 8cf0f2d0974..bd517d08843 100644
> > --- a/gcc/cp/constraint.cc
> > +++ b/gcc/cp/constraint.cc
> > @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
> > case CPTK_IS_AGGREGATE:
> > inform (loc, " %qT is not an aggregate", t1);
> > break;
> > + case CPTK_IS_ARITHMETIC:
> > + inform (loc, " %qT is not an arithmetic type", t1);
> > + break;
> > case CPTK_IS_TRIVIALLY_COPYABLE:
> > inform (loc, " %qT is not trivially copyable", t1);
> > break;
> > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> > index 8b7fece0cc8..a95aeeaf778 100644
> > --- a/gcc/cp/cp-trait.def
> > +++ b/gcc/cp/cp-trait.def
> > @@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
> > DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
> > DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
> > DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
> > +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
> > DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
> > DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
> > /* FIXME Added space to avoid direct usage in GCC 13. */
> > diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> > index 8fb47fd179e..4531f047d73 100644
> > --- a/gcc/cp/semantics.cc
> > +++ b/gcc/cp/semantics.cc
> > @@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
> > case CPTK_IS_UNION:
> > return type_code1 == UNION_TYPE;
> >
> > + case CPTK_IS_ARITHMETIC:
> > + return ARITHMETIC_TYPE_P (type1);
> > +
> > case CPTK_IS_ASSIGNABLE:
> > return is_xible (MODIFY_EXPR, type1, type2);
> >
> > @@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
> > case CPTK_IS_ENUM:
> > case CPTK_IS_UNION:
> > case CPTK_IS_SAME:
> > + case CPTK_IS_ARITHMETIC:
> > break;
> >
> > case CPTK_IS_LAYOUT_COMPATIBLE:
> > diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> > index f343e153e56..3d63b0101d1 100644
> > --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> > +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> > @@ -146,3 +146,6 @@
> > #if !__has_builtin (__remove_cvref)
> > # error "__has_builtin (__remove_cvref) failed"
> > #endif
> > +#if !__has_builtin (__is_arithmetic)
> > +# error "__has_builtin (__is_arithmetic) failed"
> > +#endif
> > diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> > new file mode 100644
> > index 00000000000..fd35831f646
> > --- /dev/null
> > +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> > @@ -0,0 +1,33 @@
> > +// { dg-do compile { target c++11 } }
> > +
> > +#include <testsuite_tr1.h>
> > +
> > +using namespace __gnu_test;
> > +
> > +#define SA(X) static_assert((X),#X)
> > +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
> > + SA(TRAIT(TYPE) == EXPECT); \
> > + SA(TRAIT(const TYPE) == EXPECT); \
> > + SA(TRAIT(volatile TYPE) == EXPECT); \
> > + SA(TRAIT(const volatile TYPE) == EXPECT)
> > +
> > +SA_TEST_CATEGORY(__is_arithmetic, void, false);
> > +
> > +SA_TEST_CATEGORY(__is_arithmetic, char, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, short, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, int, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, long, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, long long, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, float, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, double, true);
> > +SA_TEST_CATEGORY(__is_arithmetic, long double, true);
> > +
> > +// Sanity check.
> > +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
> > diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> > index 6d791484448..b16f7b685e7 100644
> > --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> > +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> > @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef __true_type __type;
> > };
> > template<typename _Tp>
> > - struct __is_arithmetic
> > + struct ____is_arithmetic
> > : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> > { };
> > template<typename _Tp>
> > struct __is_fundamental
> > - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
> > + : public __traitor<__is_void<_Tp>, ____is_arithmetic<_Tp> >
> > { };
> > template<typename _Tp>
> > struct __is_scalar
> > - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> > + : public __traitor<____is_arithmetic<_Tp>, __is_pointer<_Tp> >
> > { };
> > template<typename _Tp>
> > struct __is_char
> > diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> > index 4dbd32bd298..4329a6eb4e1 100644
> > --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> > +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> > @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > enum {
> > __value = 0 };
> > };
> > - template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> > + template<typename _Tp> struct ____is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> > };
> > - template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> > + template<typename _Tp> struct __is_scalar : public __traitor<____is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> > };
> > }
> > namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
> > diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
> > index 4312f32a4e0..95c55433c81 100644
> > --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> > +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> > @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> > // An arithmetic type is an integer type or a floating point type
> > //
> > template<typename _Tp>
> > - struct __is_arithmetic
> > + struct ____is_arithmetic
>
> I think Jonathan's remark about avoiding the 4 '_' also applies here.
>
> So rather '__is_arithmetic_type' or even '__is_arithmetic_t'.
>
Oh, thank you for pointing that out! I will fix it.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH v3 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-15 4:55 ` [PATCH v2 1/3] c++, libstdc++: Implement " Ken Matsui
` (2 preceding siblings ...)
2023-07-16 12:27 ` [PATCH v2 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait François Dumont
@ 2023-07-18 6:27 ` Ken Matsui
2023-07-18 6:27 ` [PATCH v3 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
` (3 more replies)
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
4 siblings, 4 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 6:27 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_arithmetic.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_arithmetic.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
* g++.dg/ext/is_arithmetic.C: New test.
* g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
(__is_arith): ... this.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
(__is_arith): ... this.
* include/c_global/cmath: Use __is_arith instead.
* include/c_std/cmath: Likewise.
* include/tr1/cmath: Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
gcc/cp/constraint.cc | 3 ++
gcc/cp/cp-trait.def | 1 +
gcc/cp/semantics.cc | 4 ++
gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
libstdc++-v3/include/c_std/cmath | 24 +++++------
libstdc++-v3/include/tr1/cmath | 24 +++++------
11 files changed, 99 insertions(+), 55 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..bd517d08843 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
+ case CPTK_IS_ARITHMETIC:
+ inform (loc, " %qT is not an arithmetic type", t1);
+ break;
case CPTK_IS_TRIVIALLY_COPYABLE:
inform (loc, " %qT is not trivially copyable", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..a95aeeaf778 100644
--- a/gcc/cp/cp-trait.def
+++ b/gcc/cp/cp-trait.def
@@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
+DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
/* FIXME Added space to avoid direct usage in GCC 13. */
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 8fb47fd179e..4531f047d73 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_UNION:
return type_code1 == UNION_TYPE;
+ case CPTK_IS_ARITHMETIC:
+ return ARITHMETIC_TYPE_P (type1);
+
case CPTK_IS_ASSIGNABLE:
return is_xible (MODIFY_EXPR, type1, type2);
@@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_ENUM:
case CPTK_IS_UNION:
case CPTK_IS_SAME:
+ case CPTK_IS_ARITHMETIC:
break;
case CPTK_IS_LAYOUT_COMPATIBLE:
diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
index f343e153e56..3d63b0101d1 100644
--- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
+++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
@@ -146,3 +146,6 @@
#if !__has_builtin (__remove_cvref)
# error "__has_builtin (__remove_cvref) failed"
#endif
+#if !__has_builtin (__is_arithmetic)
+# error "__has_builtin (__is_arithmetic) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
new file mode 100644
index 00000000000..fd35831f646
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
@@ -0,0 +1,33 @@
+// { dg-do compile { target c++11 } }
+
+#include <testsuite_tr1.h>
+
+using namespace __gnu_test;
+
+#define SA(X) static_assert((X),#X)
+#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
+ SA(TRAIT(TYPE) == EXPECT); \
+ SA(TRAIT(const TYPE) == EXPECT); \
+ SA(TRAIT(volatile TYPE) == EXPECT); \
+ SA(TRAIT(const volatile TYPE) == EXPECT)
+
+SA_TEST_CATEGORY(__is_arithmetic, void, false);
+
+SA_TEST_CATEGORY(__is_arithmetic, char, true);
+SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
+SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
+SA_TEST_CATEGORY(__is_arithmetic, short, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
+SA_TEST_CATEGORY(__is_arithmetic, int, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
+SA_TEST_CATEGORY(__is_arithmetic, long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
+SA_TEST_CATEGORY(__is_arithmetic, long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, float, true);
+SA_TEST_CATEGORY(__is_arithmetic, double, true);
+SA_TEST_CATEGORY(__is_arithmetic, long double, true);
+
+// Sanity check.
+SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..8d2d3eb6c5a 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
template<typename _Tp>
struct __is_fundamental
- : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
+ : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
{ };
template<typename _Tp>
struct __is_char
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..ecbe99db4f8 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
+ template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
};
- template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
+ template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > {
};
}
namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 4312f32a4e0..d00d1ea8d75 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// An arithmetic type is an integer type or a floating point type
//
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
@@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
index b0ba395eb5c..da3ef537c38 100644
--- a/libstdc++-v3/include/c_global/cmath
+++ b/libstdc++-v3/include/c_global/cmath
@@ -1255,8 +1255,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1281,8 +1281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreaterequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1307,8 +1307,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isless(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1333,8 +1333,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1359,8 +1359,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1385,8 +1385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isunordered(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1397,7 +1397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#else
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -1407,7 +1407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -1443,7 +1443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -1461,7 +1461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -1470,7 +1470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -1488,7 +1488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -1497,7 +1497,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/cmath
index 588ee1e6dc4..c1db699ecdb 100644
--- a/libstdc++-v3/include/c_std/cmath
+++ b/libstdc++-v3/include/c_std/cmath
@@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#undef isunordered
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
index ba1b60cc945..2e80f1d0d00 100644
--- a/libstdc++-v3/include/tr1/cmath
+++ b/libstdc++-v3/include/tr1/cmath
@@ -307,7 +307,7 @@ namespace tr1
/// Function template definitions [8.16.3].
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -317,7 +317,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -326,7 +326,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -335,7 +335,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -344,7 +344,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -353,7 +353,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -362,7 +362,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -371,7 +371,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -380,7 +380,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -389,7 +389,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -398,7 +398,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -407,7 +407,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v3 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in
2023-07-18 6:27 ` [PATCH v3 " Ken Matsui
@ 2023-07-18 6:27 ` Ken Matsui
2023-07-18 6:27 ` [PATCH v3 3/3] libstdc++: Optimize is_fundamental " Ken Matsui
` (2 subsequent siblings)
3 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 6:27 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_arithmetic trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_arithmetic): Use __is_arithmetic
built-in trait.
(is_arithmetic_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..7ebbe04c77b 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
/// is_arithmetic
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_arithmetic
+ : public __bool_constant<__is_arithmetic(_Tp)>
+ { };
+#else
template<typename _Tp>
struct is_arithmetic
: public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
{ };
+#endif
/// is_fundamental
template<typename _Tp>
@@ -3198,8 +3205,15 @@ template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&> = true;
template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&&> = true;
+
+#if __has_builtin(__is_arithmetic)
+template <typename _Tp>
+ inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v3 3/3] libstdc++: Optimize is_fundamental performance by __is_arithmetic built-in
2023-07-18 6:27 ` [PATCH v3 " Ken Matsui
2023-07-18 6:27 ` [PATCH v3 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
@ 2023-07-18 6:27 ` Ken Matsui
2023-07-18 7:40 ` [PATCH v4 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Ken Matsui
2023-07-22 13:50 ` [PATCH v3 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait François Dumont
3 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 6:27 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_fundamental trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_fundamental_v): Use __is_arithmetic
built-in trait.
(is_fundamental): Likewise. Optimize the original implementation.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 7ebbe04c77b..cf24de2fcac 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
/// is_fundamental
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_fundamental
+ : public __bool_constant<__is_arithmetic(_Tp)
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
+ { };
+#else
template<typename _Tp>
struct is_fundamental
- : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
- is_null_pointer<_Tp>>::type
+ : public __bool_constant<is_arithmetic<_Tp>::value
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
{ };
+#endif
/// is_object
template<typename _Tp>
@@ -3209,13 +3219,16 @@ template <typename _Tp>
#if __has_builtin(__is_arithmetic)
template <typename _Tp>
inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+template <typename _Tp>
+ inline constexpr bool is_fundamental_v
+ = __is_arithmetic(_Tp) || is_void_v<_Tp> || is_null_pointer_v<_Tp>;
#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
-#endif
-
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_object_v = is_object<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v4 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-18 6:27 ` [PATCH v3 " Ken Matsui
2023-07-18 6:27 ` [PATCH v3 2/3] libstdc++: Optimize is_arithmetic performance by __is_arithmetic built-in Ken Matsui
2023-07-18 6:27 ` [PATCH v3 3/3] libstdc++: Optimize is_fundamental " Ken Matsui
@ 2023-07-18 7:40 ` Ken Matsui
2023-07-18 7:40 ` [PATCH v4 2/4] libstdc++: Optimize is_arithmetic trait performance Ken Matsui
` (2 more replies)
2023-07-22 13:50 ` [PATCH v3 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait François Dumont
3 siblings, 3 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 7:40 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_arithmetic.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_arithmetic.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
* g++.dg/ext/is_arithmetic.C: New test.
* g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
(__is_arith): ... this.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
(__is_arith): ... this.
* include/c_global/cmath: Use __is_arith instead.
* include/c_std/cmath: Likewise.
* include/tr1/cmath: Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
gcc/cp/constraint.cc | 3 ++
gcc/cp/cp-trait.def | 1 +
gcc/cp/semantics.cc | 4 ++
gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
libstdc++-v3/include/c_std/cmath | 24 +++++------
libstdc++-v3/include/tr1/cmath | 24 +++++------
11 files changed, 99 insertions(+), 55 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..bd517d08843 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
+ case CPTK_IS_ARITHMETIC:
+ inform (loc, " %qT is not an arithmetic type", t1);
+ break;
case CPTK_IS_TRIVIALLY_COPYABLE:
inform (loc, " %qT is not trivially copyable", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..a95aeeaf778 100644
--- a/gcc/cp/cp-trait.def
+++ b/gcc/cp/cp-trait.def
@@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
+DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
/* FIXME Added space to avoid direct usage in GCC 13. */
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 8fb47fd179e..4531f047d73 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_UNION:
return type_code1 == UNION_TYPE;
+ case CPTK_IS_ARITHMETIC:
+ return ARITHMETIC_TYPE_P (type1);
+
case CPTK_IS_ASSIGNABLE:
return is_xible (MODIFY_EXPR, type1, type2);
@@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_ENUM:
case CPTK_IS_UNION:
case CPTK_IS_SAME:
+ case CPTK_IS_ARITHMETIC:
break;
case CPTK_IS_LAYOUT_COMPATIBLE:
diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
index f343e153e56..3d63b0101d1 100644
--- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
+++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
@@ -146,3 +146,6 @@
#if !__has_builtin (__remove_cvref)
# error "__has_builtin (__remove_cvref) failed"
#endif
+#if !__has_builtin (__is_arithmetic)
+# error "__has_builtin (__is_arithmetic) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
new file mode 100644
index 00000000000..fd35831f646
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
@@ -0,0 +1,33 @@
+// { dg-do compile { target c++11 } }
+
+#include <testsuite_tr1.h>
+
+using namespace __gnu_test;
+
+#define SA(X) static_assert((X),#X)
+#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
+ SA(TRAIT(TYPE) == EXPECT); \
+ SA(TRAIT(const TYPE) == EXPECT); \
+ SA(TRAIT(volatile TYPE) == EXPECT); \
+ SA(TRAIT(const volatile TYPE) == EXPECT)
+
+SA_TEST_CATEGORY(__is_arithmetic, void, false);
+
+SA_TEST_CATEGORY(__is_arithmetic, char, true);
+SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
+SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
+SA_TEST_CATEGORY(__is_arithmetic, short, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
+SA_TEST_CATEGORY(__is_arithmetic, int, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
+SA_TEST_CATEGORY(__is_arithmetic, long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
+SA_TEST_CATEGORY(__is_arithmetic, long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, float, true);
+SA_TEST_CATEGORY(__is_arithmetic, double, true);
+SA_TEST_CATEGORY(__is_arithmetic, long double, true);
+
+// Sanity check.
+SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..8d2d3eb6c5a 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
template<typename _Tp>
struct __is_fundamental
- : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
+ : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
{ };
template<typename _Tp>
struct __is_char
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..ecbe99db4f8 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
+ template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
};
- template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
+ template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > {
};
}
namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 4312f32a4e0..d00d1ea8d75 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// An arithmetic type is an integer type or a floating point type
//
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
@@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
index b0ba395eb5c..da3ef537c38 100644
--- a/libstdc++-v3/include/c_global/cmath
+++ b/libstdc++-v3/include/c_global/cmath
@@ -1255,8 +1255,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1281,8 +1281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreaterequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1307,8 +1307,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isless(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1333,8 +1333,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1359,8 +1359,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1385,8 +1385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isunordered(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1397,7 +1397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#else
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -1407,7 +1407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -1443,7 +1443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -1461,7 +1461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -1470,7 +1470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -1488,7 +1488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -1497,7 +1497,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/cmath
index 588ee1e6dc4..c1db699ecdb 100644
--- a/libstdc++-v3/include/c_std/cmath
+++ b/libstdc++-v3/include/c_std/cmath
@@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#undef isunordered
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
index ba1b60cc945..2e80f1d0d00 100644
--- a/libstdc++-v3/include/tr1/cmath
+++ b/libstdc++-v3/include/tr1/cmath
@@ -307,7 +307,7 @@ namespace tr1
/// Function template definitions [8.16.3].
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -317,7 +317,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -326,7 +326,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -335,7 +335,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -344,7 +344,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -353,7 +353,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -362,7 +362,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -371,7 +371,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -380,7 +380,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -389,7 +389,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -398,7 +398,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -407,7 +407,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v4 2/4] libstdc++: Optimize is_arithmetic trait performance
2023-07-18 7:40 ` [PATCH v4 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Ken Matsui
@ 2023-07-18 7:40 ` Ken Matsui
2023-07-18 7:40 ` [PATCH v4 3/4] libstdc++: Optimize is_fundamental " Ken Matsui
2023-07-18 7:40 ` [PATCH v4 4/4] libstdc++: Optimize is_compound " Ken Matsui
2 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 7:40 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_arithmetic trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_arithmetic): Use __is_arithmetic
built-in trait.
(is_arithmetic_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..7ebbe04c77b 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
/// is_arithmetic
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_arithmetic
+ : public __bool_constant<__is_arithmetic(_Tp)>
+ { };
+#else
template<typename _Tp>
struct is_arithmetic
: public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
{ };
+#endif
/// is_fundamental
template<typename _Tp>
@@ -3198,8 +3205,15 @@ template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&> = true;
template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&&> = true;
+
+#if __has_builtin(__is_arithmetic)
+template <typename _Tp>
+ inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v4 3/4] libstdc++: Optimize is_fundamental trait performance
2023-07-18 7:40 ` [PATCH v4 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Ken Matsui
2023-07-18 7:40 ` [PATCH v4 2/4] libstdc++: Optimize is_arithmetic trait performance Ken Matsui
@ 2023-07-18 7:40 ` Ken Matsui
2023-07-18 7:40 ` [PATCH v4 4/4] libstdc++: Optimize is_compound " Ken Matsui
2 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 7:40 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_fundamental trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_fundamental_v): Use __is_arithmetic
built-in trait.
(is_fundamental): Likewise. Optimize the original implementation.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 7ebbe04c77b..cf24de2fcac 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
/// is_fundamental
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_fundamental
+ : public __bool_constant<__is_arithmetic(_Tp)
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
+ { };
+#else
template<typename _Tp>
struct is_fundamental
- : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
- is_null_pointer<_Tp>>::type
+ : public __bool_constant<is_arithmetic<_Tp>::value
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
{ };
+#endif
/// is_object
template<typename _Tp>
@@ -3209,13 +3219,16 @@ template <typename _Tp>
#if __has_builtin(__is_arithmetic)
template <typename _Tp>
inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+template <typename _Tp>
+ inline constexpr bool is_fundamental_v
+ = __is_arithmetic(_Tp) || is_void_v<_Tp> || is_null_pointer_v<_Tp>;
#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
-#endif
-
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_object_v = is_object<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v4 4/4] libstdc++: Optimize is_compound trait performance
2023-07-18 7:40 ` [PATCH v4 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Ken Matsui
2023-07-18 7:40 ` [PATCH v4 2/4] libstdc++: Optimize is_arithmetic trait performance Ken Matsui
2023-07-18 7:40 ` [PATCH v4 3/4] libstdc++: Optimize is_fundamental " Ken Matsui
@ 2023-07-18 7:40 ` Ken Matsui
2023-08-08 20:33 ` Jonathan Wakely
2 siblings, 1 reply; 41+ messages in thread
From: Ken Matsui @ 2023-07-18 7:40 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_compound trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_compound): Use __is_arithmetic
built-in trait.
(is_compound_v): Use is_fundamental_v instead.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index cf24de2fcac..73d9a2b16fc 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -702,9 +702,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
/// is_compound
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_compound
+ : public __bool_constant<!(__is_arithmetic(_Tp)
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value)>
+ { };
+#else
template<typename _Tp>
struct is_compound
: public __not_<is_fundamental<_Tp>>::type { };
+#endif
/// @cond undocumented
template<typename _Tp>
@@ -3234,7 +3243,7 @@ template <typename _Tp>
template <typename _Tp>
inline constexpr bool is_scalar_v = is_scalar<_Tp>::value;
template <typename _Tp>
- inline constexpr bool is_compound_v = is_compound<_Tp>::value;
+ inline constexpr bool is_compound_v = !is_fundamental_v<_Tp>;
template <typename _Tp>
inline constexpr bool is_member_pointer_v = is_member_pointer<_Tp>::value;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v4 4/4] libstdc++: Optimize is_compound trait performance
2023-07-18 7:40 ` [PATCH v4 4/4] libstdc++: Optimize is_compound " Ken Matsui
@ 2023-08-08 20:33 ` Jonathan Wakely
2023-09-01 10:40 ` Ken Matsui
0 siblings, 1 reply; 41+ messages in thread
From: Jonathan Wakely @ 2023-08-08 20:33 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 2302 bytes --]
On Tue, 18 Jul 2023 at 08:44, Ken Matsui via Libstdc++ <
libstdc++@gcc.gnu.org> wrote:
> This patch optimizes the performance of the is_compound trait by
> dispatching to the new __is_arithmetic built-in trait.
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_compound): Use __is_arithmetic
> built-in trait.
> (is_compound_v): Use is_fundamental_v instead.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> libstdc++-v3/include/std/type_traits | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> index cf24de2fcac..73d9a2b16fc 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -702,9 +702,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> { };
>
> /// is_compound
> +#if __has_builtin(__is_arithmetic)
> + template<typename _Tp>
> + struct is_compound
> + : public __bool_constant<!(__is_arithmetic(_Tp)
> + || is_void<_Tp>::value
> + || is_null_pointer<_Tp>::value)>
> + { };
> +#else
> template<typename _Tp>
> struct is_compound
> : public __not_<is_fundamental<_Tp>>::type { };
> +#endif
>
I think it would be simpler to just do this unconditionally (i.e. just a
single definition without using __has_builtin):
template<typename _Tp>
struct is_compound
: __bool_constant<!is_fundamental<_Tp>::value>
{ };
This still avoids instantiating __not_. If is_fundamental is much more
efficient now, then I think it's OK to instantiate it here. Otherwise we're
duplicating the logic for is_fundamental, and just giving ourselves more
code to maintain.
Nobody ever uses is_compound anyway!
> /// @cond undocumented
> template<typename _Tp>
> @@ -3234,7 +3243,7 @@ template <typename _Tp>
> template <typename _Tp>
> inline constexpr bool is_scalar_v = is_scalar<_Tp>::value;
> template <typename _Tp>
> - inline constexpr bool is_compound_v = is_compound<_Tp>::value;
> + inline constexpr bool is_compound_v = !is_fundamental_v<_Tp>;
> template <typename _Tp>
> inline constexpr bool is_member_pointer_v =
> is_member_pointer<_Tp>::value;
> template <typename _Tp>
> --
> 2.41.0
>
>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v4 4/4] libstdc++: Optimize is_compound trait performance
2023-08-08 20:33 ` Jonathan Wakely
@ 2023-09-01 10:40 ` Ken Matsui
0 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-09-01 10:40 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: Ken Matsui, gcc-patches, libstdc++
On Tue, Aug 8, 2023 at 1:33 PM Jonathan Wakely <jwakely@redhat.com> wrote:
>
>
>
> On Tue, 18 Jul 2023 at 08:44, Ken Matsui via Libstdc++ <libstdc++@gcc.gnu.org> wrote:
>>
>> This patch optimizes the performance of the is_compound trait by
>> dispatching to the new __is_arithmetic built-in trait.
>>
>> libstdc++-v3/ChangeLog:
>>
>> * include/std/type_traits (is_compound): Use __is_arithmetic
>> built-in trait.
>> (is_compound_v): Use is_fundamental_v instead.
>>
>> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
>> ---
>> libstdc++-v3/include/std/type_traits | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
>> index cf24de2fcac..73d9a2b16fc 100644
>> --- a/libstdc++-v3/include/std/type_traits
>> +++ b/libstdc++-v3/include/std/type_traits
>> @@ -702,9 +702,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> { };
>>
>> /// is_compound
>> +#if __has_builtin(__is_arithmetic)
>> + template<typename _Tp>
>> + struct is_compound
>> + : public __bool_constant<!(__is_arithmetic(_Tp)
>> + || is_void<_Tp>::value
>> + || is_null_pointer<_Tp>::value)>
>> + { };
>> +#else
>> template<typename _Tp>
>> struct is_compound
>> : public __not_<is_fundamental<_Tp>>::type { };
>> +#endif
>
>
> I think it would be simpler to just do this unconditionally (i.e. just a single definition without using __has_builtin):
>
> template<typename _Tp>
> struct is_compound
> : __bool_constant<!is_fundamental<_Tp>::value>
> { };
>
> This still avoids instantiating __not_. If is_fundamental is much more efficient now, then I think it's OK to instantiate it here. Otherwise we're duplicating the logic for is_fundamental, and just giving ourselves more code to maintain.
>
> Nobody ever uses is_compound anyway!
>
Agreed! Will fix this patch. Thank you!
>
>
>>
>> /// @cond undocumented
>> template<typename _Tp>
>> @@ -3234,7 +3243,7 @@ template <typename _Tp>
>> template <typename _Tp>
>> inline constexpr bool is_scalar_v = is_scalar<_Tp>::value;
>> template <typename _Tp>
>> - inline constexpr bool is_compound_v = is_compound<_Tp>::value;
>> + inline constexpr bool is_compound_v = !is_fundamental_v<_Tp>;
>> template <typename _Tp>
>> inline constexpr bool is_member_pointer_v = is_member_pointer<_Tp>::value;
>> template <typename _Tp>
>> --
>> 2.41.0
>>
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PATCH v3 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-18 6:27 ` [PATCH v3 " Ken Matsui
` (2 preceding siblings ...)
2023-07-18 7:40 ` [PATCH v4 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Ken Matsui
@ 2023-07-22 13:50 ` François Dumont
2023-08-08 20:04 ` Jonathan Wakely
3 siblings, 1 reply; 41+ messages in thread
From: François Dumont @ 2023-07-22 13:50 UTC (permalink / raw)
To: Ken Matsui, gcc-patches; +Cc: libstdc++
On 18/07/2023 08:27, Ken Matsui via Libstdc++ wrote:
> This patch implements built-in trait for std::is_arithmetic.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_arithmetic.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
> * g++.dg/ext/is_arithmetic.C: New test.
> * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
> (__is_arith): ... this.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
> (__is_arith): ... this.
> * include/c_global/cmath: Use __is_arith instead.
> * include/c_std/cmath: Likewise.
> * include/tr1/cmath: Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> gcc/cp/constraint.cc | 3 ++
> gcc/cp/cp-trait.def | 1 +
> gcc/cp/semantics.cc | 4 ++
> gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
> gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
> libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
> libstdc++-v3/include/c_std/cmath | 24 +++++------
> libstdc++-v3/include/tr1/cmath | 24 +++++------
> 11 files changed, 99 insertions(+), 55 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..bd517d08843 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> + case CPTK_IS_ARITHMETIC:
> + inform (loc, " %qT is not an arithmetic type", t1);
> + break;
> case CPTK_IS_TRIVIALLY_COPYABLE:
> inform (loc, " %qT is not trivially copyable", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..a95aeeaf778 100644
> --- a/gcc/cp/cp-trait.def
> +++ b/gcc/cp/cp-trait.def
> @@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
> DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
> DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
> DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
> +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
> DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
> DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
> /* FIXME Added space to avoid direct usage in GCC 13. */
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index 8fb47fd179e..4531f047d73 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_UNION:
> return type_code1 == UNION_TYPE;
>
> + case CPTK_IS_ARITHMETIC:
> + return ARITHMETIC_TYPE_P (type1);
> +
> case CPTK_IS_ASSIGNABLE:
> return is_xible (MODIFY_EXPR, type1, type2);
>
> @@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_ENUM:
> case CPTK_IS_UNION:
> case CPTK_IS_SAME:
> + case CPTK_IS_ARITHMETIC:
> break;
>
> case CPTK_IS_LAYOUT_COMPATIBLE:
> diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> index f343e153e56..3d63b0101d1 100644
> --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> @@ -146,3 +146,6 @@
> #if !__has_builtin (__remove_cvref)
> # error "__has_builtin (__remove_cvref) failed"
> #endif
> +#if !__has_builtin (__is_arithmetic)
> +# error "__has_builtin (__is_arithmetic) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> new file mode 100644
> index 00000000000..fd35831f646
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> @@ -0,0 +1,33 @@
> +// { dg-do compile { target c++11 } }
> +
> +#include <testsuite_tr1.h>
> +
> +using namespace __gnu_test;
> +
> +#define SA(X) static_assert((X),#X)
> +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
> + SA(TRAIT(TYPE) == EXPECT); \
> + SA(TRAIT(const TYPE) == EXPECT); \
> + SA(TRAIT(volatile TYPE) == EXPECT); \
> + SA(TRAIT(const volatile TYPE) == EXPECT)
> +
> +SA_TEST_CATEGORY(__is_arithmetic, void, false);
> +
> +SA_TEST_CATEGORY(__is_arithmetic, char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
> +SA_TEST_CATEGORY(__is_arithmetic, short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, float, true);
> +SA_TEST_CATEGORY(__is_arithmetic, double, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long double, true);
> +
> +// Sanity check.
> +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..8d2d3eb6c5a 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_arithmetic
> + struct __is_arith
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
> template<typename _Tp>
> struct __is_fundamental
> - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
> + : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
> { };
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
> { };
> template<typename _Tp>
> struct __is_char
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..ecbe99db4f8 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> + template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> };
> - template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> + template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > {
> };
> }
> namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
> index 4312f32a4e0..d00d1ea8d75 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // An arithmetic type is an integer type or a floating point type
> //
> template<typename _Tp>
> - struct __is_arithmetic
> + struct __is_arith
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
'ptr' is a well known alias of 'pointer', I wouldn't say the same for
'arith' and 'arithmetic'.
But wait for a native-english feedback to change anything.
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v3 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-22 13:50 ` [PATCH v3 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait François Dumont
@ 2023-08-08 20:04 ` Jonathan Wakely
0 siblings, 0 replies; 41+ messages in thread
From: Jonathan Wakely @ 2023-08-08 20:04 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 3539 bytes --]
On Sat, 22 Jul 2023 at 14:51, François Dumont via Libstdc++ <
libstdc++@gcc.gnu.org> wrote:
>
> On 18/07/2023 08:27, Ken Matsui via Libstdc++ wrote:
> > This patch implements built-in trait for std::is_arithmetic.
> >
> > gcc/cp/ChangeLog:
> >
> > * cp-trait.def: Define __is_arithmetic.
> > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
> > * semantics.cc (trait_expr_value): Likewise.
> > (finish_trait_expr): Likewise.
> >
> > gcc/testsuite/ChangeLog:
> >
> > * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
> > * g++.dg/ext/is_arithmetic.C: New test.
> > * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
> > (__is_arith): ... this.
> > * g++.dg/torture/pr57107.C: Likewise.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
> > (__is_arith): ... this.
> > * include/c_global/cmath: Use __is_arith instead.
> > * include/c_std/cmath: Likewise.
> > * include/tr1/cmath: Likewise.
> >
> > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > ---
> > gcc/cp/constraint.cc | 3 ++
> > gcc/cp/cp-trait.def | 1 +
> > gcc/cp/semantics.cc | 4 ++
> > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
> > gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
> > gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
> > gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> > libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
> > libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
> > libstdc++-v3/include/c_std/cmath | 24 +++++------
> > libstdc++-v3/include/tr1/cmath | 24 +++++------
> > 11 files changed, 99 insertions(+), 55 deletions(-)
> > create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
>
>
[...]
> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h
> b/libstdc++-v3/include/bits/cpp_type_traits.h
> > index 4312f32a4e0..d00d1ea8d75 100644
> > --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> > +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> > @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> > // An arithmetic type is an integer type or a floating point type
> > //
> > template<typename _Tp>
> > - struct __is_arithmetic
> > + struct __is_arith
> > : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> > { };
>
> 'ptr' is a well known alias of 'pointer', I wouldn't say the same for
> 'arith' and 'arithmetic'.
>
> But wait for a native-english feedback to change anything.
>
>
I think it's clear enough. This is only an internal trait anyway, not part
of a public API.
Since all uses are with the __enable_if trait, we could add this helper and
get rid of __is_arithmetic completely:
template<typename _Tp, typename _Res,
bool = __is_integer<_Tp>::__value ||
__is_floating<_Tp>::__value>
struct __enable_if_arithmetic { };
template<typename _Tp, typename _Res>
struct __enable_if_arithmetic<_Tp, _Res, true> { typedef _Res __type; };
And similarly for a two-argument __enable_if_both_arithmetic helper.
But we can consider doing that later, I think __is_arith is fine for now.
The libstdc++ parts of this patch are OK (but wait for approval for the
compiler changes from a G++ maintainer before pushing).
^ permalink raw reply [flat|nested] 41+ messages in thread
* [PATCH v5 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-07-15 4:55 ` [PATCH v2 1/3] c++, libstdc++: Implement " Ken Matsui
` (3 preceding siblings ...)
2023-07-18 6:27 ` [PATCH v3 " Ken Matsui
@ 2023-09-01 11:25 ` Ken Matsui
2023-09-01 11:25 ` [PATCH v5 2/4] libstdc++: Optimize is_arithmetic trait performance Ken Matsui
` (4 more replies)
4 siblings, 5 replies; 41+ messages in thread
From: Ken Matsui @ 2023-09-01 11:25 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_arithmetic.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_arithmetic.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
* g++.dg/ext/is_arithmetic.C: New test.
* g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
(__is_arith): ... this.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
(__is_arith): ... this.
* include/c_global/cmath: Use __is_arith instead.
* include/c_std/cmath: Likewise.
* include/tr1/cmath: Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
gcc/cp/constraint.cc | 3 ++
gcc/cp/cp-trait.def | 1 +
gcc/cp/semantics.cc | 4 ++
gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
libstdc++-v3/include/c_std/cmath | 24 +++++------
libstdc++-v3/include/tr1/cmath | 24 +++++------
11 files changed, 99 insertions(+), 55 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..bd517d08843 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
+ case CPTK_IS_ARITHMETIC:
+ inform (loc, " %qT is not an arithmetic type", t1);
+ break;
case CPTK_IS_TRIVIALLY_COPYABLE:
inform (loc, " %qT is not trivially copyable", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..a95aeeaf778 100644
--- a/gcc/cp/cp-trait.def
+++ b/gcc/cp/cp-trait.def
@@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
+DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
/* FIXME Added space to avoid direct usage in GCC 13. */
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
index 8fb47fd179e..4531f047d73 100644
--- a/gcc/cp/semantics.cc
+++ b/gcc/cp/semantics.cc
@@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_UNION:
return type_code1 == UNION_TYPE;
+ case CPTK_IS_ARITHMETIC:
+ return ARITHMETIC_TYPE_P (type1);
+
case CPTK_IS_ASSIGNABLE:
return is_xible (MODIFY_EXPR, type1, type2);
@@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
case CPTK_IS_ENUM:
case CPTK_IS_UNION:
case CPTK_IS_SAME:
+ case CPTK_IS_ARITHMETIC:
break;
case CPTK_IS_LAYOUT_COMPATIBLE:
diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
index f343e153e56..3d63b0101d1 100644
--- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
+++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
@@ -146,3 +146,6 @@
#if !__has_builtin (__remove_cvref)
# error "__has_builtin (__remove_cvref) failed"
#endif
+#if !__has_builtin (__is_arithmetic)
+# error "__has_builtin (__is_arithmetic) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
new file mode 100644
index 00000000000..fd35831f646
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
@@ -0,0 +1,33 @@
+// { dg-do compile { target c++11 } }
+
+#include <testsuite_tr1.h>
+
+using namespace __gnu_test;
+
+#define SA(X) static_assert((X),#X)
+#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
+ SA(TRAIT(TYPE) == EXPECT); \
+ SA(TRAIT(const TYPE) == EXPECT); \
+ SA(TRAIT(volatile TYPE) == EXPECT); \
+ SA(TRAIT(const volatile TYPE) == EXPECT)
+
+SA_TEST_CATEGORY(__is_arithmetic, void, false);
+
+SA_TEST_CATEGORY(__is_arithmetic, char, true);
+SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
+SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
+SA_TEST_CATEGORY(__is_arithmetic, short, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
+SA_TEST_CATEGORY(__is_arithmetic, int, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
+SA_TEST_CATEGORY(__is_arithmetic, long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
+SA_TEST_CATEGORY(__is_arithmetic, long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
+SA_TEST_CATEGORY(__is_arithmetic, float, true);
+SA_TEST_CATEGORY(__is_arithmetic, double, true);
+SA_TEST_CATEGORY(__is_arithmetic, long double, true);
+
+// Sanity check.
+SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..8d2d3eb6c5a 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
template<typename _Tp>
struct __is_fundamental
- : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
+ : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
{ };
template<typename _Tp>
struct __is_char
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..ecbe99db4f8 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
+ template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
};
- template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
+ template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > {
};
}
namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 4312f32a4e0..d00d1ea8d75 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// An arithmetic type is an integer type or a floating point type
//
template<typename _Tp>
- struct __is_arithmetic
+ struct __is_arith
: public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
{ };
@@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
index b0ba395eb5c..da3ef537c38 100644
--- a/libstdc++-v3/include/c_global/cmath
+++ b/libstdc++-v3/include/c_global/cmath
@@ -1255,8 +1255,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1281,8 +1281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isgreaterequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1307,8 +1307,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isless(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1333,8 +1333,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessequal(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1359,8 +1359,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
islessgreater(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1385,8 +1385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
template<typename _Tp, typename _Up>
constexpr typename
- __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
- && __is_arithmetic<_Up>::__value), bool>::__type
+ __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
+ && __is_arith<_Up>::__value), bool>::__type
isunordered(_Tp __x, _Up __y)
{
typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
@@ -1397,7 +1397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#else
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -1407,7 +1407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -1443,7 +1443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -1461,7 +1461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -1470,7 +1470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -1488,7 +1488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -1497,7 +1497,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/cmath
index 588ee1e6dc4..c1db699ecdb 100644
--- a/libstdc++-v3/include/c_std/cmath
+++ b/libstdc++-v3/include/c_std/cmath
@@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#undef isunordered
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
index ba1b60cc945..2e80f1d0d00 100644
--- a/libstdc++-v3/include/tr1/cmath
+++ b/libstdc++-v3/include/tr1/cmath
@@ -307,7 +307,7 @@ namespace tr1
/// Function template definitions [8.16.3].
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
fpclassify(_Tp __f)
{
@@ -317,7 +317,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isfinite(_Tp __f)
{
@@ -326,7 +326,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isinf(_Tp __f)
{
@@ -335,7 +335,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnan(_Tp __f)
{
@@ -344,7 +344,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isnormal(_Tp __f)
{
@@ -353,7 +353,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
signbit(_Tp __f)
{
@@ -362,7 +362,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreater(_Tp __f1, _Tp __f2)
{
@@ -371,7 +371,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isgreaterequal(_Tp __f1, _Tp __f2)
{
@@ -380,7 +380,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isless(_Tp __f1, _Tp __f2)
{
@@ -389,7 +389,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessequal(_Tp __f1, _Tp __f2)
{
@@ -398,7 +398,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
islessgreater(_Tp __f1, _Tp __f2)
{
@@ -407,7 +407,7 @@ namespace tr1
}
template<typename _Tp>
- inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
+ inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
int>::__type
isunordered(_Tp __f1, _Tp __f2)
{
--
2.42.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v5 2/4] libstdc++: Optimize is_arithmetic trait performance
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
@ 2023-09-01 11:25 ` Ken Matsui
2023-09-01 11:25 ` [PATCH v5 3/4] libstdc++: Optimize is_fundamental " Ken Matsui
` (3 subsequent siblings)
4 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-09-01 11:25 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_arithmetic trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_arithmetic): Use __is_arithmetic
built-in trait.
(is_arithmetic_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..7ebbe04c77b 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -655,10 +655,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ };
/// is_arithmetic
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_arithmetic
+ : public __bool_constant<__is_arithmetic(_Tp)>
+ { };
+#else
template<typename _Tp>
struct is_arithmetic
: public __or_<is_integral<_Tp>, is_floating_point<_Tp>>::type
{ };
+#endif
/// is_fundamental
template<typename _Tp>
@@ -3198,8 +3205,15 @@ template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&> = true;
template <typename _Tp>
inline constexpr bool is_reference_v<_Tp&&> = true;
+
+#if __has_builtin(__is_arithmetic)
+template <typename _Tp>
+ inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
template <typename _Tp>
--
2.42.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v5 3/4] libstdc++: Optimize is_fundamental trait performance
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
2023-09-01 11:25 ` [PATCH v5 2/4] libstdc++: Optimize is_arithmetic trait performance Ken Matsui
@ 2023-09-01 11:25 ` Ken Matsui
2023-09-01 11:25 ` [PATCH v5 4/4] libstdc++: Optimize is_compound " Ken Matsui
` (2 subsequent siblings)
4 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-09-01 11:25 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_fundamental trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_fundamental_v): Use __is_arithmetic
built-in trait.
(is_fundamental): Likewise. Optimize the original implementation.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 7ebbe04c77b..cf24de2fcac 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -668,11 +668,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
/// is_fundamental
+#if __has_builtin(__is_arithmetic)
+ template<typename _Tp>
+ struct is_fundamental
+ : public __bool_constant<__is_arithmetic(_Tp)
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
+ { };
+#else
template<typename _Tp>
struct is_fundamental
- : public __or_<is_arithmetic<_Tp>, is_void<_Tp>,
- is_null_pointer<_Tp>>::type
+ : public __bool_constant<is_arithmetic<_Tp>::value
+ || is_void<_Tp>::value
+ || is_null_pointer<_Tp>::value>
{ };
+#endif
/// is_object
template<typename _Tp>
@@ -3209,13 +3219,16 @@ template <typename _Tp>
#if __has_builtin(__is_arithmetic)
template <typename _Tp>
inline constexpr bool is_arithmetic_v = __is_arithmetic(_Tp);
+template <typename _Tp>
+ inline constexpr bool is_fundamental_v
+ = __is_arithmetic(_Tp) || is_void_v<_Tp> || is_null_pointer_v<_Tp>;
#else
template <typename _Tp>
inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
-#endif
-
template <typename _Tp>
inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_object_v = is_object<_Tp>::value;
template <typename _Tp>
--
2.42.0
^ permalink raw reply [flat|nested] 41+ messages in thread* [PATCH v5 4/4] libstdc++: Optimize is_compound trait performance
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
2023-09-01 11:25 ` [PATCH v5 2/4] libstdc++: Optimize is_arithmetic trait performance Ken Matsui
2023-09-01 11:25 ` [PATCH v5 3/4] libstdc++: Optimize is_fundamental " Ken Matsui
@ 2023-09-01 11:25 ` Ken Matsui
2023-09-04 10:27 ` [PATCH v5 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Jonathan Wakely
2023-09-04 15:00 ` Ken Matsui
4 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-09-01 11:25 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch optimizes the performance of the is_compound trait by
dispatching to the new __is_arithmetic built-in trait.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_compound): Do not use __not_.
(is_compound_v): Use is_fundamental_v instead.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index cf24de2fcac..531f5a2bb3a 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -704,7 +704,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// is_compound
template<typename _Tp>
struct is_compound
- : public __not_<is_fundamental<_Tp>>::type { };
+ : public __bool_constant<!is_fundamental<_Tp>::value> { };
/// @cond undocumented
template<typename _Tp>
@@ -3234,7 +3234,7 @@ template <typename _Tp>
template <typename _Tp>
inline constexpr bool is_scalar_v = is_scalar<_Tp>::value;
template <typename _Tp>
- inline constexpr bool is_compound_v = is_compound<_Tp>::value;
+ inline constexpr bool is_compound_v = !is_fundamental_v<_Tp>;
template <typename _Tp>
inline constexpr bool is_member_pointer_v = is_member_pointer<_Tp>::value;
template <typename _Tp>
--
2.42.0
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v5 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
` (2 preceding siblings ...)
2023-09-01 11:25 ` [PATCH v5 4/4] libstdc++: Optimize is_compound " Ken Matsui
@ 2023-09-04 10:27 ` Jonathan Wakely
2023-09-04 15:00 ` Ken Matsui
4 siblings, 0 replies; 41+ messages in thread
From: Jonathan Wakely @ 2023-09-04 10:27 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
On Fri, 1 Sept 2023 at 12:25, Ken Matsui via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> This patch implements built-in trait for std::is_arithmetic.
The libstdc++-v3 parts are OK for trunk.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_arithmetic.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
> * g++.dg/ext/is_arithmetic.C: New test.
> * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
> (__is_arith): ... this.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
> (__is_arith): ... this.
> * include/c_global/cmath: Use __is_arith instead.
> * include/c_std/cmath: Likewise.
> * include/tr1/cmath: Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> gcc/cp/constraint.cc | 3 ++
> gcc/cp/cp-trait.def | 1 +
> gcc/cp/semantics.cc | 4 ++
> gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
> gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
> libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
> libstdc++-v3/include/c_std/cmath | 24 +++++------
> libstdc++-v3/include/tr1/cmath | 24 +++++------
> 11 files changed, 99 insertions(+), 55 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..bd517d08843 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> + case CPTK_IS_ARITHMETIC:
> + inform (loc, " %qT is not an arithmetic type", t1);
> + break;
> case CPTK_IS_TRIVIALLY_COPYABLE:
> inform (loc, " %qT is not trivially copyable", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..a95aeeaf778 100644
> --- a/gcc/cp/cp-trait.def
> +++ b/gcc/cp/cp-trait.def
> @@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
> DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
> DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
> DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
> +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
> DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
> DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
> /* FIXME Added space to avoid direct usage in GCC 13. */
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index 8fb47fd179e..4531f047d73 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_UNION:
> return type_code1 == UNION_TYPE;
>
> + case CPTK_IS_ARITHMETIC:
> + return ARITHMETIC_TYPE_P (type1);
> +
> case CPTK_IS_ASSIGNABLE:
> return is_xible (MODIFY_EXPR, type1, type2);
>
> @@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_ENUM:
> case CPTK_IS_UNION:
> case CPTK_IS_SAME:
> + case CPTK_IS_ARITHMETIC:
> break;
>
> case CPTK_IS_LAYOUT_COMPATIBLE:
> diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> index f343e153e56..3d63b0101d1 100644
> --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> @@ -146,3 +146,6 @@
> #if !__has_builtin (__remove_cvref)
> # error "__has_builtin (__remove_cvref) failed"
> #endif
> +#if !__has_builtin (__is_arithmetic)
> +# error "__has_builtin (__is_arithmetic) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> new file mode 100644
> index 00000000000..fd35831f646
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> @@ -0,0 +1,33 @@
> +// { dg-do compile { target c++11 } }
> +
> +#include <testsuite_tr1.h>
> +
> +using namespace __gnu_test;
> +
> +#define SA(X) static_assert((X),#X)
> +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
> + SA(TRAIT(TYPE) == EXPECT); \
> + SA(TRAIT(const TYPE) == EXPECT); \
> + SA(TRAIT(volatile TYPE) == EXPECT); \
> + SA(TRAIT(const volatile TYPE) == EXPECT)
> +
> +SA_TEST_CATEGORY(__is_arithmetic, void, false);
> +
> +SA_TEST_CATEGORY(__is_arithmetic, char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
> +SA_TEST_CATEGORY(__is_arithmetic, short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, float, true);
> +SA_TEST_CATEGORY(__is_arithmetic, double, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long double, true);
> +
> +// Sanity check.
> +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..8d2d3eb6c5a 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_arithmetic
> + struct __is_arith
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
> template<typename _Tp>
> struct __is_fundamental
> - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
> + : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
> { };
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
> { };
> template<typename _Tp>
> struct __is_char
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..ecbe99db4f8 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> + template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> };
> - template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> + template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > {
> };
> }
> namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
> index 4312f32a4e0..d00d1ea8d75 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // An arithmetic type is an integer type or a floating point type
> //
> template<typename _Tp>
> - struct __is_arithmetic
> + struct __is_arith
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
>
> @@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> //
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
> { };
>
> //
> diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
> index b0ba395eb5c..da3ef537c38 100644
> --- a/libstdc++-v3/include/c_global/cmath
> +++ b/libstdc++-v3/include/c_global/cmath
> @@ -1255,8 +1255,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isgreater(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1281,8 +1281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isgreaterequal(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1307,8 +1307,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isless(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1333,8 +1333,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> islessequal(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1359,8 +1359,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> islessgreater(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1385,8 +1385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isunordered(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1397,7 +1397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #else
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> fpclassify(_Tp __f)
> {
> @@ -1407,7 +1407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isfinite(_Tp __f)
> {
> @@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isinf(_Tp __f)
> {
> @@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnan(_Tp __f)
> {
> @@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnormal(_Tp __f)
> {
> @@ -1443,7 +1443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> signbit(_Tp __f)
> {
> @@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreater(_Tp __f1, _Tp __f2)
> {
> @@ -1461,7 +1461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreaterequal(_Tp __f1, _Tp __f2)
> {
> @@ -1470,7 +1470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isless(_Tp __f1, _Tp __f2)
> {
> @@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessequal(_Tp __f1, _Tp __f2)
> {
> @@ -1488,7 +1488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessgreater(_Tp __f1, _Tp __f2)
> {
> @@ -1497,7 +1497,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isunordered(_Tp __f1, _Tp __f2)
> {
> diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/cmath
> index 588ee1e6dc4..c1db699ecdb 100644
> --- a/libstdc++-v3/include/c_std/cmath
> +++ b/libstdc++-v3/include/c_std/cmath
> @@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #undef isunordered
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> fpclassify(_Tp __f)
> {
> @@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isfinite(_Tp __f)
> {
> @@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isinf(_Tp __f)
> {
> @@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnan(_Tp __f)
> {
> @@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnormal(_Tp __f)
> {
> @@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> signbit(_Tp __f)
> {
> @@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreater(_Tp __f1, _Tp __f2)
> {
> @@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreaterequal(_Tp __f1, _Tp __f2)
> {
> @@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isless(_Tp __f1, _Tp __f2)
> {
> @@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessequal(_Tp __f1, _Tp __f2)
> {
> @@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessgreater(_Tp __f1, _Tp __f2)
> {
> @@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isunordered(_Tp __f1, _Tp __f2)
> {
> diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
> index ba1b60cc945..2e80f1d0d00 100644
> --- a/libstdc++-v3/include/tr1/cmath
> +++ b/libstdc++-v3/include/tr1/cmath
> @@ -307,7 +307,7 @@ namespace tr1
>
> /// Function template definitions [8.16.3].
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> fpclassify(_Tp __f)
> {
> @@ -317,7 +317,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isfinite(_Tp __f)
> {
> @@ -326,7 +326,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isinf(_Tp __f)
> {
> @@ -335,7 +335,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnan(_Tp __f)
> {
> @@ -344,7 +344,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnormal(_Tp __f)
> {
> @@ -353,7 +353,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> signbit(_Tp __f)
> {
> @@ -362,7 +362,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreater(_Tp __f1, _Tp __f2)
> {
> @@ -371,7 +371,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreaterequal(_Tp __f1, _Tp __f2)
> {
> @@ -380,7 +380,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isless(_Tp __f1, _Tp __f2)
> {
> @@ -389,7 +389,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessequal(_Tp __f1, _Tp __f2)
> {
> @@ -398,7 +398,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessgreater(_Tp __f1, _Tp __f2)
> {
> @@ -407,7 +407,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isunordered(_Tp __f1, _Tp __f2)
> {
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 41+ messages in thread* Re: [PATCH v5 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait
2023-09-01 11:25 ` [PATCH v5 1/4] " Ken Matsui
` (3 preceding siblings ...)
2023-09-04 10:27 ` [PATCH v5 1/4] c++, libstdc++: Implement __is_arithmetic built-in trait Jonathan Wakely
@ 2023-09-04 15:00 ` Ken Matsui
4 siblings, 0 replies; 41+ messages in thread
From: Ken Matsui @ 2023-09-04 15:00 UTC (permalink / raw)
To: jason; +Cc: gcc-patches, libstdc++, Ken Matsui
Ping for __is_arithmetic built-in.
Sincerely,
Ken Matsui
On Fri, Sep 1, 2023 at 4:25 AM Ken Matsui <kmatsui@gcc.gnu.org> wrote:
>
> This patch implements built-in trait for std::is_arithmetic.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_arithmetic.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic.
> * g++.dg/ext/is_arithmetic.C: New test.
> * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ...
> (__is_arith): ... this.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ...
> (__is_arith): ... this.
> * include/c_global/cmath: Use __is_arith instead.
> * include/c_std/cmath: Likewise.
> * include/tr1/cmath: Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> gcc/cp/constraint.cc | 3 ++
> gcc/cp/cp-trait.def | 1 +
> gcc/cp/semantics.cc | 4 ++
> gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 ++
> gcc/testsuite/g++.dg/ext/is_arithmetic.C | 33 ++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 6 +--
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 4 +-
> libstdc++-v3/include/c_global/cmath | 48 ++++++++++-----------
> libstdc++-v3/include/c_std/cmath | 24 +++++------
> libstdc++-v3/include/tr1/cmath | 24 +++++------
> 11 files changed, 99 insertions(+), 55 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..bd517d08843 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> + case CPTK_IS_ARITHMETIC:
> + inform (loc, " %qT is not an arithmetic type", t1);
> + break;
> case CPTK_IS_TRIVIALLY_COPYABLE:
> inform (loc, " %qT is not trivially copyable", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..a95aeeaf778 100644
> --- a/gcc/cp/cp-trait.def
> +++ b/gcc/cp/cp-trait.def
> @@ -82,6 +82,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially_assignable", 2)
> DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible", -1)
> DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1)
> DEFTRAIT_EXPR (IS_UNION, "__is_union", 1)
> +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1)
> DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_from_temporary", 2)
> DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_temporary", 2)
> /* FIXME Added space to avoid direct usage in GCC 13. */
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index 8fb47fd179e..4531f047d73 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -12118,6 +12118,9 @@ trait_expr_value (cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_UNION:
> return type_code1 == UNION_TYPE;
>
> + case CPTK_IS_ARITHMETIC:
> + return ARITHMETIC_TYPE_P (type1);
> +
> case CPTK_IS_ASSIGNABLE:
> return is_xible (MODIFY_EXPR, type1, type2);
>
> @@ -12296,6 +12299,7 @@ finish_trait_expr (location_t loc, cp_trait_kind kind, tree type1, tree type2)
> case CPTK_IS_ENUM:
> case CPTK_IS_UNION:
> case CPTK_IS_SAME:
> + case CPTK_IS_ARITHMETIC:
> break;
>
> case CPTK_IS_LAYOUT_COMPATIBLE:
> diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> index f343e153e56..3d63b0101d1 100644
> --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> @@ -146,3 +146,6 @@
> #if !__has_builtin (__remove_cvref)
> # error "__has_builtin (__remove_cvref) failed"
> #endif
> +#if !__has_builtin (__is_arithmetic)
> +# error "__has_builtin (__is_arithmetic) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> new file mode 100644
> index 00000000000..fd35831f646
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C
> @@ -0,0 +1,33 @@
> +// { dg-do compile { target c++11 } }
> +
> +#include <testsuite_tr1.h>
> +
> +using namespace __gnu_test;
> +
> +#define SA(X) static_assert((X),#X)
> +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \
> + SA(TRAIT(TYPE) == EXPECT); \
> + SA(TRAIT(const TYPE) == EXPECT); \
> + SA(TRAIT(volatile TYPE) == EXPECT); \
> + SA(TRAIT(const volatile TYPE) == EXPECT)
> +
> +SA_TEST_CATEGORY(__is_arithmetic, void, false);
> +
> +SA_TEST_CATEGORY(__is_arithmetic, char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, signed char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true);
> +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true);
> +SA_TEST_CATEGORY(__is_arithmetic, short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true);
> +SA_TEST_CATEGORY(__is_arithmetic, int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true);
> +SA_TEST_CATEGORY(__is_arithmetic, float, true);
> +SA_TEST_CATEGORY(__is_arithmetic, double, true);
> +SA_TEST_CATEGORY(__is_arithmetic, long double, true);
> +
> +// Sanity check.
> +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false);
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..8d2d3eb6c5a 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_arithmetic
> + struct __is_arith
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
> template<typename _Tp>
> struct __is_fundamental
> - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> >
> + : public __traitor<__is_void<_Tp>, __is_arith<_Tp> >
> { };
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
> { };
> template<typename _Tp>
> struct __is_char
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..ecbe99db4f8 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_arithmetic : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> + template<typename _Tp> struct __is_arith : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > {
> };
> - template<typename _Tp> struct __is_scalar : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > {
> + template<typename _Tp> struct __is_scalar : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> > {
> };
> }
> namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) {
> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
> index 4312f32a4e0..d00d1ea8d75 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // An arithmetic type is an integer type or a floating point type
> //
> template<typename _Tp>
> - struct __is_arithmetic
> + struct __is_arith
> : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> >
> { };
>
> @@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> //
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<__is_arith<_Tp>, __is_pointer<_Tp> >
> { };
>
> //
> diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath
> index b0ba395eb5c..da3ef537c38 100644
> --- a/libstdc++-v3/include/c_global/cmath
> +++ b/libstdc++-v3/include/c_global/cmath
> @@ -1255,8 +1255,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isgreater(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1281,8 +1281,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isgreaterequal(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1307,8 +1307,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isless(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1333,8 +1333,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> islessequal(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1359,8 +1359,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> islessgreater(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1385,8 +1385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_INT
> template<typename _Tp, typename _Up>
> constexpr typename
> - __gnu_cxx::__enable_if<(__is_arithmetic<_Tp>::__value
> - && __is_arithmetic<_Up>::__value), bool>::__type
> + __gnu_cxx::__enable_if<(__is_arith<_Tp>::__value
> + && __is_arith<_Up>::__value), bool>::__type
> isunordered(_Tp __x, _Up __y)
> {
> typedef typename __gnu_cxx::__promote_2<_Tp, _Up>::__type __type;
> @@ -1397,7 +1397,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #else
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> fpclassify(_Tp __f)
> {
> @@ -1407,7 +1407,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isfinite(_Tp __f)
> {
> @@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isinf(_Tp __f)
> {
> @@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnan(_Tp __f)
> {
> @@ -1434,7 +1434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnormal(_Tp __f)
> {
> @@ -1443,7 +1443,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> signbit(_Tp __f)
> {
> @@ -1452,7 +1452,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreater(_Tp __f1, _Tp __f2)
> {
> @@ -1461,7 +1461,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreaterequal(_Tp __f1, _Tp __f2)
> {
> @@ -1470,7 +1470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isless(_Tp __f1, _Tp __f2)
> {
> @@ -1479,7 +1479,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessequal(_Tp __f1, _Tp __f2)
> {
> @@ -1488,7 +1488,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessgreater(_Tp __f1, _Tp __f2)
> {
> @@ -1497,7 +1497,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isunordered(_Tp __f1, _Tp __f2)
> {
> diff --git a/libstdc++-v3/include/c_std/cmath b/libstdc++-v3/include/c_std/cmath
> index 588ee1e6dc4..c1db699ecdb 100644
> --- a/libstdc++-v3/include/c_std/cmath
> +++ b/libstdc++-v3/include/c_std/cmath
> @@ -467,7 +467,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> #undef isunordered
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> fpclassify(_Tp __f)
> {
> @@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isfinite(_Tp __f)
> {
> @@ -486,7 +486,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isinf(_Tp __f)
> {
> @@ -495,7 +495,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnan(_Tp __f)
> {
> @@ -504,7 +504,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnormal(_Tp __f)
> {
> @@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> signbit(_Tp __f)
> {
> @@ -522,7 +522,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreater(_Tp __f1, _Tp __f2)
> {
> @@ -531,7 +531,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreaterequal(_Tp __f1, _Tp __f2)
> {
> @@ -540,7 +540,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isless(_Tp __f1, _Tp __f2)
> {
> @@ -549,7 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessequal(_Tp __f1, _Tp __f2)
> {
> @@ -558,7 +558,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessgreater(_Tp __f1, _Tp __f2)
> {
> @@ -567,7 +567,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isunordered(_Tp __f1, _Tp __f2)
> {
> diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath
> index ba1b60cc945..2e80f1d0d00 100644
> --- a/libstdc++-v3/include/tr1/cmath
> +++ b/libstdc++-v3/include/tr1/cmath
> @@ -307,7 +307,7 @@ namespace tr1
>
> /// Function template definitions [8.16.3].
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> fpclassify(_Tp __f)
> {
> @@ -317,7 +317,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isfinite(_Tp __f)
> {
> @@ -326,7 +326,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isinf(_Tp __f)
> {
> @@ -335,7 +335,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnan(_Tp __f)
> {
> @@ -344,7 +344,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isnormal(_Tp __f)
> {
> @@ -353,7 +353,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> signbit(_Tp __f)
> {
> @@ -362,7 +362,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreater(_Tp __f1, _Tp __f2)
> {
> @@ -371,7 +371,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isgreaterequal(_Tp __f1, _Tp __f2)
> {
> @@ -380,7 +380,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isless(_Tp __f1, _Tp __f2)
> {
> @@ -389,7 +389,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessequal(_Tp __f1, _Tp __f2)
> {
> @@ -398,7 +398,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> islessgreater(_Tp __f1, _Tp __f2)
> {
> @@ -407,7 +407,7 @@ namespace tr1
> }
>
> template<typename _Tp>
> - inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
> + inline typename __gnu_cxx::__enable_if<__is_arith<_Tp>::__value,
> int>::__type
> isunordered(_Tp __f1, _Tp __f2)
> {
> --
> 2.42.0
>
^ permalink raw reply [flat|nested] 41+ messages in thread