diff mbox series

libstdc++: use new built-in trait __remove_pointer

Message ID	CAML+3pW_2+9XTYMWEVHDyU8BKBpQEuGTkwmYVr+dcwUtzHVgsw@mail.gmail.com
State	Superseded
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD49D3858C53 MIME-Version: 1.0 Date: Sun, 19 Mar 2023 19:53:19 -0700 Message-ID: <CAML+3pW_2+9XTYMWEVHDyU8BKBpQEuGTkwmYVr+dcwUtzHVgsw@mail.gmail.com> Subject: [PATCH] libstdc++: use new built-in trait __remove_pointer To: gcc-patches@gcc.gnu.org Cc: Patrick Palka <ppalka@redhat.com> Content-Type: text/plain; charset="UTF-8" Precedence: list From: Ken Matsui via Gcc-patches <gcc-patches@gcc.gnu.org> Reply-To: Ken Matsui <kmatsui@cs.washington.edu> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org>
Series	libstdc++: use new built-in trait __remove_pointer \| libstdc++: use new built-in trait __remove_pointer

Commit Message

Ken Matsui March 20, 2023, 2:53 a.m. UTC

  libstdc++-v3/ChangeLog:

* include/std/type_traits (is_reference): Use __remove_pointer built-in trait.

---

Comments

Ken Matsui March 20, 2023, 7:31 a.m. UTC | #1

CCing libstdc++@gcc.gnu.org.

On Sun, Mar 19, 2023 at 7:53 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (is_reference): Use __remove_pointer built-in trait.
>
> ---
> diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> index 2bd607a8b8f..cba98091aad 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>
>    template<typename _Tp, typename>
>      struct __remove_pointer_helper
> -    { typedef _Tp     type; };
> +    { using type = _Tp; };
>
>    template<typename _Tp, typename _Up>
>      struct __remove_pointer_helper<_Tp, _Up*>
> -    { typedef _Up     type; };
> +    { using type = _Up; };
>
>    /// remove_pointer
> +#if __has_builtin(__remove_pointer)
> +  template<typename _Tp>
> +    struct remove_pointer
> +    { using type = __remove_pointer(_Tp); };
> +#else
>    template<typename _Tp>
>      struct remove_pointer
>      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
>      { };
> +#endif
>
>    template<typename _Tp, typename = void>
>      struct __add_pointer_helper

Jonathan Wakely March 20, 2023, 7:57 a.m. UTC | #2

On Mon, 20 Mar 2023, 07:32 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org>
wrote:

> CCing libstdc++@gcc.gnu.org.
>
> On Sun, Mar 19, 2023 at 7:53 PM Ken Matsui <kmatsui@cs.washington.edu>
> wrote:
> >
> > libstdc++-v3/ChangeLog:
> >
> > * include/std/type_traits (is_reference): Use __remove_pointer built-in
> trait.
>

The changelog entry says is_reference but the patch is for remove_pointer.


>
> > ---
> > diff --git a/libstdc++-v3/include/std/type_traits
> > b/libstdc++-v3/include/std/type_traits
> > index 2bd607a8b8f..cba98091aad 100644
> > --- a/libstdc++-v3/include/std/type_traits
> > +++ b/libstdc++-v3/include/std/type_traits
> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >
> >    template<typename _Tp, typename>
> >      struct __remove_pointer_helper
> > -    { typedef _Tp     type; };
> > +    { using type = _Tp; };
> >
> >    template<typename _Tp, typename _Up>
> >      struct __remove_pointer_helper<_Tp, _Up*>
> > -    { typedef _Up     type; };
> > +    { using type = _Up; };
>

The helper doesn't need to be defined for the case where we don't use it.


>
> >    /// remove_pointer
> > +#if __has_builtin(__remove_pointer)
> > +  template<typename _Tp>
> > +    struct remove_pointer
> > +    { using type = __remove_pointer(_Tp); };
> > +#else
> >    template<typename _Tp>
> >      struct remove_pointer
> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
> >      { };
> > +#endif
> >
> >    template<typename _Tp, typename = void>
> >      struct __add_pointer_helper
>

Ken Matsui March 20, 2023, 8:07 a.m. UTC | #3

Ooh... Thank you for pointing that out!

> The helper doesn't need to be defined for the case where we don't use it.

