From 2a5569fad3cd964d1c8456b07a411189695ad275 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Thu, 19 May 2016 20:23:52 +0000
Subject: [PATCH] re PR c++/71075 (Broken diagnostic: 'integer_cst' not
 supported by 'dump_decl')

	PR c++/71075
	* pt.c (unify_template_argument_mismatch): Use %qE instead of %qD.

	* g++.dg/diagnostic/pr71075.C: New test.

From-SVN: r236487
---
 gcc/cp/ChangeLog                          | 5 +++++
 gcc/cp/pt.c                               | 2 +-
 gcc/testsuite/ChangeLog                   | 5 +++++
 gcc/testsuite/g++.dg/diagnostic/pr71075.C | 8 ++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/diagnostic/pr71075.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5c38aaf9b57..dcd660f627c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/71075
+	* pt.c (unify_template_argument_mismatch): Use %qE instead of %qD.
+
 2016-05-19  Jason Merrill  <jason@redhat.com>
 
 	PR c++/10200
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 39085927e86..2bba571b97e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6165,7 +6165,7 @@ unify_template_argument_mismatch (bool explain_p, tree parm, tree arg)
 {
   if (explain_p)
     inform (input_location,
-	    "  template argument %qE does not match %qD", arg, parm);
+	    "  template argument %qE does not match %qE", arg, parm);
   return 1;
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1630598fe31..41668728f07 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-19  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/71075
+	* g++.dg/diagnostic/pr71075.C: New test.
+
 2016-05-19  David Malcolm  <dmalcolm@redhat.com>
 
 	PR c++/71184
diff --git a/gcc/testsuite/g++.dg/diagnostic/pr71075.C b/gcc/testsuite/g++.dg/diagnostic/pr71075.C
new file mode 100644
index 00000000000..6bb1e68e0b7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/diagnostic/pr71075.C
@@ -0,0 +1,8 @@
+// PR c++/71075
+
+template<typename T, int I> struct A {};
+template<typename T> void foo(A<T,1>) {}
+int main() {
+  foo(A<int,2>()); // { dg-error "no matching" }
+// { dg-message "template argument .2. does not match .1." "" { target *-*-* } 6 }
+}
-- 
2.30.2