aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-03-09 12:57:46 -0500
committerJason Merrill <jason@gcc.gnu.org>2011-03-09 12:57:46 -0500
commit3a8face47ee8bb94a50a98a0cfb5c5fd6292e58c (patch)
tree1bd3aa9449d81f488521c0a82f051bdd39085608
parentbf6817f2c5ab79e08392ef031a40df227fa69b02 (diff)
downloadgcc-3a8face47ee8bb94a50a98a0cfb5c5fd6292e58c.zip
gcc-3a8face47ee8bb94a50a98a0cfb5c5fd6292e58c.tar.gz
gcc-3a8face47ee8bb94a50a98a0cfb5c5fd6292e58c.tar.bz2
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: r170824
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/pt.c3
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/g++.dg/template/nontype22.C11
4 files changed, 23 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b0adb8f..789b2cf 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-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
--- 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
--- 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
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);
+}