obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 43 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/template/error38.C b/gcc/testsuite/g++.dg/template/error38.C
new file mode 100644
index 000000000..14a213299
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/error38.C
@@ -0,0 +1,43 @@
+// Testcase for printing typename/typedef bindings as well as template args
+// in diagnostics (PR c++/25185)
+
+template <class T>
+struct A {
+  typename T::type f();		// { dg-message "typename T::type = void*" }
+  void f(int i = 0);		// { dg-message "" }
+
+  typedef typename T::type mytype;
+  mytype g();			// { dg-message "mytype = void*" }
+  void g(int i = 0);		// { dg-message "" }
+};
+
+struct B
+{
+  typedef void* type;
+};
+
+// Also make sure that deduced template arguments get canonicalized.
+
+template <class T>
+void f (T &t);			// { dg-message "T = int" }
+
+template <class T>
+void f (T &t, int = 0);		// { dg-message "" }
+
+typedef int myint;
+myint i;
+myint *p;
+
+int main()
+{
+  A<B> a;
+  a.f();			// { dg-error "" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 34 }
+  a.g();			// { dg-error "" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 36 }
+
+  f(i);				// { dg-error "" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 39 }
+  f(p);				// { dg-error "" }
+  // { dg-message "candidate" "candidate note" { target *-*-* } 41 }
+}