From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa2b.google.com (mail-vk1-xa2b.google.com [IPv6:2607:f8b0:4864:20::a2b]) by sourceware.org (Postfix) with ESMTPS id 0FD0A3858D28 for ; Mon, 17 Jul 2023 04:47:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0FD0A3858D28 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-vk1-xa2b.google.com with SMTP id 71dfb90a1353d-4812f361e67so1155488e0c.2 for ; Sun, 16 Jul 2023 21:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1689569223; x=1692161223; 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=xZZhF+H+yxADiyncb8ni1BAVuX42AHv/kaq4TBDF99s=; b=PB6SIM27eWLKytOf4MTKZFQpA4K39gc49v4ddENUm9qJhGeHjnuFXu8fYYiJdH65FV sArJ624HA9XVFlVDM21ShXLuefductC+Xh5WyVRJ8jo/8NUjgO/FexLtNzSEUpUYE7LV uDFjzX59NVb6G3rf5L4dXcceszHlKOVxtcJTg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689569223; x=1692161223; 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=xZZhF+H+yxADiyncb8ni1BAVuX42AHv/kaq4TBDF99s=; b=C1tfzDMK/KoyBrQjFKbFdlAZ8mM7JYh63kOsCGwzJ16HWhMuoM/DDT6ESUM5PkVYrs QNGfD9kHqxZzZX0T0DegbyTw7ZeARzGpm8sTL9AzjsQjoOpX9nla+Bg54b64t6m4oKJ2 4JidgwtKBgHyOZdzMg+r0/Rnk3MNxD59jTJc2qaIxzkbW890e4GwjwqJHO01UgdSdnNm 0n4m0GOY7YWTz+szG6kyCbM2IVBZScie3isYVd891H0wK1IrHmLQ43wDLsiFkI23ajJ9 zjJ3kfzVbeJcAwACZMreDrk6IAx7EySeYIerzQAgVvBfNyVsia4tMejkWNKya1vcfcpK RkyQ== X-Gm-Message-State: ABy/qLauhq8dBzApIm3C/b4SHVpjt6J+P4Iifz8GR0BxDs1MDP9Et6oT hTnF2IJzKp0k3cnb1LvrjdiomoBffNCl+Pl6J+V9lQ== X-Google-Smtp-Source: APBJJlFCXXEbmmD+q/4VkHZagCaz5I1nU3/l4ymqzAbw0ij2Q58Zn0VFMpBlnyyC2caBOKbd+Xu3azAlg0jsOQ2OAz4= X-Received: by 2002:a1f:e6c2:0:b0:481:6d58:7fac with SMTP id d185-20020a1fe6c2000000b004816d587facmr3613061vkh.10.1689569222859; Sun, 16 Jul 2023 21:47:02 -0700 (PDT) MIME-Version: 1.0 References: <20230709125715.26884-1-kmatsui@gcc.gnu.org> <20230715045519.50684-1-kmatsui@gcc.gnu.org> <3b7ac8f1-030e-e226-68c9-7e69f11ef9a8@gmail.com> In-Reply-To: <3b7ac8f1-030e-e226-68c9-7e69f11ef9a8@gmail.com> From: Ken Matsui Date: Sun, 16 Jul 2023 21:46:47 -0700 Message-ID: Subject: Re: [PATCH v2 1/3] c++, libstdc++: Implement __is_arithmetic built-in trait To: =?UTF-8?Q?Fran=C3=A7ois_Dumont?= 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.1 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 Sun, Jul 16, 2023 at 5:28=E2=80=AFAM Fran=C3=A7ois Dumont wrote: > > > On 15/07/2023 06:55, Ken Matsui via Libstdc++ wrote: > > This patch implements built-in trait for std::is_arithmetic. > > > > gcc/cp/ChangeLog: > > > > * cp-trait.def: Define __is_arithmetic. > > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_ARITHMETIC. > > * semantics.cc (trait_expr_value): Likewise. > > (finish_trait_expr): Likewise. > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/ext/has-builtin-1.C: Test existence of __is_arithmetic. > > * g++.dg/ext/is_arithmetic.C: New test. > > * g++.dg/tm/pr46567.C (__is_arithmetic): Rename to ... > > (____is_arithmetic): ... this. > > * g++.dg/torture/pr57107.C: Likewise. > > > > libstdc++-v3/ChangeLog: > > > > * include/bits/cpp_type_traits.h (__is_arithmetic): Rename to ... > > (____is_arithmetic): ... this. > > * include/c_global/cmath: Use ____is_arithmetic instead. > > * include/c_std/cmath: Likewise. > > * include/tr1/cmath: 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_arithmetic.C | 33 ++++++++++++++ > > gcc/testsuite/g++.dg/tm/pr46567.C | 6 +-- > > gcc/testsuite/g++.dg/torture/pr57107.C | 4 +- > > libstdc++-v3/include/bits/cpp_type_traits.h | 4 +- > > libstdc++-v3/include/c_global/cmath | 48 ++++++++++----------= - > > libstdc++-v3/include/c_std/cmath | 24 +++++------ > > libstdc++-v3/include/tr1/cmath | 24 +++++------ > > 11 files changed, 99 insertions(+), 55 deletions(-) > > create mode 100644 gcc/testsuite/g++.dg/ext/is_arithmetic.C > > > > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc > > index 8cf0f2d0974..bd517d08843 100644 > > --- a/gcc/cp/constraint.cc > > +++ b/gcc/cp/constraint.cc > > @@ -3754,6 +3754,9 @@ diagnose_trait_expr (tree expr, tree args) > > case CPTK_IS_AGGREGATE: > > inform (loc, " %qT is not an aggregate", t1); > > break; > > + case CPTK_IS_ARITHMETIC: > > + inform (loc, " %qT is not an arithmetic type", t1); > > + break; > > case CPTK_IS_TRIVIALLY_COPYABLE: > > inform (loc, " %qT is not trivially copyable", t1); > > break; > > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def > > index 8b7fece0cc8..a95aeeaf778 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_constructi= ble", -1) > > DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1) > > DEFTRAIT_EXPR (IS_UNION, "__is_union", 1) > > +DEFTRAIT_EXPR (IS_ARITHMETIC, "__is_arithmetic", 1) > > DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs= _from_temporary", 2) > > DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_fro= m_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..4531f047d73 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_ARITHMETIC: > > + return ARITHMETIC_TYPE_P (type1); > > + > > 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_ARITHMETIC: > > 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..3d63b0101d1 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_arithmetic) > > +# error "__has_builtin (__is_arithmetic) failed" > > +#endif > > diff --git a/gcc/testsuite/g++.dg/ext/is_arithmetic.C b/gcc/testsuite/g= ++.dg/ext/is_arithmetic.C > > new file mode 100644 > > index 00000000000..fd35831f646 > > --- /dev/null > > +++ b/gcc/testsuite/g++.dg/ext/is_arithmetic.C > > @@ -0,0 +1,33 @@ > > +// { dg-do compile { target c++11 } } > > + > > +#include > > + > > +using namespace __gnu_test; > > + > > +#define SA(X) static_assert((X),#X) > > +#define SA_TEST_CATEGORY(TRAIT, TYPE, EXPECT) \ > > + SA(TRAIT(TYPE) =3D=3D EXPECT); \ > > + SA(TRAIT(const TYPE) =3D=3D EXPECT); \ > > + SA(TRAIT(volatile TYPE) =3D=3D EXPECT); \ > > + SA(TRAIT(const volatile TYPE) =3D=3D EXPECT) > > + > > +SA_TEST_CATEGORY(__is_arithmetic, void, false); > > + > > +SA_TEST_CATEGORY(__is_arithmetic, char, true); > > +SA_TEST_CATEGORY(__is_arithmetic, signed char, true); > > +SA_TEST_CATEGORY(__is_arithmetic, unsigned char, true); > > +SA_TEST_CATEGORY(__is_arithmetic, wchar_t, true); > > +SA_TEST_CATEGORY(__is_arithmetic, short, true); > > +SA_TEST_CATEGORY(__is_arithmetic, unsigned short, true); > > +SA_TEST_CATEGORY(__is_arithmetic, int, true); > > +SA_TEST_CATEGORY(__is_arithmetic, unsigned int, true); > > +SA_TEST_CATEGORY(__is_arithmetic, long, true); > > +SA_TEST_CATEGORY(__is_arithmetic, unsigned long, true); > > +SA_TEST_CATEGORY(__is_arithmetic, long long, true); > > +SA_TEST_CATEGORY(__is_arithmetic, unsigned long long, true); > > +SA_TEST_CATEGORY(__is_arithmetic, float, true); > > +SA_TEST_CATEGORY(__is_arithmetic, double, true); > > +SA_TEST_CATEGORY(__is_arithmetic, long double, true); > > + > > +// Sanity check. > > +SA_TEST_CATEGORY(__is_arithmetic, ClassType, false); > > diff --git a/gcc/testsuite/g++.dg/tm/pr46567.C b/gcc/testsuite/g++.dg/t= m/pr46567.C > > index 6d791484448..b16f7b685e7 100644 > > --- a/gcc/testsuite/g++.dg/tm/pr46567.C > > +++ b/gcc/testsuite/g++.dg/tm/pr46567.C > > @@ -217,16 +217,16 @@ namespace std __attribute__ ((__visibility__ ("de= fault"))) { > > typedef __true_type __type; > > }; > > template > > - struct __is_arithmetic > > + struct ____is_arithmetic > > : public __traitor<__is_integer<_Tp>, __is_floating<_Tp> > > > { }; > > template > > struct __is_fundamental > > - : public __traitor<__is_void<_Tp>, __is_arithmetic<_Tp> > > > + : public __traitor<__is_void<_Tp>, ____is_arithmetic<_Tp> > > > { }; > > template > > struct __is_scalar > > - : public __traitor<__is_arithmetic<_Tp>, __is_pointer<_Tp> > > > + : public __traitor<____is_arithmetic<_Tp>, __is_pointer<_Tp> > > > { }; > > template > > struct __is_char > > diff --git a/gcc/testsuite/g++.dg/torture/pr57107.C b/gcc/testsuite/g++= .dg/torture/pr57107.C > > index 4dbd32bd298..4329a6eb4e1 100644 > > --- a/gcc/testsuite/g++.dg/torture/pr57107.C > > +++ b/gcc/testsuite/g++.dg/torture/pr57107.C > > @@ -25,9 +25,9 @@ namespace std __attribute__ ((__visibility__ ("defaul= t"))) { > > enum { > > __value =3D 0 }; > > }; > > - template struct __is_arithmetic : public __t= raitor<__is_integer<_Tp>, __is_floating<_Tp> > { > > + template struct ____is_arithmetic : public _= _traitor<__is_integer<_Tp>, __is_floating<_Tp> > { > > }; > > - template struct __is_scalar : public __trait= or<__is_arithmetic<_Tp>, __is_pointer<_Tp> > { > > + template struct __is_scalar : public __trait= or<____is_arithmetic<_Tp>, __is_pointer<_Tp> > { > > }; > > } > > namespace __gnu_cxx __attribute__ ((__visibility__ ("default"))) { > > diff --git a/libstdc++-v3/include/bits/cpp_type_traits.h b/libstdc++-v3= /include/bits/cpp_type_traits.h > > index 4312f32a4e0..95c55433c81 100644 > > --- a/libstdc++-v3/include/bits/cpp_type_traits.h > > +++ b/libstdc++-v3/include/bits/cpp_type_traits.h > > @@ -381,7 +381,7 @@ __INT_N(__GLIBCXX_TYPE_INT_N_3) > > // An arithmetic type is an integer type or a floating point type > > // > > template > > - struct __is_arithmetic > > + struct ____is_arithmetic > > I think Jonathan's remark about avoiding the 4 '_' also applies here. > > So rather '__is_arithmetic_type' or even '__is_arithmetic_t'. > Oh, thank you for pointing that out! I will fix it.