* pt.c (tsubst_decl): Robustify.

From-SVN: r30716

gcc/cp/ChangeLog

+1999-11-29  Mark Mitchell  <mark@codesourcery.com>
+
+	* pt.c (tsubst_decl): Robustify.
+
 1999-11-27  Mark Mitchell  <mark@codesourcery.com>
 
 	* decl2.c (finish_file): Call expand_body for inline functions

gcc/cp/pt.c

@@ -5863,7 +5863,7 @@ tsubst_decl (t, args, type, in_decl)
 	my_friendly_assert (DECL_LANG_SPECIFIC (t) 
 			    && DECL_TEMPLATE_INFO (t) != NULL_TREE, 0);
 
-	if (TYPE_P (DECL_CONTEXT (t)))
+	if (TYPE_P (CP_DECL_CONTEXT (t)))
 	  ctx = tsubst_aggr_type (DECL_CONTEXT (t), args, 
 				  /*complain=*/1,
 				  in_decl, /*entering_scope=*/1);

gcc/testsuite/g++.old-deja/g++.pt/extern1.C

+// Build don't link:
+// Origin: Mark Mitchell <mark@codesourcery.com>
+
+template <class T>
+void f ()
+{
+  extern int i;
+  extern T j;
+  
+  i = j;
+}
+
+template void f<int>();