diff options
| author | Patrick Palka <ppalka@redhat.com> | 2020-07-29 22:06:44 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2020-07-29 22:06:44 -0400 |
| commit | 2c58f5cadfac338a67723fd6e41c9097760c4a33 (patch) | |
| tree | 5a10e90b44cbed1580f27667e45b3fcafb165fff /gcc | |
| parent | 71141b1bd537cc516e485c834c2d36abba3f4544 (diff) | |
| download | gcc-2c58f5cadfac338a67723fd6e41c9097760c4a33.zip gcc-2c58f5cadfac338a67723fd6e41c9097760c4a33.tar.gz gcc-2c58f5cadfac338a67723fd6e41c9097760c4a33.tar.bz2 | |
c++: overload sets and placeholder return type [PR64194]
In the testcase below, template argument deduction for the call
g(id<int>) goes wrong because the functions in the overload set id<int>
each have a yet-undeduced auto return type, and this undeduced return
type makes try_one_overload fail to match up any of the overloads with
g's parameter type, leading to g's template argument going undeduced and
to the overload set going unresolved.
This patch fixes this issue by performing return type deduction via
instantiation before doing try_one_overload, in a manner similar to what
resolve_address_of_overloaded_function does.
gcc/cp/ChangeLog:
PR c++/64194
* pt.c (resolve_overloaded_unification): If the function
template specialization has a placeholder return type,
then instantiate it before attempting unification.
gcc/testsuite/ChangeLog:
PR c++/64194
* g++.dg/cpp1y/auto-fn60.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/pt.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/auto-fn60.C | 11 |
2 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a7ab2bd..72bdf86 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -22120,7 +22120,16 @@ resolve_overloaded_unification (tree tparms, if (subargs != error_mark_node && !any_dependent_template_arguments_p (subargs)) { - elem = TREE_TYPE (instantiate_template (fn, subargs, tf_none)); + fn = instantiate_template (fn, subargs, tf_none); + if (undeduced_auto_decl (fn)) + { + /* Instantiate the function to deduce its return type. */ + ++function_depth; + instantiate_decl (fn, /*defer*/false, /*class*/false); + --function_depth; + } + + elem = TREE_TYPE (fn); if (try_one_overload (tparms, targs, tempargs, parm, elem, strict, sub_strict, addr_p, explain_p) && (!goodfn || !same_type_p (goodfn, elem))) diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn60.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn60.C new file mode 100644 index 0000000..575abaf --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn60.C @@ -0,0 +1,11 @@ +// PR c++/64194 +// { dg-do compile { target c++14 } } + +template <typename T> void g(void (*)(T)) { } + +template <typename> auto id(int) { } +template <typename> auto id(char) { return 0; } + +int main() { + g(id<int>); +} |