re PR c++/33035 (ICE on local class destructor)

/cp
2007-08-15  Paolo Carlini  <pcarlini@suse.de>

	PR c++/33035
	* pt.c (push_template_decl_real): Depending on TYPE_P
	use either TYPE_CONTEXT or DECL_CONTEXT.

/testsuite
2007-08-15  Paolo Carlini  <pcarlini@suse.de>

	PR c++/33035
	* g++.dg/template/crash68.C: New.

From-SVN: r127508

gcc/cp/ChangeLog

+2007-08-15  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/33035
+	* pt.c (push_template_decl_real): Depending on TYPE_P
+	use either TYPE_CONTEXT or DECL_CONTEXT.
+
 2007-08-14  Mark Mitchell  <mark@codesourcery.com>
 
 	* semantics.c (finish_omp_clauses): Strip a NOP_EXPR if

gcc/cp/pt.c

@@ -3913,7 +3913,9 @@ push_template_decl_real (tree decl, bool is_friend)
 	    if (current == decl)
 	      current = ctx;
 	    else
-	      current = TYPE_CONTEXT (current);
+	      current = (TYPE_P (current)
+			 ? TYPE_CONTEXT (current)
+			 : DECL_CONTEXT (current));
 	  }
     }
 

gcc/testsuite/ChangeLog

+2007-08-15  Paolo Carlini  <pcarlini@suse.de>
+
+	PR c++/33035
+	* g++.dg/template/crash68.C: New.
+
 2007-08-15  Maxim Kuvyrkov  <maxim@codesourcery.com>
  
 	* gcc.dg/sibcall-3.c: Remove m68k from XFAIL list.

gcc/testsuite/g++.dg/template/crash68.C

+// PR c++/33035
+
+template<class A> 
+struct a {
+        template<class B> 
+        struct b {
+                template<class C>
+                void f()
+                {
+                        struct g
+                        {
+                                ~g() {}
+                        };
+                }
+        };
+};