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.133.124]) by sourceware.org (Postfix) with ESMTPS id 40B02384AB6E for ; Thu, 2 May 2024 20:38:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 40B02384AB6E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 40B02384AB6E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714682303; cv=none; b=P1X1FBUBjUuVcXvVs6es1J+5U/8jMEu1UZwcBDLZKpVK+Er7ULfRFPifFXaR+V1Pi5rY1pzf6LLwvIdU+QNMPzBOowXF2b2w+irA6h8zLTMdMVtgbFGClDaMjrcRG9xeDELe4Hubz9OPvGV1ZbQYG7HOT7QdjcZPTLlJtFbvFsI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714682303; c=relaxed/simple; bh=v0To0DjyuaSrHMEaLcuqRjlTjcfKFOBRg91Ja5IHDmU=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=g9C8djmqK7ZscDsNsvV093NYSaJFd1lf0GWK4DD0MvEqz2WXbLdyM9qXLGnUPDIPaYRj4cTHTUnnzUA8HpLjJs62jBTsG7O94v+xPrmt4U7euIISsC6+mj9W1o019xmcjpHojJoOO1bBTfxJV7+XIaZiUbYAZXdISEZSXbLr+aI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714682299; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A8iRfdI8qBqsxLR8TKQDFVLplKbcidz9quhKGUmTgPM=; b=adtcXfKRjgb87URriet8bsrIVPqwqSekzELxv8bViZOOVVznT0AjDe1PfymQfzC1qbEFj1 tUrR85k/JS7W8lSna7whcgBJDETHUAIuLoFU/cqEoct/GWi0N97zuSrQrn86r2D+hDas63 Ry39+h5h7Iepq3VQfGJAcYa0SpJ6moY= Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-428-gyq4NZ9iPq-sX3o94w573Q-1; Thu, 02 May 2024 16:38:18 -0400 X-MC-Unique: gyq4NZ9iPq-sX3o94w573Q-1 Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-7f05639bf82so3370213241.0 for ; Thu, 02 May 2024 13:38:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714682298; x=1715287098; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=A8iRfdI8qBqsxLR8TKQDFVLplKbcidz9quhKGUmTgPM=; b=YV98XfL2Uxh9rXhiiXLMZ/0/ga0USGaiFSzcwKBqQZOlFcDw9rMKNcSEhCLPbhe26q iz4ySXldSG64Sm4Z2KJwHAeUZY1Z05VWQSS3UTDwDZe3THg/LDov1oSwFTK8J+b8m/4a X+SMigfGOHOyGHZlE4iQ+jMYc176QxuaNlAxDZsWSaX4Hb/RLapMs4q/u2nyuQ1EUBGi JkaSLK7g/H4CnqhhXYKzxgBdsalIVh1yf3U5NJ2kcKnN6Ebt00FTMaShveOkYrAi9pA+ KvGb1GuBpfLP5HnkSA9lL5Fw7cKuKgMpC5qB0QHrGaDpaKRrTVcSuui676lYj1jfiEWS 07mg== X-Gm-Message-State: AOJu0Yx6x8muls2BVBH4UPaN0JQTBkX85guSLmb0cst3HOJY6yfC8VtT IvIX/HlzPMagV3Fq2Ws80425wGZ+vLD2fYPgGLB2n65EdJhrokyy5lmLlPcYiQEZZ6M3lZ2rgNw khxPkjP6bDnYpS61FJnz27df1/cEqX7PLyLpoZ8zawVRZiAwKLWIN X-Received: by 2002:a67:e3ac:0:b0:47c:248d:cfee with SMTP id j12-20020a67e3ac000000b0047c248dcfeemr865285vsm.15.1714682297933; Thu, 02 May 2024 13:38:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQBC5hhL2H17bq+pxFERbGSSF41Qq4oarXZcflgA8CM6eaXvol87YzUTucJzMXR/M5amNK3Q== X-Received: by 2002:a67:e3ac:0:b0:47c:248d:cfee with SMTP id j12-20020a67e3ac000000b0047c248dcfeemr865273vsm.15.1714682297573; Thu, 02 May 2024 13:38:17 -0700 (PDT) Received: from [192.168.1.130] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id z4-20020a0ce984000000b006a0f58d0288sm616831qvn.104.2024.05.02.13.38.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 May 2024 13:38:17 -0700 (PDT) Message-ID: Date: Thu, 2 May 2024 16:38:16 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v18 23/26] c++: Implement __is_invocable built-in trait To: Ken Matsui , gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org References: <20240502184529.97337-1-kmatsui@gcc.gnu.org> <20240502201549.459244-1-kmatsui@gcc.gnu.org> <20240502201549.459244-24-kmatsui@gcc.gnu.org> From: Jason Merrill In-Reply-To: <20240502201549.459244-24-kmatsui@gcc.gnu.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.0 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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,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 5/2/24 16:12, Ken Matsui wrote: > 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 | 134 +++++++++ > 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, 723 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_pointer", 1) > diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h > index 1938ada0268..83dc20e1130 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -7338,6 +7338,8 @@ extern tree get_copy_assign (tree); > extern tree get_default_ctor (tree); > extern tree get_dtor (tree, tsubst_flags_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..faf932258e6 100644 > --- a/gcc/cp/method.cc > +++ b/gcc/cp/method.cc > @@ -1928,6 +1928,140 @@ 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 complain) > +{ > + 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) == 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) == REFERENCE_TYPE) > + { > + tree deref_fn_type = TREE_TYPE (fn_type); > + is_ptrdatamem = TYPE_PTRDATAMEM_P (deref_fn_type); > + is_ptrmemfunc = TYPE_PTRMEMFUNC_P (deref_fn_type); > + > + /* Dereference fn_type if it is a pointer to member. */ > + if (is_ptrdatamem || is_ptrmemfunc) > + fn_type = deref_fn_type; > + } > + else > + { > + is_ptrdatamem = TYPE_PTRDATAMEM_P (fn_type); > + is_ptrmemfunc = TYPE_PTRMEMFUNC_P (fn_type); > + } > + > + if (is_ptrdatamem && TREE_VEC_LENGTH (arg_types) != 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) == 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 = TREE_VEC_ELT (arg_types, 0); > + > + /* datum must be a class type or a reference/pointer to a class type. */ > + if (!(CLASS_TYPE_P (datum_type) > + || ((TYPE_REF_P (datum_type) || POINTER_TYPE_P (datum_type)) > + && CLASS_TYPE_P (TREE_TYPE (datum_type))))) > + { > + if (complain & tf_error) > + error ("first argument type %qT of a pointer to member must be" > + "a class type or a reference/pointer to a class type", > + datum_type); > + return error_mark_node; > + } > + > + bool is_refwrap = false; > + if (CLASS_TYPE_P (datum_type)) > + { > + /* 1.2 & 1.5: Handle std::reference_wrapper. */ > + tree datum_decl = TYPE_NAME (TYPE_MAIN_VARIANT (datum_type)); > + if (decl_in_std_namespace_p (datum_decl)) > + { > + const_tree name = DECL_NAME (datum_decl); > + if (name && (id_equal (name, "reference_wrapper"))) > + { > + /* Retrieve T from std::reference_wrapper, > + i.e., decltype(datum.get()). */ > + datum_type = TREE_VEC_ELT (TYPE_TI_ARGS (datum_type), 0); > + is_refwrap = true; > + } > + } > + } > + > + tree ptrmem_class_type = TYPE_PTRMEM_CLASS_TYPE (fn_type); > + const bool ptrmem_is_base_of_datum = > + (NON_UNION_CLASS_TYPE_P (ptrmem_class_type) > + && NON_UNION_CLASS_TYPE_P (datum_type) Why NON_UNION? That doesn't seem to be based on anything in the standard. This check and the one for reference_wrapper need to ignore REFERENCE_TYPE; INVOKE is defined in terms of expressions, and the type of an expression is never a reference. > + && (same_type_ignoring_top_level_qualifiers_p (ptrmem_class_type, > + datum_type) > + || DERIVED_FROM_P (ptrmem_class_type, datum_type))); > + > + tree datum_expr = build_trait_object (datum_type); > + if (!ptrmem_is_base_of_datum && !is_refwrap && !TYPE_REF_P (datum_type)) ...so we shouldn't need to check TYPE_REF_P here. Jason > + /* 1.3 & 1.6: Try to dereference datum_expr. */ > + datum_expr = build_x_indirect_ref (UNKNOWN_LOCATION, datum_expr, > + RO_UNARY_STAR, NULL_TREE, complain); > + /* 1.1, 1.2, 1.4, & 1.5: Otherwise. */ > + > + tree fn_expr = build_trait_object (fn_type); > + ptrmem_expr = build_m_component_ref (datum_expr, fn_expr, complain); > + > + if (error_operand_p (ptrmem_expr)) > + return error_mark_node; > + > + if (is_ptrdatamem) > + return ptrmem_expr; > + } > + > + /* Construct expressions for arguments to INVOKE. For a pointer to member > + function, the first argument, which is the object, is not arguments to > + the function. */ > + releasing_vec args; > + for (int i = is_ptrmemfunc ? 1 : 0; i < TREE_VEC_LENGTH (arg_types); ++i) > + { > + tree arg_type = TREE_VEC_ELT (arg_types, i); > + tree arg = build_trait_object (arg_type); > + vec_safe_push (args, arg); > + } > + > + tree invoke_expr; > + if (is_ptrmemfunc) > + invoke_expr = build_offset_ref_call_from_tree (ptrmem_expr, &args, > + complain); > + else /* 1.7. */ > + invoke_expr = finish_call_expr (build_trait_object (fn_type), &args, false, > + false, complain); > + return invoke_expr; > +} > + > /* Determine which function will be called when looking up NAME in TYPE, > called with a single ARGTYPE argument, or no argument if ARGTYPE is > null. FLAGS and COMPLAIN are as for build_new_method_call.