I thought that macroing them out leads to compiler errors since users
are possibly using those helpers. But do we not have to care about
that?

---
libstdc++-v3/ChangeLog:

* include/std/type_traits (remove_pointer): Use __remove_pointer built-in trait.

---
diff --git a/libstdc++-v3/include/std/type_traits
b/libstdc++-v3/include/std/type_traits
index 2bd607a8b8f..cba98091aad 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION

   template<typename _Tp, typename>
     struct __remove_pointer_helper
-    { typedef _Tp     type; };
+    { using type = _Tp; };

   template<typename _Tp, typename _Up>
     struct __remove_pointer_helper<_Tp, _Up*>
-    { typedef _Up     type; };
+    { using type = _Up; };

   /// remove_pointer
+#if __has_builtin(__remove_pointer)
+  template<typename _Tp>
+    struct remove_pointer
+    { using type = __remove_pointer(_Tp); };
+#else
   template<typename _Tp>
     struct remove_pointer
     : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
     { };
+#endif

   template<typename _Tp, typename = void>
     struct __add_pointer_helper

On Mon, Mar 20, 2023 at 12:57 AM Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
>
>
>
> On Mon, 20 Mar 2023, 07:32 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org> wrote:
>>
>> CCing libstdc++@gcc.gnu.org.
>>
>> On Sun, Mar 19, 2023 at 7:53 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
>> >
>> > libstdc++-v3/ChangeLog:
>> >
>> > * include/std/type_traits (is_reference): Use __remove_pointer built-in trait.
>
>
> The changelog entry says is_reference but the patch is for remove_pointer.
>
>
>> >
>> > ---
>> > diff --git a/libstdc++-v3/include/std/type_traits
>> > b/libstdc++-v3/include/std/type_traits
>> > index 2bd607a8b8f..cba98091aad 100644
>> > --- a/libstdc++-v3/include/std/type_traits
>> > +++ b/libstdc++-v3/include/std/type_traits
>> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> >
>> >    template<typename _Tp, typename>
>> >      struct __remove_pointer_helper
>> > -    { typedef _Tp     type; };
>> > +    { using type = _Tp; };
>> >
>> >    template<typename _Tp, typename _Up>
>> >      struct __remove_pointer_helper<_Tp, _Up*>
>> > -    { typedef _Up     type; };
>> > +    { using type = _Up; };
>
>
> The helper doesn't need to be defined for the case where we don't use it.
>
>
>> >
>> >    /// remove_pointer
>> > +#if __has_builtin(__remove_pointer)
>> > +  template<typename _Tp>
>> > +    struct remove_pointer
>> > +    { using type = __remove_pointer(_Tp); };
>> > +#else
>> >    template<typename _Tp>
>> >      struct remove_pointer
>> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
>> >      { };
>> > +#endif
>> >
>> >    template<typename _Tp, typename = void>
>> >      struct __add_pointer_helper

Jonathan Wakely March 20, 2023, 9:11 a.m. UTC | #4

On Mon, 20 Mar 2023 at 08:08, Ken Matsui <kmatsui@cs.washington.edu> wrote:
>
> Ooh... Thank you for pointing that out!
>
> > The helper doesn't need to be defined for the case where we don't use it.
>
> I thought that macroing them out leads to compiler errors since users
> are possibly using those helpers. But do we not have to care about
> that?

No, absolutely not.

