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: r170826

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a35d9e9bc278f2ae9f3a8771cfa01f5767caa218..337e94bd556c31fb9e8138aba957b48608123e45 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 716a7c568e12be792cb1ff71658c7b25ed097241..b868770007b9461639bb5149b86e5d1ebc16270c 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15194,6 +15194,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 6e09fa368a5b160a8a7e2cc8142603e36bd172ee..260abc982fdd63994a3da49e81b0bf82837ffe3c 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..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);
+}