From 7bb37352bed918f61a537596ea8097eb399b3883 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 11 Jan 2012 11:46:57 -0500
Subject: [PATCH] re PR c++/51613 (Ambiguous function template instantiations
 as template argument are not rejected)

	PR c++/51613
	* pt.c (resolve_overloaded_unification): Compare types with
	same_type_p, not decls_match.

From-SVN: r183099
---
 gcc/cp/ChangeLog                              |  6 +++++
 gcc/cp/pt.c                                   |  2 +-
 gcc/testsuite/ChangeLog                       |  5 ++++
 .../g++.dg/template/explicit-args5.C          | 24 +++++++++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/explicit-args5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9b080fbaeb80..537d1aa54731 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51613
+	* pt.c (resolve_overloaded_unification): Compare types with
+	same_type_p, not decls_match.
+
 2012-01-10  Jason Merrill  <jason@redhat.com>
 
 	PR c++/51614
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index bc3dd9713a96..ac72b6ddaaa5 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -15471,7 +15471,7 @@ resolve_overloaded_unification (tree tparms,
 	      elem = tsubst (TREE_TYPE (fn), subargs, tf_none, NULL_TREE);
 	      if (try_one_overload (tparms, targs, tempargs, parm,
 				    elem, strict, sub_strict, addr_p, explain_p)
-		  && (!goodfn || !decls_match (goodfn, elem)))
+		  && (!goodfn || !same_type_p (goodfn, elem)))
 		{
 		  goodfn = elem;
 		  ++good;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4fafc8a45856..5ac78a5826e3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/51613
+	* g++.dg/template/explicit-args5.C: New.
+
 2012-01-11  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
 
 	* gcc.c-torture/execute/20120110-1.c: New testcase.
diff --git a/gcc/testsuite/g++.dg/template/explicit-args5.C b/gcc/testsuite/g++.dg/template/explicit-args5.C
new file mode 100644
index 000000000000..d6c9a575f917
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/explicit-args5.C
@@ -0,0 +1,24 @@
+// PR c++/51613
+
+template<typename F, typename T>
+void apply(F f, T t)
+{
+    f(t);
+}
+
+template<typename T>
+void multi(T)
+{
+}
+
+template<typename T>
+void multi(T*)
+{
+}
+
+int main()
+{
+    apply(&multi<int>, 7);	// { dg-error "no match" }
+
+    return 0;
+}
-- 
2.47.3