>
> ---
> libstdc++-v3/ChangeLog:
>
> * include/std/type_traits (remove_pointer): Use __remove_pointer built-in trait.
>
> ---
> diff --git a/libstdc++-v3/include/std/type_traits
> b/libstdc++-v3/include/std/type_traits
> index 2bd607a8b8f..cba98091aad 100644
> --- a/libstdc++-v3/include/std/type_traits
> +++ b/libstdc++-v3/include/std/type_traits
> @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>
>    template<typename _Tp, typename>
>      struct __remove_pointer_helper
> -    { typedef _Tp     type; };
> +    { using type = _Tp; };
>
>    template<typename _Tp, typename _Up>
>      struct __remove_pointer_helper<_Tp, _Up*>
> -    { typedef _Up     type; };
> +    { using type = _Up; };
>
>    /// remove_pointer
> +#if __has_builtin(__remove_pointer)
> +  template<typename _Tp>
> +    struct remove_pointer
> +    { using type = __remove_pointer(_Tp); };
> +#else
>    template<typename _Tp>
>      struct remove_pointer
>      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
>      { };
> +#endif
>
>    template<typename _Tp, typename = void>
>      struct __add_pointer_helper
>
> On Mon, Mar 20, 2023 at 12:57 AM Jonathan Wakely <jwakely.gcc@gmail.com> wrote:
> >
> >
> >
> > On Mon, 20 Mar 2023, 07:32 Ken Matsui via Libstdc++, <libstdc++@gcc.gnu.org> wrote:
> >>
> >> CCing libstdc++@gcc.gnu.org.
> >>
> >> On Sun, Mar 19, 2023 at 7:53 PM Ken Matsui <kmatsui@cs.washington.edu> wrote:
> >> >
> >> > libstdc++-v3/ChangeLog:
> >> >
> >> > * include/std/type_traits (is_reference): Use __remove_pointer built-in trait.
> >
> >
> > The changelog entry says is_reference but the patch is for remove_pointer.
> >
> >
> >> >
> >> > ---
> >> > diff --git a/libstdc++-v3/include/std/type_traits
> >> > b/libstdc++-v3/include/std/type_traits
> >> > index 2bd607a8b8f..cba98091aad 100644
> >> > --- a/libstdc++-v3/include/std/type_traits
> >> > +++ b/libstdc++-v3/include/std/type_traits
> >> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >> >
> >> >    template<typename _Tp, typename>
> >> >      struct __remove_pointer_helper
> >> > -    { typedef _Tp     type; };
> >> > +    { using type = _Tp; };
> >> >
> >> >    template<typename _Tp, typename _Up>
> >> >      struct __remove_pointer_helper<_Tp, _Up*>
> >> > -    { typedef _Up     type; };
> >> > +    { using type = _Up; };
> >
> >
> > The helper doesn't need to be defined for the case where we don't use it.
> >
> >
> >> >
> >> >    /// remove_pointer
> >> > +#if __has_builtin(__remove_pointer)
> >> > +  template<typename _Tp>
> >> > +    struct remove_pointer
> >> > +    { using type = __remove_pointer(_Tp); };
> >> > +#else
> >> >    template<typename _Tp>
> >> >      struct remove_pointer
> >> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
> >> >      { };
> >> > +#endif
> >> >
> >> >    template<typename _Tp, typename = void>
> >> >      struct __add_pointer_helper

Ken Matsui March 20, 2023, 1:26 p.m. UTC | #5

Thank you!

On Mon, Mar 20, 2023 at 2:12 AM Jonathan Wakely <jwakely.gcc@gmail.com>
wrote:

