* [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait
@ 2023-07-10 5:23 Ken Matsui
2023-07-10 5:23 ` [PATCH 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
` (3 more replies)
0 siblings, 4 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-10 5:23 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_pointer.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_pointer.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
* g++.dg/ext/is_pointer.C: New test.
* g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
(____is_pointer): ... this.
* g++.dg/torture/20070621-1.C: Likewise.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
(____is_pointer): ... this.
* include/bits/deque.tcc: Use ____is_pointer instead.
* include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
libstdc++-v3/include/bits/deque.tcc | 6 +--
libstdc++-v3/include/bits/stl_algobase.h | 6 +--
11 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..30266204eb5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_UNION:
inform (loc, " %qT is not a union", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
+ return TYPE_PTR_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_POINTER:
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..9dace5cbd48 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_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
new file mode 100644
index 00000000000..d6e39565950
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..0896035390e 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct ____is_pointer
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct ____is_pointer<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
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
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && ____is_pointer<_II>::__value
+ && ____is_pointer<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && ____is_pointer<_BI1>::__value
+ && ____is_pointer<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && ____is_pointer<_II1>::__value
+ && ____is_pointer<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && ____is_pointer<_II1>::__value
+ && ____is_pointer<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index d8a6a76b6b0..9ae96717e4f 100644
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct ____is_pointer {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && ____is_pointer<_II1>::__value && ____is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..1fcf337ee58 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct ____is_pointer {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
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..3999898ffa6 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct ____is_pointer
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct ____is_pointer<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -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_arithmetic<_Tp>, ____is_pointer<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index a212b8a6940..9f5593fac51 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && ____is_pointer<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && ____is_pointer<_Ptr1>::__value
+ && ____is_pointer<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index dd95e94f7e9..b061c6c1185 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || ____is_pointer<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && ____is_pointer<_II1>::__value
+ && ____is_pointer<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 2/2] libstdc++: use new built-in trait __is_pointer
2023-07-10 5:23 [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
@ 2023-07-10 5:23 ` Ken Matsui
2023-07-10 5:32 ` Daniel Krügler
2023-07-10 5:38 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
` (2 subsequent siblings)
3 siblings, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-10 5:23 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch lets libstdc++ use new built-in trait __is_pointer.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_pointer): Use __is_pointer
built-in trait.
(is_pointer_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..d83db98403b 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -515,6 +515,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct is_array<_Tp[]>
: public true_type { };
+ /// is_pointer
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct is_pointer
+ : public __bool_constant<__is_pointer(_Tp)>
+ { };
+#else
template<typename>
struct __is_pointer_helper
: public false_type { };
@@ -523,11 +530,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __is_pointer_helper<_Tp*>
: public true_type { };
- /// is_pointer
template<typename _Tp>
struct is_pointer
: public __is_pointer_helper<__remove_cv_t<_Tp>>::type
{ };
+#endif
/// is_lvalue_reference
template<typename>
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 2/2] libstdc++: use new built-in trait __is_pointer
2023-07-10 5:23 ` [PATCH 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
@ 2023-07-10 5:32 ` Daniel Krügler
2023-07-10 5:34 ` Ken Matsui
0 siblings, 1 reply; 28+ messages in thread
From: Daniel Krügler @ 2023-07-10 5:32 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
Am Mo., 10. Juli 2023 um 07:24 Uhr schrieb Ken Matsui via Libstdc++
<libstdc++@gcc.gnu.org>:
>
> This patch lets libstdc++ use new built-in trait __is_pointer.
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_pointer): Use __is_pointer
> built-in trait.
> (is_pointer_v): Likewise.
>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> libstdc++-v3/include/std/type_traits | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> index 0e7a9c9c7f3..d83db98403b 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -515,6 +515,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> struct is_array<_Tp[]>
> : public true_type { };
>
> + /// is_pointer
> +#if __has_builtin(__is_pointer)
> + template<typename _Tp>
> + struct is_pointer
> + : public __bool_constant<__is_pointer(_Tp)>
> + { };
> +#else
> template<typename>
> struct __is_pointer_helper
> : public false_type { };
> @@ -523,11 +530,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> struct __is_pointer_helper<_Tp*>
> : public true_type { };
>
> - /// is_pointer
> template<typename _Tp>
> struct is_pointer
> : public __is_pointer_helper<__remove_cv_t<_Tp>>::type
> { };
> +#endif
>
> /// is_lvalue_reference
> template<typename>
> --
> 2.41.0
Shouldn't this adjust is_pointer_v as well?
Thanks,
- Daniel
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 2/2] libstdc++: use new built-in trait __is_pointer
2023-07-10 5:32 ` Daniel Krügler
@ 2023-07-10 5:34 ` Ken Matsui
0 siblings, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-10 5:34 UTC (permalink / raw)
To: Daniel Krügler; +Cc: Ken Matsui, gcc-patches, libstdc++
Oops! Thank you for pointing that out!
Sincerely,
Ken Matsui
On Sun, Jul 9, 2023 at 10:33 PM Daniel Krügler
<daniel.kruegler@gmail.com> wrote:
>
> Am Mo., 10. Juli 2023 um 07:24 Uhr schrieb Ken Matsui via Libstdc++
> <libstdc++@gcc.gnu.org>:
> >
> > This patch lets libstdc++ use new built-in trait __is_pointer.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/std/type_traits (is_pointer): Use __is_pointer
> > built-in trait.
> > (is_pointer_v): Likewise.
> >
> > Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> > ---
> > libstdc++-v3/include/std/type_traits | 9 ++++++++-
> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> > index 0e7a9c9c7f3..d83db98403b 100644
> > --- a/libstdc++-v3/include/std/type_traits
> > +++ b/libstdc++-v3/include/std/type_traits
> > @@ -515,6 +515,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > struct is_array<_Tp[]>
> > : public true_type { };
> >
> > + /// is_pointer
> > +#if __has_builtin(__is_pointer)
> > + template<typename _Tp>
> > + struct is_pointer
> > + : public __bool_constant<__is_pointer(_Tp)>
> > + { };
> > +#else
> > template<typename>
> > struct __is_pointer_helper
> > : public false_type { };
> > @@ -523,11 +530,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > struct __is_pointer_helper<_Tp*>
> > : public true_type { };
> >
> > - /// is_pointer
> > template<typename _Tp>
> > struct is_pointer
> > : public __is_pointer_helper<__remove_cv_t<_Tp>>::type
> > { };
> > +#endif
> >
> > /// is_lvalue_reference
> > template<typename>
> > --
> > 2.41.0
>
> Shouldn't this adjust is_pointer_v as well?
>
> Thanks,
>
> - Daniel
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-10 5:23 [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-10 5:23 ` [PATCH 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
@ 2023-07-10 5:38 ` Ken Matsui
2023-07-10 5:38 ` [PATCH v2 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
2023-07-10 5:50 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-12 4:40 ` [PATCH " François Dumont
2023-07-12 9:48 ` Jonathan Wakely
3 siblings, 2 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-10 5:38 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_pointer.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_pointer.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
* g++.dg/ext/is_pointer.C: New test.
* g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
(____is_pointer): ... this.
* g++.dg/torture/20070621-1.C: Likewise.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
(____is_pointer): ... this.
* include/bits/deque.tcc: Use ____is_pointer instead.
* include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
libstdc++-v3/include/bits/deque.tcc | 6 +--
libstdc++-v3/include/bits/stl_algobase.h | 6 +--
11 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..30266204eb5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_UNION:
inform (loc, " %qT is not a union", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
+ return TYPE_PTR_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_POINTER:
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..9dace5cbd48 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_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
new file mode 100644
index 00000000000..d6e39565950
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..0896035390e 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct ____is_pointer
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct ____is_pointer<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
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
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && ____is_pointer<_II>::__value
+ && ____is_pointer<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && ____is_pointer<_BI1>::__value
+ && ____is_pointer<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && ____is_pointer<_II1>::__value
+ && ____is_pointer<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && ____is_pointer<_II1>::__value
+ && ____is_pointer<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index d8a6a76b6b0..9ae96717e4f 100644
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct ____is_pointer {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && ____is_pointer<_II1>::__value && ____is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..1fcf337ee58 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct ____is_pointer {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
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..3999898ffa6 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct ____is_pointer
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct ____is_pointer<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -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_arithmetic<_Tp>, ____is_pointer<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index a212b8a6940..9f5593fac51 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && ____is_pointer<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && ____is_pointer<_Ptr1>::__value
+ && ____is_pointer<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index dd95e94f7e9..b061c6c1185 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || ____is_pointer<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && ____is_pointer<_II1>::__value
+ && ____is_pointer<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 2/2] libstdc++: use new built-in trait __is_pointer
2023-07-10 5:38 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
@ 2023-07-10 5:38 ` Ken Matsui
2023-07-10 5:50 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
1 sibling, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-10 5:38 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch lets libstdc++ use new built-in trait __is_pointer.
libstdc++-v3/ChangeLog:
* include/std/type_traits (is_pointer): Use __is_pointer
built-in trait.
(is_pointer_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/std/type_traits | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..b8291a31d3e 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -515,6 +515,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct is_array<_Tp[]>
: public true_type { };
+ /// is_pointer
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct is_pointer
+ : public __bool_constant<__is_pointer(_Tp)>
+ { };
+#else
template<typename>
struct __is_pointer_helper
: public false_type { };
@@ -523,11 +530,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __is_pointer_helper<_Tp*>
: public true_type { };
- /// is_pointer
template<typename _Tp>
struct is_pointer
: public __is_pointer_helper<__remove_cv_t<_Tp>>::type
{ };
+#endif
/// is_lvalue_reference
template<typename>
@@ -3168,8 +3175,14 @@ template <typename _Tp>
template <typename _Tp, size_t _Num>
inline constexpr bool is_array_v<_Tp[_Num]> = true;
+#if __has_builtin(__is_pointer)
+template <typename _Tp>
+ inline constexpr bool is_pointer_v = __is_pointer(_Tp);
+#else
template <typename _Tp>
inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
+#endif
+
template <typename _Tp>
inline constexpr bool is_lvalue_reference_v = false;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-10 5:38 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-10 5:38 ` [PATCH v2 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
@ 2023-07-10 5:50 ` Ken Matsui
2023-07-12 10:01 ` Jonathan Wakely
1 sibling, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-10 5:50 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
Hi,
Here is the benchmark result for is_pointer:
https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
Time: -62.1344%
Peak Memory Usage: -52.4281%
Total Memory Usage: -53.5889%
Sincerely,
Ken Matsui
On Sun, Jul 9, 2023 at 10:38 PM Ken Matsui <kmatsui@gcc.gnu.org> wrote:
>
> This patch implements built-in trait for std::is_pointer.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_pointer.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
> * g++.dg/ext/is_pointer.C: New test.
> * g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
> (____is_pointer): ... this.
> * g++.dg/torture/20070621-1.C: Likewise.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
> (____is_pointer): ... this.
> * include/bits/deque.tcc: Use ____is_pointer instead.
> * include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
> gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
> libstdc++-v3/include/bits/deque.tcc | 6 +--
> libstdc++-v3/include/bits/stl_algobase.h | 6 +--
> 11 files changed, 86 insertions(+), 24 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..30266204eb5 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_UNION:
> inform (loc, " %qT is not a union", t1);
> break;
> + case CPTK_IS_POINTER:
> + inform (loc, " %qT is not a pointer", t1);
> + break;
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
> + return TYPE_PTR_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_POINTER:
> 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..9dace5cbd48 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_pointer)
> +# error "__has_builtin (__is_pointer) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
> new file mode 100644
> index 00000000000..d6e39565950
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
> @@ -0,0 +1,51 @@
> +// { dg-do compile { target c++11 } }
> +
> +#define SA(X) static_assert((X),#X)
> +
> +SA(!__is_pointer(int));
> +SA(__is_pointer(int*));
> +SA(__is_pointer(int**));
> +
> +SA(__is_pointer(const int*));
> +SA(__is_pointer(const int**));
> +SA(__is_pointer(int* const));
> +SA(__is_pointer(int** const));
> +SA(__is_pointer(int* const* const));
> +
> +SA(__is_pointer(volatile int*));
> +SA(__is_pointer(volatile int**));
> +SA(__is_pointer(int* volatile));
> +SA(__is_pointer(int** volatile));
> +SA(__is_pointer(int* volatile* volatile));
> +
> +SA(__is_pointer(const volatile int*));
> +SA(__is_pointer(const volatile int**));
> +SA(__is_pointer(const int* volatile));
> +SA(__is_pointer(volatile int* const));
> +SA(__is_pointer(int* const volatile));
> +SA(__is_pointer(const int** volatile));
> +SA(__is_pointer(volatile int** const));
> +SA(__is_pointer(int** const volatile));
> +SA(__is_pointer(int* const* const volatile));
> +SA(__is_pointer(int* volatile* const volatile));
> +SA(__is_pointer(int* const volatile* const volatile));
> +
> +SA(!__is_pointer(int&));
> +SA(!__is_pointer(const int&));
> +SA(!__is_pointer(volatile int&));
> +SA(!__is_pointer(const volatile int&));
> +
> +SA(!__is_pointer(int&&));
> +SA(!__is_pointer(const int&&));
> +SA(!__is_pointer(volatile int&&));
> +SA(!__is_pointer(const volatile int&&));
> +
> +SA(!__is_pointer(int[3]));
> +SA(!__is_pointer(const int[3]));
> +SA(!__is_pointer(volatile int[3]));
> +SA(!__is_pointer(const volatile int[3]));
> +
> +SA(!__is_pointer(int(int)));
> +SA(__is_pointer(int(*const)(int)));
> +SA(__is_pointer(int(*volatile)(int)));
> +SA(__is_pointer(int(*const volatile)(int)));
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..0896035390e 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_pointer
> + struct ____is_pointer
> {
> enum { __value = 0 };
> typedef __false_type __type;
> };
> template<typename _Tp>
> - struct __is_pointer<_Tp*>
> + struct ____is_pointer<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> @@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> { };
> 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
> @@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
> typedef typename iterator_traits<_II>::iterator_category _Category;
> const bool __simple = (__is_pod(_ValueTypeI)
> - && __is_pointer<_II>::__value
> - && __is_pointer<_OI>::__value
> + && ____is_pointer<_II>::__value
> + && ____is_pointer<_OI>::__value
> && __are_same<_ValueTypeI, _ValueTypeO>::__value);
> return std::__copy_move<_IsMove, __simple,
> _Category>::__copy_m(__first, __last, __result);
> @@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_BI2>::value_type _ValueType2;
> typedef typename iterator_traits<_BI1>::iterator_category _Category;
> const bool __simple = (__is_pod(_ValueType1)
> - && __is_pointer<_BI1>::__value
> - && __is_pointer<_BI2>::__value
> + && ____is_pointer<_BI1>::__value
> + && ____is_pointer<_BI2>::__value
> && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__copy_move_backward<_IsMove, __simple,
> _Category>::__copy_move_b(__first,
> @@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> const bool __simple = (__is_integer<_ValueType1>::__value
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value
> + && ____is_pointer<_II1>::__value
> + && ____is_pointer<_II2>::__value
> && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> @@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> (__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
> && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
> && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value);
> + && ____is_pointer<_II1>::__value
> + && ____is_pointer<_II2>::__value);
> return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
> __first2, __last2);
> }
> diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
> index d8a6a76b6b0..9ae96717e4f 100644
> --- a/gcc/testsuite/g++.dg/torture/20070621-1.C
> +++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
> @@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_pointer {
> + template<typename _Tp> struct ____is_pointer {
> enum {
> __value = 0 };
> };
> @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> - const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> + const bool __simple = (__is_integer<_ValueType1>::__value && ____is_pointer<_II1>::__value && ____is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..1fcf337ee58 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_pointer {
> + template<typename _Tp> struct ____is_pointer {
> enum {
> __value = 0 };
> };
> @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> };
> 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..3999898ffa6 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // Pointer types
> //
> template<typename _Tp>
> - struct __is_pointer
> + struct ____is_pointer
> {
> enum { __value = 0 };
> typedef __false_type __type;
> };
>
> template<typename _Tp>
> - struct __is_pointer<_Tp*>
> + struct ____is_pointer<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> @@ -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_arithmetic<_Tp>, ____is_pointer<_Tp> >
> { };
>
> //
> diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
> index a212b8a6940..9f5593fac51 100644
> --- a/libstdc++-v3/include/bits/deque.tcc
> +++ b/libstdc++-v3/include/bits/deque.tcc
> @@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> const bool __simple =
> (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> - && __is_pointer<_Ptr>::__value
> + && ____is_pointer<_Ptr>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> @@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> const bool __simple =
> (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> - && __is_pointer<_Ptr1>::__value
> - && __is_pointer<_Ptr2>::__value
> + && ____is_pointer<_Ptr1>::__value
> + && ____is_pointer<_Ptr2>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
> index dd95e94f7e9..b061c6c1185 100644
> --- a/libstdc++-v3/include/bits/stl_algobase.h
> +++ b/libstdc++-v3/include/bits/stl_algobase.h
> @@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> const bool __simple = ((__is_integer<_ValueType1>::__value
> - || __is_pointer<_ValueType1>::__value)
> + || ____is_pointer<_ValueType1>::__value)
> && __memcmpable<_II1, _II2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> @@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> const bool __simple =
> (__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value
> + && ____is_pointer<_II1>::__value
> + && ____is_pointer<_II2>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-10 5:23 [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-10 5:23 ` [PATCH 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
2023-07-10 5:38 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
@ 2023-07-12 4:40 ` François Dumont
2023-07-12 9:47 ` Jonathan Wakely
2023-07-12 9:48 ` Jonathan Wakely
3 siblings, 1 reply; 28+ messages in thread
From: François Dumont @ 2023-07-12 4:40 UTC (permalink / raw)
To: Ken Matsui, gcc-patches; +Cc: libstdc++
On 10/07/2023 07:23, Ken Matsui via Libstdc++ wrote:
> This patch implements built-in trait for std::is_pointer.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_pointer.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
> * g++.dg/ext/is_pointer.C: New test.
> * g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
> (____is_pointer): ... this.
> * g++.dg/torture/20070621-1.C: Likewise.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
> (____is_pointer): ... this.
> * include/bits/deque.tcc: Use ____is_pointer instead.
> * include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
> gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
> libstdc++-v3/include/bits/deque.tcc | 6 +--
> libstdc++-v3/include/bits/stl_algobase.h | 6 +--
> 11 files changed, 86 insertions(+), 24 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..30266204eb5 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_UNION:
> inform (loc, " %qT is not a union", t1);
> break;
> + case CPTK_IS_POINTER:
> + inform (loc, " %qT is not a pointer", t1);
> + break;
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
> + return TYPE_PTR_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_POINTER:
> 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..9dace5cbd48 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_pointer)
> +# error "__has_builtin (__is_pointer) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
> new file mode 100644
> index 00000000000..d6e39565950
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
> @@ -0,0 +1,51 @@
> +// { dg-do compile { target c++11 } }
> +
> +#define SA(X) static_assert((X),#X)
> +
> +SA(!__is_pointer(int));
> +SA(__is_pointer(int*));
> +SA(__is_pointer(int**));
> +
> +SA(__is_pointer(const int*));
> +SA(__is_pointer(const int**));
> +SA(__is_pointer(int* const));
> +SA(__is_pointer(int** const));
> +SA(__is_pointer(int* const* const));
> +
> +SA(__is_pointer(volatile int*));
> +SA(__is_pointer(volatile int**));
> +SA(__is_pointer(int* volatile));
> +SA(__is_pointer(int** volatile));
> +SA(__is_pointer(int* volatile* volatile));
> +
> +SA(__is_pointer(const volatile int*));
> +SA(__is_pointer(const volatile int**));
> +SA(__is_pointer(const int* volatile));
> +SA(__is_pointer(volatile int* const));
> +SA(__is_pointer(int* const volatile));
> +SA(__is_pointer(const int** volatile));
> +SA(__is_pointer(volatile int** const));
> +SA(__is_pointer(int** const volatile));
> +SA(__is_pointer(int* const* const volatile));
> +SA(__is_pointer(int* volatile* const volatile));
> +SA(__is_pointer(int* const volatile* const volatile));
> +
> +SA(!__is_pointer(int&));
> +SA(!__is_pointer(const int&));
> +SA(!__is_pointer(volatile int&));
> +SA(!__is_pointer(const volatile int&));
> +
> +SA(!__is_pointer(int&&));
> +SA(!__is_pointer(const int&&));
> +SA(!__is_pointer(volatile int&&));
> +SA(!__is_pointer(const volatile int&&));
> +
> +SA(!__is_pointer(int[3]));
> +SA(!__is_pointer(const int[3]));
> +SA(!__is_pointer(volatile int[3]));
> +SA(!__is_pointer(const volatile int[3]));
> +
> +SA(!__is_pointer(int(int)));
> +SA(__is_pointer(int(*const)(int)));
> +SA(__is_pointer(int(*volatile)(int)));
> +SA(__is_pointer(int(*const volatile)(int)));
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..0896035390e 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_pointer
> + struct ____is_pointer
> {
> enum { __value = 0 };
> typedef __false_type __type;
> };
> template<typename _Tp>
> - struct __is_pointer<_Tp*>
> + struct ____is_pointer<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> @@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> { };
> 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
> @@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
> typedef typename iterator_traits<_II>::iterator_category _Category;
> const bool __simple = (__is_pod(_ValueTypeI)
> - && __is_pointer<_II>::__value
> - && __is_pointer<_OI>::__value
> + && ____is_pointer<_II>::__value
> + && ____is_pointer<_OI>::__value
> && __are_same<_ValueTypeI, _ValueTypeO>::__value);
> return std::__copy_move<_IsMove, __simple,
> _Category>::__copy_m(__first, __last, __result);
> @@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_BI2>::value_type _ValueType2;
> typedef typename iterator_traits<_BI1>::iterator_category _Category;
> const bool __simple = (__is_pod(_ValueType1)
> - && __is_pointer<_BI1>::__value
> - && __is_pointer<_BI2>::__value
> + && ____is_pointer<_BI1>::__value
> + && ____is_pointer<_BI2>::__value
> && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__copy_move_backward<_IsMove, __simple,
> _Category>::__copy_move_b(__first,
> @@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> const bool __simple = (__is_integer<_ValueType1>::__value
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value
> + && ____is_pointer<_II1>::__value
> + && ____is_pointer<_II2>::__value
> && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> @@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> (__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
> && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
> && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value);
> + && ____is_pointer<_II1>::__value
> + && ____is_pointer<_II2>::__value);
> return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
> __first2, __last2);
> }
> diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
> index d8a6a76b6b0..9ae96717e4f 100644
> --- a/gcc/testsuite/g++.dg/torture/20070621-1.C
> +++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
> @@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_pointer {
> + template<typename _Tp> struct ____is_pointer {
> enum {
> __value = 0 };
> };
> @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> - const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> + const bool __simple = (__is_integer<_ValueType1>::__value && ____is_pointer<_II1>::__value && ____is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..1fcf337ee58 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_pointer {
> + template<typename _Tp> struct ____is_pointer {
> enum {
> __value = 0 };
> };
> @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> };
> 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..3999898ffa6 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // Pointer types
> //
> template<typename _Tp>
> - struct __is_pointer
> + struct ____is_pointer
It makes the creation of builtin __is_pointer pointless for libstdc++ if
you do it this way, no ?
IMHO you should do something like:
//
// Pointer types
//
template<typename _Tp>
struct ____is_pointer
{
#if __has_builtin(__is_pointer)
enum { __value = __is_pointer(_Tp) };
typedef typename __truth_type<__value>::__type __type;
#else
enum { __value = 0 };
typedef __false_type __type;
#endif
};
#if !__has_builtin(__is_pointer)
template<typename _Tp>
struct __is_pointer<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
};
#endif
> {
> enum { __value = 0 };
> typedef __false_type __type;
> };
>
> template<typename _Tp>
> - struct __is_pointer<_Tp*>
> + struct ____is_pointer<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> @@ -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_arithmetic<_Tp>, ____is_pointer<_Tp> >
> { };
>
> //
> diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
> index a212b8a6940..9f5593fac51 100644
> --- a/libstdc++-v3/include/bits/deque.tcc
> +++ b/libstdc++-v3/include/bits/deque.tcc
> @@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> const bool __simple =
> (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> - && __is_pointer<_Ptr>::__value
> + && ____is_pointer<_Ptr>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> @@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> const bool __simple =
> (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> - && __is_pointer<_Ptr1>::__value
> - && __is_pointer<_Ptr2>::__value
> + && ____is_pointer<_Ptr1>::__value
> + && ____is_pointer<_Ptr2>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
> index dd95e94f7e9..b061c6c1185 100644
> --- a/libstdc++-v3/include/bits/stl_algobase.h
> +++ b/libstdc++-v3/include/bits/stl_algobase.h
> @@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> const bool __simple = ((__is_integer<_ValueType1>::__value
> - || __is_pointer<_ValueType1>::__value)
> + || ____is_pointer<_ValueType1>::__value)
> && __memcmpable<_II1, _II2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> @@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> const bool __simple =
> (__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value
> + && ____is_pointer<_II1>::__value
> + && ____is_pointer<_II2>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-12 4:40 ` [PATCH " François Dumont
@ 2023-07-12 9:47 ` Jonathan Wakely
0 siblings, 0 replies; 28+ messages in thread
From: Jonathan Wakely @ 2023-07-12 9:47 UTC (permalink / raw)
To: François Dumont; +Cc: Ken Matsui, gcc-patches, libstdc++
On Wed, 12 Jul 2023 at 05:41, François Dumont via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
>
> On 10/07/2023 07:23, Ken Matsui via Libstdc++ wrote:
> > This patch implements built-in trait for std::is_pointer.
> >
> > gcc/cp/ChangeLog:
> >
> > * cp-trait.def: Define __is_pointer.
> > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
> > * semantics.cc (trait_expr_value): Likewise.
> > (finish_trait_expr): Likewise.
> >
> > gcc/testsuite/ChangeLog:
> >
> > * g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
> > * g++.dg/ext/is_pointer.C: New test.
> > * g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
> > (____is_pointer): ... this.
> > * g++.dg/torture/20070621-1.C: Likewise.
> > * g++.dg/torture/pr57107.C: Likewise.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
> > (____is_pointer): ... this.
> > * include/bits/deque.tcc: Use ____is_pointer instead.
> > * include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
> > gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
> > gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
> > gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> > libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
> > libstdc++-v3/include/bits/deque.tcc | 6 +--
> > libstdc++-v3/include/bits/stl_algobase.h | 6 +--
> > 11 files changed, 86 insertions(+), 24 deletions(-)
> > create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
> >
> > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> > index 8cf0f2d0974..30266204eb5 100644
> > --- a/gcc/cp/constraint.cc
> > +++ b/gcc/cp/constraint.cc
> > @@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
> > case CPTK_IS_UNION:
> > inform (loc, " %qT is not a union", t1);
> > break;
> > + case CPTK_IS_POINTER:
> > + inform (loc, " %qT is not a pointer", t1);
> > + break;
> > case CPTK_IS_AGGREGATE:
> > inform (loc, " %qT is not an aggregate", t1);
> > break;
> > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> > index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
> > + return TYPE_PTR_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_POINTER:
> > 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..9dace5cbd48 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_pointer)
> > +# error "__has_builtin (__is_pointer) failed"
> > +#endif
> > diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
> > new file mode 100644
> > index 00000000000..d6e39565950
> > --- /dev/null
> > +++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
> > @@ -0,0 +1,51 @@
> > +// { dg-do compile { target c++11 } }
> > +
> > +#define SA(X) static_assert((X),#X)
> > +
> > +SA(!__is_pointer(int));
> > +SA(__is_pointer(int*));
> > +SA(__is_pointer(int**));
> > +
> > +SA(__is_pointer(const int*));
> > +SA(__is_pointer(const int**));
> > +SA(__is_pointer(int* const));
> > +SA(__is_pointer(int** const));
> > +SA(__is_pointer(int* const* const));
> > +
> > +SA(__is_pointer(volatile int*));
> > +SA(__is_pointer(volatile int**));
> > +SA(__is_pointer(int* volatile));
> > +SA(__is_pointer(int** volatile));
> > +SA(__is_pointer(int* volatile* volatile));
> > +
> > +SA(__is_pointer(const volatile int*));
> > +SA(__is_pointer(const volatile int**));
> > +SA(__is_pointer(const int* volatile));
> > +SA(__is_pointer(volatile int* const));
> > +SA(__is_pointer(int* const volatile));
> > +SA(__is_pointer(const int** volatile));
> > +SA(__is_pointer(volatile int** const));
> > +SA(__is_pointer(int** const volatile));
> > +SA(__is_pointer(int* const* const volatile));
> > +SA(__is_pointer(int* volatile* const volatile));
> > +SA(__is_pointer(int* const volatile* const volatile));
> > +
> > +SA(!__is_pointer(int&));
> > +SA(!__is_pointer(const int&));
> > +SA(!__is_pointer(volatile int&));
> > +SA(!__is_pointer(const volatile int&));
> > +
> > +SA(!__is_pointer(int&&));
> > +SA(!__is_pointer(const int&&));
> > +SA(!__is_pointer(volatile int&&));
> > +SA(!__is_pointer(const volatile int&&));
> > +
> > +SA(!__is_pointer(int[3]));
> > +SA(!__is_pointer(const int[3]));
> > +SA(!__is_pointer(volatile int[3]));
> > +SA(!__is_pointer(const volatile int[3]));
> > +
> > +SA(!__is_pointer(int(int)));
> > +SA(__is_pointer(int(*const)(int)));
> > +SA(__is_pointer(int(*volatile)(int)));
> > +SA(__is_pointer(int(*const volatile)(int)));
> > diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> > index 6d791484448..0896035390e 100644
> > --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> > +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> > @@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef __true_type __type;
> > };
> > template<typename _Tp>
> > - struct __is_pointer
> > + struct ____is_pointer
> > {
> > enum { __value = 0 };
> > typedef __false_type __type;
> > };
> > template<typename _Tp>
> > - struct __is_pointer<_Tp*>
> > + struct ____is_pointer<_Tp*>
> > {
> > enum { __value = 1 };
> > typedef __true_type __type;
> > @@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > { };
> > 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
> > @@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
> > typedef typename iterator_traits<_II>::iterator_category _Category;
> > const bool __simple = (__is_pod(_ValueTypeI)
> > - && __is_pointer<_II>::__value
> > - && __is_pointer<_OI>::__value
> > + && ____is_pointer<_II>::__value
> > + && ____is_pointer<_OI>::__value
> > && __are_same<_ValueTypeI, _ValueTypeO>::__value);
> > return std::__copy_move<_IsMove, __simple,
> > _Category>::__copy_m(__first, __last, __result);
> > @@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef typename iterator_traits<_BI2>::value_type _ValueType2;
> > typedef typename iterator_traits<_BI1>::iterator_category _Category;
> > const bool __simple = (__is_pod(_ValueType1)
> > - && __is_pointer<_BI1>::__value
> > - && __is_pointer<_BI2>::__value
> > + && ____is_pointer<_BI1>::__value
> > + && ____is_pointer<_BI2>::__value
> > && __are_same<_ValueType1, _ValueType2>::__value);
> > return std::__copy_move_backward<_IsMove, __simple,
> > _Category>::__copy_move_b(__first,
> > @@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef typename iterator_traits<_II1>::value_type _ValueType1;
> > typedef typename iterator_traits<_II2>::value_type _ValueType2;
> > const bool __simple = (__is_integer<_ValueType1>::__value
> > - && __is_pointer<_II1>::__value
> > - && __is_pointer<_II2>::__value
> > + && ____is_pointer<_II1>::__value
> > + && ____is_pointer<_II2>::__value
> > && __are_same<_ValueType1, _ValueType2>::__value);
> > return std::__equal<__simple>::equal(__first1, __last1, __first2);
> > }
> > @@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > (__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
> > && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
> > && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
> > - && __is_pointer<_II1>::__value
> > - && __is_pointer<_II2>::__value);
> > + && ____is_pointer<_II1>::__value
> > + && ____is_pointer<_II2>::__value);
> > return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
> > __first2, __last2);
> > }
> > diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
> > index d8a6a76b6b0..9ae96717e4f 100644
> > --- a/gcc/testsuite/g++.dg/torture/20070621-1.C
> > +++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
> > @@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > enum {
> > __value = 0 };
> > };
> > - template<typename _Tp> struct __is_pointer {
> > + template<typename _Tp> struct ____is_pointer {
> > enum {
> > __value = 0 };
> > };
> > @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
> > typedef typename iterator_traits<_II1>::value_type _ValueType1;
> > typedef typename iterator_traits<_II2>::value_type _ValueType2;
> > - const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> > + const bool __simple = (__is_integer<_ValueType1>::__value && ____is_pointer<_II1>::__value && ____is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> > return std::__equal<__simple>::equal(__first1, __last1, __first2);
> > }
> > template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
> > diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> > index 4dbd32bd298..1fcf337ee58 100644
> > --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> > +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> > @@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > enum {
> > __value = 0 };
> > };
> > - template<typename _Tp> struct __is_pointer {
> > + template<typename _Tp> struct ____is_pointer {
> > enum {
> > __value = 0 };
> > };
> > @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > };
> > 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..3999898ffa6 100644
> > --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> > +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> > @@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> > // Pointer types
> > //
> > template<typename _Tp>
> > - struct __is_pointer
> > + struct ____is_pointer
>
> It makes the creation of builtin __is_pointer pointless for libstdc++ if
> you do it this way, no ?
This is [PATCH 1/2], see the [PATCH 2/2] which uses the new built-in
for std::is_pointer. So it's not pointless.
But I agree that we could make use of the new built-in in this
non-standard trait as well.
>
> IMHO you should do something like:
>
> //
> // Pointer types
> //
> template<typename _Tp>
> struct ____is_pointer
> {
> #if __has_builtin(__is_pointer)
> enum { __value = __is_pointer(_Tp) };
> typedef typename __truth_type<__value>::__type __type;
This would mean we instantiate a class template here anyway, and have
to match a partial specialization. If we do that, there's no point
using the built-in to avoid matching a partial specialization of this
trait.
> #else
> enum { __value = 0 };
> typedef __false_type __type;
> #endif
> };
>
> #if !__has_builtin(__is_pointer)
> template<typename _Tp>
> struct __is_pointer<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> };
> #endif
I think this would be simpler to read as two completely separate
blocks, and with the __type in a base class that won't be instantiated
unless needed.
#if __has_builtin(__is_pointer)
template<typename _Tp>
struct __is_pointer_type : __truth_type<__is_pointer(_Tp)>
{
enum { __value = __is_pointer(_Tp) };
};
#else
existing code ...
#endif
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-10 5:23 [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
` (2 preceding siblings ...)
2023-07-12 4:40 ` [PATCH " François Dumont
@ 2023-07-12 9:48 ` Jonathan Wakely
3 siblings, 0 replies; 28+ messages in thread
From: Jonathan Wakely @ 2023-07-12 9:48 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
On Mon, 10 Jul 2023 at 06:24, Ken Matsui via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> This patch implements built-in trait for std::is_pointer.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_pointer.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
> * g++.dg/ext/is_pointer.C: New test.
> * g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
> (____is_pointer): ... this.
> * g++.dg/torture/20070621-1.C: Likewise.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
> (____is_pointer): ... this.
Please pick another name, ____is_pointer is not OK for the library trait.
(It might be OK for the g++.dg tests, I have no opinion on that.)
You could use __is_pointer_type or __is_ptr, I don't really mind which
(it's only used in two places).
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-10 5:50 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
@ 2023-07-12 10:01 ` Jonathan Wakely
2023-07-12 20:42 ` Ken Matsui
0 siblings, 1 reply; 28+ messages in thread
From: Jonathan Wakely @ 2023-07-12 10:01 UTC (permalink / raw)
To: Ken Matsui; +Cc: Ken Matsui, gcc-patches, libstdc++
On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
<libstdc++@gcc.gnu.org> wrote:
>
> Hi,
>
> Here is the benchmark result for is_pointer:
>
> https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
>
> Time: -62.1344%
> Peak Memory Usage: -52.4281%
> Total Memory Usage: -53.5889%
Wow!
Although maybe we could have improved our std::is_pointer_v anyway, like so:
template <typename _Tp>
inline constexpr bool is_pointer_v = false;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp*> = true;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp* const> = true;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp* volatile> = true;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
I'm not sure why I didn't already do that.
Could you please benchmark that? And if it is better than the current
impl using is_pointer<_Tp>::value then we should do this in the
library:
#if __has_builtin(__is_pointer)
template <typename _Tp>
inline constexpr bool is_pointer_v = __is_pointer(_Tp);
#else
template <typename _Tp>
inline constexpr bool is_pointer_v = false;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp*> = true;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp* const> = true;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp* volatile> = true;
template <typename _Tp>
inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
#endif
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-12 10:01 ` Jonathan Wakely
@ 2023-07-12 20:42 ` Ken Matsui
2023-07-13 1:11 ` [PATCH v3 1/2] c++, libstdc++: Implement " Ken Matsui
2023-07-13 9:21 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Jonathan Wakely
0 siblings, 2 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-12 20:42 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: Ken Matsui, gcc-patches, libstdc++
On Wed, Jul 12, 2023 at 3:01 AM Jonathan Wakely <jwakely@redhat.com> wrote:
>
> On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
> <libstdc++@gcc.gnu.org> wrote:
> >
> > Hi,
> >
> > Here is the benchmark result for is_pointer:
> >
> > https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
> >
> > Time: -62.1344%
> > Peak Memory Usage: -52.4281%
> > Total Memory Usage: -53.5889%
>
> Wow!
>
> Although maybe we could have improved our std::is_pointer_v anyway, like so:
>
> template <typename _Tp>
> inline constexpr bool is_pointer_v = false;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp*> = true;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp* const> = true;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
>
> I'm not sure why I didn't already do that.
>
> Could you please benchmark that? And if it is better than the current
> impl using is_pointer<_Tp>::value then we should do this in the
> library:
>
> #if __has_builtin(__is_pointer)
> template <typename _Tp>
> inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> #else
> template <typename _Tp>
> inline constexpr bool is_pointer_v = false;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp*> = true;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp* const> = true;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> template <typename _Tp>
> inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> #endif
Hi François and Jonathan,
Thank you for your reviews! I will rename the four underscores to the
appropriate name and take a benchmark once I get home.
If I apply your change on is_pointer_v, is it better to add the
`Co-authored-by:` line in the commit?
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait
2023-07-12 20:42 ` Ken Matsui
@ 2023-07-13 1:11 ` Ken Matsui
2023-07-13 1:11 ` [PATCH v3 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
` (2 more replies)
2023-07-13 9:21 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Jonathan Wakely
1 sibling, 3 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 1:11 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_pointer.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_pointer.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
* g++.dg/ext/is_pointer.C: New test.
* g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
(__is_ptr): ... this.
* g++.dg/torture/20070621-1.C: Likewise.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
(__is_ptr): ... this.
* include/bits/deque.tcc: Use __is_ptr instead.
* include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
libstdc++-v3/include/bits/deque.tcc | 6 +--
libstdc++-v3/include/bits/stl_algobase.h | 6 +--
11 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..30266204eb5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_UNION:
inform (loc, " %qT is not a union", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
+ return TYPE_PTR_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_POINTER:
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..9dace5cbd48 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_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
new file mode 100644
index 00000000000..d6e39565950
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..f08bbf6fd7b 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
template<typename _Tp>
struct __is_char
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && __is_ptr<_II>::__value
+ && __is_ptr<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && __is_ptr<_BI1>::__value
+ && __is_ptr<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index d8a6a76b6b0..b05136163e8 100644
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..be0689096fb 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
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_ptr<_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..3711e4be526 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -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_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index a212b8a6940..08d888ee8af 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && __is_ptr<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && __is_ptr<_Ptr1>::__value
+ && __is_ptr<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index dd95e94f7e9..cf21611fa5c 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || __is_ptr<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v3 2/2] libstdc++: Use new built-in trait __is_pointer
2023-07-13 1:11 ` [PATCH v3 1/2] c++, libstdc++: Implement " Ken Matsui
@ 2023-07-13 1:11 ` Ken Matsui
2023-07-13 1:13 ` [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
2023-07-13 3:16 ` [PATCH v4 " Ken Matsui
2 siblings, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 1:11 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch lets libstdc++ use new built-in trait __is_pointer.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_ptr): Use __is_pointer
built-in trait.
* include/std/type_traits (is_pointer): Likewise.
(is_pointer_v): Likewise. Optimize its implementation.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/bits/cpp_type_traits.h | 8 +++++++
libstdc++-v3/include/std/type_traits | 25 +++++++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 3711e4be526..4da1e7c407c 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -363,6 +363,13 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
// Pointer types
//
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct __is_ptr : __truth_type<__is_pointer(_Tp)>
+ {
+ enum { __value = __is_pointer(_Tp) };
+ };
+#else
template<typename _Tp>
struct __is_ptr
{
@@ -376,6 +383,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
enum { __value = 1 };
typedef __true_type __type;
};
+#endif
//
// An arithmetic type is an integer type or a floating point type
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..181a50e48d0 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -515,6 +515,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct is_array<_Tp[]>
: public true_type { };
+ /// is_pointer
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct is_pointer
+ : public __bool_constant<__is_pointer(_Tp)>
+ { };
+#else
template<typename>
struct __is_pointer_helper
: public false_type { };
@@ -523,11 +530,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __is_pointer_helper<_Tp*>
: public true_type { };
- /// is_pointer
template<typename _Tp>
struct is_pointer
: public __is_pointer_helper<__remove_cv_t<_Tp>>::type
{ };
+#endif
/// is_lvalue_reference
template<typename>
@@ -3168,8 +3175,22 @@ template <typename _Tp>
template <typename _Tp, size_t _Num>
inline constexpr bool is_array_v<_Tp[_Num]> = true;
+#if __has_builtin(__is_pointer)
template <typename _Tp>
- inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
+ inline constexpr bool is_pointer_v = __is_pointer(_Tp);
+#else
+template <typename _Tp>
+ inline constexpr bool is_pointer_v = false;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp*> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* volatile> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
+#endif
+
template <typename _Tp>
inline constexpr bool is_lvalue_reference_v = false;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait
2023-07-13 1:11 ` [PATCH v3 1/2] c++, libstdc++: Implement " Ken Matsui
2023-07-13 1:11 ` [PATCH v3 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
@ 2023-07-13 1:13 ` Ken Matsui
2023-07-13 1:15 ` Ken Matsui
2023-07-13 3:16 ` [PATCH v4 " Ken Matsui
2 siblings, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 1:13 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++
Hi,
Here is the updated benchmark result for is_pointer:
https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#wed-jul-12-055654-pm-pdt-2023
Time: -2.79488%
Peak Memory Usage: -2.39379%
Total Memory Usage: -3.39559%
Sincerely,
Ken Matsui
On Wed, Jul 12, 2023 at 6:12 PM Ken Matsui <kmatsui@gcc.gnu.org> wrote:
>
> This patch implements built-in trait for std::is_pointer.
>
> gcc/cp/ChangeLog:
>
> * cp-trait.def: Define __is_pointer.
> * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
> * semantics.cc (trait_expr_value): Likewise.
> (finish_trait_expr): Likewise.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
> * g++.dg/ext/is_pointer.C: New test.
> * g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
> (__is_ptr): ... this.
> * g++.dg/torture/20070621-1.C: Likewise.
> * g++.dg/torture/pr57107.C: Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
> (__is_ptr): ... this.
> * include/bits/deque.tcc: Use __is_ptr instead.
> * include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
> gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
> gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
> gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
> libstdc++-v3/include/bits/deque.tcc | 6 +--
> libstdc++-v3/include/bits/stl_algobase.h | 6 +--
> 11 files changed, 86 insertions(+), 24 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
>
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 8cf0f2d0974..30266204eb5 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_IS_UNION:
> inform (loc, " %qT is not a union", t1);
> break;
> + case CPTK_IS_POINTER:
> + inform (loc, " %qT is not a pointer", t1);
> + break;
> case CPTK_IS_AGGREGATE:
> inform (loc, " %qT is not an aggregate", t1);
> break;
> diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
> + return TYPE_PTR_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_POINTER:
> 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..9dace5cbd48 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_pointer)
> +# error "__has_builtin (__is_pointer) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
> new file mode 100644
> index 00000000000..d6e39565950
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
> @@ -0,0 +1,51 @@
> +// { dg-do compile { target c++11 } }
> +
> +#define SA(X) static_assert((X),#X)
> +
> +SA(!__is_pointer(int));
> +SA(__is_pointer(int*));
> +SA(__is_pointer(int**));
> +
> +SA(__is_pointer(const int*));
> +SA(__is_pointer(const int**));
> +SA(__is_pointer(int* const));
> +SA(__is_pointer(int** const));
> +SA(__is_pointer(int* const* const));
> +
> +SA(__is_pointer(volatile int*));
> +SA(__is_pointer(volatile int**));
> +SA(__is_pointer(int* volatile));
> +SA(__is_pointer(int** volatile));
> +SA(__is_pointer(int* volatile* volatile));
> +
> +SA(__is_pointer(const volatile int*));
> +SA(__is_pointer(const volatile int**));
> +SA(__is_pointer(const int* volatile));
> +SA(__is_pointer(volatile int* const));
> +SA(__is_pointer(int* const volatile));
> +SA(__is_pointer(const int** volatile));
> +SA(__is_pointer(volatile int** const));
> +SA(__is_pointer(int** const volatile));
> +SA(__is_pointer(int* const* const volatile));
> +SA(__is_pointer(int* volatile* const volatile));
> +SA(__is_pointer(int* const volatile* const volatile));
> +
> +SA(!__is_pointer(int&));
> +SA(!__is_pointer(const int&));
> +SA(!__is_pointer(volatile int&));
> +SA(!__is_pointer(const volatile int&));
> +
> +SA(!__is_pointer(int&&));
> +SA(!__is_pointer(const int&&));
> +SA(!__is_pointer(volatile int&&));
> +SA(!__is_pointer(const volatile int&&));
> +
> +SA(!__is_pointer(int[3]));
> +SA(!__is_pointer(const int[3]));
> +SA(!__is_pointer(volatile int[3]));
> +SA(!__is_pointer(const volatile int[3]));
> +
> +SA(!__is_pointer(int(int)));
> +SA(__is_pointer(int(*const)(int)));
> +SA(__is_pointer(int(*volatile)(int)));
> +SA(__is_pointer(int(*const volatile)(int)));
> diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> index 6d791484448..f08bbf6fd7b 100644
> --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> @@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef __true_type __type;
> };
> template<typename _Tp>
> - struct __is_pointer
> + struct __is_ptr
> {
> enum { __value = 0 };
> typedef __false_type __type;
> };
> template<typename _Tp>
> - struct __is_pointer<_Tp*>
> + struct __is_ptr<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> @@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> { };
> template<typename _Tp>
> struct __is_scalar
> - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> + : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
> { };
> template<typename _Tp>
> struct __is_char
> @@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
> typedef typename iterator_traits<_II>::iterator_category _Category;
> const bool __simple = (__is_pod(_ValueTypeI)
> - && __is_pointer<_II>::__value
> - && __is_pointer<_OI>::__value
> + && __is_ptr<_II>::__value
> + && __is_ptr<_OI>::__value
> && __are_same<_ValueTypeI, _ValueTypeO>::__value);
> return std::__copy_move<_IsMove, __simple,
> _Category>::__copy_m(__first, __last, __result);
> @@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_BI2>::value_type _ValueType2;
> typedef typename iterator_traits<_BI1>::iterator_category _Category;
> const bool __simple = (__is_pod(_ValueType1)
> - && __is_pointer<_BI1>::__value
> - && __is_pointer<_BI2>::__value
> + && __is_ptr<_BI1>::__value
> + && __is_ptr<_BI2>::__value
> && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__copy_move_backward<_IsMove, __simple,
> _Category>::__copy_move_b(__first,
> @@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> const bool __simple = (__is_integer<_ValueType1>::__value
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value
> + && __is_ptr<_II1>::__value
> + && __is_ptr<_II2>::__value
> && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> @@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> (__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
> && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
> && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value);
> + && __is_ptr<_II1>::__value
> + && __is_ptr<_II2>::__value);
> return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
> __first2, __last2);
> }
> diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
> index d8a6a76b6b0..b05136163e8 100644
> --- a/gcc/testsuite/g++.dg/torture/20070621-1.C
> +++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
> @@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_pointer {
> + template<typename _Tp> struct __is_ptr {
> enum {
> __value = 0 };
> };
> @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> - const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> + const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
> diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> index 4dbd32bd298..be0689096fb 100644
> --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> @@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> enum {
> __value = 0 };
> };
> - template<typename _Tp> struct __is_pointer {
> + template<typename _Tp> struct __is_ptr {
> enum {
> __value = 0 };
> };
> @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> };
> 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_ptr<_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..3711e4be526 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> // Pointer types
> //
> template<typename _Tp>
> - struct __is_pointer
> + struct __is_ptr
> {
> enum { __value = 0 };
> typedef __false_type __type;
> };
>
> template<typename _Tp>
> - struct __is_pointer<_Tp*>
> + struct __is_ptr<_Tp*>
> {
> enum { __value = 1 };
> typedef __true_type __type;
> @@ -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_arithmetic<_Tp>, __is_ptr<_Tp> >
> { };
>
> //
> diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
> index a212b8a6940..08d888ee8af 100644
> --- a/libstdc++-v3/include/bits/deque.tcc
> +++ b/libstdc++-v3/include/bits/deque.tcc
> @@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> const bool __simple =
> (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> - && __is_pointer<_Ptr>::__value
> + && __is_ptr<_Ptr>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> @@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> const bool __simple =
> (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> - && __is_pointer<_Ptr1>::__value
> - && __is_pointer<_Ptr2>::__value
> + && __is_ptr<_Ptr1>::__value
> + && __is_ptr<_Ptr2>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
> index dd95e94f7e9..cf21611fa5c 100644
> --- a/libstdc++-v3/include/bits/stl_algobase.h
> +++ b/libstdc++-v3/include/bits/stl_algobase.h
> @@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> {
> typedef typename iterator_traits<_II1>::value_type _ValueType1;
> const bool __simple = ((__is_integer<_ValueType1>::__value
> - || __is_pointer<_ValueType1>::__value)
> + || __is_ptr<_ValueType1>::__value)
> && __memcmpable<_II1, _II2>::__value);
> return std::__equal<__simple>::equal(__first1, __last1, __first2);
> }
> @@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> typedef typename iterator_traits<_II2>::value_type _ValueType2;
> const bool __simple =
> (__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
> - && __is_pointer<_II1>::__value
> - && __is_pointer<_II2>::__value
> + && __is_ptr<_II1>::__value
> + && __is_ptr<_II2>::__value
> #if __cplusplus > 201703L && __cpp_lib_concepts
> // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> // so __is_byte<T> could be true, but we can't use memcmp with
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait
2023-07-13 1:13 ` [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
@ 2023-07-13 1:15 ` Ken Matsui
0 siblings, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 1:15 UTC (permalink / raw)
To: Ken Matsui; +Cc: gcc-patches, libstdc++, Jonathan Wakely
Also, here is the Kanban board for our GSoC project, which might be
useful for you to manage non-reviewed patches.
https://github.com/users/ken-matsui/projects/1/views/1
On Wed, Jul 12, 2023 at 6:13 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> Hi,
>
> Here is the updated benchmark result for is_pointer:
>
> https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#wed-jul-12-055654-pm-pdt-2023
>
> Time: -2.79488%
> Peak Memory Usage: -2.39379%
> Total Memory Usage: -3.39559%
>
> Sincerely,
> Ken Matsui
>
> On Wed, Jul 12, 2023 at 6:12 PM Ken Matsui <kmatsui@gcc.gnu.org> wrote:
> >
> > This patch implements built-in trait for std::is_pointer.
> >
> > gcc/cp/ChangeLog:
> >
> > * cp-trait.def: Define __is_pointer.
> > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
> > * semantics.cc (trait_expr_value): Likewise.
> > (finish_trait_expr): Likewise.
> >
> > gcc/testsuite/ChangeLog:
> >
> > * g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
> > * g++.dg/ext/is_pointer.C: New test.
> > * g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
> > (__is_ptr): ... this.
> > * g++.dg/torture/20070621-1.C: Likewise.
> > * g++.dg/torture/pr57107.C: Likewise.
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
> > (__is_ptr): ... this.
> > * include/bits/deque.tcc: Use __is_ptr instead.
> > * include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
> > gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
> > gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
> > gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
> > libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
> > libstdc++-v3/include/bits/deque.tcc | 6 +--
> > libstdc++-v3/include/bits/stl_algobase.h | 6 +--
> > 11 files changed, 86 insertions(+), 24 deletions(-)
> > create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
> >
> > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> > index 8cf0f2d0974..30266204eb5 100644
> > --- a/gcc/cp/constraint.cc
> > +++ b/gcc/cp/constraint.cc
> > @@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
> > case CPTK_IS_UNION:
> > inform (loc, " %qT is not a union", t1);
> > break;
> > + case CPTK_IS_POINTER:
> > + inform (loc, " %qT is not a pointer", t1);
> > + break;
> > case CPTK_IS_AGGREGATE:
> > inform (loc, " %qT is not an aggregate", t1);
> > break;
> > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
> > index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
> > + return TYPE_PTR_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_POINTER:
> > 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..9dace5cbd48 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_pointer)
> > +# error "__has_builtin (__is_pointer) failed"
> > +#endif
> > diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
> > new file mode 100644
> > index 00000000000..d6e39565950
> > --- /dev/null
> > +++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
> > @@ -0,0 +1,51 @@
> > +// { dg-do compile { target c++11 } }
> > +
> > +#define SA(X) static_assert((X),#X)
> > +
> > +SA(!__is_pointer(int));
> > +SA(__is_pointer(int*));
> > +SA(__is_pointer(int**));
> > +
> > +SA(__is_pointer(const int*));
> > +SA(__is_pointer(const int**));
> > +SA(__is_pointer(int* const));
> > +SA(__is_pointer(int** const));
> > +SA(__is_pointer(int* const* const));
> > +
> > +SA(__is_pointer(volatile int*));
> > +SA(__is_pointer(volatile int**));
> > +SA(__is_pointer(int* volatile));
> > +SA(__is_pointer(int** volatile));
> > +SA(__is_pointer(int* volatile* volatile));
> > +
> > +SA(__is_pointer(const volatile int*));
> > +SA(__is_pointer(const volatile int**));
> > +SA(__is_pointer(const int* volatile));
> > +SA(__is_pointer(volatile int* const));
> > +SA(__is_pointer(int* const volatile));
> > +SA(__is_pointer(const int** volatile));
> > +SA(__is_pointer(volatile int** const));
> > +SA(__is_pointer(int** const volatile));
> > +SA(__is_pointer(int* const* const volatile));
> > +SA(__is_pointer(int* volatile* const volatile));
> > +SA(__is_pointer(int* const volatile* const volatile));
> > +
> > +SA(!__is_pointer(int&));
> > +SA(!__is_pointer(const int&));
> > +SA(!__is_pointer(volatile int&));
> > +SA(!__is_pointer(const volatile int&));
> > +
> > +SA(!__is_pointer(int&&));
> > +SA(!__is_pointer(const int&&));
> > +SA(!__is_pointer(volatile int&&));
> > +SA(!__is_pointer(const volatile int&&));
> > +
> > +SA(!__is_pointer(int[3]));
> > +SA(!__is_pointer(const int[3]));
> > +SA(!__is_pointer(volatile int[3]));
> > +SA(!__is_pointer(const volatile int[3]));
> > +
> > +SA(!__is_pointer(int(int)));
> > +SA(__is_pointer(int(*const)(int)));
> > +SA(__is_pointer(int(*volatile)(int)));
> > +SA(__is_pointer(int(*const volatile)(int)));
> > diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
> > index 6d791484448..f08bbf6fd7b 100644
> > --- a/gcc/testsuite/g++.dg/tm/pr46567.C
> > +++ b/gcc/testsuite/g++.dg/tm/pr46567.C
> > @@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef __true_type __type;
> > };
> > template<typename _Tp>
> > - struct __is_pointer
> > + struct __is_ptr
> > {
> > enum { __value = 0 };
> > typedef __false_type __type;
> > };
> > template<typename _Tp>
> > - struct __is_pointer<_Tp*>
> > + struct __is_ptr<_Tp*>
> > {
> > enum { __value = 1 };
> > typedef __true_type __type;
> > @@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > { };
> > template<typename _Tp>
> > struct __is_scalar
> > - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
> > + : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
> > { };
> > template<typename _Tp>
> > struct __is_char
> > @@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
> > typedef typename iterator_traits<_II>::iterator_category _Category;
> > const bool __simple = (__is_pod(_ValueTypeI)
> > - && __is_pointer<_II>::__value
> > - && __is_pointer<_OI>::__value
> > + && __is_ptr<_II>::__value
> > + && __is_ptr<_OI>::__value
> > && __are_same<_ValueTypeI, _ValueTypeO>::__value);
> > return std::__copy_move<_IsMove, __simple,
> > _Category>::__copy_m(__first, __last, __result);
> > @@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef typename iterator_traits<_BI2>::value_type _ValueType2;
> > typedef typename iterator_traits<_BI1>::iterator_category _Category;
> > const bool __simple = (__is_pod(_ValueType1)
> > - && __is_pointer<_BI1>::__value
> > - && __is_pointer<_BI2>::__value
> > + && __is_ptr<_BI1>::__value
> > + && __is_ptr<_BI2>::__value
> > && __are_same<_ValueType1, _ValueType2>::__value);
> > return std::__copy_move_backward<_IsMove, __simple,
> > _Category>::__copy_move_b(__first,
> > @@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > typedef typename iterator_traits<_II1>::value_type _ValueType1;
> > typedef typename iterator_traits<_II2>::value_type _ValueType2;
> > const bool __simple = (__is_integer<_ValueType1>::__value
> > - && __is_pointer<_II1>::__value
> > - && __is_pointer<_II2>::__value
> > + && __is_ptr<_II1>::__value
> > + && __is_ptr<_II2>::__value
> > && __are_same<_ValueType1, _ValueType2>::__value);
> > return std::__equal<__simple>::equal(__first1, __last1, __first2);
> > }
> > @@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > (__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
> > && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
> > && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
> > - && __is_pointer<_II1>::__value
> > - && __is_pointer<_II2>::__value);
> > + && __is_ptr<_II1>::__value
> > + && __is_ptr<_II2>::__value);
> > return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
> > __first2, __last2);
> > }
> > diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
> > index d8a6a76b6b0..b05136163e8 100644
> > --- a/gcc/testsuite/g++.dg/torture/20070621-1.C
> > +++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
> > @@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > enum {
> > __value = 0 };
> > };
> > - template<typename _Tp> struct __is_pointer {
> > + template<typename _Tp> struct __is_ptr {
> > enum {
> > __value = 0 };
> > };
> > @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
> > typedef typename iterator_traits<_II1>::value_type _ValueType1;
> > typedef typename iterator_traits<_II2>::value_type _ValueType2;
> > - const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> > + const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
> > return std::__equal<__simple>::equal(__first1, __last1, __first2);
> > }
> > template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
> > diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
> > index 4dbd32bd298..be0689096fb 100644
> > --- a/gcc/testsuite/g++.dg/torture/pr57107.C
> > +++ b/gcc/testsuite/g++.dg/torture/pr57107.C
> > @@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > enum {
> > __value = 0 };
> > };
> > - template<typename _Tp> struct __is_pointer {
> > + template<typename _Tp> struct __is_ptr {
> > enum {
> > __value = 0 };
> > };
> > @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
> > };
> > 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_ptr<_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..3711e4be526 100644
> > --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> > +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> > @@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> > // Pointer types
> > //
> > template<typename _Tp>
> > - struct __is_pointer
> > + struct __is_ptr
> > {
> > enum { __value = 0 };
> > typedef __false_type __type;
> > };
> >
> > template<typename _Tp>
> > - struct __is_pointer<_Tp*>
> > + struct __is_ptr<_Tp*>
> > {
> > enum { __value = 1 };
> > typedef __true_type __type;
> > @@ -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_arithmetic<_Tp>, __is_ptr<_Tp> >
> > { };
> >
> > //
> > diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
> > index a212b8a6940..08d888ee8af 100644
> > --- a/libstdc++-v3/include/bits/deque.tcc
> > +++ b/libstdc++-v3/include/bits/deque.tcc
> > @@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> > {
> > const bool __simple =
> > (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> > - && __is_pointer<_Ptr>::__value
> > + && __is_ptr<_Ptr>::__value
> > #if __cplusplus > 201703L && __cpp_lib_concepts
> > // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> > // so __is_byte<T> could be true, but we can't use memcmp with
> > @@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> > {
> > const bool __simple =
> > (__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
> > - && __is_pointer<_Ptr1>::__value
> > - && __is_pointer<_Ptr2>::__value
> > + && __is_ptr<_Ptr1>::__value
> > + && __is_ptr<_Ptr2>::__value
> > #if __cplusplus > 201703L && __cpp_lib_concepts
> > // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> > // so __is_byte<T> could be true, but we can't use memcmp with
> > diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
> > index dd95e94f7e9..cf21611fa5c 100644
> > --- a/libstdc++-v3/include/bits/stl_algobase.h
> > +++ b/libstdc++-v3/include/bits/stl_algobase.h
> > @@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> > {
> > typedef typename iterator_traits<_II1>::value_type _ValueType1;
> > const bool __simple = ((__is_integer<_ValueType1>::__value
> > - || __is_pointer<_ValueType1>::__value)
> > + || __is_ptr<_ValueType1>::__value)
> > && __memcmpable<_II1, _II2>::__value);
> > return std::__equal<__simple>::equal(__first1, __last1, __first2);
> > }
> > @@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
> > typedef typename iterator_traits<_II2>::value_type _ValueType2;
> > const bool __simple =
> > (__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
> > - && __is_pointer<_II1>::__value
> > - && __is_pointer<_II2>::__value
> > + && __is_ptr<_II1>::__value
> > + && __is_ptr<_II2>::__value
> > #if __cplusplus > 201703L && __cpp_lib_concepts
> > // For C++20 iterator_traits<volatile T*>::value_type is non-volatile
> > // so __is_byte<T> could be true, but we can't use memcmp with
> > --
> > 2.41.0
> >
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v4 1/2] c++, libstdc++: Implement __is_pointer built-in trait
2023-07-13 1:11 ` [PATCH v3 1/2] c++, libstdc++: Implement " Ken Matsui
2023-07-13 1:11 ` [PATCH v3 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
2023-07-13 1:13 ` [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
@ 2023-07-13 3:16 ` Ken Matsui
2023-07-13 3:16 ` [PATCH v4 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
2023-07-13 3:19 ` [PATCH v5 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
2 siblings, 2 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 3:16 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_pointer.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_pointer.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
* g++.dg/ext/is_pointer.C: New test.
* g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
(__is_ptr): ... this.
* g++.dg/torture/20070621-1.C: Likewise.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
(__is_ptr): ... this.
* include/bits/deque.tcc: Use __is_ptr instead.
* include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
libstdc++-v3/include/bits/deque.tcc | 6 +--
libstdc++-v3/include/bits/stl_algobase.h | 6 +--
11 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..30266204eb5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_UNION:
inform (loc, " %qT is not a union", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
+ return TYPE_PTR_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_POINTER:
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..9dace5cbd48 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_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
new file mode 100644
index 00000000000..d6e39565950
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..f08bbf6fd7b 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
template<typename _Tp>
struct __is_char
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && __is_ptr<_II>::__value
+ && __is_ptr<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && __is_ptr<_BI1>::__value
+ && __is_ptr<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index d8a6a76b6b0..b05136163e8 100644
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..be0689096fb 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
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_ptr<_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..3711e4be526 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -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_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index a212b8a6940..08d888ee8af 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && __is_ptr<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && __is_ptr<_Ptr1>::__value
+ && __is_ptr<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index dd95e94f7e9..cf21611fa5c 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || __is_ptr<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v4 2/2] libstdc++: Use new built-in trait __is_pointer
2023-07-13 3:16 ` [PATCH v4 " Ken Matsui
@ 2023-07-13 3:16 ` Ken Matsui
2023-07-13 3:19 ` [PATCH v5 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
1 sibling, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 3:16 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch lets libstdc++ use new built-in trait __is_pointer.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_ptr): Use __is_pointer
built-in trait.
* include/std/type_traits (is_pointer): Likewise. Optimize its
implementation.
(is_pointer_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/bits/cpp_type_traits.h | 8 ++++
libstdc++-v3/include/std/type_traits | 45 +++++++++++++++++----
2 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 3711e4be526..4da1e7c407c 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -363,6 +363,13 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
// Pointer types
//
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct __is_ptr : __truth_type<__is_pointer(_Tp)>
+ {
+ enum { __value = __is_pointer(_Tp) };
+ };
+#else
template<typename _Tp>
struct __is_ptr
{
@@ -376,6 +383,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
enum { __value = 1 };
typedef __true_type __type;
};
+#endif
//
// An arithmetic type is an integer type or a floating point type
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..0743db4cb51 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -515,19 +515,34 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct is_array<_Tp[]>
: public true_type { };
- template<typename>
- struct __is_pointer_helper
+ /// is_pointer
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct is_pointer
+ : public __bool_constant<__is_pointer(_Tp)>
+ { };
+#else
+ template<typename _Tp>
+ struct is_pointer
: public false_type { };
+ { };
template<typename _Tp>
- struct __is_pointer_helper<_Tp*>
+ struct is_pointer<_Tp*>
: public true_type { };
- /// is_pointer
template<typename _Tp>
- struct is_pointer
- : public __is_pointer_helper<__remove_cv_t<_Tp>>::type
- { };
+ struct is_pointer<_Tp* const>
+ : public true_type { };
+
+ template<typename _Tp>
+ struct is_pointer<_Tp* volatile>
+ : public true_type { };
+
+ template<typename _Tp>
+ struct is_pointer<_Tp* const volatile>
+ : public true_type { };
+#endif
/// is_lvalue_reference
template<typename>
@@ -3168,8 +3183,22 @@ template <typename _Tp>
template <typename _Tp, size_t _Num>
inline constexpr bool is_array_v<_Tp[_Num]> = true;
+#if __has_builtin(__is_pointer)
+template <typename _Tp>
+ inline constexpr bool is_pointer_v = __is_pointer(_Tp);
+#else
+template <typename _Tp>
+ inline constexpr bool is_pointer_v = false;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp*> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const> = true;
template <typename _Tp>
- inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
+ inline constexpr bool is_pointer_v<_Tp* volatile> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
+#endif
+
template <typename _Tp>
inline constexpr bool is_lvalue_reference_v = false;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v5 1/2] c++, libstdc++: Implement __is_pointer built-in trait
2023-07-13 3:16 ` [PATCH v4 " Ken Matsui
2023-07-13 3:16 ` [PATCH v4 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
@ 2023-07-13 3:19 ` Ken Matsui
2023-07-13 3:19 ` [PATCH v5 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
1 sibling, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 3:19 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_pointer.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_pointer.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
* g++.dg/ext/is_pointer.C: New test.
* g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
(__is_ptr): ... this.
* g++.dg/torture/20070621-1.C: Likewise.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
(__is_ptr): ... this.
* include/bits/deque.tcc: Use __is_ptr instead.
* include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
libstdc++-v3/include/bits/deque.tcc | 6 +--
libstdc++-v3/include/bits/stl_algobase.h | 6 +--
11 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..30266204eb5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_UNION:
inform (loc, " %qT is not a union", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
+ return TYPE_PTR_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_POINTER:
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..9dace5cbd48 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_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
new file mode 100644
index 00000000000..d6e39565950
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..f08bbf6fd7b 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
template<typename _Tp>
struct __is_char
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && __is_ptr<_II>::__value
+ && __is_ptr<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && __is_ptr<_BI1>::__value
+ && __is_ptr<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index d8a6a76b6b0..b05136163e8 100644
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..be0689096fb 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
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_ptr<_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..3711e4be526 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -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_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index a212b8a6940..08d888ee8af 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && __is_ptr<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && __is_ptr<_Ptr1>::__value
+ && __is_ptr<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index dd95e94f7e9..cf21611fa5c 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || __is_ptr<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v5 2/2] libstdc++: Use new built-in trait __is_pointer
2023-07-13 3:19 ` [PATCH v5 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
@ 2023-07-13 3:19 ` Ken Matsui
2023-07-13 20:48 ` [PATCH v6 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
0 siblings, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 3:19 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch lets libstdc++ use new built-in trait __is_pointer.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_ptr): Use __is_pointer
built-in trait.
* include/std/type_traits (is_pointer): Likewise. Optimize its
implementation.
(is_pointer_v): Likewise.
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/bits/cpp_type_traits.h | 8 ++++
libstdc++-v3/include/std/type_traits | 44 +++++++++++++++++----
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 3711e4be526..4da1e7c407c 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -363,6 +363,13 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
// Pointer types
//
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct __is_ptr : __truth_type<__is_pointer(_Tp)>
+ {
+ enum { __value = __is_pointer(_Tp) };
+ };
+#else
template<typename _Tp>
struct __is_ptr
{
@@ -376,6 +383,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
enum { __value = 1 };
typedef __true_type __type;
};
+#endif
//
// An arithmetic type is an integer type or a floating point type
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..16b2f6de536 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -515,19 +515,33 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct is_array<_Tp[]>
: public true_type { };
- template<typename>
- struct __is_pointer_helper
+ /// is_pointer
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct is_pointer
+ : public __bool_constant<__is_pointer(_Tp)>
+ { };
+#else
+ template<typename _Tp>
+ struct is_pointer
: public false_type { };
template<typename _Tp>
- struct __is_pointer_helper<_Tp*>
+ struct is_pointer<_Tp*>
: public true_type { };
- /// is_pointer
template<typename _Tp>
- struct is_pointer
- : public __is_pointer_helper<__remove_cv_t<_Tp>>::type
- { };
+ struct is_pointer<_Tp* const>
+ : public true_type { };
+
+ template<typename _Tp>
+ struct is_pointer<_Tp* volatile>
+ : public true_type { };
+
+ template<typename _Tp>
+ struct is_pointer<_Tp* const volatile>
+ : public true_type { };
+#endif
/// is_lvalue_reference
template<typename>
@@ -3168,8 +3182,22 @@ template <typename _Tp>
template <typename _Tp, size_t _Num>
inline constexpr bool is_array_v<_Tp[_Num]> = true;
+#if __has_builtin(__is_pointer)
+template <typename _Tp>
+ inline constexpr bool is_pointer_v = __is_pointer(_Tp);
+#else
template <typename _Tp>
- inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
+ inline constexpr bool is_pointer_v = false;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp*> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* volatile> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
+#endif
+
template <typename _Tp>
inline constexpr bool is_lvalue_reference_v = false;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-12 20:42 ` Ken Matsui
2023-07-13 1:11 ` [PATCH v3 1/2] c++, libstdc++: Implement " Ken Matsui
@ 2023-07-13 9:21 ` Jonathan Wakely
2023-07-13 20:04 ` Ken Matsui
1 sibling, 1 reply; 28+ messages in thread
From: Jonathan Wakely @ 2023-07-13 9:21 UTC (permalink / raw)
To: Ken Matsui; +Cc: Ken Matsui, gcc-patches, libstdc++
On Wed, 12 Jul 2023 at 21:42, Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> On Wed, Jul 12, 2023 at 3:01 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> >
> > On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
> > <libstdc++@gcc.gnu.org> wrote:
> > >
> > > Hi,
> > >
> > > Here is the benchmark result for is_pointer:
> > >
> > > https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
> > >
> > > Time: -62.1344%
> > > Peak Memory Usage: -52.4281%
> > > Total Memory Usage: -53.5889%
> >
> > Wow!
> >
> > Although maybe we could have improved our std::is_pointer_v anyway, like so:
> >
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v = false;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp*> = true;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> >
> > I'm not sure why I didn't already do that.
> >
> > Could you please benchmark that? And if it is better than the current
> > impl using is_pointer<_Tp>::value then we should do this in the
> > library:
> >
> > #if __has_builtin(__is_pointer)
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> > #else
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v = false;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp*> = true;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > template <typename _Tp>
> > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > #endif
>
> Hi François and Jonathan,
>
> Thank you for your reviews! I will rename the four underscores to the
> appropriate name and take a benchmark once I get home.
>
> If I apply your change on is_pointer_v, is it better to add the
> `Co-authored-by:` line in the commit?
Yes, that would be the correct thing to do (although in this case the
change is small enough that I don't really care about getting credit
for it :-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-13 9:21 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Jonathan Wakely
@ 2023-07-13 20:04 ` Ken Matsui
2023-07-14 10:48 ` Jonathan Wakely
0 siblings, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 20:04 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: Ken Matsui, gcc-patches, libstdc++
On Thu, Jul 13, 2023 at 2:22 AM Jonathan Wakely <jwakely@redhat.com> wrote:
>
> On Wed, 12 Jul 2023 at 21:42, Ken Matsui <kmatsui@cs.washington.edu> wrote:
> >
> > On Wed, Jul 12, 2023 at 3:01 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> > >
> > > On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
> > > <libstdc++@gcc.gnu.org> wrote:
> > > >
> > > > Hi,
> > > >
> > > > Here is the benchmark result for is_pointer:
> > > >
> > > > https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
> > > >
> > > > Time: -62.1344%
> > > > Peak Memory Usage: -52.4281%
> > > > Total Memory Usage: -53.5889%
> > >
> > > Wow!
> > >
> > > Although maybe we could have improved our std::is_pointer_v anyway, like so:
> > >
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v = false;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > >
> > > I'm not sure why I didn't already do that.
> > >
> > > Could you please benchmark that? And if it is better than the current
> > > impl using is_pointer<_Tp>::value then we should do this in the
> > > library:
> > >
> > > #if __has_builtin(__is_pointer)
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> > > #else
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v = false;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > template <typename _Tp>
> > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > #endif
> >
> > Hi François and Jonathan,
> >
> > Thank you for your reviews! I will rename the four underscores to the
> > appropriate name and take a benchmark once I get home.
> >
> > If I apply your change on is_pointer_v, is it better to add the
> > `Co-authored-by:` line in the commit?
>
> Yes, that would be the correct thing to do (although in this case the
> change is small enough that I don't really care about getting credit
> for it :-)
>
Thank you! I will include it in my commit :) I see that you included
the DCO sign-off in the MAINTAINERS file. However, if a reviewer
doesn't, should I include the `Signed-off-by:` line for the reviewer
as well?
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v6 1/2] c++, libstdc++: Implement __is_pointer built-in trait
2023-07-13 3:19 ` [PATCH v5 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
@ 2023-07-13 20:48 ` Ken Matsui
2023-07-13 20:48 ` [PATCH v6 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
0 siblings, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 20:48 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui
This patch implements built-in trait for std::is_pointer.
gcc/cp/ChangeLog:
* cp-trait.def: Define __is_pointer.
* constraint.cc (diagnose_trait_expr): Handle CPTK_IS_POINTER.
* semantics.cc (trait_expr_value): Likewise.
(finish_trait_expr): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/ext/has-builtin-1.C: Test existence of __is_pointer.
* g++.dg/ext/is_pointer.C: New test.
* g++.dg/tm/pr46567.C (__is_pointer): Rename to ...
(__is_ptr): ... this.
* g++.dg/torture/20070621-1.C: Likewise.
* g++.dg/torture/pr57107.C: Likewise.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_pointer): Rename to ...
(__is_ptr): ... this.
* include/bits/deque.tcc: Use __is_ptr instead.
* include/bits/stl_algobase.h: 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_pointer.C | 51 +++++++++++++++++++++
gcc/testsuite/g++.dg/tm/pr46567.C | 22 ++++-----
gcc/testsuite/g++.dg/torture/20070621-1.C | 4 +-
gcc/testsuite/g++.dg/torture/pr57107.C | 4 +-
libstdc++-v3/include/bits/cpp_type_traits.h | 6 +--
libstdc++-v3/include/bits/deque.tcc | 6 +--
libstdc++-v3/include/bits/stl_algobase.h | 6 +--
11 files changed, 86 insertions(+), 24 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/ext/is_pointer.C
diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
index 8cf0f2d0974..30266204eb5 100644
--- a/gcc/cp/constraint.cc
+++ b/gcc/cp/constraint.cc
@@ -3751,6 +3751,9 @@ diagnose_trait_expr (tree expr, tree args)
case CPTK_IS_UNION:
inform (loc, " %qT is not a union", t1);
break;
+ case CPTK_IS_POINTER:
+ inform (loc, " %qT is not a pointer", t1);
+ break;
case CPTK_IS_AGGREGATE:
inform (loc, " %qT is not an aggregate", t1);
break;
diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def
index 8b7fece0cc8..b7c263e9a77 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_POINTER, "__is_pointer", 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..68f8a4fe85b 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_POINTER:
+ return TYPE_PTR_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_POINTER:
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..9dace5cbd48 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_pointer)
+# error "__has_builtin (__is_pointer) failed"
+#endif
diff --git a/gcc/testsuite/g++.dg/ext/is_pointer.C b/gcc/testsuite/g++.dg/ext/is_pointer.C
new file mode 100644
index 00000000000..d6e39565950
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/is_pointer.C
@@ -0,0 +1,51 @@
+// { dg-do compile { target c++11 } }
+
+#define SA(X) static_assert((X),#X)
+
+SA(!__is_pointer(int));
+SA(__is_pointer(int*));
+SA(__is_pointer(int**));
+
+SA(__is_pointer(const int*));
+SA(__is_pointer(const int**));
+SA(__is_pointer(int* const));
+SA(__is_pointer(int** const));
+SA(__is_pointer(int* const* const));
+
+SA(__is_pointer(volatile int*));
+SA(__is_pointer(volatile int**));
+SA(__is_pointer(int* volatile));
+SA(__is_pointer(int** volatile));
+SA(__is_pointer(int* volatile* volatile));
+
+SA(__is_pointer(const volatile int*));
+SA(__is_pointer(const volatile int**));
+SA(__is_pointer(const int* volatile));
+SA(__is_pointer(volatile int* const));
+SA(__is_pointer(int* const volatile));
+SA(__is_pointer(const int** volatile));
+SA(__is_pointer(volatile int** const));
+SA(__is_pointer(int** const volatile));
+SA(__is_pointer(int* const* const volatile));
+SA(__is_pointer(int* volatile* const volatile));
+SA(__is_pointer(int* const volatile* const volatile));
+
+SA(!__is_pointer(int&));
+SA(!__is_pointer(const int&));
+SA(!__is_pointer(volatile int&));
+SA(!__is_pointer(const volatile int&));
+
+SA(!__is_pointer(int&&));
+SA(!__is_pointer(const int&&));
+SA(!__is_pointer(volatile int&&));
+SA(!__is_pointer(const volatile int&&));
+
+SA(!__is_pointer(int[3]));
+SA(!__is_pointer(const int[3]));
+SA(!__is_pointer(volatile int[3]));
+SA(!__is_pointer(const volatile int[3]));
+
+SA(!__is_pointer(int(int)));
+SA(__is_pointer(int(*const)(int)));
+SA(__is_pointer(int(*volatile)(int)));
+SA(__is_pointer(int(*const volatile)(int)));
diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/tm/pr46567.C
index 6d791484448..f08bbf6fd7b 100644
--- a/gcc/testsuite/g++.dg/tm/pr46567.C
+++ b/gcc/testsuite/g++.dg/tm/pr46567.C
@@ -192,13 +192,13 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef __true_type __type;
};
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
{ };
template<typename _Tp>
struct __is_scalar
- : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> >
+ : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
template<typename _Tp>
struct __is_char
@@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_OI>::value_type _ValueTypeO;
typedef typename iterator_traits<_II>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueTypeI)
- && __is_pointer<_II>::__value
- && __is_pointer<_OI>::__value
+ && __is_ptr<_II>::__value
+ && __is_ptr<_OI>::__value
&& __are_same<_ValueTypeI, _ValueTypeO>::__value);
return std::__copy_move<_IsMove, __simple,
_Category>::__copy_m(__first, __last, __result);
@@ -1294,8 +1294,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_BI2>::value_type _ValueType2;
typedef typename iterator_traits<_BI1>::iterator_category _Category;
const bool __simple = (__is_pod(_ValueType1)
- && __is_pointer<_BI1>::__value
- && __is_pointer<_BI2>::__value
+ && __is_ptr<_BI1>::__value
+ && __is_ptr<_BI2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__copy_move_backward<_IsMove, __simple,
_Category>::__copy_move_b(__first,
@@ -1426,8 +1426,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple = (__is_integer<_ValueType1>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
&& __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1515,8 +1515,8 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
(__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value
&& !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed
&& !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value);
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value);
return std::__lexicographical_compare<__simple>::__lc(__first1, __last1,
__first2, __last2);
}
diff --git a/gcc/testsuite/g++.dg/torture/20070621-1.C b/gcc/testsuite/g++.dg/torture/20070621-1.C
index d8a6a76b6b0..b05136163e8 100644
--- a/gcc/testsuite/g++.dg/torture/20070621-1.C
+++ b/gcc/testsuite/g++.dg/torture/20070621-1.C
@@ -18,7 +18,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
template<typename _II1, typename _II2> inline bool __equal_aux(_II1 __first1, _II1 __last1, _II2 __first2) {
typedef typename iterator_traits<_II1>::value_type _ValueType1;
typedef typename iterator_traits<_II2>::value_type _ValueType2;
- const bool __simple = (__is_integer<_ValueType1>::__value && __is_pointer<_II1>::__value && __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
+ const bool __simple = (__is_integer<_ValueType1>::__value && __is_ptr<_II1>::__value && __is_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
template<typename _II1, typename _II2> inline bool equal(_II1 __first1, _II1 __last1, _II2 __first2) {
diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++.dg/torture/pr57107.C
index 4dbd32bd298..be0689096fb 100644
--- a/gcc/testsuite/g++.dg/torture/pr57107.C
+++ b/gcc/testsuite/g++.dg/torture/pr57107.C
@@ -17,7 +17,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
enum {
__value = 0 };
};
- template<typename _Tp> struct __is_pointer {
+ template<typename _Tp> struct __is_ptr {
enum {
__value = 0 };
};
@@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("default"))) {
};
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_ptr<_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..3711e4be526 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -364,14 +364,14 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
// Pointer types
//
template<typename _Tp>
- struct __is_pointer
+ struct __is_ptr
{
enum { __value = 0 };
typedef __false_type __type;
};
template<typename _Tp>
- struct __is_pointer<_Tp*>
+ struct __is_ptr<_Tp*>
{
enum { __value = 1 };
typedef __true_type __type;
@@ -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_arithmetic<_Tp>, __is_ptr<_Tp> >
{ };
//
diff --git a/libstdc++-v3/include/bits/deque.tcc b/libstdc++-v3/include/bits/deque.tcc
index a212b8a6940..08d888ee8af 100644
--- a/libstdc++-v3/include/bits/deque.tcc
+++ b/libstdc++-v3/include/bits/deque.tcc
@@ -1273,7 +1273,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr>::__value
+ && __is_ptr<_Ptr>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
@@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
const bool __simple =
(__is_memcmp_ordered_with<_Tp1, _Tp2>::__value
- && __is_pointer<_Ptr1>::__value
- && __is_pointer<_Ptr2>::__value
+ && __is_ptr<_Ptr1>::__value
+ && __is_ptr<_Ptr2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index dd95e94f7e9..cf21611fa5c 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1214,7 +1214,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
{
typedef typename iterator_traits<_II1>::value_type _ValueType1;
const bool __simple = ((__is_integer<_ValueType1>::__value
- || __is_pointer<_ValueType1>::__value)
+ || __is_ptr<_ValueType1>::__value)
&& __memcmpable<_II1, _II2>::__value);
return std::__equal<__simple>::equal(__first1, __last1, __first2);
}
@@ -1377,8 +1377,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
typedef typename iterator_traits<_II2>::value_type _ValueType2;
const bool __simple =
(__is_memcmp_ordered_with<_ValueType1, _ValueType2>::__value
- && __is_pointer<_II1>::__value
- && __is_pointer<_II2>::__value
+ && __is_ptr<_II1>::__value
+ && __is_ptr<_II2>::__value
#if __cplusplus > 201703L && __cpp_lib_concepts
// For C++20 iterator_traits<volatile T*>::value_type is non-volatile
// so __is_byte<T> could be true, but we can't use memcmp with
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v6 2/2] libstdc++: Use new built-in trait __is_pointer
2023-07-13 20:48 ` [PATCH v6 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
@ 2023-07-13 20:48 ` Ken Matsui
2023-09-01 13:00 ` [PING][PATCH " Ken Matsui
0 siblings, 1 reply; 28+ messages in thread
From: Ken Matsui @ 2023-07-13 20:48 UTC (permalink / raw)
To: gcc-patches; +Cc: libstdc++, Ken Matsui, Jonathan Wakely
This patch lets libstdc++ use new built-in trait __is_pointer.
libstdc++-v3/ChangeLog:
* include/bits/cpp_type_traits.h (__is_ptr): Use __is_pointer
built-in trait.
* include/std/type_traits (is_pointer): Likewise. Optimize its
implementation.
(is_pointer_v): Likewise.
Co-authored-by: Jonathan Wakely <jwakely@redhat.com>
Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
---
libstdc++-v3/include/bits/cpp_type_traits.h | 8 ++++
libstdc++-v3/include/std/type_traits | 44 +++++++++++++++++----
2 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
index 3711e4be526..4da1e7c407c 100644
--- a/libstdc++-v3/include/bits/cpp_type_traits.h
+++ b/libstdc++-v3/include/bits/cpp_type_traits.h
@@ -363,6 +363,13 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
//
// Pointer types
//
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct __is_ptr : __truth_type<__is_pointer(_Tp)>
+ {
+ enum { __value = __is_pointer(_Tp) };
+ };
+#else
template<typename _Tp>
struct __is_ptr
{
@@ -376,6 +383,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
enum { __value = 1 };
typedef __true_type __type;
};
+#endif
//
// An arithmetic type is an integer type or a floating point type
diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
index 0e7a9c9c7f3..16b2f6de536 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -515,19 +515,33 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct is_array<_Tp[]>
: public true_type { };
- template<typename>
- struct __is_pointer_helper
+ /// is_pointer
+#if __has_builtin(__is_pointer)
+ template<typename _Tp>
+ struct is_pointer
+ : public __bool_constant<__is_pointer(_Tp)>
+ { };
+#else
+ template<typename _Tp>
+ struct is_pointer
: public false_type { };
template<typename _Tp>
- struct __is_pointer_helper<_Tp*>
+ struct is_pointer<_Tp*>
: public true_type { };
- /// is_pointer
template<typename _Tp>
- struct is_pointer
- : public __is_pointer_helper<__remove_cv_t<_Tp>>::type
- { };
+ struct is_pointer<_Tp* const>
+ : public true_type { };
+
+ template<typename _Tp>
+ struct is_pointer<_Tp* volatile>
+ : public true_type { };
+
+ template<typename _Tp>
+ struct is_pointer<_Tp* const volatile>
+ : public true_type { };
+#endif
/// is_lvalue_reference
template<typename>
@@ -3168,8 +3182,22 @@ template <typename _Tp>
template <typename _Tp, size_t _Num>
inline constexpr bool is_array_v<_Tp[_Num]> = true;
+#if __has_builtin(__is_pointer)
+template <typename _Tp>
+ inline constexpr bool is_pointer_v = __is_pointer(_Tp);
+#else
template <typename _Tp>
- inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
+ inline constexpr bool is_pointer_v = false;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp*> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* volatile> = true;
+template <typename _Tp>
+ inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
+#endif
+
template <typename _Tp>
inline constexpr bool is_lvalue_reference_v = false;
template <typename _Tp>
--
2.41.0
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-13 20:04 ` Ken Matsui
@ 2023-07-14 10:48 ` Jonathan Wakely
2023-07-14 10:49 ` Jonathan Wakely
0 siblings, 1 reply; 28+ messages in thread
From: Jonathan Wakely @ 2023-07-14 10:48 UTC (permalink / raw)
To: Ken Matsui; +Cc: Ken Matsui, gcc-patches, libstdc++
On Thu, 13 Jul 2023 at 21:04, Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> On Thu, Jul 13, 2023 at 2:22 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> >
> > On Wed, 12 Jul 2023 at 21:42, Ken Matsui <kmatsui@cs.washington.edu> wrote:
> > >
> > > On Wed, Jul 12, 2023 at 3:01 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> > > >
> > > > On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
> > > > <libstdc++@gcc.gnu.org> wrote:
> > > > >
> > > > > Hi,
> > > > >
> > > > > Here is the benchmark result for is_pointer:
> > > > >
> > > > > https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
> > > > >
> > > > > Time: -62.1344%
> > > > > Peak Memory Usage: -52.4281%
> > > > > Total Memory Usage: -53.5889%
> > > >
> > > > Wow!
> > > >
> > > > Although maybe we could have improved our std::is_pointer_v anyway, like so:
> > > >
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v = false;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > >
> > > > I'm not sure why I didn't already do that.
> > > >
> > > > Could you please benchmark that? And if it is better than the current
> > > > impl using is_pointer<_Tp>::value then we should do this in the
> > > > library:
> > > >
> > > > #if __has_builtin(__is_pointer)
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> > > > #else
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v = false;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > > template <typename _Tp>
> > > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > > #endif
> > >
> > > Hi François and Jonathan,
> > >
> > > Thank you for your reviews! I will rename the four underscores to the
> > > appropriate name and take a benchmark once I get home.
> > >
> > > If I apply your change on is_pointer_v, is it better to add the
> > > `Co-authored-by:` line in the commit?
> >
> > Yes, that would be the correct thing to do (although in this case the
> > change is small enough that I don't really care about getting credit
> > for it :-)
> >
> Thank you! I will include it in my commit :) I see that you included
> the DCO sign-off in the MAINTAINERS file. However, if a reviewer
> doesn't, should I include the `Signed-off-by:` line for the reviewer
> as well?
No, reviewers should not sign-off, that's for the code author. And
authors should add that themselves (or clearly state that they agree
to the DCO terms). You should not sign-off on someone else's behalf.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-14 10:48 ` Jonathan Wakely
@ 2023-07-14 10:49 ` Jonathan Wakely
2023-07-14 19:55 ` Ken Matsui
0 siblings, 1 reply; 28+ messages in thread
From: Jonathan Wakely @ 2023-07-14 10:49 UTC (permalink / raw)
To: Ken Matsui; +Cc: Ken Matsui, gcc-patches, libstdc++
On Fri, 14 Jul 2023 at 11:48, Jonathan Wakely <jwakely@redhat.com> wrote:
>
> On Thu, 13 Jul 2023 at 21:04, Ken Matsui <kmatsui@cs.washington.edu> wrote:
> >
> > On Thu, Jul 13, 2023 at 2:22 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> > >
> > > On Wed, 12 Jul 2023 at 21:42, Ken Matsui <kmatsui@cs.washington.edu> wrote:
> > > >
> > > > On Wed, Jul 12, 2023 at 3:01 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> > > > >
> > > > > On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
> > > > > <libstdc++@gcc.gnu.org> wrote:
> > > > > >
> > > > > > Hi,
> > > > > >
> > > > > > Here is the benchmark result for is_pointer:
> > > > > >
> > > > > > https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
> > > > > >
> > > > > > Time: -62.1344%
> > > > > > Peak Memory Usage: -52.4281%
> > > > > > Total Memory Usage: -53.5889%
> > > > >
> > > > > Wow!
> > > > >
> > > > > Although maybe we could have improved our std::is_pointer_v anyway, like so:
> > > > >
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v = false;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > > >
> > > > > I'm not sure why I didn't already do that.
> > > > >
> > > > > Could you please benchmark that? And if it is better than the current
> > > > > impl using is_pointer<_Tp>::value then we should do this in the
> > > > > library:
> > > > >
> > > > > #if __has_builtin(__is_pointer)
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> > > > > #else
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v = false;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > > > template <typename _Tp>
> > > > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > > > #endif
> > > >
> > > > Hi François and Jonathan,
> > > >
> > > > Thank you for your reviews! I will rename the four underscores to the
> > > > appropriate name and take a benchmark once I get home.
> > > >
> > > > If I apply your change on is_pointer_v, is it better to add the
> > > > `Co-authored-by:` line in the commit?
> > >
> > > Yes, that would be the correct thing to do (although in this case the
> > > change is small enough that I don't really care about getting credit
> > > for it :-)
> > >
> > Thank you! I will include it in my commit :) I see that you included
> > the DCO sign-off in the MAINTAINERS file. However, if a reviewer
> > doesn't, should I include the `Signed-off-by:` line for the reviewer
> > as well?
>
> No, reviewers should not sign-off, that's for the code author. And
> authors should add that themselves (or clearly state that they agree
> to the DCO terms). You should not sign-off on someone else's behalf.
You can add Reviewed-by: if you want to record that information.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait
2023-07-14 10:49 ` Jonathan Wakely
@ 2023-07-14 19:55 ` Ken Matsui
0 siblings, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-07-14 19:55 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: Ken Matsui, gcc-patches, libstdc++
On Fri, Jul 14, 2023 at 3:49 AM Jonathan Wakely <jwakely@redhat.com> wrote:
>
> On Fri, 14 Jul 2023 at 11:48, Jonathan Wakely <jwakely@redhat.com> wrote:
> >
> > On Thu, 13 Jul 2023 at 21:04, Ken Matsui <kmatsui@cs.washington.edu> wrote:
> > >
> > > On Thu, Jul 13, 2023 at 2:22 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> > > >
> > > > On Wed, 12 Jul 2023 at 21:42, Ken Matsui <kmatsui@cs.washington.edu> wrote:
> > > > >
> > > > > On Wed, Jul 12, 2023 at 3:01 AM Jonathan Wakely <jwakely@redhat.com> wrote:
> > > > > >
> > > > > > On Mon, 10 Jul 2023 at 06:51, Ken Matsui via Libstdc++
> > > > > > <libstdc++@gcc.gnu.org> wrote:
> > > > > > >
> > > > > > > Hi,
> > > > > > >
> > > > > > > Here is the benchmark result for is_pointer:
> > > > > > >
> > > > > > > https://github.com/ken-matsui/gcc-benches/blob/main/is_pointer.md#sun-jul--9-103948-pm-pdt-2023
> > > > > > >
> > > > > > > Time: -62.1344%
> > > > > > > Peak Memory Usage: -52.4281%
> > > > > > > Total Memory Usage: -53.5889%
> > > > > >
> > > > > > Wow!
> > > > > >
> > > > > > Although maybe we could have improved our std::is_pointer_v anyway, like so:
> > > > > >
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v = false;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > > > >
> > > > > > I'm not sure why I didn't already do that.
> > > > > >
> > > > > > Could you please benchmark that? And if it is better than the current
> > > > > > impl using is_pointer<_Tp>::value then we should do this in the
> > > > > > library:
> > > > > >
> > > > > > #if __has_builtin(__is_pointer)
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> > > > > > #else
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v = false;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp*> = true;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp* const> = true;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> > > > > > template <typename _Tp>
> > > > > > inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> > > > > > #endif
> > > > >
> > > > > Hi François and Jonathan,
> > > > >
> > > > > Thank you for your reviews! I will rename the four underscores to the
> > > > > appropriate name and take a benchmark once I get home.
> > > > >
> > > > > If I apply your change on is_pointer_v, is it better to add the
> > > > > `Co-authored-by:` line in the commit?
> > > >
> > > > Yes, that would be the correct thing to do (although in this case the
> > > > change is small enough that I don't really care about getting credit
> > > > for it :-)
> > > >
> > > Thank you! I will include it in my commit :) I see that you included
> > > the DCO sign-off in the MAINTAINERS file. However, if a reviewer
> > > doesn't, should I include the `Signed-off-by:` line for the reviewer
> > > as well?
> >
> > No, reviewers should not sign-off, that's for the code author. And
> > authors should add that themselves (or clearly state that they agree
> > to the DCO terms). You should not sign-off on someone else's behalf.
>
> You can add Reviewed-by: if you want to record that information.
>
I see. Thank you!
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PING][PATCH v6 2/2] libstdc++: Use new built-in trait __is_pointer
2023-07-13 20:48 ` [PATCH v6 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
@ 2023-09-01 13:00 ` Ken Matsui
0 siblings, 0 replies; 28+ messages in thread
From: Ken Matsui @ 2023-09-01 13:00 UTC (permalink / raw)
To: Jonathan Wakely; +Cc: gcc-patches, libstdc++, Ken Matsui
Ping for the use of __is_pointer built-in.
Sincerely,
Ken Matsui
On Thu, Jul 13, 2023 at 1:49 PM Ken Matsui <kmatsui@gcc.gnu.org> wrote:
>
> This patch lets libstdc++ use new built-in trait __is_pointer.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/cpp_type_traits.h (__is_ptr): Use __is_pointer
> built-in trait.
> * include/std/type_traits (is_pointer): Likewise. Optimize its
> implementation.
> (is_pointer_v): Likewise.
>
> Co-authored-by: Jonathan Wakely <jwakely@redhat.com>
> Signed-off-by: Ken Matsui <kmatsui@gcc.gnu.org>
> ---
> libstdc++-v3/include/bits/cpp_type_traits.h | 8 ++++
> libstdc++-v3/include/std/type_traits | 44 +++++++++++++++++----
> 2 files changed, 44 insertions(+), 8 deletions(-)
>
> diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3/include/bits/cpp_type_traits.h
> index 3711e4be526..4da1e7c407c 100644
> --- a/libstdc++-v3/include/bits/cpp_type_traits.h
> +++ b/libstdc++-v3/include/bits/cpp_type_traits.h
> @@ -363,6 +363,13 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> //
> // Pointer types
> //
> +#if __has_builtin(__is_pointer)
> + template<typename _Tp>
> + struct __is_ptr : __truth_type<__is_pointer(_Tp)>
> + {
> + enum { __value = __is_pointer(_Tp) };
> + };
> +#else
> template<typename _Tp>
> struct __is_ptr
> {
> @@ -376,6 +383,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3)
> enum { __value = 1 };
> typedef __true_type __type;
> };
> +#endif
>
> //
> // An arithmetic type is an integer type or a floating point type
> diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits
> index 0e7a9c9c7f3..16b2f6de536 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -515,19 +515,33 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> struct is_array<_Tp[]>
> : public true_type { };
>
> - template<typename>
> - struct __is_pointer_helper
> + /// is_pointer
> +#if __has_builtin(__is_pointer)
> + template<typename _Tp>
> + struct is_pointer
> + : public __bool_constant<__is_pointer(_Tp)>
> + { };
> +#else
> + template<typename _Tp>
> + struct is_pointer
> : public false_type { };
>
> template<typename _Tp>
> - struct __is_pointer_helper<_Tp*>
> + struct is_pointer<_Tp*>
> : public true_type { };
>
> - /// is_pointer
> template<typename _Tp>
> - struct is_pointer
> - : public __is_pointer_helper<__remove_cv_t<_Tp>>::type
> - { };
> + struct is_pointer<_Tp* const>
> + : public true_type { };
> +
> + template<typename _Tp>
> + struct is_pointer<_Tp* volatile>
> + : public true_type { };
> +
> + template<typename _Tp>
> + struct is_pointer<_Tp* const volatile>
> + : public true_type { };
> +#endif
>
> /// is_lvalue_reference
> template<typename>
> @@ -3168,8 +3182,22 @@ template <typename _Tp>
> template <typename _Tp, size_t _Num>
> inline constexpr bool is_array_v<_Tp[_Num]> = true;
>
> +#if __has_builtin(__is_pointer)
> +template <typename _Tp>
> + inline constexpr bool is_pointer_v = __is_pointer(_Tp);
> +#else
> template <typename _Tp>
> - inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
> + inline constexpr bool is_pointer_v = false;
> +template <typename _Tp>
> + inline constexpr bool is_pointer_v<_Tp*> = true;
> +template <typename _Tp>
> + inline constexpr bool is_pointer_v<_Tp* const> = true;
> +template <typename _Tp>
> + inline constexpr bool is_pointer_v<_Tp* volatile> = true;
> +template <typename _Tp>
> + inline constexpr bool is_pointer_v<_Tp* const volatile> = true;
> +#endif
> +
> template <typename _Tp>
> inline constexpr bool is_lvalue_reference_v = false;
> template <typename _Tp>
> --
> 2.41.0
>
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-09-01 13:00 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-10 5:23 [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-10 5:23 ` [PATCH 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
2023-07-10 5:32 ` Daniel Krügler
2023-07-10 5:34 ` Ken Matsui
2023-07-10 5:38 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-10 5:38 ` [PATCH v2 2/2] libstdc++: use new built-in trait __is_pointer Ken Matsui
2023-07-10 5:50 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Ken Matsui
2023-07-12 10:01 ` Jonathan Wakely
2023-07-12 20:42 ` Ken Matsui
2023-07-13 1:11 ` [PATCH v3 1/2] c++, libstdc++: Implement " Ken Matsui
2023-07-13 1:11 ` [PATCH v3 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
2023-07-13 1:13 ` [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
2023-07-13 1:15 ` Ken Matsui
2023-07-13 3:16 ` [PATCH v4 " Ken Matsui
2023-07-13 3:16 ` [PATCH v4 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
2023-07-13 3:19 ` [PATCH v5 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
2023-07-13 3:19 ` [PATCH v5 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
2023-07-13 20:48 ` [PATCH v6 1/2] c++, libstdc++: Implement __is_pointer built-in trait Ken Matsui
2023-07-13 20:48 ` [PATCH v6 2/2] libstdc++: Use new built-in trait __is_pointer Ken Matsui
2023-09-01 13:00 ` [PING][PATCH " Ken Matsui
2023-07-13 9:21 ` [PATCH v2 1/2] c++, libstdc++: implement __is_pointer built-in trait Jonathan Wakely
2023-07-13 20:04 ` Ken Matsui
2023-07-14 10:48 ` Jonathan Wakely
2023-07-14 10:49 ` Jonathan Wakely
2023-07-14 19:55 ` Ken Matsui
2023-07-12 4:40 ` [PATCH " François Dumont
2023-07-12 9:47 ` Jonathan Wakely
2023-07-12 9:48 ` Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).