Re: [PATCH v14 23/26] c++: Implement __is_invocable built-in trait
On Thu, Mar 14, 2024 at 6:53 PM Ken Matsui wrote: > > On Fri, Mar 8, 2024 at 9:17 AM Patrick Palka wrote: > > > > On Wed, 28 Feb 2024, 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. > > > > Thanks, this looks great! This generic build_invoke function could be > > used for invoke_result etc as well, and it could also cache the built-up > > call across __is_invocable and __is_nothrow_invocable checks on the same > > arguments (which is a common pattern in the standard library). LGTM > > > > > > > > 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 | 132 + > > > gcc/cp/semantics.cc | 4 + > > > 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, 720 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 23ea66d9c12..c87b126fdb1 100644 > > > --- a/gcc/cp/constraint.cc > > > +++ b/gcc/cp/constraint.cc > > > @@ -3791,6 +3791,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 85056c8140b..6cb2b55f4ea 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 334c11396c2..261d3a71faa 100644 > > > --- a/gcc/cp/cp-tree.h > > > +++ b/gcc/cp/cp-tree.h > > > @@ -7334,6 +7334,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 98c10e6a8b5..953f1bed6fc 100644 > > > --- a/gcc/cp/method.cc > > > +++ b/gcc/cp/method.cc > > > @@ -1928,6 +1928,138 @@ 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 (fn_type == error_mark_node || arg_types == error_mark_node) > > > +
Re: [PATCH v14 23/26] c++: Implement __is_invocable built-in trait
On Fri, Mar 8, 2024 at 9:17 AM Patrick Palka wrote: > > On Wed, 28 Feb 2024, 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. > > Thanks, this looks great! This generic build_invoke function could be > used for invoke_result etc as well, and it could also cache the built-up > call across __is_invocable and __is_nothrow_invocable checks on the same > arguments (which is a common pattern in the standard library). LGTM > > > > > 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 | 132 + > > gcc/cp/semantics.cc | 4 + > > 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, 720 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 23ea66d9c12..c87b126fdb1 100644 > > --- a/gcc/cp/constraint.cc > > +++ b/gcc/cp/constraint.cc > > @@ -3791,6 +3791,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 85056c8140b..6cb2b55f4ea 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 334c11396c2..261d3a71faa 100644 > > --- a/gcc/cp/cp-tree.h > > +++ b/gcc/cp/cp-tree.h > > @@ -7334,6 +7334,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 98c10e6a8b5..953f1bed6fc 100644 > > --- a/gcc/cp/method.cc > > +++ b/gcc/cp/method.cc > > @@ -1928,6 +1928,138 @@ 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 (fn_type == error_mark_node || arg_types == error_mark_node) > > +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); > > + > >
Re: [PATCH v14 23/26] c++: Implement __is_invocable built-in trait
On Fri, Mar 8, 2024 at 9:17 AM Patrick Palka wrote: > > On Wed, 28 Feb 2024, 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. > > Thanks, this looks great! This generic build_invoke function could be > used for invoke_result etc as well, and it could also cache the built-up > call across __is_invocable and __is_nothrow_invocable checks on the same > arguments (which is a common pattern in the standard library). LGTM Thank you!!! Yes, I will also work on those features! > > > > > 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 | 132 + > > gcc/cp/semantics.cc | 4 + > > 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, 720 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 23ea66d9c12..c87b126fdb1 100644 > > --- a/gcc/cp/constraint.cc > > +++ b/gcc/cp/constraint.cc > > @@ -3791,6 +3791,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 85056c8140b..6cb2b55f4ea 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 334c11396c2..261d3a71faa 100644 > > --- a/gcc/cp/cp-tree.h > > +++ b/gcc/cp/cp-tree.h > > @@ -7334,6 +7334,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 98c10e6a8b5..953f1bed6fc 100644 > > --- a/gcc/cp/method.cc > > +++ b/gcc/cp/method.cc > > @@ -1928,6 +1928,138 @@ 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 (fn_type == error_mark_node || arg_types == error_mark_node) > > +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. */ > > +
Re: [PATCH v14 23/26] c++: Implement __is_invocable built-in trait
On Wed, 28 Feb 2024, 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. Thanks, this looks great! This generic build_invoke function could be used for invoke_result etc as well, and it could also cache the built-up call across __is_invocable and __is_nothrow_invocable checks on the same arguments (which is a common pattern in the standard library). LGTM > > 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 | 132 + > gcc/cp/semantics.cc | 4 + > 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, 720 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 23ea66d9c12..c87b126fdb1 100644 > --- a/gcc/cp/constraint.cc > +++ b/gcc/cp/constraint.cc > @@ -3791,6 +3791,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 85056c8140b..6cb2b55f4ea 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 334c11396c2..261d3a71faa 100644 > --- a/gcc/cp/cp-tree.h > +++ b/gcc/cp/cp-tree.h > @@ -7334,6 +7334,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 98c10e6a8b5..953f1bed6fc 100644 > --- a/gcc/cp/method.cc > +++ b/gcc/cp/method.cc > @@ -1928,6 +1928,138 @@ 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 (fn_type == error_mark_node || arg_types == error_mark_node) > +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 =
[PATCH v14 23/26] c++: Implement __is_invocable built-in trait
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 | 132 + gcc/cp/semantics.cc | 4 + 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, 720 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 23ea66d9c12..c87b126fdb1 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -3791,6 +3791,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 85056c8140b..6cb2b55f4ea 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 334c11396c2..261d3a71faa 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7334,6 +7334,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 98c10e6a8b5..953f1bed6fc 100644 --- a/gcc/cp/method.cc +++ b/gcc/cp/method.cc @@ -1928,6 +1928,138 @@ 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 (fn_type == error_mark_node || arg_types == error_mark_node) +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) +/* Only a pointer to data member with one argument is invocable. */ +return error_mark_node;