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 26AFF3849AEA for ; Fri, 10 May 2024 15:31:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 26AFF3849AEA 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 26AFF3849AEA 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=1715355090; cv=none; b=pDf00AxnbDVZ/tQCzn5PwGheDgyvKv8yEzOTNDAJH18y4cqj7ZholJGKObr8mL4XFguONJyTU17lc1URIQZNYZUTudxqj8fQJ9mJJBfE9hYh9RLuAnPJYBeqbP8fr2MJ7rlhFzUtZISmX1QNtM0QwmZEuB5QWfL43qo7Gp+xmlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715355090; c=relaxed/simple; bh=lk83Iz0jw6INd9blbrWAXEz7xu4wWNIHUGD8P1epm4M=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=P6T2jhqSrUUwYIZ8lM6XGfwS8IMqBoxHFRutDGv59ICJW6DvrBWEOSLylYpacZuACiA2U95ljlPqH9BMCU/BWBTvd7MARuKoQOrQCXPcct8owGh2QeE2EXPB9LcATo7dt9dcsM0+XOgN1DH8a3QNFqZmMP5iBJEXCtXJUuY4bEk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715355087; 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=VSdF9gcyrnPj+BOT/6Bf/fP8zy/kmNWByStZzkJiRWc=; b=VDp/oO1Acrpsqt+2Q0LEPinry7cHVgiCSa7qfyOXc/NjhgaJISbHV3eZSW6FH+ICsxQ6Q/ 6HYaa33yOoX7Ctgjv9snluCFS2P6WoB5q5hFWWhg5hGfrPyFwGWfs5zneN/K6asLAfq/FW za66GXILY7Fnxnr2tioofF4hC8jWwgk= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-390-aQmvY2ApNySEh7BdbeDUEg-1; Fri, 10 May 2024 11:27:18 -0400 X-MC-Unique: aQmvY2ApNySEh7BdbeDUEg-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-790c61cdb29so180649185a.3 for ; Fri, 10 May 2024 08:27:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715354838; x=1715959638; 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=VSdF9gcyrnPj+BOT/6Bf/fP8zy/kmNWByStZzkJiRWc=; b=g7kKcVsSuTTtN2cB8H8+WEgKWWWmAQsXCwepVrH2PSuAhZZFVLzjSX8/a9JhxA2TZz 3/69eBfY9ryOw/XxZ7tLXgutjxRSv0qFbsSekqBfIMOmP8dERBzpH/adGaK3X6dZ10TX H4xS1bGYFKa+bv4HZnUvqrHWgM77LvUe44NbdwyZ2snlK060SqBrVO1oyaDKCwv1P4Yk suhPRM1ctmoPglBROaMxKIx0iWPZv611CyKxsgbQk9vxce3B6/lMZGVdkD0jupFuvPer iYieauTgbyTW/QbTfr5NT71FKLA5cHH2lvQLuNpUIL+g84ZZJHNllyR1bO0+5No1kAw8 0HIA== X-Gm-Message-State: AOJu0Yx3ibHpIxYHv5aFtKaKNBzhzTrosfq+/mcvQckhAmUay+YYrBWo bn0O4uFKr0ZeGMsGizBzPnbODPIBVWwEiQKL0jyRegtr+Kr/+CTqdvTGl7DwVRmkbTmcoIPyFzI vy4SZvDjGx1UEZH+MUUM+DzvJl0KfSgtJywhLs6CLiANwWb650I8OCl5s8YBs X-Received: by 2002:a05:620a:4905:b0:792:c243:3270 with SMTP id af79cd13be357-792c7577b4dmr335132685a.7.1715354838100; Fri, 10 May 2024 08:27:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdpypTkmKZ4Ij6cdVOyusmVsIWg5+MhRtKTAGdU3bm/Uq4GFaDkVEVfDF+a3cDwNxgkCLXgg== X-Received: by 2002:a05:620a:4905:b0:792:c243:3270 with SMTP id af79cd13be357-792c7577b4dmr335130185a.7.1715354837617; Fri, 10 May 2024 08:27: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 af79cd13be357-792c3ef7caesm135079385a.57.2024.05.10.08.27.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 May 2024 08:27:16 -0700 (PDT) Message-ID: <5a99fa9f-48d8-46cf-b4db-d84a48d5075e@redhat.com> Date: Fri, 10 May 2024 11:27:16 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v24 20/23] c++: Implement __is_invocable built-in trait To: Ken Matsui , gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org References: <20240510112417.8927-21-kmatsui@gcc.gnu.org> <20240510144547.90831-21-kmatsui@gcc.gnu.org> From: Jason Merrill In-Reply-To: <20240510144547.90831-21-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=-12.6 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=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 5/10/24 10:45, Ken Matsui wrote: > Fixed the incorrect if condition. Could you please review this again? > > -- >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_pointer", 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_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..bbe91a276e1 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 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 non_ref_fn_type = TREE_TYPE (fn_type); > + is_ptrdatamem = TYPE_PTRDATAMEM_P (non_ref_fn_type); > + is_ptrmemfunc = TYPE_PTRMEMFUNC_P (non_ref_fn_type); > + > + /* Dereference fn_type if it is a pointer to member. */ > + if (is_ptrdatamem || is_ptrmemfunc) > + fn_type = non_ref_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); > + tree non_ref_datum_type = datum_type; > + if (TYPE_REF_P (datum_type)) > + non_ref_datum_type = 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)))) > + { > + if (complain & tf_error) > + error ("first argument type %qT of a pointer to member must be a " > + "class type or a pointer to a class type", datum_type); > + return error_mark_node; > + } > + > + bool datum_is_refwrap = false; > + if (CLASS_TYPE_P (non_ref_datum_type)) > + { > + /* 1.2 & 1.5: Handle std::reference_wrapper. */ > + tree datum_decl = TYPE_NAME (TYPE_MAIN_VARIANT (non_ref_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 (non_ref_datum_type), 0); > + datum_is_refwrap = true; > + } > + } > + } > + > + tree datum_expr = build_trait_object (datum_type); > + non_ref_datum_type = TREE_TYPE (datum_expr); > + > + tree ptrmem_class_type = TYPE_PTRMEM_CLASS_TYPE (fn_type); > + const bool ptrmem_is_same_or_base_of_datum = > + (same_type_p (ptrmem_class_type, non_ref_datum_type) This should be _ignoring_top_level_qualifiers_p... > + || (NON_UNION_CLASS_TYPE_P (ptrmem_class_type) > + && NON_UNION_CLASS_TYPE_P (non_ref_datum_type) > + && (same_type_ignoring_top_level_qualifiers_p (ptrmem_class_type, > + non_ref_datum_type) ...so you don't need to check it again here. And from [func.require] it seems we should check same-or-base first, and not check for reference_wrapper if same-or-base is satisfied. Unlikely to actually matter (who would check is_invocable with a pointer to member of reference_wrapper?) but we might as well be precise. Jason