From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-xa32.google.com (mail-vk1-xa32.google.com [IPv6:2607:f8b0:4864:20::a32]) by sourceware.org (Postfix) with ESMTPS id 3F5E73842FDC for ; Fri, 10 May 2024 14:44:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F5E73842FDC 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 ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3F5E73842FDC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::a32 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715352245; cv=none; b=FoCMG7KIEm6jPTt5QIwWdB6V13EPAxa/HMX3BaE9CKUkud7FZKPN3QOPhwx4w1LxkRkwfasf7o0JEfzL/eKxtXM7iO0inrGZZC1DQXPxqn5y8J0WMnjh5QWSJv2i0mNduPIts8UEIj+OHi2LV6PR5HVp3CoV6p7GGoeZY6ir2hc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715352245; c=relaxed/simple; bh=Xd9Usy5MNDPUwr7KuoKSG5rB7RSQZsVDFHbOZb59dik=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=faV5O3+pC2RHv7ffcBxx5KHGnb9Dr2SVhxAiuXUH8JYbUsO/Mciufc/oV5+EUb+posdZBhhFrGoghoTQh/QKbWCavgXqCwfXxJEIr2S8fdYlHGgHr7bcntppKrpPa6RcAFWnz3LrUYPwKRC5qpXbRuSL+VVfBX8rOAj6/nHm6TA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-vk1-xa32.google.com with SMTP id 71dfb90a1353d-4df4b388887so586444e0c.3 for ; Fri, 10 May 2024 07:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1715352241; x=1715957041; 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=j1cvYOcAZel2rwqjgcflD0fndTJIpVMGQ8p4geDYGj8=; b=cYGC0OiFfpiZKiimEVbn15OBqniSuzp0G1DVPij8YNwYfH7PULGUWVwohVQ6uAZ/g2 SbLBMrFDPos66L/oXCayR0WJezdcj6Tj6qTBBCYbqd2NNRQq2r5Hq5dDgEAmyuecCiT7 uXtYt4EBROgmwOd+gORebFnwMeIp7BJal3wZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715352241; x=1715957041; 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=j1cvYOcAZel2rwqjgcflD0fndTJIpVMGQ8p4geDYGj8=; b=ti+qSh2AT16p02YfUXfOJsiT071kI4mhwinJzRsLW2rW59lntqpBj+n4WMU/pE5EoR F5KwbilbDUaxUM19F+MtsVOFZPXM94by3hy4GGJarzmlk2PDCmbkYG43vAnydmhppKSG eYTim8w9iV0/2uycci1Hxo+1/Tws4TiqfOoeeg/+Gae5dlHx4iNFp3BB4tYKPRi6kM1X 1uOwxmJjtmf8WVqHD/e8IMHHgGUMuWwE7Ake1LspZANt8SNMrTXvWbVm72uG0Ghh++79 LkZXNxU+/Ih8sWmTpWhyixGFXaCUPLj9hv8Yj7bhY8HenWR0WBRZDDUITKaRIR36qdF9 HuGQ== X-Forwarded-Encrypted: i=1; AJvYcCV7h88NLyY2VENd/0fkS9Xi5qcjkkEnNrjb6MeUyoqmHHCXunfSmIz1ttdCmDnFDpZG0LjSmk6rjzT+0T7atYiygfRFRGI= X-Gm-Message-State: AOJu0Ywe3dSEFEl48nyY0lbfzXVw18QJblsgkTZNlqCg6RLHRMZ2bMfm 8J1ST8jxrS5w99UItxGrclsp+RfmKbV4U+sSh4eKE8h7a66Z3Z1V+ueJtcoBvLLViSeMQKaO0E5 alrAZKxPDS67SsSyc/a/T5tGS9j3ijDMVXXAJ X-Google-Smtp-Source: AGHT+IFNncu0Zz0sQxo7Oc0uIzf1s8T/f4TXSGv3AVe3yonccGyLz8rMOaqc2W9EYmJ4m0ckSeDNJVlyNyRk3HZXDJo= X-Received: by 2002:a05:6122:1693:b0:4d4:3ec6:421e with SMTP id 71dfb90a1353d-4df882a870fmr3329779e0c.4.1715352239947; Fri, 10 May 2024 07:43:59 -0700 (PDT) MIME-Version: 1.0 References: <20240508050455.365029-21-kmatsui@gcc.gnu.org> <20240510112417.8927-21-kmatsui@gcc.gnu.org> <177fdb76-499c-4427-bfab-9e32019bbb25@redhat.com> In-Reply-To: <177fdb76-499c-4427-bfab-9e32019bbb25@redhat.com> From: Ken Matsui Date: Fri, 10 May 2024 07:43:24 -0700 Message-ID: Subject: Re: [PATCH v23 20/23] c++: Implement __is_invocable built-in trait To: Jason Merrill 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=-11.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 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 Fri, May 10, 2024 at 7:20=E2=80=AFAM Jason Merrill wr= ote: > > On 5/10/24 07:24, Ken Matsui wrote: > > Fixed the reference to pointer to class case. Ok for trunk? > > > > -- >8 -- > > > > This patch implements built-in trait for std::is_invocable. > > > > gcc/cp/ChangeLog: > > > > * cp-trait.def: Define __is_invocable. > > * constraint.cc (diagnose_trait_expr): Handle CPTK_IS_INVOCABLE. > > * semantics.cc (trait_expr_value): Likewise. > > (finish_trait_expr): Likewise. > > * cp-tree.h (build_invoke): New function. > > * method.cc (build_invoke): New function. > > > > gcc/testsuite/ChangeLog: > > > > * g++.dg/ext/has-builtin-1.C: Test existence of __is_invocable. > > * g++.dg/ext/is_invocable1.C: New test. > > * g++.dg/ext/is_invocable2.C: New test. > > * g++.dg/ext/is_invocable3.C: New test. > > * g++.dg/ext/is_invocable4.C: New test. > > > > Signed-off-by: Ken Matsui > > --- > > gcc/cp/constraint.cc | 6 + > > gcc/cp/cp-trait.def | 1 + > > gcc/cp/cp-tree.h | 2 + > > gcc/cp/method.cc | 139 +++++++++ > > gcc/cp/semantics.cc | 5 + > > gcc/testsuite/g++.dg/ext/has-builtin-1.C | 3 + > > gcc/testsuite/g++.dg/ext/is_invocable1.C | 349 ++++++++++++++++++++++= + > > gcc/testsuite/g++.dg/ext/is_invocable2.C | 139 +++++++++ > > gcc/testsuite/g++.dg/ext/is_invocable3.C | 51 ++++ > > gcc/testsuite/g++.dg/ext/is_invocable4.C | 33 +++ > > 10 files changed, 728 insertions(+) > > create mode 100644 gcc/testsuite/g++.dg/ext/is_invocable1.C > > create mode 100644 gcc/testsuite/g++.dg/ext/is_invocable2.C > > create mode 100644 gcc/testsuite/g++.dg/ext/is_invocable3.C > > create mode 100644 gcc/testsuite/g++.dg/ext/is_invocable4.C > > > > diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc > > index c28d7bf428e..6d14ef7dcc7 100644 > > --- a/gcc/cp/constraint.cc > > +++ b/gcc/cp/constraint.cc > > @@ -3792,6 +3792,12 @@ diagnose_trait_expr (tree expr, tree args) > > case CPTK_IS_FUNCTION: > > inform (loc, " %qT is not a function", t1); > > break; > > + case CPTK_IS_INVOCABLE: > > + if (!t2) > > + inform (loc, " %qT is not invocable", t1); > > + else > > + inform (loc, " %qT is not invocable by %qE", t1, t2); > > + break; > > case CPTK_IS_LAYOUT_COMPATIBLE: > > inform (loc, " %qT is not layout compatible with %qT", t1, t2)= ; > > break; > > diff --git a/gcc/cp/cp-trait.def b/gcc/cp/cp-trait.def > > index b1c875a6e7d..4e420d5390a 100644 > > --- a/gcc/cp/cp-trait.def > > +++ b/gcc/cp/cp-trait.def > > @@ -75,6 +75,7 @@ DEFTRAIT_EXPR (IS_EMPTY, "__is_empty", 1) > > DEFTRAIT_EXPR (IS_ENUM, "__is_enum", 1) > > DEFTRAIT_EXPR (IS_FINAL, "__is_final", 1) > > DEFTRAIT_EXPR (IS_FUNCTION, "__is_function", 1) > > +DEFTRAIT_EXPR (IS_INVOCABLE, "__is_invocable", -1) > > DEFTRAIT_EXPR (IS_LAYOUT_COMPATIBLE, "__is_layout_compatible", 2) > > DEFTRAIT_EXPR (IS_LITERAL_TYPE, "__is_literal_type", 1) > > DEFTRAIT_EXPR (IS_MEMBER_FUNCTION_POINTER, "__is_member_function_poin= ter", 1) > > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > > index 52d6841559c..8aa41f7147f 100644 > > --- a/gcc/cp/cp-tree.h > > +++ b/gcc/cp/cp-tree.h > > @@ -7340,6 +7340,8 @@ extern tree get_copy_assign (= tree); > > extern tree get_default_ctor (tree); > > extern tree get_dtor (tree, tsubst_fla= gs_t); > > extern tree build_stub_object (tree); > > +extern tree build_invoke (tree, const_tree, > > + tsubst_flags_t); > > extern tree strip_inheriting_ctors (tree); > > extern tree inherited_ctor_binfo (tree); > > extern bool base_ctor_omit_inherited_parms (tree); > > diff --git a/gcc/cp/method.cc b/gcc/cp/method.cc > > index 08a3d34fb01..7e66d67f5d9 100644 > > --- a/gcc/cp/method.cc > > +++ b/gcc/cp/method.cc > > @@ -1928,6 +1928,145 @@ build_trait_object (tree type) > > return build_stub_object (type); > > } > > > > +/* [func.require] Build an expression of INVOKE(FN_TYPE, ARG_TYPES...)= . If the > > + given is not invocable, returns error_mark_node. */ > > + > > +tree > > +build_invoke (tree fn_type, const_tree arg_types, tsubst_flags_t compl= ain) > > +{ > > + if (error_operand_p (fn_type) || error_operand_p (arg_types)) > > + return error_mark_node; > > + > > + gcc_assert (TYPE_P (fn_type)); > > + gcc_assert (TREE_CODE (arg_types) =3D=3D TREE_VEC); > > + > > + /* Access check is required to determine if the given is invocable. = */ > > + deferring_access_check_sentinel acs (dk_no_deferred); > > + > > + /* INVOKE is an unevaluated context. */ > > + cp_unevaluated cp_uneval_guard; > > + > > + bool is_ptrdatamem; > > + bool is_ptrmemfunc; > > + if (TREE_CODE (fn_type) =3D=3D REFERENCE_TYPE) > > + { > > + tree non_ref_fn_type =3D TREE_TYPE (fn_type); > > + is_ptrdatamem =3D TYPE_PTRDATAMEM_P (non_ref_fn_type); > > + is_ptrmemfunc =3D TYPE_PTRMEMFUNC_P (non_ref_fn_type); > > + > > + /* Dereference fn_type if it is a pointer to member. */ > > + if (is_ptrdatamem || is_ptrmemfunc) > > + fn_type =3D non_ref_fn_type; > > + } > > + else > > + { > > + is_ptrdatamem =3D TYPE_PTRDATAMEM_P (fn_type); > > + is_ptrmemfunc =3D TYPE_PTRMEMFUNC_P (fn_type); > > + } > > + > > + if (is_ptrdatamem && TREE_VEC_LENGTH (arg_types) !=3D 1) > > + { > > + if (complain & tf_error) > > + error ("pointer to data member type %qT can only be invoked with = " > > + "one argument", fn_type); > > + return error_mark_node; > > + } > > + if (is_ptrmemfunc && TREE_VEC_LENGTH (arg_types) =3D=3D 0) > > + { > > + if (complain & tf_error) > > + error ("pointer to member function type %qT must be invoked with = " > > + "at least one argument", fn_type); > > + return error_mark_node; > > + } > > + > > + /* Construct an expression of a pointer to member. */ > > + tree ptrmem_expr; > > + if (is_ptrdatamem || is_ptrmemfunc) > > + { > > + tree datum_type =3D TREE_VEC_ELT (arg_types, 0); > > + tree non_ref_datum_type =3D datum_type; > > + if (TYPE_REF_P (datum_type)) > > + non_ref_datum_type =3D TREE_TYPE (datum_type); > > + > > + /* datum must be a class type or a pointer to a class type. */ > > + if (!CLASS_TYPE_P (non_ref_datum_type) > > + && (POINTER_TYPE_P (non_ref_datum_type) > > + && !CLASS_TYPE_P (TREE_TYPE (non_ref_datum_type)))) > > This logic looks like it will now only reject a pointer to non-class, > not any non-pointer, non-class type. > > Such types will still fail when we get to build_x_indirect_ref, but I > think you meant them to get this diagnostic (if we get here with tf_error= ). Oops, thank you once again for your review...! > > Jason >