diff options
| author | Patrick Palka <ppalka@redhat.com> | 2023-02-03 09:41:10 -0500 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2023-02-03 09:41:10 -0500 |
| commit | 59e0376f607805ef9b67fd7b0a4a3084ab3571a5 (patch) | |
| tree | 14f66e3a67c240451c7814e5f314e7b05107ee54 /gcc/cp | |
| parent | ed2b519e02eac99fadfa51adc7b11f8854c24575 (diff) | |
| download | gcc-59e0376f607805ef9b67fd7b0a4a3084ab3571a5.zip gcc-59e0376f607805ef9b67fd7b0a4a3084ab3571a5.tar.gz gcc-59e0376f607805ef9b67fd7b0a4a3084ab3571a5.tar.bz2 | |
c++: unexpected ADDR_EXPR after overload set pruning [PR107461]
Here the ahead-of-time overload set pruning in finish_call_expr is
unintentionally returning a CALL_EXPR whose (pruned) callee is wrapped
in an ADDR_EXPR, despite the original callee not being wrapped in an
ADDR_EXPR. This ends up causing a bogus declaration mismatch error in
the below testcase because the call to min in #1 gets expressed as a
CALL_EXPR of ADDR_EXPR of FUNCTION_DECL, whereas the level-lowered call
to min in #2 gets expressed instead as a CALL_EXPR of FUNCTION_DECL.
This patch fixes this by stripping the spurious ADDR_EXPR appropriately.
Thus the first call to min now also gets expressed as a CALL_EXPR of
FUNCTION_DECL, matching the behavior before r12-6075-g2decd2cabe5a4f.
PR c++/107461
gcc/cp/ChangeLog:
* semantics.cc (finish_call_expr): Strip ADDR_EXPR from
the selected callee during overload set pruning.
gcc/testsuite/ChangeLog:
* g++.dg/template/call9.C: New test.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/semantics.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gcc/cp/semantics.cc b/gcc/cp/semantics.cc index 1656d02..c2df0b6 100644 --- a/gcc/cp/semantics.cc +++ b/gcc/cp/semantics.cc @@ -2957,13 +2957,18 @@ finish_call_expr (tree fn, vec<tree, va_gc> **args, bool disallow_virtual, if (TREE_CODE (result) == CALL_EXPR && really_overloaded_fn (orig_fn)) { - orig_fn = CALL_EXPR_FN (result); - if (TREE_CODE (orig_fn) == COMPONENT_REF) + tree sel_fn = CALL_EXPR_FN (result); + if (TREE_CODE (sel_fn) == COMPONENT_REF) { /* The non-dependent result of build_new_method_call. */ - orig_fn = TREE_OPERAND (orig_fn, 1); - gcc_assert (BASELINK_P (orig_fn)); - } + sel_fn = TREE_OPERAND (sel_fn, 1); + gcc_assert (BASELINK_P (sel_fn)); + } + else if (TREE_CODE (sel_fn) == ADDR_EXPR) + /* Our original callee wasn't wrapped in an ADDR_EXPR, + so strip this ADDR_EXPR added by build_over_call. */ + sel_fn = TREE_OPERAND (sel_fn, 0); + orig_fn = sel_fn; } result = build_call_vec (TREE_TYPE (result), orig_fn, orig_args); |