]> gcc.gnu.org Git - gcc.git/commitdiff
c++: overload sets and placeholder return type [PR64194]
authorPatrick Palka <ppalka@redhat.com>
Thu, 30 Jul 2020 02:06:44 +0000 (22:06 -0400)
committerPatrick Palka <ppalka@redhat.com>
Thu, 10 Dec 2020 03:45:57 +0000 (22:45 -0500)
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.

(cherry picked from commit 2c58f5cadfac338a67723fd6e41c9097760c4a33)

gcc/cp/pt.c
gcc/testsuite/g++.dg/cpp1y/auto-fn60.C [new file with mode: 0644]

index 7bbd9d1f55e275b8dcdbd598361aa54408407c1c..0879989c28734e65a0336e0daca43215d4e1b321 100644 (file)
@@ -22240,6 +22240,13 @@ resolve_overloaded_unification (tree tparms,
              fn = instantiate_template (fn, subargs, tf_none);
              if (!constraints_satisfied_p (fn))
                continue;
+             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,
diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn60.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn60.C
new file mode 100644 (file)
index 0000000..575abaf
--- /dev/null
@@ -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>);
+}
This page took 0.086423 seconds and 5 git commands to generate.