re PR c++/44629 (ICE in unify, at cp/pt.c:15155)

	PR c++/44629
	* pt.c (unify): An unresolved overload is a nondeduced context.

From-SVN: r170825

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ce2384af3e2ffdbddd97c60c147e5444c8d5213c..b8be9ca61f9badbcedd69e680977d3f2e13e112d 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-08  Jason Merrill  <jason@redhat.com>
 
        PR c++/45651

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index fb60c49723ea76647c999ba5f9492650be62bea2..45db33e0776ae61cc0c0fcc5c3b4466adb1a0e83 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14125,6 +14125,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 9d6cda6ece9efb141aa5b9a24e87dcc324a1e66d..78953d898b129db48bccfb17b743bba7eb4bf3bd 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-08  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/template/anon5.C: New.

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..9046980
--- /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> &);
+void g()
+{
+  A<char> a;
+  f(a);                                // { dg-bogus "" "" { xfail *-*-* } }
+}