From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vs1-xe31.google.com (mail-vs1-xe31.google.com [IPv6:2607:f8b0:4864:20::e31]) by sourceware.org (Postfix) with ESMTPS id 148283858D35 for ; Tue, 7 May 2024 18:47:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 148283858D35 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 148283858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::e31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715107654; cv=none; b=aedtEDHfKxz7DBM/AqgnFI/3MmycvLyjdWxOfa6HFW6ztcVoEUzfCylFpKOSaA9V7khYLhnCn3SF3kqvT487GGUkSDYHqCodcZ7sE8hdBWM4hJhsdc4HqrrOu5eAegvyc7DdU675X80EPQo7u3OJ/B3WHN6N6+oMXGL7kl7pzuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715107654; c=relaxed/simple; bh=eX3+UrmVEIzy6JCsZzecIVI9L09GuZbIZeymTwrPH/s=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=MrmJKqogjH/rM7ETK4SkeMy+7J+94Olo8ItKpNZ0qYinTZH+Jm0DYb5pMHz0W4CGmhGm1yY+fU5dkiXOjxwPSSB2YuZS5+kLTp1vm6LXCkfepjGWoOH29GKJWzlBGc7UN0A4GOLjH9r9S/UkGnj9eS9EcxP6EqNXm2IXbY9i2+c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-vs1-xe31.google.com with SMTP id ada2fe7eead31-47ef9a05d6fso1063161137.2 for ; Tue, 07 May 2024 11:47:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.washington.edu; s=goo201206; t=1715107650; x=1715712450; 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=wENo4f7I/H2boA2H0PkXgPxdzjDHU8wA0mWfgE2bHJk=; b=fmLHGzhhHF/xOy8UrKWCpl5aK7ch/y3DOb0b0d1ReUTD8MC/rwIQbojM6n9CGCLHJw L6LDoKWwEHk1W/v6r8l5q/luf+avpBmSuisQAAzbSxDJ7CnskSiMBZ9CN5ydQAmSVsXq 0joB+y1o/CeWszyltz4kGSHVWchvNhXVhgfhk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715107650; x=1715712450; 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=wENo4f7I/H2boA2H0PkXgPxdzjDHU8wA0mWfgE2bHJk=; b=qsXxCTvuKJhdpbmCNVwlJ52f+LZaDFHXbGlAUN7Zvs4Ux1b7HNIb28wmgtzR/ViNPR Wxebzm6B4j6kQ+d6OtiaYo6iSXaQCdaGTwf7b2YUb4w5B23IVqpuYKR+XOuFA8Ogm6aM m+6QIrYZ1Xcr6Ivdw4O17wzTEt/+j9cJnwh1pWfRSQS29zpNwh9QchW+D3FyWnfjUexP yW3cDFgiqfwtMlPH9D16P/D71MF7+sg9brvm4jiX3tFN+ZJkYSPvoIN/FfKpEHBIfmIs QqzqmbUh4/zTF7877/G+i4Dg6+KjHvhj4gzHj8YFipcn5bTrrCRNJYnJT0HZ2ioKKKis tUrg== X-Forwarded-Encrypted: i=1; AJvYcCV1UpOv1O8kt46D7IhnXnWF4kcfvaSwNVYk5IxSIfv4wnT89/D/JHll2zLHEi4FhOCP00+63PUCoCdpYEqw3Y92+X6Tr7s= X-Gm-Message-State: AOJu0Yy6zGf2907UhNF5nWhs/ZLi23N3e9tQKzz8VEOGqKwLrPpK2FNn J6D6vQhYhX3cNdpoSQLdFfwZ80P9CuEHGm2LvCH5aMLG6dCDMYCOHTKeDpDSpUHgybr+XZt/FdO OO5FaSoAd2ueVyRjdHirV0Y4C6U25F0vcU3yM X-Google-Smtp-Source: AGHT+IGIgcAXIj6a1tmH0TPGN5clmI6DEcMfjfI4A2PpxywXAsUBjF7kCqp+8rRT2MGPL3DbaR9Ui5MS6rrsedEvvbs= X-Received: by 2002:a67:fd45:0:b0:47e:fe45:eb32 with SMTP id ada2fe7eead31-47f3c35f0f8mr306846137.25.1715107649823; Tue, 07 May 2024 11:47:29 -0700 (PDT) MIME-Version: 1.0 References: <20240503032531.1247607-24-kmatsui@gcc.gnu.org> <20240503205259.360779-21-kmatsui@gcc.gnu.org> <337a8f19-09a9-4ab0-a4cc-1d88ab814682@redhat.com> In-Reply-To: <337a8f19-09a9-4ab0-a4cc-1d88ab814682@redhat.com> From: Ken Matsui Date: Tue, 7 May 2024 11:46:53 -0700 Message-ID: Subject: Re: [PATCH v21 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=-10.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=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 Tue, May 7, 2024 at 11:36=E2=80=AFAM Jason Merrill wr= ote: > > On 5/3/24 16:52, Ken Matsui wrote: > > Fixed datum reference problem. 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 | 137 +++++++++ > > 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, 726 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..80791227a0a 100644 > > --- a/gcc/cp/method.cc > > +++ b/gcc/cp/method.cc > > @@ -1928,6 +1928,143 @@ 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; > > + } > > + > > + tree datum_expr =3D build_trait_object (datum_type); > > + datum_type =3D TREE_TYPE (datum_expr); > > + > > + bool datum_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); > > + datum_is_refwrap =3D true; > > Hmm, with datum_expr moved up as I suggested, it's now wrong for the > reference_wrapper case. So either we need to override it here, or move > it back down and do something else to handle reference to > reference_wrapper, like another local variable non_ref_datum_type or > something. Ahh, I totally missed this! Thank you for your review! Let me think of th= is. > > Jason >