> On Mon, 20 Mar 2023 at 08:08, Ken Matsui <kmatsui@cs.washington.edu>
> wrote:
> >
> > Ooh... Thank you for pointing that out!
> >
> > > The helper doesn't need to be defined for the case where we don't use
> it.
> >
> > I thought that macroing them out leads to compiler errors since users
> > are possibly using those helpers. But do we not have to care about
> > that?
>
> No, absolutely not.
>
> >
> > ---
> > libstdc++-v3/ChangeLog:
> >
> > * include/std/type_traits (remove_pointer): Use __remove_pointer
> built-in trait.
> >
> > ---
> > diff --git a/libstdc++-v3/include/std/type_traits
> > b/libstdc++-v3/include/std/type_traits
> > index 2bd607a8b8f..cba98091aad 100644
> > --- a/libstdc++-v3/include/std/type_traits
> > +++ b/libstdc++-v3/include/std/type_traits
> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> >
> >    template<typename _Tp, typename>
> >      struct __remove_pointer_helper
> > -    { typedef _Tp     type; };
> > +    { using type = _Tp; };
> >
> >    template<typename _Tp, typename _Up>
> >      struct __remove_pointer_helper<_Tp, _Up*>
> > -    { typedef _Up     type; };
> > +    { using type = _Up; };
> >
> >    /// remove_pointer
> > +#if __has_builtin(__remove_pointer)
> > +  template<typename _Tp>
> > +    struct remove_pointer
> > +    { using type = __remove_pointer(_Tp); };
> > +#else
> >    template<typename _Tp>
> >      struct remove_pointer
> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
> >      { };
> > +#endif
> >
> >    template<typename _Tp, typename = void>
> >      struct __add_pointer_helper
> >
> > On Mon, Mar 20, 2023 at 12:57 AM Jonathan Wakely <jwakely.gcc@gmail.com>
> wrote:
> > >
> > >
> > >
> > > On Mon, 20 Mar 2023, 07:32 Ken Matsui via Libstdc++, <
> libstdc++@gcc.gnu.org> wrote:
> > >>
> > >> CCing libstdc++@gcc.gnu.org.
> > >>
> > >> On Sun, Mar 19, 2023 at 7:53 PM Ken Matsui <kmatsui@cs.washington.edu>
> wrote:
> > >> >
> > >> > libstdc++-v3/ChangeLog:
> > >> >
> > >> > * include/std/type_traits (is_reference): Use __remove_pointer
> built-in trait.
> > >
> > >
> > > The changelog entry says is_reference but the patch is for
> remove_pointer.
> > >
> > >
> > >> >
> > >> > ---
> > >> > diff --git a/libstdc++-v3/include/std/type_traits
> > >> > b/libstdc++-v3/include/std/type_traits
> > >> > index 2bd607a8b8f..cba98091aad 100644
> > >> > --- a/libstdc++-v3/include/std/type_traits
> > >> > +++ b/libstdc++-v3/include/std/type_traits
> > >> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
> > >> >
> > >> >    template<typename _Tp, typename>
> > >> >      struct __remove_pointer_helper
> > >> > -    { typedef _Tp     type; };
> > >> > +    { using type = _Tp; };
> > >> >
> > >> >    template<typename _Tp, typename _Up>
> > >> >      struct __remove_pointer_helper<_Tp, _Up*>
> > >> > -    { typedef _Up     type; };
> > >> > +    { using type = _Up; };
> > >
> > >
> > > The helper doesn't need to be defined for the case where we don't use
> it.
> > >
> > >
> > >> >
> > >> >    /// remove_pointer
> > >> > +#if __has_builtin(__remove_pointer)
> > >> > +  template<typename _Tp>
> > >> > +    struct remove_pointer
> > >> > +    { using type = __remove_pointer(_Tp); };
> > >> > +#else
> > >> >    template<typename _Tp>
> > >> >      struct remove_pointer
> > >> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
> > >> >      { };
> > >> > +#endif
> > >> >
> > >> >    template<typename _Tp, typename = void>
> > >> >      struct __add_pointer_helper
>

Ken Matsui March 20, 2023, 10:24 p.m. UTC | #6

Please disregard this email.


On Mon, Mar 20, 2023 at 6:26 AM Ken Matsui <kmatsui@cs.washington.edu>
wrote:

