From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa30.google.com (mail-vk1-xa30.google.com [IPv6:2607:f8b0:4864:20::a30]) by sourceware.org (Postfix) with ESMTPS id 3B1413857C41 for ; Mon, 4 Sep 2023 15:00:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B1413857C41 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-xa30.google.com with SMTP id 71dfb90a1353d-48d109dc6beso319182e0c.1 for ; Mon, 04 Sep 2023 08:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1693839649; x=1694444449; darn=gcc.gnu.org; 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=uc30xqxzBHRS4oEnK0nvj405Fht40WBil9xVGfG+qis=; b=j82kfUw4UNx9xNfzJ38dGID5IrH3J8bf8SxUwmivm16UK+2yVdBIE4CxkLVKyBA8oX LbLoas6byYsXACho1uzPdkedqbWvVg28pSVYjItUPzjrqHm7e1FJsm8saY5gYpAwnSrK +0hWzNsH6yEonNEyUwhWC/RTohPNKBFYIRJw8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839649; x=1694444449; 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=uc30xqxzBHRS4oEnK0nvj405Fht40WBil9xVGfG+qis=; b=AeJnrbG3LSsDTuj9hTFIBjzooy1CU0IRsrgkVz/6iZ2wi/olCjCisoMYvVNvYOX7fn rzVSpRIosJrwp2p+tM2d5NPaiNhfE1UxP4fSeUkRrm+8gGrP7dHb3JKJ9VPjU+4TtbEg u/LfZjA3YbLxYEW2cFquQXjQClr45PZIt8r2i5TB3edPL9fcEZPXwtB+K3KcBADwEUEh JpaZaRlP7/Yl2yGaVRIFGVv09cjGYLlWKEoUhYgkRfdQTywpZS04Dgasv4VuwXi+awuq bESXYhRC53yVDXqfyuhPIvhsUuKyvvs/t4T7kN6OqZVownreRrwQlid0QOsw2A7cXmMV T3Mw== X-Gm-Message-State: AOJu0YxP+jVL8lCLkYJGNl6MXWbTA2MuJ469TMBh8enOll+7ry/GnOUs 446zTaQQx63hHIc1OzOMQyLvqG3Aofs54g68GSlLNA== X-Google-Smtp-Source: AGHT+IHY+j6TP8KV1lMRW6BvMpAh0CJNM9dZob7AenTcq0a3PDKz7VAI7ErUja10zsLsOceJumpkEm+DanEvvJEVkiQ= X-Received: by 2002:a1f:4a81:0:b0:48d:1cf0:f3c3 with SMTP id x123-20020a1f4a81000000b0048d1cf0f3c3mr4723168vka.14.1693839649551; Mon, 04 Sep 2023 08:00:49 -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> <2588a7df-2cb0-3e5d-7d6d-a1c2c13125b6@idea> In-Reply-To: <2588a7df-2cb0-3e5d-7d6d-a1c2c13125b6@idea> From: Ken Matsui Date: Mon, 4 Sep 2023 08:00:00 -0700 Message-ID: Subject: [PING][PATCH v10 3/5] c++: Implement __is_function built-in trait To: jason@redhat.com Cc: Ken Matsui , gcc-patches , "libstdc++" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-12.9 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Ping for __is_function built-in. Sincerely, Ken Matsui On Tue, Aug 22, 2023 at 12:53=E2=80=AFPM Patrick Palka = wrote: > > On Wed, 12 Jul 2023, Ken Matsui via Libstdc++ wrote: > > > 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. > > LGTM! > > > > > 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_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_FUNCTION, "__is_function", 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 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 type= 1, 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_kin= d 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++= .dg/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 > > > > >