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.129.124]) by sourceware.org (Postfix) with ESMTPS id B8B223858280 for ; Tue, 20 Jun 2023 16:05:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B8B223858280 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=1687277157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=R1kiFHG2kl0he6M8CBjANSm9mvz4e1kPqj8gPI2hzEI=; b=RHdqhUVfIxyRaKRh3YACncdJzHTFC81lvdWOyr/asYnW4Lf9eZ+vkAMGAzJneJ4wQ9NF7s et4NrGA9qY+u05iF7obcYzAYwL6V5/rYiIWAcv/FAQIq928BUrPvvqNYzkv3H+tOGll2T4 /0nF9sqzAhE99o2AdCPwArbtup/Z9c0= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-3KC5hTUsMl2P86o04nCeLQ-1; Tue, 20 Jun 2023 12:05:47 -0400 X-MC-Unique: 3KC5hTUsMl2P86o04nCeLQ-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-62ff9f695d3so49347426d6.3 for ; Tue, 20 Jun 2023 09:05:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687277135; x=1689869135; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R1kiFHG2kl0he6M8CBjANSm9mvz4e1kPqj8gPI2hzEI=; b=Qqy2Bp7aTQEO6QujiQsumswAKfekmajt5TEsA0mVe2HlUhm6O9i869os+VPdOJmDzh 5OkBdbYm7end01j5I4t6fbRMjIHeVqAILPRcO/owNDkPbQDXjC4MM/g8Rd2ruYJHRnkA gcOFRHYqtQFrLARvaZtD58h8ia+TYdUbzig4/sV4xXLEV3wbAhW2/ksyzIbGj6ojeKRB KzcZrVbJ0R0e0Qt28J5iSmgtRvodZwHu7ZthFfGcLKksTNo6WNHvDOgbNvFyN9CK5QM0 UQoa7Dq0/iy2xOX3lm2vbHzQjRltwk/G98QdXSIxUOGFNZoIyQzX2Y6HlPDETaZtjHVl Lwbg== X-Gm-Message-State: AC+VfDwMNzuqSOtltlX4zoxTe/PllxsoX6GmlPnQ3xsdB5/dAdJ/ZQta knYBJ491QvLmraUINd+6R7etELggqt6WD0LxchC6TAAmcor/6zs/YLKp9Z7CxK8orR67yYzrs+b xLqMJrjUUd6gHnTs= X-Received: by 2002:a05:6214:21ac:b0:630:2a0:46d7 with SMTP id t12-20020a05621421ac00b0063002a046d7mr12135531qvc.45.1687277135315; Tue, 20 Jun 2023 09:05:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Q5tJVzeftZx9HHLhn2R+JC3SE6xKOhrP49+wHsb9rPQrC4qNkFGm4Ouv5hOzvLHsBdAQ5uw== X-Received: by 2002:a05:6214:21ac:b0:630:2a0:46d7 with SMTP id t12-20020a05621421ac00b0063002a046d7mr12135510qvc.45.1687277135025; Tue, 20 Jun 2023 09:05:35 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id g5-20020a0cdf05000000b00630c0ed6339sm1364840qvl.64.2023.06.20.09.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 09:05:34 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Tue, 20 Jun 2023 12:05:34 -0400 (EDT) To: Ken Matsui cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH v7 3/6] c++: implement __is_function built-in trait In-Reply-To: <20230612224909.21188-4-kmatsui@cs.washington.edu> Message-ID: References: <20230612224109.20749-1-kmatsui@cs.washington.edu> <20230612224909.21188-1-kmatsui@cs.washington.edu> <20230612224909.21188-4-kmatsui@cs.washington.edu> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: On Mon, 12 Jun 2023, Ken Matsui via Gcc-patches 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_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_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 type1, tree type2) > case CPTK_IS_ENUM: > return type_code1 == ENUMERAL_TYPE; > > + case CPTK_IS_FUNCTION: > + return type_code1 == 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++.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) == EXPECT); \ > + SA(TRAIT(const TYPE) == EXPECT); \ > + SA(TRAIT(volatile TYPE) == EXPECT); \ > + SA(TRAIT(const volatile TYPE) == EXPECT) > + > +struct A > +{ void fn(); }; > + > +template > +struct AHolder { }; > + > +template > +struct AHolder > +{ using type = 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 > >