From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 4EA083858D38 for ; Wed, 12 Jul 2023 09:48:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4EA083858D38 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689155289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4V85kwyNXtb+aTdUXXAQsmgfL63uBjeWmfeqlruL3eA=; b=GVqUSyrfZmhT8s8bdyJkq14VhDd279vE+PHBrn4/fh7yyrwbbWhx46CRdBG07PcKPK1kGE i2PY+H3TeoHWm76MuyxqV/6TG3oNmhh5euSs01FBbU1DuTFmOMuwYdTc8xovGh5Hy/qxLa D60BSF2Vk9zRf/I/AaqodtIl8ihpN2A= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-FmIlk8pvP_qvMbuD99sfog-1; Wed, 12 Jul 2023 05:48:08 -0400 X-MC-Unique: FmIlk8pvP_qvMbuD99sfog-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2b6fdb7eeafso61538721fa.2 for ; Wed, 12 Jul 2023 02:48:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689155287; x=1691747287; 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=4V85kwyNXtb+aTdUXXAQsmgfL63uBjeWmfeqlruL3eA=; b=fpNh/QGNlGYlPwzEwLxoqEoEve7AzikvVq6t+YZTtHRBrvGChQ5YZ6G1nLgybVIDQY XjXuuI8VuePuJgZ6DAc40BkpsqUYYTcNAmmGvvm1R/7ZCgHe8yo6KsL2MJ7kcGMiUi8q WsdTqnLJVLXt8ZnvCiOSYnfzSYakklq7hMb3HgZSnHoU7ugnXVeB/M/x9M7ZSuRyKy3g eOcYrfTOFtejKtIdqsm+H6ez7ef5f+sk4MB2tnNIiaKLKdk2To4w7oeCu+RIafKFkxy4 p0zJAi/AM+qGoymRsL/iWn5sVqSFa9ztZ60J/QEsLvroSA4B/Y8hNkIWf/CI5jnQSRWB tUiA== X-Gm-Message-State: ABy/qLbB6tIcaKd5tKKF/5RzOow57tOoB5FqcBD770p4WHptYjmPxB1u f2rQBVwXIEmA1sdxPL4V3Xo6bfG+7kWlSdd+b4NRxJh3xj/Q50/e1ZYkUeiaVcUiqJM/i9bn7+I tPwEE2r0tsyc0XbIs2J9v7AVsABIKULk= X-Received: by 2002:a2e:9f14:0:b0:2b6:a841:e686 with SMTP id u20-20020a2e9f14000000b002b6a841e686mr15002876ljk.6.1689155286828; Wed, 12 Jul 2023 02:48:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlG0Dpjg7vrK41UH2WqWCHPcZxQGmN3FvknN8KP1dFwLgYj3dPZ0F9PNW/1UTj5oamlMTiUGFpc3kmqWfpMtlbk= X-Received: by 2002:a2e:9f14:0:b0:2b6:a841:e686 with SMTP id u20-20020a2e9f14000000b002b6a841e686mr15002859ljk.6.1689155286508; Wed, 12 Jul 2023 02:48:06 -0700 (PDT) MIME-Version: 1.0 References: <20230710052310.48116-1-kmatsui@gcc.gnu.org> In-Reply-To: From: Jonathan Wakely Date: Wed, 12 Jul 2023 10:47:55 +0100 Message-ID: Subject: Re: [PATCH 1/2] c++, libstdc++: implement __is_pointer built-in trait To: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= Cc: Ken Matsui , gcc-patches , "libstdc++" X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, 12 Jul 2023 at 05:41, Fran=C3=A7ois Dumont via Libstdc++ 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 > > --- > > 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_constructi= ble", -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_fro= m_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..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__ ("de= fault"))) { > > typedef __true_type __type; > > }; > > template > > - struct __is_pointer > > + struct ____is_pointer > > { > > enum { __value =3D 0 }; > > typedef __false_type __type; > > }; > > template > > - struct __is_pointer<_Tp*> > > + struct ____is_pointer<_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_pointer<_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 _Categ= ory; > > const bool __simple =3D (__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__ ("de= fault"))) { > > typedef typename iterator_traits<_BI2>::value_type _ValueType2; > > typedef typename iterator_traits<_BI1>::iterator_category _Cate= gory; > > const bool __simple =3D (__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__ ("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_pointer<_II1>::__value > > + && ____is_pointer<_II2>::__value > > && __are_same<_ValueType1, _ValueType2>::__value); > > return std::__equal<__simple>::equal(__first1, __last1, __first= 2); > > } > > @@ -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_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__ ("defaul= t"))) { > > enum { > > __value =3D 0 }; > > }; > > - template struct __is_pointer { > > + template struct ____is_pointer { > > enum { > > __value =3D 0 }; > > }; > > @@ -49,7 +49,7 @@ namespace std __attribute__ ((__visibility__ ("defaul= t"))) { > > template inline bool __equa= l_aux(_II1 __first1, _II1 __last1, _II2 __first2) { > > typedef typename iterator_traits<_II1>::value_type _ValueType= 1; > > typedef typename iterator_traits<_II2>::value_type _ValueType= 2; > > - 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_pointer<_II1>::__value = && ____is_pointer<_II2>::__value && __are_same<_ValueType1, _ValueT= ype2>::__value); > > return std::__equal<__simple>::equal(__first1, __last1, __fir= st2); > > } > > 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..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__ ("defaul= t"))) { > > enum { > > __value =3D 0 }; > > }; > > - template struct __is_pointer { > > + template struct ____is_pointer { > > enum { > > __value =3D 0 }; > > }; > > @@ -27,7 +27,7 @@ namespace std __attribute__ ((__visibility__ ("defaul= t"))) { > > }; > > template struct __is_arithmetic : public __= traitor<__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_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 > > - 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 > struct ____is_pointer > { > #if __has_builtin(__is_pointer) > enum { __value =3D __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 =3D 0 }; > typedef __false_type __type; > #endif > }; > > #if !__has_builtin(__is_pointer) > template > struct __is_pointer<_Tp*> > { > enum { __value =3D 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 struct __is_pointer_type : __truth_type<__is_pointer(_Tp)> { enum { __value =3D __is_pointer(_Tp) }; }; #else existing code ... #endif