diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e25e5253745b0881d96bb067eaaf88521b9525e..cc3fdde757b3f70ea94486247f57f10e26c37073 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	PR c++/57638
+	* pt.c (unify, [TEMPLATE_PARM_INDEX]): Pass to unify_type_mismatch
+	TREE_TYPE (arg), not arg itself.
+
 2013-06-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/53211
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 25cbf3100cf1172df557c1f1ce2e0c79e1c519f3..517f05b3f42144bd528a76d0d8904e143dad29be 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -16961,7 +16961,7 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict,
 	   later.  */
 	return unify_success (explain_p);
       else
-	return unify_type_mismatch (explain_p, tparm, arg);
+	return unify_type_mismatch (explain_p, tparm, TREE_TYPE (arg));
 
       /* If ARG is a parameter pack or an expansion, we cannot unify
 	 against it unless PARM is also a parameter pack.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 73e1c625e473073d76ef8319857d1d24b32771a3..1d7c2af7df2b43916bd0d67aad66e48e681806c3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
+
+	PR c++/57638
+	* g++.dg/template/error53.C: New.
+
 2013-06-19  Sebastian Huber  <sebastian.huber@embedded-brains.de>
 
 	PR target/55033
diff --git a/gcc/testsuite/g++.dg/template/error53.C b/gcc/testsuite/g++.dg/template/error53.C
new file mode 100644
index 0000000000000000000000000000000000000000..5976c868d6d43af876eed8da0a28ff9695313760
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/error53.C
@@ -0,0 +1,13 @@
+// PR c++/57638
+
+template<int x>
+struct S {};
+
+template<long long i>
+void g(S<i>);
+
+void f()
+{
+  S<1000> t;
+  g(t);         // { dg-error "no matching" }
+}  // { dg-message "mismatched types 'long long int' and 'int'" "" { target *-*-* } 12 }