From 176ad28d272c915916f196f6944f8a0b3700eab5 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 9 Mar 2011 12:57:51 -0500
Subject: [PATCH] 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
---
 gcc/cp/ChangeLog                          |  5 +++++
 gcc/cp/pt.c                               |  3 +++
 gcc/testsuite/ChangeLog                   |  4 ++++
 gcc/testsuite/g++.dg/template/nontype22.C | 11 +++++++++++
 4 files changed, 23 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/template/nontype22.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a35d9e9bc278..337e94bd556c 100644
--- 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 716a7c568e12..b868770007b9 100644
--- 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 6e09fa368a5b..260abc982fdd 100644
--- 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
index 000000000000..f2c8c46e9fc0
--- /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);
+}
-- 
2.47.2