> Thank you!
>
> On Mon, Mar 20, 2023 at 2:12 AM Jonathan Wakely <jwakely.gcc@gmail.com>
> wrote:
>
>> On Mon, 20 Mar 2023 at 08:08, Ken Matsui <kmatsui@cs.washington.edu>
>> wrote:
>> >
>> > Ooh... Thank you for pointing that out!
>> >
>> > > The helper doesn't need to be defined for the case where we don't use
>> it.
>> >
>> > I thought that macroing them out leads to compiler errors since users
>> > are possibly using those helpers. But do we not have to care about
>> > that?
>>
>> No, absolutely not.
>>
>> >
>> > ---
>> > libstdc++-v3/ChangeLog:
>> >
>> > * include/std/type_traits (remove_pointer): Use __remove_pointer
>> built-in trait.
>> >
>> > ---
>> > diff --git a/libstdc++-v3/include/std/type_traits
>> > b/libstdc++-v3/include/std/type_traits
>> > index 2bd607a8b8f..cba98091aad 100644
>> > --- a/libstdc++-v3/include/std/type_traits
>> > +++ b/libstdc++-v3/include/std/type_traits
>> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> >
>> >    template<typename _Tp, typename>
>> >      struct __remove_pointer_helper
>> > -    { typedef _Tp     type; };
>> > +    { using type = _Tp; };
>> >
>> >    template<typename _Tp, typename _Up>
>> >      struct __remove_pointer_helper<_Tp, _Up*>
>> > -    { typedef _Up     type; };
>> > +    { using type = _Up; };
>> >
>> >    /// remove_pointer
>> > +#if __has_builtin(__remove_pointer)
>> > +  template<typename _Tp>
>> > +    struct remove_pointer
>> > +    { using type = __remove_pointer(_Tp); };
>> > +#else
>> >    template<typename _Tp>
>> >      struct remove_pointer
>> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
>> >      { };
>> > +#endif
>> >
>> >    template<typename _Tp, typename = void>
>> >      struct __add_pointer_helper
>> >
>> > On Mon, Mar 20, 2023 at 12:57 AM Jonathan Wakely <jwakely.gcc@gmail.com>
>> wrote:
>> > >
>> > >
>> > >
>> > > On Mon, 20 Mar 2023, 07:32 Ken Matsui via Libstdc++, <
>> libstdc++@gcc.gnu.org> wrote:
>> > >>
>> > >> CCing libstdc++@gcc.gnu.org.
>> > >>
>> > >> On Sun, Mar 19, 2023 at 7:53 PM Ken Matsui <
>> kmatsui@cs.washington.edu> wrote:
>> > >> >
>> > >> > libstdc++-v3/ChangeLog:
>> > >> >
>> > >> > * include/std/type_traits (is_reference): Use __remove_pointer
>> built-in trait.
>> > >
>> > >
>> > > The changelog entry says is_reference but the patch is for
>> remove_pointer.
>> > >
>> > >
>> > >> >
>> > >> > ---
>> > >> > diff --git a/libstdc++-v3/include/std/type_traits
>> > >> > b/libstdc++-v3/include/std/type_traits
>> > >> > index 2bd607a8b8f..cba98091aad 100644
>> > >> > --- a/libstdc++-v3/include/std/type_traits
>> > >> > +++ b/libstdc++-v3/include/std/type_traits
>> > >> > @@ -2025,17 +2025,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>> > >> >
>> > >> >    template<typename _Tp, typename>
>> > >> >      struct __remove_pointer_helper
>> > >> > -    { typedef _Tp     type; };
>> > >> > +    { using type = _Tp; };
>> > >> >
>> > >> >    template<typename _Tp, typename _Up>
>> > >> >      struct __remove_pointer_helper<_Tp, _Up*>
>> > >> > -    { typedef _Up     type; };
>> > >> > +    { using type = _Up; };
>> > >
>> > >
>> > > The helper doesn't need to be defined for the case where we don't use
>> it.
>> > >
>> > >
>> > >> >
>> > >> >    /// remove_pointer
>> > >> > +#if __has_builtin(__remove_pointer)
>> > >> > +  template<typename _Tp>
>> > >> > +    struct remove_pointer
>> > >> > +    { using type = __remove_pointer(_Tp); };
>> > >> > +#else
>> > >> >    template<typename _Tp>
>> > >> >      struct remove_pointer
>> > >> >      : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
>> > >> >      { };
>> > >> > +#endif
>> > >> >
>> > >> >    template<typename _Tp, typename = void>
>> > >> >      struct __add_pointer_helper
>>
>

diff mbox series

Patch

diff --git a/libstdc++-v3/include/std/type_traits
b/libstdc++-v3/include/std/type_traits
index 2bd607a8b8f..cba98091aad 100644
--- a/libstdc++-v3/include/std/type_traits
+++ b/libstdc++-v3/include/std/type_traits
@@ -2025,17 +2025,23 @@  _GLIBCXX_BEGIN_NAMESPACE_VERSION

   template<typename _Tp, typename>
     struct __remove_pointer_helper
-    { typedef _Tp     type; };
+    { using type = _Tp; };

   template<typename _Tp, typename _Up>
     struct __remove_pointer_helper<_Tp, _Up*>
-    { typedef _Up     type; };
+    { using type = _Up; };

   /// remove_pointer
+#if __has_builtin(__remove_pointer)
+  template<typename _Tp>
+    struct remove_pointer
+    { using type = __remove_pointer(_Tp); };
+#else
   template<typename _Tp>
     struct remove_pointer
     : public __remove_pointer_helper<_Tp, __remove_cv_t<_Tp>>
     { };
+#endif

   template<typename _Tp, typename = void>
     struct __add_pointer_helper