From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x92e.google.com (mail-ua1-x92e.google.com [IPv6:2607:f8b0:4864:20::92e]) by sourceware.org (Postfix) with ESMTPS id 271C43858C1F for ; Thu, 13 Jul 2023 01:42:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 271C43858C1F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=cs.washington.edu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=cs.washington.edu Received: by mail-ua1-x92e.google.com with SMTP id a1e0cc1a2514c-794b8fe8cc4so993772241.0 for ; Wed, 12 Jul 2023 18:42:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1689212529; x=1691804529; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=rCq4mmC8aWHus2nWKu1KJS91qW8UN6AcwehZQurCklk=; b=gK82WiMAazkGaaV2PoSUeKq6QC/mb9yDhuQPDzEDOtLjhuhlrhzJSBviLHVPCku6en QFT2lI9zj2XcOluVO6l5D9+EoCzmxmY0idL4UmWe35pZZ8R1N7KEp8ebS2R7ipW1LLE9 ChU0D/jYuuvqBZE0kMj+/xl+ArR58F0MkL7Zk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689212529; x=1691804529; 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=rCq4mmC8aWHus2nWKu1KJS91qW8UN6AcwehZQurCklk=; b=enMaOEcIn0Z4Thk9jhMgf4GhwsVMv0BI778IEl5zqprRITFp3eyBebrWC0wpYk7eJS koDgjI0Jnak6KtMhXr/O1pVOBgahOOn23+MpVY58h+t1yKRuKxYh6yLV0fqCjtnLqbBA 884G2uq/tJWhipfCvHxGEyo2pHLzqMINCJruuB1bPnQwB65nlfIcOQ93964MCd8eVODo 609ccDFPy5Z+bD6cqzH4pJd+LzjW2y1t7iOfsybkYk8VsrVJSIHLQ1UNYzOMb4AnMM/u uLniXp7Jafh+wNQGfTo8fTxgJKGSWdKcUnDQGBdp2gZV5ubUTV8b51wlUQMPsK84ImO9 iIUw== X-Gm-Message-State: ABy/qLZLT+HKP6D0B+xACuSWHh8X8yGEi8ODtmazl1hI4TVyPnawp6Jw DQ00alVi3brB3qaVPA7CG7BBMoQxB6oo1S+fdg51K/8TYv6fQQAMU7Y= X-Google-Smtp-Source: APBJJlHIP+GDMbmHyGGkF5OL1GSqBk9A9l+zzXfGinRXLk+LN2u9jYVBBa/9Zlq0PoO7N/e8Crlm7iR4ACkKRqnas8E= X-Received: by 2002:a67:dd8b:0:b0:445:1348:a54 with SMTP id i11-20020a67dd8b000000b0044513480a54mr1005414vsk.15.1689212528756; Wed, 12 Jul 2023 18:42:08 -0700 (PDT) MIME-Version: 1.0 References: <20230709084717.20744-1-kmatsui@gcc.gnu.org> In-Reply-To: From: Ken Matsui Date: Wed, 12 Jul 2023 18:41:53 -0700 Message-ID: Subject: Re: [PATCH 1/2] c++, libstdc++: implement __is_signed built-in trait To: Jonathan Wakely Cc: Ken Matsui , gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: On Wed, Jul 12, 2023 at 3:20=E2=80=AFAM Jonathan Wakely wrote: > > On Sun, 9 Jul 2023 at 09:50, Ken Matsui via Libstdc++ > wrote: > > > > This patch implements built-in trait for std::is_signed. > > > > gcc/cp/ChangeLog: > > > > * cp-trait.def: Define __is_signed. > > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_SIGNED. > > * semantics.cc (trait_expr_value): Likewise. > > (finish_trait_expr): Likewise. > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/ext/has-builtin-1.C: Test existence of __is_signed. > > * g++.dg/ext/is_signed.C: New test. > > * g++.dg/tm/pr46567.C (__is_signed): Rename to ... > > (____is_signed): ... this. > > > > libstdc++-v3/ChangeLog: > > > > * include/ext/numeric_traits.h (__is_signed): Rename to ... > > (____is_signed): ... this. > > Again, please do not use four underscores. > > This data member of __numeric_traits_integer could be __signed or > __is_signed_integer. I think I prefer __signed here, since the > "integer" part is redundant with __numeric_traits_integer. > Thank you for your review. It appears that __signed is a keyword. I will choose __is_signed_type since we also have __is_signed for __numeric_traits_floating. > > > > * include/bits/charconv.h: Use ____is_signed instead. > > * include/bits/locale_facets.tcc: Likewise. > > * include/bits/uniform_int_dist.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_signed.C | 47 ++++++++++++++++++++ > > gcc/testsuite/g++.dg/tm/pr46567.C | 12 ++--- > > libstdc++-v3/include/bits/charconv.h | 2 +- > > libstdc++-v3/include/bits/locale_facets.tcc | 6 +-- > > libstdc++-v3/include/bits/uniform_int_dist.h | 4 +- > > libstdc++-v3/include/ext/numeric_traits.h | 18 ++++---- > > 10 files changed, 79 insertions(+), 21 deletions(-) > > create mode 100644 gcc/testsuite/g++.dg/ext/is_signed.C > > > > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc > > index 8cf0f2d0974..73fcbfe39e8 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_SIGNED: > > + inform (loc, " %qT is not a signed type", 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..576d5528d05 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_constructib= le", -1) > > DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1) > > DEFTRAIT_EXPR (IS_UNION, "__is_union", 1) > > +DEFTRAIT_EXPR (IS_SIGNED, "__is_signed", 1) > > DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_= from_temporary", 2) > > DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from= _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..17aad992f96 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_SIGNED: > > + return ARITHMETIC_TYPE_P (type1) && TYPE_SIGN (type1) =3D=3D SIG= NED; > > + > > 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_SIGNED: > > 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..a43202d0d59 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_signed) > > +# error "__has_builtin (__is_signed) failed" > > +#endif > > diff --git a/gcc/testsuite/g++.dg/ext/is_signed.C b/gcc/testsuite/g++.d= g/ext/is_signed.C > > new file mode 100644 > > index 00000000000..a04b548105d > > --- /dev/null > > +++ b/gcc/testsuite/g++.dg/ext/is_signed.C > > @@ -0,0 +1,47 @@ > > +// { dg-do compile { target c++11 } } > > + > > +#include > > + > > +using namespace __gnu_test; > > + > > +#define SA(X) static_assert((X),#X) > > +#define SA_TEST_CATEGORY(TRAIT, X, expect) \ > > + SA(TRAIT(X) =3D=3D expect); \ > > + SA(TRAIT(const X) =3D=3D expect); \ > > + SA(TRAIT(volatile X) =3D=3D expect); \ > > + SA(TRAIT(const volatile X) =3D=3D expect) > > + > > +SA_TEST_CATEGORY(__is_signed, void, false); > > + > > +SA_TEST_CATEGORY(__is_signed, bool, bool(-1) < bool(0)); > > +SA_TEST_CATEGORY(__is_signed, char, char(-1) < char(0)); > > +SA_TEST_CATEGORY(__is_signed, signed char, true); > > +SA_TEST_CATEGORY(__is_signed, unsigned char, false); > > +SA_TEST_CATEGORY(__is_signed, wchar_t, wchar_t(-1) < wchar_t(0)); > > +SA_TEST_CATEGORY(__is_signed, short, true); > > +SA_TEST_CATEGORY(__is_signed, unsigned short, false); > > +SA_TEST_CATEGORY(__is_signed, int, true); > > +SA_TEST_CATEGORY(__is_signed, unsigned int, false); > > +SA_TEST_CATEGORY(__is_signed, long, true); > > +SA_TEST_CATEGORY(__is_signed, unsigned long, false); > > +SA_TEST_CATEGORY(__is_signed, long long, true); > > +SA_TEST_CATEGORY(__is_signed, unsigned long long, false); > > + > > +SA_TEST_CATEGORY(__is_signed, float, true); > > +SA_TEST_CATEGORY(__is_signed, double, true); > > +SA_TEST_CATEGORY(__is_signed, long double, true); > > + > > +#ifndef __STRICT_ANSI__ > > +// GNU Extensions. > > +#ifdef __SIZEOF_INT128__ > > +SA_TEST_CATEGORY(__is_signed, __int128, true); > > +SA_TEST_CATEGORY(__is_signed, unsigned __int128, false); > > +#endif > > + > > +#ifdef _GLIBCXX_USE_FLOAT128 > > +SA_TEST_CATEGORY(__is_signed, __float128, true); > > +#endif > > +#endif > > + > > +// Sanity check. > > +SA_TEST_CATEGORY(__is_signed, ClassType, false); > > diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/t= m/pr46567.C > > index 6d791484448..06400fa1178 100644 > > --- a/gcc/testsuite/g++.dg/tm/pr46567.C > > +++ b/gcc/testsuite/g++.dg/tm/pr46567.C > > @@ -403,7 +403,7 @@ namespace __gnu_cxx __attribute__ ((__visibility__ = ("default"))) { > > { > > static const _Value __min =3D (((_Value)(-1) < 0) ? (_Value)1 <<= (sizeof(_Value) * 8 - ((_Value)(-1) < 0)) : (_Value)0); > > static const _Value __max =3D (((_Value)(-1) < 0) ? (((((_Value)= 1 << ((sizeof(_Value) * 8 - ((_Value)(-1) < 0)) - 1)) - 1) << 1) + 1) : ~(_= Value)0); > > - static const bool __is_signed =3D ((_Value)(-1) < 0); > > + static const bool ____is_signed =3D ((_Value)(-1) < 0); > > static const int __digits =3D (sizeof(_Value) * 8 - ((_Value)(-1= ) < 0)); > > }; > > template > > @@ -411,21 +411,21 @@ namespace __gnu_cxx __attribute__ ((__visibility_= _ ("default"))) { > > template > > const _Value __numeric_traits_integer<_Value>::__max; > > template > > - const bool __numeric_traits_integer<_Value>::__is_signed; > > + const bool __numeric_traits_integer<_Value>::____is_signed; > > template > > const int __numeric_traits_integer<_Value>::__digits; > > template > > struct __numeric_traits_floating > > { > > static const int __max_digits10 =3D (2 + (std::__are_same<_Value= , float>::__value ? 24 : std::__are_same<_Value, double>::__value ? 53 : 64= ) * 3010 / 10000); > > - static const bool __is_signed =3D true; > > + static const bool ____is_signed =3D true; > > static const int __digits10 =3D (std::__are_same<_Value, float>:= :__value ? 6 : std::__are_same<_Value, double>::__value ? 15 : 18); > > static const int __max_exponent10 =3D (std::__are_same<_Value, f= loat>::__value ? 38 : std::__are_same<_Value, double>::__value ? 308 : 4932= ); > > }; > > template > > const int __numeric_traits_floating<_Value>::__max_digits10; > > template > > - const bool __numeric_traits_floating<_Value>::__is_signed; > > + const bool __numeric_traits_floating<_Value>::____is_signed; > > template > > const int __numeric_traits_floating<_Value>::__digits10; > > template > > @@ -1513,8 +1513,8 @@ namespace std __attribute__ ((__visibility__ ("de= fault"))) { > > typedef typename iterator_traits<_II2>::value_type _ValueType2; > > const bool __simple =3D > > (__is_byte<_ValueType1>::__value && __is_byte<_ValueType2>::__value > > - && !__gnu_cxx::__numeric_traits<_ValueType1>::__is_signed > > - && !__gnu_cxx::__numeric_traits<_ValueType2>::__is_signed > > + && !__gnu_cxx::__numeric_traits<_ValueType1>::____is_signed > > + && !__gnu_cxx::__numeric_traits<_ValueType2>::____is_signed > > && __is_pointer<_II1>::__value > > && __is_pointer<_II2>::__value); > > return std::__lexicographical_compare<__simple>::__lc(__first1, = __last1, > > diff --git a/libstdc++-v3/include/bits/charconv.h b/libstdc++-v3/includ= e/bits/charconv.h > > index 20da8303f7a..c6a4c993c17 100644 > > --- a/libstdc++-v3/include/bits/charconv.h > > +++ b/libstdc++-v3/include/bits/charconv.h > > @@ -46,7 +46,7 @@ namespace __detail > > // This accepts 128-bit integers even in strict mode. > > template > > constexpr bool __integer_to_chars_is_unsigned > > - =3D ! __gnu_cxx::__int_traits<_Tp>::__is_signed; > > + =3D ! __gnu_cxx::__int_traits<_Tp>::____is_signed; > > #endif > > > > // Generic implementation for arbitrary bases. > > diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3= /include/bits/locale_facets.tcc > > index 6bfff7d6289..0e62bc89397 100644 > > --- a/libstdc++-v3/include/bits/locale_facets.tcc > > +++ b/libstdc++-v3/include/bits/locale_facets.tcc > > @@ -470,7 +470,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL > > bool __testfail =3D false; > > bool __testoverflow =3D false; > > const __unsigned_type __max =3D > > - (__negative && __num_traits::__is_signed) > > + (__negative && __num_traits::____is_signed) > > ? -static_cast<__unsigned_type>(__num_traits::__min) > > : __num_traits::__max; > > const __unsigned_type __smax =3D __max / __base; > > @@ -573,7 +573,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL > > } > > else if (__testoverflow) > > { > > - if (__negative && __num_traits::__is_signed) > > + if (__negative && __num_traits::____is_signed) > > __v =3D __num_traits::__min; > > else > > __v =3D __num_traits::__max; > > @@ -914,7 +914,7 @@ _GLIBCXX_BEGIN_NAMESPACE_LDBL > > if (__v >=3D 0) > > { > > if (bool(__flags & ios_base::showpos) > > - && __gnu_cxx::__numeric_traits<_ValueT>::__is_signe= d) > > + && __gnu_cxx::__numeric_traits<_ValueT>::____is_sig= ned) > > *--__cs =3D __lit[__num_base::_S_oplus], ++__len; > > } > > else > > diff --git a/libstdc++-v3/include/bits/uniform_int_dist.h b/libstdc++-v= 3/include/bits/uniform_int_dist.h > > index 7ccf930a6d4..b8cfa3c1c71 100644 > > --- a/libstdc++-v3/include/bits/uniform_int_dist.h > > +++ b/libstdc++-v3/include/bits/uniform_int_dist.h > > @@ -258,8 +258,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > { > > using _Up_traits =3D __gnu_cxx::__int_traits<_Up>; > > using _Wp_traits =3D __gnu_cxx::__int_traits<_Wp>; > > - static_assert(!_Up_traits::__is_signed, "U must be unsigned")= ; > > - static_assert(!_Wp_traits::__is_signed, "W must be unsigned")= ; > > + static_assert(!_Up_traits::____is_signed, "U must be unsigned= "); > > + static_assert(!_Wp_traits::____is_signed, "W must be unsigned= "); > > static_assert(_Wp_traits::__digits =3D=3D (2 * _Up_traits::__= digits), > > "W must be twice as wide as U"); > > > > diff --git a/libstdc++-v3/include/ext/numeric_traits.h b/libstdc++-v3/i= nclude/ext/numeric_traits.h > > index dcbc2d12927..ce7341be785 100644 > > --- a/libstdc++-v3/include/ext/numeric_traits.h > > +++ b/libstdc++-v3/include/ext/numeric_traits.h > > @@ -67,15 +67,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > > > // NB: these two are also available in std::numeric_limits as co= mpile > > // time constants, but is big and we can avoid includin= g it. > > - static const bool __is_signed =3D (_Value)(-1) < 0; > > + static const bool ____is_signed =3D (_Value)(-1) < 0; > > static const int __digits > > - =3D __is_integer_nonstrict<_Value>::__width - __is_signed; > > + =3D __is_integer_nonstrict<_Value>::__width - ____is_signed; > > > > // The initializers must be constants so that __max and __min ar= e too. > > - static const _Value __max =3D __is_signed > > + static const _Value __max =3D ____is_signed > > ? (((((_Value)1 << (__digits - 1)) - 1) << 1) + 1) > > : ~(_Value)0; > > - static const _Value __min =3D __is_signed ? -__max - 1 : (_Value= )0; > > + static const _Value __min =3D ____is_signed ? -__max - 1 : (_Val= ue)0; > > }; > > > > template > > @@ -85,7 +85,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > const _Value __numeric_traits_integer<_Value>::__max; > > > > template > > - const bool __numeric_traits_integer<_Value>::__is_signed; > > + const bool __numeric_traits_integer<_Value>::____is_signed; > > > > template > > const int __numeric_traits_integer<_Value>::__digits; > > @@ -161,7 +161,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > static const int __max_digits10 =3D __glibcxx_max_digits10(_Valu= e); > > > > // See above comment... > > - static const bool __is_signed =3D true; > > + static const bool ____is_signed =3D true; > > static const int __digits10 =3D __glibcxx_digits10(_Value); > > static const int __max_exponent10 =3D __glibcxx_max_exponent10(_= Value); > > }; > > @@ -170,7 +170,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > const int __numeric_traits_floating<_Value>::__max_digits10; > > > > template > > - const bool __numeric_traits_floating<_Value>::__is_signed; > > + const bool __numeric_traits_floating<_Value>::____is_signed; > > > > template > > const int __numeric_traits_floating<_Value>::__digits10; > > @@ -210,7 +210,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > struct __numeric_traits_floating<__ibm128> > > { > > static const int __max_digits10 =3D 33; > > - static const bool __is_signed =3D true; > > + static const bool ____is_signed =3D true; > > static const int __digits10 =3D 31; > > static const int __max_exponent10 =3D 308; > > }; > > @@ -224,7 +224,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION > > struct __numeric_traits_floating<__ieee128> > > { > > static const int __max_digits10 =3D 36; > > - static const bool __is_signed =3D true; > > + static const bool ____is_signed =3D true; > > static const int __digits10 =3D 33; > > static const int __max_exponent10 =3D 4932; > > }; > > -- > > 2.41.0 > > >