re PR c++/38089 (g++ crash on invalid code)

gcc/cp/

2009-06-02  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/38089
	* pt.c (register_specialization): Properly setup DECL_CONTEXT for
	specializations in an invalid namespace.

gcc/testsuite/

2009-06-02  Simon Martin  <simartin@users.sourceforge.net>

	PR c++/38089
	* g++.dg/template/spec36.C: New test.

From-SVN: r148069

gcc/cp/ChangeLog

+2009-06-02  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/38089
+	* pt.c (register_specialization): Properly setup DECL_CONTEXT for
+	specializations in an invalid namespace.
+
 2009-06-01  Aldy Hernandez  <aldyh@redhat.com>
 
 	* error.c (print_instantiation_partial_context): Print column

gcc/cp/pt.c

@@ -1316,7 +1316,7 @@ register_specialization (tree spec, tree tmpl, tree args, bool is_friend)
      template it is specializing.  */
   if (DECL_TEMPLATE_SPECIALIZATION (spec)
       && !check_specialization_namespace (tmpl))
-    DECL_CONTEXT (spec) = FROB_CONTEXT (decl_namespace_context (tmpl));
+    DECL_CONTEXT (spec) = DECL_CONTEXT (tmpl);
 
   if (!optimize_specialization_lookup_p (tmpl))
     DECL_TEMPLATE_SPECIALIZATIONS (tmpl)

gcc/testsuite/ChangeLog

+2009-06-02  Simon Martin  <simartin@users.sourceforge.net>
+
+	PR c++/38089
+	* g++.dg/template/spec36.C: New test.
+
 2009-06-01  Ian Lance Taylor  <iant@google.com>
 
 	* gcc.dg/cast-qual-3.c: New testcase.

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

+/* PR c++/38089 */
+/* { dg-do "compile" } */
+
+struct basic_string
+{
+  basic_string(const int __s);
+};
+namespace MyNS {
+  class MyClass {
+    template <typename T>
+    T test() { } /* { dg-error "from definition" } */
+  };
+}
+template <>
+basic_string MyNS::MyClass::test() /* { dg-error "specialization of" } */
+{ return 1; }