From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x935.google.com (mail-ua1-x935.google.com [IPv6:2607:f8b0:4864:20::935]) by sourceware.org (Postfix) with ESMTPS id 257033858C74 for ; Thu, 13 Jul 2023 01:16:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 257033858C74 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cs.washington.edu Received: by mail-ua1-x935.google.com with SMTP id a1e0cc1a2514c-7943bfaed0dso54265241.0 for ; Wed, 12 Jul 2023 18:16:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1689210971; x=1691802971; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=x2NHUopAuYCnCpqT4i47cnqhNuOpkzoXbCpJoXV5LKA=; b=PSdWE3N/BOrZKWF8ZEJN4ULDm9Nsly+OdqkgHjtszU6f8diqovxZgsvlUA+Mg28GQC XDs8R3kVYTFMNmcbm+UC7tQV2R6t/hDFLfaI5AG9OPLnaiX1xy3KH/4frugTQBQ1l6JH CapMlwGaX3qwf8ypeGa20FJGivLuMjwNSe7dk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689210971; x=1691802971; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x2NHUopAuYCnCpqT4i47cnqhNuOpkzoXbCpJoXV5LKA=; b=Wt5NodaDrguBXhD7sQUa4Ugi6hzdud92vyPGa/VdlQVnNT0aunIbtEB/iIr7jhnMb/ NsM4ObkyRaELOCHjzvm+TUOQVc+wE/qSxuHSGyOaJ8ICYz9mz6QVG93cCYUihqRjdlRK ZQ4NeV1SkZ8wuNp2eLq9E1lV7P20vRmc548/dN1OpGHCYNVxNwsucILewdcZDpYOtfLH UnlDtJKCH+ClbtA4Emjd97shcG6+qJMuWZpYJNgM/xlIdIImDnfyspXwN8+7+DJnAzCb 9ODY/WaP6OboTCzFb7sOkqHccVqA5eEUk7l/9rQBNhv7docGLdIFMFmOdPbVoJMTmkFr WXIg== X-Gm-Message-State: ABy/qLZSZ0fr4KSLAU3bezbOGbtRT9T0HYi3/AoKsi4ESB9cgO0UczUh kU24qbotDyJHDKYKTItWTXkKLyIQ/xXryo3l1K08BsleTgjdCuRn72o= X-Google-Smtp-Source: APBJJlE5/oHxsST59gM2goOT/FAG8eTKUBJaRHhwi9ombHu0JeG8yvPq4l3Of+CXxREKHGCf5Rk813TzBKv4Y9kUz5o= X-Received: by 2002:a05:6102:284f:b0:443:6b27:65ae with SMTP id az15-20020a056102284f00b004436b2765aemr289303vsb.24.1689210971541; Wed, 12 Jul 2023 18:16:11 -0700 (PDT) MIME-Version: 1.0 References: <20230713011127.98367-1-kmatsui@gcc.gnu.org> In-Reply-To: From: Ken Matsui Date: Wed, 12 Jul 2023 18:15:55 -0700 Message-ID: Subject: Re: [PATCH v3 1/2] c++, libstdc++: Implement __is_pointer built-in trait To: Ken Matsui Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, Jonathan Wakely Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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=E2=80=AFPM Ken Matsui 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=E2=80=AFPM Ken Matsui = 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 > > --- > > 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_trivial= ly_assignable", 2) > > DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructib= le", -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 type= 1, tree type2) > > case CPTK_IS_UNION: > > return type_code1 =3D=3D 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_kin= d 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/t= m/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__ ("de= fault"))) { > > typedef __true_type __type; > > }; > > template > > - struct __is_pointer > > + struct __is_ptr > > { > > enum { __value =3D 0 }; > > typedef __false_type __type; > > }; > > template > > - struct __is_pointer<_Tp*> > > + struct __is_ptr<_Tp*> > > { > > enum { __value =3D 1 }; > > typedef __true_type __type; > > @@ -226,7 +226,7 @@ namespace std __attribute__ ((__visibility__ ("defa= ult"))) { > > { }; > > template > > struct __is_scalar > > - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > > > + : public __traitor<__is_arithmetic<_Tp>, __is_ptr<_Tp> > > > { }; > > template > > struct __is_char > > @@ -1202,8 +1202,8 @@ namespace std __attribute__ ((__visibility__ ("de= fault"))) { > > typedef typename iterator_traits<_OI>::value_type _ValueTypeO; > > typedef typename iterator_traits<_II>::iterator_category _Catego= ry; > > const bool __simple =3D (__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__ ("de= fault"))) { > > typedef typename iterator_traits<_BI2>::value_type _ValueType2; > > typedef typename iterator_traits<_BI1>::iterator_category _Categ= ory; > > const bool __simple =3D (__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__ ("de= fault"))) { > > typedef typename iterator_traits<_II1>::value_type _ValueType1; > > typedef typename iterator_traits<_II2>::value_type _ValueType2; > > const bool __simple =3D (__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__ ("de= fault"))) { > > (__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__ ("defaul= t"))) { > > enum { > > __value =3D 0 }; > > }; > > - template struct __is_pointer { > > + template struct __is_ptr { > > enum { > > __value =3D 0 }; > > }; > > @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("defaul= t"))) { > > template 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 =3D (__is_integer<_ValueType1>::__value = && __is_pointer<_II1>::__value &&= __is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueType2= >::__value); > > + const bool __simple =3D (__is_integer<_ValueType1>::__value = && __is_ptr<_II1>::__value && __i= s_ptr<_II2>::__value && __are_same<_ValueType1, _ValueType2>::__val= ue); > > return std::__equal<__simple>::equal(__first1, __last1, __firs= t2); > > } > > template 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__ ("defaul= t"))) { > > enum { > > __value =3D 0 }; > > }; > > - template struct __is_pointer { > > + template struct __is_ptr { > > enum { > > __value =3D 0 }; > > }; > > @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("defaul= t"))) { > > }; > > template struct __is_arithmetic : public __t= raitor<__is_integer<_Tp>, __is_floating<_Tp> > { > > }; > > - template struct __is_scalar : public __trait= or<__is_arithmetic<_Tp>, __is_pointer<_Tp> > { > > + template struct __is_scalar : public __trait= or<__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 > > - struct __is_pointer > > + struct __is_ptr > > { > > enum { __value =3D 0 }; > > typedef __false_type __type; > > }; > > > > template > > - struct __is_pointer<_Tp*> > > + struct __is_ptr<_Tp*> > > { > > enum { __value =3D 1 }; > > typedef __true_type __type; > > @@ -390,7 +390,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3) > > // > > template > > 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 =3D > > (__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::value_type is non-v= olatile > > // so __is_byte could be true, but we can't use memcmp with > > @@ -1329,8 +1329,8 @@ _GLIBCXX_END_NAMESPACE_CONTAINER > > { > > const bool __simple =3D > > (__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::value_type is non-v= olatile > > // so __is_byte could be true, but we can't use memcmp with > > diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/in= clude/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 =3D ((__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 =3D > > (__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::value_type is non-v= olatile > > // so __is_byte could be true, but we can't use memcmp with > > -- > > 2.41.0 > >