diff options
| author | Patrick Palka <ppalka@redhat.com> | 2022-01-27 10:56:49 -0500 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2022-01-27 10:56:49 -0500 |
| commit | dec8d0e5fa00ceb2ded78b8a3eba8976d860a90e (patch) | |
| tree | 46e912a46c6c9af56ad5822f06098a7aca16a31b /gcc/cp/tree.cc | |
| parent | ce6054a22ae14594a2919d2ad87cd9478e616fb3 (diff) | |
| download | gcc-dec8d0e5fa00ceb2ded78b8a3eba8976d860a90e.zip gcc-dec8d0e5fa00ceb2ded78b8a3eba8976d860a90e.tar.gz gcc-dec8d0e5fa00ceb2ded78b8a3eba8976d860a90e.tar.bz2 | |
c++: non-dependent immediate member fn call [PR99895]
Here we're emitting a bogus error during ahead of time evaluation of a
non-dependent immediate member function call such as a.f(args) because
the defacto templated form for such a call is (a.f)(args) but we're
trying to evaluate it using the intermediate CALL_EXPR built by
build_over_call, which has the non-member form f(a, args). The defacto
member form is built in build_new_method_call, so it seems we should
handle the immediate call there instead, or perhaps make build_over_call
build the correct form in the first place.
Giiven that there are many spots other than build_new_method_call that
call build_over_call for member functions, e.g. build_op_call, this
patch takes the latter approach.
In passing, this patch makes us avoid wrapping PARM_DECL in
NON_DEPENDENT_EXPR for benefit of the third testcase below.
PR c++/99895
gcc/cp/ChangeLog:
* call.cc (build_over_call): For a non-dependent member call,
build up a CALL_EXPR using a COMPONENT_REF callee, as in
build_new_method_call.
* pt.cc (build_non_dependent_expr): Don't wrap PARM_DECL either.
* tree.cc (build_min_non_dep_op_overload): Adjust accordingly
after the build_over_call change.
gcc/ChangeLog:
* tree.cc (build_call_vec): Add const to second parameter.
* tree.h (build_call_vec): Likewise.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/consteval-memfn1.C: New test.
* g++.dg/cpp2a/consteval-memfn2.C: New test.
* g++.dg/cpp2a/consteval28.C: New test.
Diffstat (limited to 'gcc/cp/tree.cc')
| -rw-r--r-- | gcc/cp/tree.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/cp/tree.cc b/gcc/cp/tree.cc index 5d453e4..056f10f 100644 --- a/gcc/cp/tree.cc +++ b/gcc/cp/tree.cc @@ -3661,6 +3661,8 @@ build_min_non_dep_op_overload (enum tree_code op, nargs = call_expr_nargs (non_dep); expected_nargs = cp_tree_code_length (op); + if (TREE_CODE (TREE_TYPE (overload)) == METHOD_TYPE) + expected_nargs -= 1; if ((op == POSTINCREMENT_EXPR || op == POSTDECREMENT_EXPR) /* With -fpermissive non_dep could be operator++(). */ @@ -3687,7 +3689,7 @@ build_min_non_dep_op_overload (enum tree_code op, tree method = build_baselink (binfo, binfo, overload, NULL_TREE); fn = build_min (COMPONENT_REF, TREE_TYPE (overload), object, method, NULL_TREE); - for (int i = 1; i < nargs; i++) + for (int i = 0; i < nargs; i++) { tree arg = va_arg (p, tree); vec_safe_push (args, arg); @@ -3723,7 +3725,6 @@ build_min_non_dep_op_overload (tree non_dep, tree overload, tree object, tree method = build_baselink (binfo, binfo, overload, NULL_TREE); tree fn = build_min (COMPONENT_REF, TREE_TYPE (overload), object, method, NULL_TREE); - nargs--; gcc_assert (vec_safe_length (args) == nargs); tree call = build_min_non_dep_call_vec (non_dep, fn, args); |