re PR c++/21151 (ICE when compiling c++ PCH of class definition within template function.)

cp:
	PR c++/21151
	* name-lookup.c (pushtag): Push local class even in a template.
testsuite:
	PR c++/21151
	* g++.dg/pch/local-1.C: New.
	* g++.dg/pch/local-1.Hs: New.

From-SVN: r100482

gcc/cp/ChangeLog

+2005-06-02  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/21151
+	* name-lookup.c (pushtag): Push local class even in a template.
+
 2005-05-31  Nathan Sidwell  <nathan@codesourcery.com>
 
 	PR c++/21165

gcc/cp/name-lookup.c

@@ -4698,8 +4698,7 @@ pushtag (tree name, tree type, tag_scope scope)
 	     way.  (It's otherwise tricky to find a member function definition
 	     it's only pointed to from within a local class.)  */
 	  if (TYPE_CONTEXT (type)
-	      && TREE_CODE (TYPE_CONTEXT (type)) == FUNCTION_DECL
-	      && !processing_template_decl)
+	      && TREE_CODE (TYPE_CONTEXT (type)) == FUNCTION_DECL)
 	    VEC_safe_push (tree, gc, local_classes, type);
         }
       if (b->kind == sk_class

gcc/testsuite/ChangeLog

+2005-06-02  Nathan Sidwell  <nathan@codesourcery.com>
+
+	PR c++/21151
+	* g++.dg/pch/local-1.C: New.
+	* g++.dg/pch/local-1.Hs: New.
+
 2005-06-01  Diego Novillo  <dnovillo@redhat.com>
 
 	PR 14341, PR 21332, PR 20701, PR 21086, PR 21090

gcc/testsuite/g++.dg/pch/local-1.C

+#include "local-1.H"
+int main() 
+{
+  func<int> ();
+  return 0;
+}

gcc/testsuite/g++.dg/pch/local-1.Hs

+template<typename T> void func()   
+{   
+  struct object   
+  {   
+    object() {}
+  };   
+}