From: Jason Merrill <jason@redhat.com>
To: Patrick Palka <ppalka@redhat.com>, gcc-patches@gcc.gnu.org
Cc: libstdc++@gcc.gnu.org
Subject: Re: [PATCH 2/2] c++: implement __remove_cv, __remove_reference and __remove_cvref
Date: Tue, 27 Sep 2022 17:09:48 -0400 [thread overview]
Message-ID: <3415f78a-425a-f0d8-4e80-b891549138be@redhat.com> (raw)
In-Reply-To: <20220927195030.2024439-2-ppalka@redhat.com>
On 9/27/22 15:50, Patrick Palka wrote:
> This uses TRAIT_TYPE from the previous patch to implement efficient
> built-ins for std::remove_cv, std::remove_reference and std::remove_cvref.
>
> Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk?
OK once the previous patch goes in.
> gcc/c-family/ChangeLog:
>
> * c-common.cc (c_common_reswords): Add __remove_cv,
> __remove_reference and __remove_cvref.
> * c-common.h (enum rid): Add RID_REMOVE_CV, RID_REMOVE_REFERENCE
> and RID_REMOVE_CVREF.
>
> gcc/cp/ChangeLog:
>
> * constraint.cc (diagnose_trait_expr): Handle CPTK_REMOVE_CV,
> CPTK_REMOVE_REFERENCE and CPTK_REMOVE_CVREF.
> * cp-objcp-common.cc (names_builtin_p): Likewise.
> * cp-tree.h (enum cp_trait_kind): Add CPTK_REMOVE_CV,
> CPTK_REMOVE_REFERENCE and CPTK_REMOVE_CVREF.
> * cxx-pretty-print.cc (pp_cxx_trait): Handle CPTK_REMOVE_CV,
> CPTK_REMOVE_REFERENCE and CPTK_REMOVE_CVREF.
> * parser.cc (cp_keyword_starts_decl_specifier_p): Return true
> for RID_REMOVE_CV, RID_REMOVE_REFERENCE and RID_REMOVE_CVREF.
> (cp_parser_trait): Handle RID_REMOVE_CV, RID_REMOVE_REFERENCE
> and RID_REMOVE_CVREF.
> (cp_parser_simple_type_specifier): Likewise.
> * semantics.cc (finish_trait_type): Likewise.
>
> libstdc++-v3/ChangeLog:
>
> * include/bits/unique_ptr.h (unique_ptr<_Tp[], _Dp>): Remove
> __remove_cv and use __remove_cv_t instead.
>
> gcc/testsuite/ChangeLog:
>
> * g++.dg/ext/has-builtin-1.C: Test __remove_cv,
> __remove_reference and __remove_cvref.
> * g++.dg/ext/remove_cv.C: New test.
> * g++.dg/ext/remove_reference.C: New test.
> * g++.dg/ext/remove_cvref.C: New test.
> ---
> gcc/c-family/c-common.cc | 3 +++
> gcc/c-family/c-common.h | 1 +
> gcc/cp/constraint.cc | 3 +++
> gcc/cp/cp-objcp-common.cc | 3 +++
> gcc/cp/cp-tree.h | 5 +++-
> gcc/cp/cxx-pretty-print.cc | 9 +++++++
> gcc/cp/parser.cc | 18 ++++++++++++++
> gcc/cp/semantics.cc | 10 ++++++++
> gcc/testsuite/g++.dg/ext/has-builtin-1.C | 9 +++++++
> gcc/testsuite/g++.dg/ext/remove_cv.C | 26 +++++++++++++++++++++
> gcc/testsuite/g++.dg/ext/remove_cvref.C | 26 +++++++++++++++++++++
> gcc/testsuite/g++.dg/ext/remove_reference.C | 26 +++++++++++++++++++++
> libstdc++-v3/include/bits/unique_ptr.h | 5 +---
> 13 files changed, 139 insertions(+), 5 deletions(-)
> create mode 100644 gcc/testsuite/g++.dg/ext/remove_cv.C
> create mode 100644 gcc/testsuite/g++.dg/ext/remove_cvref.C
> create mode 100644 gcc/testsuite/g++.dg/ext/remove_reference.C
>
> diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc
> index cda6910e8c5..6e0af863a49 100644
> --- a/gcc/c-family/c-common.cc
> +++ b/gcc/c-family/c-common.cc
> @@ -547,6 +547,9 @@ const struct c_common_resword c_common_reswords[] =
> D_CXXONLY },
> { "__reference_converts_from_temporary", RID_REF_CONVERTS_FROM_TEMPORARY,
> D_CXXONLY },
> + { "__remove_cv", RID_REMOVE_CV, D_CXXONLY },
> + { "__remove_reference", RID_REMOVE_REFERENCE, D_CXXONLY },
> + { "__remove_cvref", RID_REMOVE_CVREF, D_CXXONLY },
>
> /* C++ transactional memory. */
> { "synchronized", RID_SYNCHRONIZED, D_CXX_OBJC | D_TRANSMEM },
> diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
> index 50a4691cda6..d5c98d306ce 100644
> --- a/gcc/c-family/c-common.h
> +++ b/gcc/c-family/c-common.h
> @@ -187,6 +187,7 @@ enum rid
> RID_IS_CONVERTIBLE, RID_IS_NOTHROW_CONVERTIBLE,
> RID_REF_CONSTRUCTS_FROM_TEMPORARY,
> RID_REF_CONVERTS_FROM_TEMPORARY,
> + RID_REMOVE_CV, RID_REMOVE_REFERENCE, RID_REMOVE_CVREF,
>
> /* C++11 */
> RID_CONSTEXPR, RID_DECLTYPE, RID_NOEXCEPT, RID_NULLPTR, RID_STATIC_ASSERT,
> diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc
> index 266ec581a20..ca73aff3f38 100644
> --- a/gcc/cp/constraint.cc
> +++ b/gcc/cp/constraint.cc
> @@ -3714,6 +3714,9 @@ diagnose_trait_expr (tree expr, tree args)
> case CPTK_BASES:
> case CPTK_DIRECT_BASES:
> case CPTK_UNDERLYING_TYPE:
> + case CPTK_REMOVE_CV:
> + case CPTK_REMOVE_REFERENCE:
> + case CPTK_REMOVE_CVREF:
> /* We shouldn't see these non-expression traits. */
> gcc_unreachable ();
> /* We deliberately omit the default case so that when adding a new
> diff --git a/gcc/cp/cp-objcp-common.cc b/gcc/cp/cp-objcp-common.cc
> index 380f288a7f1..2d3f206b530 100644
> --- a/gcc/cp/cp-objcp-common.cc
> +++ b/gcc/cp/cp-objcp-common.cc
> @@ -467,6 +467,9 @@ names_builtin_p (const char *name)
> case RID_IS_NOTHROW_CONVERTIBLE:
> case RID_REF_CONSTRUCTS_FROM_TEMPORARY:
> case RID_REF_CONVERTS_FROM_TEMPORARY:
> + case RID_REMOVE_CV:
> + case RID_REMOVE_REFERENCE:
> + case RID_REMOVE_CVREF:
> return true;
> default:
> break;
> diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
> index c9adf1b3822..5c8f585b821 100644
> --- a/gcc/cp/cp-tree.h
> +++ b/gcc/cp/cp-tree.h
> @@ -1411,7 +1411,10 @@ enum cp_trait_kind
> CPTK_IS_CONVERTIBLE,
> CPTK_IS_NOTHROW_CONVERTIBLE,
> CPTK_REF_CONSTRUCTS_FROM_TEMPORARY,
> - CPTK_REF_CONVERTS_FROM_TEMPORARY
> + CPTK_REF_CONVERTS_FROM_TEMPORARY,
> + CPTK_REMOVE_CV,
> + CPTK_REMOVE_REFERENCE,
> + CPTK_REMOVE_CVREF,
> };
>
> /* The types that we are processing. */
> diff --git a/gcc/cp/cxx-pretty-print.cc b/gcc/cp/cxx-pretty-print.cc
> index d484019a539..9ca158f1453 100644
> --- a/gcc/cp/cxx-pretty-print.cc
> +++ b/gcc/cp/cxx-pretty-print.cc
> @@ -2724,6 +2724,15 @@ pp_cxx_trait (cxx_pretty_printer *pp, tree t)
> case CPTK_UNDERLYING_TYPE:
> pp_cxx_ws_string (pp, "__underlying_type");
> break;
> + case CPTK_REMOVE_CV:
> + pp_cxx_ws_string (pp, "__remove_cv");
> + break;
> + case CPTK_REMOVE_REFERENCE:
> + pp_cxx_ws_string (pp, "__remove_reference");
> + break;
> + case CPTK_REMOVE_CVREF:
> + pp_cxx_ws_string (pp, "__remove_cvref");
> + break;
> default:
> gcc_unreachable ();
> }
> diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
> index 9f5e2c292b3..d592d783250 100644
> --- a/gcc/cp/parser.cc
> +++ b/gcc/cp/parser.cc
> @@ -1147,6 +1147,9 @@ cp_keyword_starts_decl_specifier_p (enum rid keyword)
> /* C++11 extensions. */
> case RID_DECLTYPE:
> case RID_UNDERLYING_TYPE:
> + case RID_REMOVE_CV:
> + case RID_REMOVE_REFERENCE:
> + case RID_REMOVE_CVREF:
> case RID_CONSTEXPR:
> /* C++20 extensions. */
> case RID_CONSTINIT:
> @@ -11027,6 +11030,18 @@ cp_parser_trait (cp_parser* parser, enum rid keyword)
> kind = CPTK_REF_CONVERTS_FROM_TEMPORARY;
> binary = true;
> break;
> + case RID_REMOVE_CV:
> + kind = CPTK_REMOVE_CV;
> + type = true;
> + break;
> + case RID_REMOVE_REFERENCE:
> + kind = CPTK_REMOVE_REFERENCE;
> + type = true;
> + break;
> + case RID_REMOVE_CVREF:
> + kind = CPTK_REMOVE_CVREF;
> + type = true;
> + break;
> default:
> gcc_unreachable ();
> }
> @@ -19867,6 +19882,9 @@ cp_parser_simple_type_specifier (cp_parser* parser,
> return type;
>
> case RID_UNDERLYING_TYPE:
> + case RID_REMOVE_CV:
> + case RID_REMOVE_REFERENCE:
> + case RID_REMOVE_CVREF:
> type = cp_parser_trait (parser, token->keyword);
> if (decl_specs)
> cp_parser_set_decl_spec_type (decl_specs, type,
> diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc
> index ea00805c97d..a73a07d468d 100644
> --- a/gcc/cp/semantics.cc
> +++ b/gcc/cp/semantics.cc
> @@ -12236,6 +12236,16 @@ finish_trait_type (cp_trait_kind kind, tree type1, tree type2)
> {
> case CPTK_UNDERLYING_TYPE:
> return finish_underlying_type (type1);
> + case CPTK_REMOVE_CV:
> + return cv_unqualified (type1);
> + case CPTK_REMOVE_REFERENCE:
> + if (TYPE_REF_P (type1))
> + type1 = TREE_TYPE (type1);
> + return type1;
> + case CPTK_REMOVE_CVREF:
> + if (TYPE_REF_P (type1))
> + type1 = TREE_TYPE (type1);
> + return cv_unqualified (type1);
> default:
> gcc_unreachable ();
> }
> diff --git a/gcc/testsuite/g++.dg/ext/has-builtin-1.C b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> index 17dabf648cf..f343e153e56 100644
> --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C
> @@ -137,3 +137,12 @@
> #if !__has_builtin (__is_nothrow_convertible)
> # error "__has_builtin (__is_nothrow_convertible) failed"
> #endif
> +#if !__has_builtin (__remove_cv)
> +# error "__has_builtin (__remove_cv) failed"
> +#endif
> +#if !__has_builtin (__remove_reference)
> +# error "__has_builtin (__remove_reference) failed"
> +#endif
> +#if !__has_builtin (__remove_cvref)
> +# error "__has_builtin (__remove_cvref) failed"
> +#endif
> diff --git a/gcc/testsuite/g++.dg/ext/remove_cv.C b/gcc/testsuite/g++.dg/ext/remove_cv.C
> new file mode 100644
> index 00000000000..941aa9e4c11
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/remove_cv.C
> @@ -0,0 +1,26 @@
> +// { dg-do compile { target c++11 } }
> +
> +#define SA(X) static_assert((X),#X)
> +
> +SA(__is_same(__remove_cv(void), void));
> +SA(__is_same(__remove_cv(int*), int*));
> +
> +SA(__is_same(__remove_cv(int&), int&));
> +SA(__is_same(__remove_cv(const int&), const int&));
> +SA(__is_same(__remove_cv(volatile int&), volatile int&));
> +SA(__is_same(__remove_cv(const volatile int&), const volatile int&));
> +
> +SA(__is_same(__remove_cv(int&&), int&&));
> +SA(__is_same(__remove_cv(const int&&), const int&&));
> +SA(__is_same(__remove_cv(volatile int&&), volatile int&&));
> +SA(__is_same(__remove_cv(const volatile int&&), const volatile int&&));
> +
> +SA(__is_same(__remove_cv(int[3]), int[3]));
> +SA(__is_same(__remove_cv(const int[3]), int[3]));
> +SA(__is_same(__remove_cv(volatile int[3]), int[3]));
> +SA(__is_same(__remove_cv(const volatile int[3]), int[3]));
> +
> +SA(__is_same(__remove_cv(int(int)), int(int)));
> +SA(__is_same(__remove_cv(int(*const)(int)), int(*)(int)));
> +SA(__is_same(__remove_cv(int(*volatile)(int)), int(*)(int)));
> +SA(__is_same(__remove_cv(int(*const volatile)(int)), int(*)(int)));
> diff --git a/gcc/testsuite/g++.dg/ext/remove_cvref.C b/gcc/testsuite/g++.dg/ext/remove_cvref.C
> new file mode 100644
> index 00000000000..22725c08f63
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/remove_cvref.C
> @@ -0,0 +1,26 @@
> +// { dg-do compile { target c++11 } }
> +
> +#define SA(X) static_assert((X),#X)
> +
> +SA(__is_same(__remove_cvref(void), void));
> +SA(__is_same(__remove_cvref(int*), int*));
> +
> +SA(__is_same(__remove_cvref(int&), int));
> +SA(__is_same(__remove_cvref(const int&), int));
> +SA(__is_same(__remove_cvref(volatile int&), int));
> +SA(__is_same(__remove_cvref(const volatile int&), int));
> +
> +SA(__is_same(__remove_cvref(int&&), int));
> +SA(__is_same(__remove_cvref(const int&&), int));
> +SA(__is_same(__remove_cvref(volatile int&&), int));
> +SA(__is_same(__remove_cvref(const volatile int&&), int));
> +
> +SA(__is_same(__remove_cvref(int[3]), int[3]));
> +SA(__is_same(__remove_cvref(const int[3]), int[3]));
> +SA(__is_same(__remove_cvref(volatile int[3]), int[3]));
> +SA(__is_same(__remove_cvref(const volatile int[3]), int[3]));
> +
> +SA(__is_same(__remove_cvref(int(int)), int(int)));
> +SA(__is_same(__remove_cvref(int(*const)(int)), int(*)(int)));
> +SA(__is_same(__remove_cvref(int(*volatile)(int)), int(*)(int)));
> +SA(__is_same(__remove_cvref(int(*const volatile)(int)), int(*)(int)));
> diff --git a/gcc/testsuite/g++.dg/ext/remove_reference.C b/gcc/testsuite/g++.dg/ext/remove_reference.C
> new file mode 100644
> index 00000000000..af3c354b670
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/ext/remove_reference.C
> @@ -0,0 +1,26 @@
> +// { dg-do compile { target c++11 } }
> +
> +#define SA(X) static_assert((X),#X)
> +
> +SA(__is_same(__remove_reference(void), void));
> +SA(__is_same(__remove_reference(int*), int*));
> +
> +SA(__is_same(__remove_reference(int&), int));
> +SA(__is_same(__remove_reference(const int&), const int));
> +SA(__is_same(__remove_reference(volatile int&), volatile int));
> +SA(__is_same(__remove_reference(const volatile int&), const volatile int));
> +
> +SA(__is_same(__remove_reference(int&&), int));
> +SA(__is_same(__remove_reference(const int&&), const int));
> +SA(__is_same(__remove_reference(volatile int&&), volatile int));
> +SA(__is_same(__remove_reference(const volatile int&&), const volatile int));
> +
> +SA(__is_same(__remove_reference(int[3]), int[3]));
> +SA(__is_same(__remove_reference(const int[3]), const int[3]));
> +SA(__is_same(__remove_reference(volatile int[3]), volatile int[3]));
> +SA(__is_same(__remove_reference(const volatile int[3]), const volatile int[3]));
> +
> +SA(__is_same(__remove_reference(int(int)), int(int)));
> +SA(__is_same(__remove_reference(int(*const)(int)), int(*const)(int)));
> +SA(__is_same(__remove_reference(int(*volatile)(int)), int(*volatile)(int)));
> +SA(__is_same(__remove_reference(int(*const volatile)(int)), int(*const volatile)(int)));
> diff --git a/libstdc++-v3/include/bits/unique_ptr.h b/libstdc++-v3/include/bits/unique_ptr.h
> index 1086f408374..34c3a766179 100644
> --- a/libstdc++-v3/include/bits/unique_ptr.h
> +++ b/libstdc++-v3/include/bits/unique_ptr.h
> @@ -541,14 +541,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
>
> __uniq_ptr_data<_Tp, _Dp> _M_t;
>
> - template<typename _Up>
> - using __remove_cv = typename remove_cv<_Up>::type;
> -
> // like is_base_of<_Tp, _Up> but false if unqualified types are the same
> template<typename _Up>
> using __is_derived_Tp
> = __and_< is_base_of<_Tp, _Up>,
> - __not_<is_same<__remove_cv<_Tp>, __remove_cv<_Up>>> >;
> + __not_<is_same<__remove_cv_t<_Tp>, __remove_cv_t<_Up>>> >;
>
> public:
> using pointer = typename __uniq_ptr_impl<_Tp, _Dp>::pointer;
next prev parent reply other threads:[~2022-09-27 21:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 19:50 [PATCH 1/2] c++: introduce TRAIT_TYPE alongside TRAIT_EXPR Patrick Palka
2022-09-27 19:50 ` [PATCH 2/2] c++: implement __remove_cv, __remove_reference and __remove_cvref Patrick Palka
2022-09-27 20:27 ` Jonathan Wakely
2022-09-27 21:09 ` Jason Merrill [this message]
2022-09-27 21:07 ` [PATCH 1/2] c++: introduce TRAIT_TYPE alongside TRAIT_EXPR Jason Merrill
2022-09-28 16:36 ` Patrick Palka
2022-09-28 18:49 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3415f78a-425a-f0d8-4e80-b891549138be@redhat.com \
--to=jason@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
--cc=ppalka@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).