From: Volker Reichelt <reichelt@igpm.rwth-aachen.de>
Date: Mon, 5 Dec 2005 13:09:17 +0000 (+0000)
Subject: Backport:
X-Git-Tag: releases/gcc-3.4.6~272
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=985561226e1963f0c2e88d1d615e882e7db67830;p=thirdparty%2Fgcc.git

Backport:

	2005-10-13  Mark Mitchell  <mark@codesourcery.com>

	PR c++/23307
	* pt.c (push_template_decl_real): Complain about attempts to
	declare template variables.

	* g++.dg/template/crash38.C: New test.

From-SVN: r108054
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 58b445bf8d7c..6a78fa502d30 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/23307
+	* pt.c (push_template_decl_real): Complain about attempts to
+	declare template variables.
+
 2005-11-30  Release Manager
 
 	* GCC 3.4.5 released.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0e4a7b9d3461..b547cefbda9a 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -2837,9 +2837,8 @@ push_template_decl_real (tree decl, int is_friend)
 	      return decl;
 	    }
 	}
-      else if ((DECL_IMPLICIT_TYPEDEF_P (decl)
-		&& CLASS_TYPE_P (TREE_TYPE (decl)))
-	       || (TREE_CODE (decl) == VAR_DECL && ctx && CLASS_TYPE_P (ctx)))
+      else if (DECL_IMPLICIT_TYPEDEF_P (decl)
+	       && CLASS_TYPE_P (TREE_TYPE (decl)))
 	/* OK */;
       else
 	{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b3c6d9755ab5..6d38f7e7025f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-05  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+	Backport:
+	2005-10-13  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/23307
+	* g++.dg/template/crash38.C: New test.
+
 2005-12-03  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.c-torture/execute/stdio-opt-1.c,
diff --git a/gcc/testsuite/g++.dg/template/crash38.C b/gcc/testsuite/g++.dg/template/crash38.C
new file mode 100644
index 000000000000..c652cc86f6ef
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash38.C
@@ -0,0 +1,8 @@
+// PR c++/23307
+
+class A
+{
+  template<class R>
+  static void f(X&); // { dg-error "" }
+  inline void A::f<void>(X&); // { dg-error "f|expected" }
+};