public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-3203] libstdc++: Revert addition of constraints to make_signed/make_unsigned Date: Mon, 10 Oct 2022 20:38:37 +0000 (GMT) [thread overview] Message-ID: <20221010203837.DBC0E3858D37@sourceware.org> (raw) https://gcc.gnu.org/g:1d2f07ed4ce028a7c1f9b18f5d959f30213545ca commit r13-3203-g1d2f07ed4ce028a7c1f9b18f5d959f30213545ca Author: Jonathan Wakely <jwakely@redhat.com> Date: Mon Oct 10 15:06:53 2022 +0100 libstdc++: Revert addition of constraints to make_signed/make_unsigned Constraining the primary template makes it unusable in uninstantiated contexts. libstdc++-v3/ChangeLog: * include/std/type_traits (make_signed, make_unsigned): Remove constraints on primary template. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Undo changes to expected error in C++20 mode. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Likewise. * testsuite/24_iterators/range_access/range_access_cpp20_neg.cc: Likewise. * testsuite/20_util/make_signed/requirements/uninstantiated.cc: New test. * testsuite/20_util/make_unsigned/requirements/uninstantiated.cc: New test. Diff: --- libstdc++-v3/include/std/type_traits | 6 ------ .../testsuite/20_util/make_signed/requirements/typedefs_neg.cc | 3 +-- .../testsuite/20_util/make_signed/requirements/uninstantiated.cc | 8 ++++++++ .../testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc | 3 +-- .../20_util/make_unsigned/requirements/uninstantiated.cc | 8 ++++++++ .../testsuite/24_iterators/range_access/range_access_cpp20_neg.cc | 3 +-- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 6108b98aa6a..1d7c3b04a0e 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1802,9 +1802,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Primary template. /// make_unsigned template<typename _Tp> -#if __cpp_concepts - requires is_integral<_Tp>::value || __is_enum(_Tp) -#endif struct make_unsigned { typedef typename __make_unsigned_selector<_Tp>::__type type; }; @@ -1937,9 +1934,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Primary template. /// make_signed template<typename _Tp> -#if __cpp_concepts - requires is_integral<_Tp>::value || __is_enum(_Tp) -#endif struct make_signed { typedef typename __make_signed_selector<_Tp>::__type type; }; diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc index 88b8ae887ef..451eeb8c92d 100644 --- a/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc @@ -43,5 +43,4 @@ void test01() using T8 = make_signed<float>::type; // { dg-error "here" } } -// { dg-error "invalid use of incomplete type" "" { target c++17_down } 0 } -// { dg-error "constraint failure" "" { target c++20 } 0 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/20_util/make_signed/requirements/uninstantiated.cc b/libstdc++-v3/testsuite/20_util/make_signed/requirements/uninstantiated.cc new file mode 100644 index 00000000000..3facf0c595a --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/make_signed/requirements/uninstantiated.cc @@ -0,0 +1,8 @@ +// { dg-do compile { target c++11 } } +#include <type_traits> + +// Check that we can name invalid specializations, just don't instantiate them. + +using X = std::make_signed<float>; +using Y = std::make_signed<bool>; +using Z = std::make_signed<void>; diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc index 50f15e7037c..49d520936a3 100644 --- a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc @@ -43,5 +43,4 @@ void test01() using T8 = make_unsigned<float>::type; // { dg-error "here" } } -// { dg-error "invalid use of incomplete type" "" { target c++17_down } 0 } -// { dg-error "constraint failure" "" { target c++20 } 0 } +// { dg-error "invalid use of incomplete type" "" { target *-*-* } 0 } diff --git a/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/uninstantiated.cc b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/uninstantiated.cc new file mode 100644 index 00000000000..9b860967379 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/uninstantiated.cc @@ -0,0 +1,8 @@ +// { dg-do compile { target c++11 } } +#include <type_traits> + +// Check that we can name invalid specializations, just don't instantiate them. + +using X = std::make_unsigned<float>; +using Y = std::make_unsigned<bool>; +using Z = std::make_unsigned<void>; diff --git a/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc b/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc index 26c8ae0ee1e..c0825a58587 100644 --- a/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc +++ b/libstdc++-v3/testsuite/24_iterators/range_access/range_access_cpp20_neg.cc @@ -46,5 +46,4 @@ test03() C c; std::ssize(c); // { dg-error "no matching function" } } -// { dg-error "incomplete type .*make_signed.*S" "" { target c++17_down } 0 } -// { dg-error "constraint failure" "" { target c++20 } 0 } +// { dg-error "incomplete type .*make_signed.*S" "" { target *-*-* } 0 }
reply other threads:[~2022-10-10 20:38 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20221010203837.DBC0E3858D37@sourceware.org \ --to=redi@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /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: linkBe 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).