From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ua1-x930.google.com (mail-ua1-x930.google.com [IPv6:2607:f8b0:4864:20::930]) by sourceware.org (Postfix) with ESMTPS id 47787384AB47 for ; Thu, 2 May 2024 20:55:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 47787384AB47 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 47787384AB47 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::930 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714683322; cv=none; b=ApOS8Q5ucYbB1NccYQ+Hb2k9mAvKA7Ey5fcK2Npv/Ewqjp5k6MNlhKZckYnx1kRU9vZ0xis3QXW7oshLXRtz+00ZsLZaVGI0fQh2XsjjyQAiUi9gv0lMWLQTBz5MNOdyXIW++aNxOvMSrvwsWrDSZyiL5ij4VYJY3P+AGTus08s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714683322; c=relaxed/simple; bh=tnek3MOD9f8JZYI90N/v/+NzfczvF2VTlTIFRGLmuLU=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=vJiiRF3+cfmbv5kWJjsVrhJccU4Z2VuRVyW3XDaCamOfo4QaXpl9DjL3LHOPFlboTqihMCmDNKWCU5UA89DaLtQhhDtc9bA0gjUvZP/AjisJap5iW6J88nYJMT5Y98AgzaBo2z1SGjRzdJIaSQxHH+3yegXqlzHLzLK/cMgRsXk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ua1-x930.google.com with SMTP id a1e0cc1a2514c-7f3a5ab6a18so653807241.2 for ; Thu, 02 May 2024 13:55:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1714683318; x=1715288118; 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=6p4V53IYfIJ9+BuOg+1G6MCC87CcsbWten3DrC53MTY=; b=WAC35w5Ea5ukoooPRosZnDFj3VqrjoPKo8OaVilCigJoP6MtRAYUVREMI97PlxdEWb YzLlR+7N1W6xGP/rP8YRdnRUzxvhg7H/HsGBMXve6wCzc7/Ap5BAzyvBXeHJ5JAF/d+W i8vkYuWJvw7U/Mn3bCu8uX+lkVdcllzjfycKM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714683318; x=1715288118; 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=6p4V53IYfIJ9+BuOg+1G6MCC87CcsbWten3DrC53MTY=; b=A+ZFLPd5nOX4LCjDUZ0NVt3BQPvJNNULPjY1lk+R/lFMkafSm68Ef6rMMAQ0q4qj2/ QWBhDShpFvHw85fR3rmIBZt3VeMnzyyX23S7FO3SkwPOGQhlPEDsUzcz6XkW21uPJXjb hY+Kh5BnG5S8QjZTUxzmkXkICFmuCqxaS/1HgDECCeUSV97OMcn6V4vfrZwCpbolRkyY hLZcBTq8zV6IJcaC/BpT8UIAwrDKS8WWGVUmDNc9S0SSE0I5FwFiLVd03SE/thx5g09J tlfyBifxwEL7I5iJqnx5IvW7Uj36eROSzYSfbXr2H2vfaruACWCsZnjnSeM0QmbmKoWF oN2Q== X-Forwarded-Encrypted: i=1; AJvYcCVNqIRtYQmMfODagvOjr2RWEBLFHo7SwumIm0yzm50cxeRqoM6rG2sWSZAezWe7vdN+G277zg2uV93JdkxHYUACgTHB+O0= X-Gm-Message-State: AOJu0YxNOXeGR+Os+7nz0tOWHiWaC2RmBJeJsMouGyHS2TjsZGOwKtce 569Q8kekNuUXvKIz+L4AmMl6IM6ArCzy2MJ36QjITQf/rCH8sQhLGJ4AvdiT2YhCkgRD/JqFR/v 8dyE86qCpirax4AfHkxjolzkE2oFVphV/3wFL X-Google-Smtp-Source: AGHT+IH81EFsBmIG+XQRuhM73l82mhKPVkte5Pl6bn3dm3qqYOUXNFYvL4n9/a09ppSoQjtdl4t1zqttDdnqsDdGsXw= X-Received: by 2002:a05:6102:4a43:b0:47e:4523:d10b with SMTP id jx3-20020a0561024a4300b0047e4523d10bmr849703vsb.35.1714683317298; Thu, 02 May 2024 13:55:17 -0700 (PDT) MIME-Version: 1.0 References: <20240502184529.97337-1-kmatsui@gcc.gnu.org> <20240502201549.459244-1-kmatsui@gcc.gnu.org> <20240502201549.459244-24-kmatsui@gcc.gnu.org> In-Reply-To: From: Ken Matsui Date: Thu, 2 May 2024 13:54:41 -0700 Message-ID: Subject: Re: [PATCH v18 23/26] 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=-10.5 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 Thu, May 2, 2024 at 1:38=E2=80=AFPM Jason Merrill wro= te: > > 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_poin= ter", 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_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..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 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 deref_fn_type =3D TREE_TYPE (fn_type); > > + is_ptrdatamem =3D TYPE_PTRDATAMEM_P (deref_fn_type); > > + is_ptrmemfunc =3D TYPE_PTRMEMFUNC_P (deref_fn_type); > > + > > + /* Dereference fn_type if it is a pointer to member. */ > > + if (is_ptrdatamem || is_ptrmemfunc) > > + fn_type =3D deref_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); > > + > > + /* 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 b= e" > > + "a class type or a reference/pointer to a class type", > > + datum_type); > > + return error_mark_node; > > + } > > + > > + bool is_refwrap =3D false; > > + if (CLASS_TYPE_P (datum_type)) > > + { > > + /* 1.2 & 1.5: Handle std::reference_wrapper. */ > > + tree datum_decl =3D TYPE_NAME (TYPE_MAIN_VARIANT (datum_type)); > > + if (decl_in_std_namespace_p (datum_decl)) > > + { > > + const_tree name =3D DECL_NAME (datum_decl); > > + if (name && (id_equal (name, "reference_wrapper"))) > > + { > > + /* Retrieve T from std::reference_wrapper, > > + i.e., decltype(datum.get()). */ > > + datum_type =3D TREE_VEC_ELT (TYPE_TI_ARGS (datum_type),= 0); > > + is_refwrap =3D true; > > + } > > + } > > + } > > + > > + tree ptrmem_class_type =3D TYPE_PTRMEM_CLASS_TYPE (fn_type); > > + const bool ptrmem_is_base_of_datum =3D > > + (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. I think ptrmem_is_base_of_datum and is_refwrap checks are ignoring REFERENCE_TYPE, leading to false, ... > > > + && (same_type_ignoring_top_level_qualifiers_p (ptrmem_class_type= , > > + datum_type) > > + || DERIVED_FROM_P (ptrmem_class_type, datum_type))); > > + > > + tree datum_expr =3D build_trait_object (datum_type); > > + if (!ptrmem_is_base_of_datum && !is_refwrap && !TYPE_REF_P (datu= m_type)) ... which is why I think we need to check TYPE_REF_P here. > > ...so we shouldn't need to check TYPE_REF_P here. > > Jason > > > + /* 1.3 & 1.6: Try to dereference datum_expr. */ > > + datum_expr =3D build_x_indirect_ref (UNKNOWN_LOCATION, datum_expr= , > > + RO_UNARY_STAR, NULL_TREE, comp= lain); > > + /* 1.1, 1.2, 1.4, & 1.5: Otherwise. */ > > + > > + tree fn_expr =3D build_trait_object (fn_type); > > + ptrmem_expr =3D build_m_component_ref (datum_expr, fn_expr, comp= lain); > > + > > + 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 argumen= ts to > > + the function. */ > > + releasing_vec args; > > + for (int i =3D is_ptrmemfunc ? 1 : 0; i < TREE_VEC_LENGTH (arg_types= ); ++i) > > + { > > + tree arg_type =3D TREE_VEC_ELT (arg_types, i); > > + tree arg =3D build_trait_object (arg_type); > > + vec_safe_push (args, arg); > > + } > > + > > + tree invoke_expr; > > + if (is_ptrmemfunc) > > + invoke_expr =3D build_offset_ref_call_from_tree (ptrmem_expr, &arg= s, > > + complain); > > + else /* 1.7. */ > > + invoke_expr =3D finish_call_expr (build_trait_object (fn_type), &a= rgs, false, > > + false, complain); > > + return invoke_expr; > > +} > > + > > /* Determine which function will be called when looking up NAME in TY= PE, > > called with a single ARGTYPE argument, or no argument if ARGTYPE i= s > > null. FLAGS and COMPLAIN are as for build_new_method_call. >