From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-xe2b.google.com (mail-vs1-xe2b.google.com [IPv6:2607:f8b0:4864:20::e2b]) by sourceware.org (Postfix) with ESMTPS id F3BEC3856DC0 for ; Thu, 13 Jul 2023 02:41:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F3BEC3856DC0 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-vs1-xe2b.google.com with SMTP id ada2fe7eead31-4435508cff9so128835137.0 for ; Wed, 12 Jul 2023 19:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1689216111; x=1691808111; 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=t+ccdo82GN5i5GuGoVkEv249ZvX4D59YawhBluWS6pU=; b=QuoOYIfU8gG4COf1L3a/J03vci8nznm80HlVSEPXoUgDgDQ6pz8Sk8BEs7EwygnVRJ BVX0MfzyvhoSH1Wc63talVAFxfcsAZoeYSvDgy1v7Qe0cbAGRPrpHuIvVnOa+mrBnLIW hZ58NuaY4GzPm2GAreZ9boLUvxERi/P+CvmFU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689216111; x=1691808111; 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=t+ccdo82GN5i5GuGoVkEv249ZvX4D59YawhBluWS6pU=; b=bWSwPBopUiaUge6yDgoEqWFZqAE9cpbVvYeiw72Ii9Zt0480IOG6SBvuuDob3gio9S I9oV4XmR4W4EkCcuNvRbg55NyneSuI7N+/mT2VthSdkMHwoP/gfSZz/Vlr1PHL/16LWk EOlPSx64LQjQYHYVx7LYtD2q46TOEeqyj1t30efLj+4W4w2frdRLgXtKjipWSeQ0n71C DEeEejXu6huyTrCwDG59w5LUwN6AsyKrl7kdlqQrKmk2pUfr5wnh3fbqAJ8WNYdSKTSv 1CuCGZFreI0EMCWXVTbbjh4p+VvJbZsrj+KEQ14IqRJE2xXvCcOh/EKoGbcum5B3Ki0Z Tt3w== X-Gm-Message-State: ABy/qLYrQDavU5/IzO1A91ypUq22DBrJkp7oDSRPqoTQdM59BnKPn3JS UesVvCioXPOGI+lprPavoiY67GrkCGQmUhrr8Ah6QA== X-Google-Smtp-Source: APBJJlGTj/qEBWOWcgYyilibNEYg5fY1xcJGOH77ZjLUNRYfcovpaqXytYccvW+MpQMuWOm0Rv2ST5Y2JJbHw/jWKRo= X-Received: by 2002:a67:e90d:0:b0:443:5ce7:e62d with SMTP id c13-20020a67e90d000000b004435ce7e62dmr298238vso.21.1689216111166; Wed, 12 Jul 2023 19:41:51 -0700 (PDT) MIME-Version: 1.0 References: <20230708051137.63707-1-kmatsui@gcc.gnu.org> <20230713023731.15571-1-kmatsui@gcc.gnu.org> <20230713023731.15571-4-kmatsui@gcc.gnu.org> In-Reply-To: <20230713023731.15571-4-kmatsui@gcc.gnu.org> From: Ken Matsui Date: Wed, 12 Jul 2023 19:41:35 -0700 Message-ID: Subject: Re: [PATCH v10 3/5] c++: Implement __is_function built-in trait To: Ken Matsui Cc: 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: Hi, Here is the benchmark result for is_function: https://github.com/ken-matsui/gcc-benches/blob/main/is_function.md#wed-jul-= 12-072510-pm-pdt-2023 Time: -21.3748% Peak Memory Usage: -10.962% Total Memory Usage: -12.8384% Sincerely, Ken Matsui On Wed, Jul 12, 2023 at 7:40=E2=80=AFPM Ken Matsui wr= ote: > > This patch implements built-in trait for std::is_function. > > gcc/cp/ChangeLog: > > * cp-trait.def: Define __is_function. > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_FUNCTION. > * semantics.cc (trait_expr_value): Likewise. > (finish_trait_expr): Likewise. > > gcc/testsuite/ChangeLog: > > * g++.dg/ext/has-builtin-1.C: Test existence of __is_function. > * g++.dg/ext/is_function.C: New test. > > 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_function.C | 58 ++++++++++++++++++++++++ > 5 files changed, 69 insertions(+) > create mode 100644 gcc/testsuite/g++.dg/ext/is_function.C > > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc > index f6951ee2670..927605c6cb7 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_UNION: > inform (loc, " %qT is not a union", t1); > break; > + case CPTK_IS_FUNCTION: > + inform (loc, " %qT is not a function", 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 1e3310cd682..3cd3babc242 100644 > --- a/gcc/cp/cp-trait.def > +++ b/gcc/cp/cp-trait.def > @@ -83,6 +83,7 @@ DEFTRAIT_EXPR (IS_TRIVIALLY_ASSIGNABLE, "__is_trivially= _assignable", 2) > DEFTRAIT_EXPR (IS_TRIVIALLY_CONSTRUCTIBLE, "__is_trivially_constructible= ", -1) > DEFTRAIT_EXPR (IS_TRIVIALLY_COPYABLE, "__is_trivially_copyable", 1) > DEFTRAIT_EXPR (IS_UNION, "__is_union", 1) > +DEFTRAIT_EXPR (IS_FUNCTION, "__is_function", 1) > DEFTRAIT_EXPR (REF_CONSTRUCTS_FROM_TEMPORARY, "__reference_constructs_fr= om_temporary", 2) > DEFTRAIT_EXPR (REF_CONVERTS_FROM_TEMPORARY, "__reference_converts_from_t= emporary", 2) > /* FIXME Added space to avoid direct usage in GCC 13. */ > diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc > index 2f37bc353a1..b976633645a 100644 > --- a/gcc/cp/semantics.cc > +++ b/gcc/cp/semantics.cc > @@ -12072,6 +12072,9 @@ trait_expr_value (cp_trait_kind kind, tree type1,= tree type2) > case CPTK_IS_ENUM: > return type_code1 =3D=3D ENUMERAL_TYPE; > > + case CPTK_IS_FUNCTION: > + return type_code1 =3D=3D FUNCTION_TYPE; > + > case CPTK_IS_FINAL: > return CLASS_TYPE_P (type1) && CLASSTYPE_FINAL (type1); > > @@ -12293,6 +12296,7 @@ finish_trait_expr (location_t loc, cp_trait_kind = kind, tree type1, tree type2) > case CPTK_IS_UNION: > case CPTK_IS_SAME: > case CPTK_IS_REFERENCE: > + case CPTK_IS_FUNCTION: > 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 b697673790c..90eb00ebf2d 100644 > --- a/gcc/testsuite/g++.dg/ext/has-builtin-1.C > +++ b/gcc/testsuite/g++.dg/ext/has-builtin-1.C > @@ -149,3 +149,6 @@ > #if !__has_builtin (__is_reference) > # error "__has_builtin (__is_reference) failed" > #endif > +#if !__has_builtin (__is_function) > +# error "__has_builtin (__is_function) failed" > +#endif > diff --git a/gcc/testsuite/g++.dg/ext/is_function.C b/gcc/testsuite/g++.d= g/ext/is_function.C > new file mode 100644 > index 00000000000..2e1594b12ad > --- /dev/null > +++ b/gcc/testsuite/g++.dg/ext/is_function.C > @@ -0,0 +1,58 @@ > +// { 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) > + > +struct A > +{ void fn(); }; > + > +template > +struct AHolder { }; > + > +template > +struct AHolder > +{ using type =3D U; }; > + > +// Positive tests. > +SA(__is_function(int (int))); > +SA(__is_function(ClassType (ClassType))); > +SA(__is_function(float (int, float, int[], int&))); > +SA(__is_function(int (int, ...))); > +SA(__is_function(bool (ClassType) const)); > +SA(__is_function(AHolder::type)); > + > +void fn(); > +SA(__is_function(decltype(fn))); > + > +// Negative tests. > +SA_TEST_CATEGORY(__is_function, int, false); > +SA_TEST_CATEGORY(__is_function, int*, false); > +SA_TEST_CATEGORY(__is_function, int&, false); > +SA_TEST_CATEGORY(__is_function, void, false); > +SA_TEST_CATEGORY(__is_function, void*, false); > +SA_TEST_CATEGORY(__is_function, void**, false); > +SA_TEST_CATEGORY(__is_function, std::nullptr_t, false); > + > +SA_TEST_CATEGORY(__is_function, AbstractClass, false); > +SA(!__is_function(int(&)(int))); > +SA(!__is_function(int(*)(int))); > + > +SA_TEST_CATEGORY(__is_function, A, false); > +SA_TEST_CATEGORY(__is_function, decltype(&A::fn), false); > + > +struct FnCallOverload > +{ void operator()(); }; > +SA_TEST_CATEGORY(__is_function, FnCallOverload, false); > + > +// Sanity check. > +SA_TEST_CATEGORY(__is_function, ClassType, false); > +SA_TEST_CATEGORY(__is_function, IncompleteClass, false); > +SA_TEST_CATEGORY(__is_function, IncompleteUnion, false); > -- > 2.41.0 >