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, 33 insertions, 0 deletions

diff --git a/gcc/testsuite/g++.dg/template/injected1.C b/gcc/testsuite/g++.dg/template/injected1.C
new file mode 100644
index 000000000..81873b498
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/injected1.C
@@ -0,0 +1,33 @@
+// PR c++/13950, DR 176
+
+template <class T> struct Base { }; // { dg-error "" } candidate
+
+struct D1: Base<void>
+{
+  D1::Base* p1;
+  D1::Base<double>* p2;
+  Base *p3;
+  Base<double>* p4;
+};
+
+struct D2: Base<void>, Base<void*>
+{
+  D2::Base* p1;			// { dg-error "" }
+  D2::Base<double>* p2;
+  Base *p3;			// { dg-error "" }
+  Base<double>* p4;
+};
+
+template <class T>
+struct D3: Base<T> {
+  typename D3::Base* p1;
+  typename D3::template Base<double>* p2;
+};
+template struct D3<void>;
+
+template <class T>
+struct D4: Base<T>, Base<T*> {
+  typename D4::Base* p1;	// { dg-error "" }
+  typename D4::template Base<double>* p2;
+};
+template struct D4<void>;	// { dg-message "instantiated" }