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.129.124]) by sourceware.org (Postfix) with ESMTPS id A1798385843B for ; Thu, 9 May 2024 16:16:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A1798385843B 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 A1798385843B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715271371; cv=none; b=aJMo/vMHYXACf5XAG23oF6ZIo1cBUUiUDlaqtPRE1YEw9aKzcqHdWs/lVnpU7ywnVsmTo+aidqnYwDJcZgKt0OuYTGhKv92d2Gp+KoQ+HqVZ2fyBQepixEhgD7IDr2ynC1tow2VqAlHk2ecYXn1Tlsa/vC+JnaI4W/6ab0k2MSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715271371; c=relaxed/simple; bh=d48Rv3gJaSpNeS1lYGaG7A6OrkT4TYE3FF2EUtlB06w=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=dEMGNtKBLdZpbvAoowS7amilpVntmrzJWK7TUyXkkDcBzAta7qSYHpfZ49ZN7Z8NY375mtJ47fcR/XzPEqDGnaK+Y3veAgQv9Uz4DoMaqwcZ9mZ3mqAn0Sj5geEy8lPzqOrnDM/0DCkG8dPkxBLSSw23hwa9hzCDfrBwEhIiusQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715271368; 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=u8BNQ/FZV/lfVYsOyS1AS/+zBmO2lGnBAI8h5LIry58=; b=Lbf1doisrMoc+c94WPF4GkzNJVQ7zSBykxPSfBOYvP4lh8rANnrB2QNiPquY87e5D90Yi3 Yb81KLuqHXUmwwdHRRbNyue8U4I6MnjQivRO+0zfsaeWVkrmjuHWGqU8qmIuv6uKznUKy3 Sk2Jp8WZ8qHPsPsaZgTAzplwLgPPKDY= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-421-8vca8FTKPKeLoUgDL3i0zg-1; Thu, 09 May 2024 12:16:07 -0400 X-MC-Unique: 8vca8FTKPKeLoUgDL3i0zg-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6a0c1aff9f5so13111736d6.2 for ; Thu, 09 May 2024 09:16:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715271366; x=1715876166; 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=u8BNQ/FZV/lfVYsOyS1AS/+zBmO2lGnBAI8h5LIry58=; b=cLgboPCrcaWxNRdwzuA886ONr/MjKKcEc3moXoE53igDF5xZGZRnD/OHewggjBGqWs OHrh7dvOVn/WIABf0aMpPtpqubqHv+eB3YK+8g50gMm6o1/sZI7nxNgRtwy9Y6DNVCju yDG0obQOtwma0mlXFjzKXDnAyQ8Ke9M8THZGFK0nUbStWWGJQoVk+kfd6oRoxlWakpwJ HiqfWDva/YbEcOXZmtbTzjbHwY2IEr49wbTLtj+/2BUeBzEU/OTqdD6TP3PNY8ZpcmY8 P07/XB0tM4DJQVqfc1rskgiQqTnBuaIPvR1d82aYXRL6leT8U/YJe1OEQ1CC+YE6prwe q+Qw== X-Forwarded-Encrypted: i=1; AJvYcCU8BxXAFqgn2J9R+xM254A+z/lIN4slJ1X7flL5wxpPF856nGCZ5KxM4Kb1toyApc8SwIIY0noaLPLXk2lWZ6BfqyPZUGxOJQ== X-Gm-Message-State: AOJu0YzAZgu1XarnOi9gNPRPwDikLHiJul1Nf/DCQfEZ1UvQVBGNIX+5 NFxomtBT8csQvXXyS5yXOmhOjGydBbrtQvlQTEezsmbT/+6HZaBcI2JU5HAFXx2zB6qX1+n497r NtYvNP/jVdE250tYHijwyGezlFtLdmegnviIr09VZ/CMmeof+z53uBUE= X-Received: by 2002:ad4:5bae:0:b0:691:8b3a:5acb with SMTP id 6a1803df08f44-6a15142f5d0mr67143956d6.13.1715271366519; Thu, 09 May 2024 09:16:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH9R2UiIgne0eMfH11VnGFY8jeyDqjOyAvYmc6uLMewhDlp2/iULvggC0p3Lu0YJydR8KzHYQ== X-Received: by 2002:ad4:5bae:0:b0:691:8b3a:5acb with SMTP id 6a1803df08f44-6a15142f5d0mr67143586d6.13.1715271365841; Thu, 09 May 2024 09:16:05 -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-792bf27f870sm83194385a.28.2024.05.09.09.16.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 09 May 2024 09:16:05 -0700 (PDT) Message-ID: Date: Thu, 9 May 2024 12:16:04 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v22 20/23] c++: Implement __is_invocable built-in trait To: Ken Matsui , gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org References: <20240503205259.360779-21-kmatsui@gcc.gnu.org> <20240508050455.365029-21-kmatsui@gcc.gnu.org> From: Jason Merrill In-Reply-To: <20240508050455.365029-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=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/8/24 01:04, Ken Matsui wrote: > Fixed the reference_wrapper case. I used non_ref_datum_type to avoid > potentially multiple build_trait_object calls. > > -- >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 | 142 +++++++++ > 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, 731 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..1c3233ca5d7 100644 > --- a/gcc/cp/method.cc > +++ b/gcc/cp/method.cc > @@ -1928,6 +1928,148 @@ 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); > + > + /* 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; > + } > + > + tree non_ref_datum_type = datum_type; > + if (TYPE_REF_P (datum_type)) > + non_ref_datum_type = TREE_TYPE (datum_type); One more tweak: I think we want to use this type for the above pointer-to-class check as well, in case the first type is a reference to pointer to class. Thanks for your persistence! Jason