Merge from mainline

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/dataflow-branch@113230 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 53 insertions, 1 deletions

diff --git a/gcc/testsuite/g++.dg/template/crash35.C b/gcc/testsuite/g++.dg/template/crash35.C
index dd8aa2f0906..348d91d0caf 100644
--- a/gcc/testsuite/g++.dg/template/crash35.C
+++ b/gcc/testsuite/g++.dg/template/crash35.C
@@ -5,5 +5,5 @@ template <typename T> struct C; // { dg-error "declaration" }
 
 template <typename T> void C<T>::f() // { dg-error "invalid|template" }
 {
-  const foo bar; // { dg-error "name a type" }
+  const foo bar;
 }
diff --git a/gcc/testsuite/g++.dg/template/crash45.C b/gcc/testsuite/g++.dg/template/crash45.C
new file mode 100644
index 00000000000..f138e3d6169
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash45.C
@@ -0,0 +1,13 @@
+// PR c++/26365
+
+struct A {};
+
+namespace N
+{
+  template<int> void foo();
+}
+
+void bar(A *p)
+{
+  p->N::foo<0>; // { dg-error "not a member" } 
+}
diff --git a/gcc/testsuite/g++.dg/template/crash46.C b/gcc/testsuite/g++.dg/template/crash46.C
new file mode 100644
index 00000000000..6fbda7c0767
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash46.C
@@ -0,0 +1,5 @@
+// PR c++/27102
+
+template <class T>
+void T::foo() {} // { dg-error "invalid" }
+
diff --git a/gcc/testsuite/g++.dg/template/friend41.C b/gcc/testsuite/g++.dg/template/friend41.C
new file mode 100644
index 00000000000..6d686019d9a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/friend41.C
@@ -0,0 +1,11 @@
+// PR c++/26912
+
+struct Foo { 
+  template<class T> int func() const; 
+}; 
+
+class Bar { 
+  friend int Foo::func<int>() const;
+}; 
+
+
diff --git a/gcc/testsuite/g++.dg/template/new3.C b/gcc/testsuite/g++.dg/template/new3.C
new file mode 100644
index 00000000000..c6c108903e1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/new3.C
@@ -0,0 +1,17 @@
+extern void *operator new(__SIZE_TYPE__); // { dg-error "candidate" }
+
+template <class T >
+struct C
+{
+  void f() {
+    int* node;
+    new (&node) int(0); // { dg-error "new" }
+  }
+};
+
+void* operator new(__SIZE_TYPE__, void* __p);
+
+void g() {
+  C<int> c;
+  c.f();
+} 
diff --git a/gcc/testsuite/g++.dg/template/pure1.C b/gcc/testsuite/g++.dg/template/pure1.C
new file mode 100644
index 00000000000..ca9b94e00b7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/pure1.C
@@ -0,0 +1,6 @@
+// PR c++/26122
+
+struct A
+{
+  template<int> void foo() = 1; // { dg-error "pure" }
+};