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.133.124]) by sourceware.org (Postfix) with ESMTPS id 0033A3858016 for ; Mon, 10 Oct 2022 11:20:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0033A3858016 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=1665400807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pUIP8isJkHwAxS9ld8xCsg3SqpSSopBhttWudmIOsZY=; b=ePUApN9bWp0E6z4jROHiCTWGgbkINmnVppjwrpojykQR4JoV2tCHfFwXmMxBpnzJL0XsWg mzhdbuBCTSO3wklf7/p4ewS2Hpxx4Hhbw+tnFo2KltPKWJBY9NpQnSSSHk5XwXIu8LsF1L SdOEtIWH2JBKlaK8zbtTkHSwgT5Vduo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-192-MkQNTrhpNLWkKoDHb3eJqg-1; Mon, 10 Oct 2022 07:20:06 -0400 X-MC-Unique: MkQNTrhpNLWkKoDHb3eJqg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38AC585A59D; Mon, 10 Oct 2022 11:20:06 +0000 (UTC) Received: from localhost (unknown [10.33.36.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2792112D16C; Mon, 10 Oct 2022 11:20:05 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: std::make_signed_t should be ill-formed Date: Mon, 10 Oct 2022 12:20:05 +0100 Message-Id: <20221010112005.1523979-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP 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: Tested powerpc64le-linux. Pushed to trunk. -- >8 -- Currently we only reject std::make_signed_t but not cv bool. Similarly for std::make_unsigned_t. As well as making those ill-formed, this adds a requires-clause to the make_signed and make_unsigned primary templates. This makes non-integral, non-enum cases fail immediately with a clear error, rather than giving an error about __make_signed_selector being incomplete. libstdc++-v3/ChangeLog: * include/std/type_traits (make_signed, make_unsigned): Add specializations for cv bool. Add requires-clause for C++20 to improve diagnostics for non-integral, non-enum cases. * testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Check cv bool. * testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Likewise. * testsuite/24_iterators/range_access/range_access_cpp20_neg.cc: Adjust expected errors for C++20 and later. * testsuite/lib/prune.exp: Prune "in requirements [with ...]" lines from diagnostics. --- libstdc++-v3/include/std/type_traits | 18 ++++++++++--- .../make_signed/requirements/typedefs_neg.cc | 27 +++++++++---------- .../requirements/typedefs_neg.cc | 25 ++++++++--------- .../range_access/range_access_cpp20_neg.cc | 3 ++- libstdc++-v3/testsuite/lib/prune.exp | 1 + 5 files changed, 40 insertions(+), 34 deletions(-) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index b74565eb521..6108b98aa6a 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -1802,12 +1802,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Primary template. /// make_unsigned template +#if __cpp_concepts + requires is_integral<_Tp>::value || __is_enum(_Tp) +#endif struct make_unsigned { typedef typename __make_unsigned_selector<_Tp>::__type type; }; // Integral, but don't define. - template<> - struct make_unsigned; + template<> struct make_unsigned; + template<> struct make_unsigned; + template<> struct make_unsigned; + template<> struct make_unsigned; /// @cond undocumented @@ -1932,12 +1937,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Primary template. /// make_signed template +#if __cpp_concepts + requires is_integral<_Tp>::value || __is_enum(_Tp) +#endif struct make_signed { typedef typename __make_signed_selector<_Tp>::__type type; }; // Integral, but don't define. - template<> - struct make_signed; + template<> struct make_signed; + template<> struct make_signed; + template<> struct make_signed; + template<> struct make_signed; #if __cplusplus > 201103L /// Alias template for make_signed 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 051bb64c710..88b8ae887ef 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 @@ -20,31 +20,28 @@ // . #include -#include -enum test_enum { first_selection }; +struct pod_class { }; void test01() { using std::make_signed; // Negative tests. - typedef make_signed::type test1_type; + using T1 = make_signed::type; // { dg-error "incomplete" } + using T2 = make_signed::type; // { dg-error "incomplete" } + using T3 = make_signed::type; // { dg-error "incomplete" } + using T4 = make_signed::type; // { dg-error "incomplete" } - typedef make_signed<__gnu_test::pod_uint>::type test2_type; + using T5 = make_signed::type; // { dg-error "here" } - typedef make_signed::type test3_type; + using T6 = make_signed::type; // { dg-error "here" } - typedef void (fn_type) (); - typedef make_signed::type test4_type; + using fn_type = void (); + using T7 = make_signed::type; // { dg-error "here" } - typedef make_signed::type test5_type; + using T8 = make_signed::type; // { dg-error "here" } } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 32 } -// { dg-error "required from here" "" { target *-*-* } 34 } -// { dg-error "required from here" "" { target *-*-* } 36 } -// { dg-error "required from here" "" { target *-*-* } 39 } -// { dg-error "required from here" "" { target *-*-* } 41 } - -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 0 } +// { dg-error "invalid use of incomplete type" "" { target c++17_down } 0 } +// { dg-error "constraint failure" "" { target c++20 } 0 } 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 ff98cc42ef7..50f15e7037c 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 @@ -21,7 +21,6 @@ #include -enum test_enum { first_selection }; struct pod_class { }; void test01() @@ -29,22 +28,20 @@ void test01() using std::make_unsigned; // Negative tests. - typedef make_unsigned::type test1_type; + using T1 = make_unsigned::type; // { dg-error "incomplete" } + using T2 = make_unsigned::type; // { dg-error "incomplete" } + using T3 = make_unsigned::type; // { dg-error "incomplete" } + using T4 = make_unsigned::type; // { dg-error "incomplete" } - typedef make_unsigned::type test2_type; + using T5 = make_unsigned::type; // { dg-error "here" } - typedef make_unsigned::type test3_type; + using T6 = make_unsigned::type; // { dg-error "here" } - typedef void (fn_type) (); - typedef make_unsigned::type test4_type; + using fn_type = void (); + using T7 = make_unsigned::type; // { dg-error "here" } - typedef make_unsigned::type test5_type; + using T8 = make_unsigned::type; // { dg-error "here" } } -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 32 } -// { dg-error "required from here" "" { target *-*-* } 34 } -// { dg-error "required from here" "" { target *-*-* } 36 } -// { dg-error "required from here" "" { target *-*-* } 39 } -// { dg-error "required from here" "" { target *-*-* } 41 } - -// { dg-error "invalid use of incomplete type" "" { target *-*-* } 0 } +// { dg-error "invalid use of incomplete type" "" { target c++17_down } 0 } +// { dg-error "constraint failure" "" { target c++20 } 0 } 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 c0825a58587..26c8ae0ee1e 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,4 +46,5 @@ test03() C c; std::ssize(c); // { dg-error "no matching function" } } -// { dg-error "incomplete type .*make_signed.*S" "" { target *-*-* } 0 } +// { dg-error "incomplete type .*make_signed.*S" "" { target c++17_down } 0 } +// { dg-error "constraint failure" "" { target c++20 } 0 } diff --git a/libstdc++-v3/testsuite/lib/prune.exp b/libstdc++-v3/testsuite/lib/prune.exp index d457e975218..6d0b77a8ccd 100644 --- a/libstdc++-v3/testsuite/lib/prune.exp +++ b/libstdc++-v3/testsuite/lib/prune.exp @@ -51,6 +51,7 @@ proc libstdc++-dg-prune { system text } { regsub -all "(^|\n)\[^\n\]*: (recursively )?required \[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: . skipping \[0-9\]* instantiation contexts \[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*: in .constexpr. expansion \[^\n\]*" $text "" text + regsub -all "(^|\n)\[^\n\]*: in requirements .with\[^\n\]*" $text "" text regsub -all "(^|\n) inlined from \[^\n\]*" $text "" text # Why doesn't GCC need these to strip header context? regsub -all "(^|\n)In file included from \[^\n\]*" $text "" text -- 2.37.3