PR c++/44629

	* pt.c (unify): An unresolved overload is a nondeduced context.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170824 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b0adb8f..789b2cf 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-09  Jason Merrill  <jason@redhat.com>
+
+       PR c++/44629
+       * pt.c (unify): An unresolved overload is a nondeduced context.
+
 2011-03-09  Martin Jambor  <mjambor@suse.cz>
 
        PR tree-optimization/47714

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2ca2cd0..ac91698 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15688,6 +15688,9 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict)
       return 1;
 
     default:
+      /* An unresolved overload is a nondeduced context.  */
+      if (type_unknown_p (parm))
+       return 0;
       gcc_assert (EXPR_P (parm));
 
       /* We must be looking at an expression.  This can happen with

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ba746da..0c30b08 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-09  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/template/nontype22.C: New.
+
 2011-03-09  Martin Jambor  <mjambor@suse.cz>
 
        PR tree-optimization/47714

diff --git a/gcc/testsuite/g++.dg/template/nontype22.C b/gcc/testsuite/g++.dg/template/nontype22.C
new file mode 100644 (file)
index 0000000..f2c8c46
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/nontype22.C
@@ -0,0 +1,11 @@
+// PR c++/44629
+// The proper mangling is unclear.
+
+template<typename T> int cmp1(T a, T b);
+template<typename T, int (*cmp)(T, T) = cmp1> struct A { };
+template <typename T> void f (A<T> &); // { dg-bogus "" "" { xfail *-*-* } }
+void g()
+{
+  A<char> a;
+  f(a);
+}