cp-tree.h (VAR_OR_FUNCTION_DECL_CHECK): New macro.

	* cp-tree.h (VAR_OR_FUNCTION_DECL_CHECK): New macro.
	(RECORD_OR_UNION_TYPE_CHECK, LANG_IDENTIFIER_CAST): Likewise.
	(DEFARG_NODE_CHECK): Remove; replace with DEFAULT_ARG_CHECK.
	* cp-tree.h: Add tree checking macros to various tree access
	macros.
	* ptree.c (print_lang_decl): Test for function or variable
	before accessing template info.

From-SVN: r29642

gcc/cp/ChangeLog

+1999-09-23  Martin v. Lwis  <loewis@informatik.hu-berlin.de>
+
+	* cp-tree.h (VAR_OR_FUNCTION_DECL_CHECK): New macro.
+	(RECORD_OR_UNION_TYPE_CHECK, LANG_IDENTIFIER_CAST): Likewise.
+	(DEFARG_NODE_CHECK): Remove; replace with DEFAULT_ARG_CHECK.
+	* cp-tree.h: Add tree checking macros to various tree access
+	macros.	
+	* ptree.c (print_lang_decl): Test for function or variable
+	before accessing template info.
+
 1999-09-23  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* lex.c: Get WCHAR_TYPE_SIZE from wchar_type_node.

gcc/cp/ptree.c

@@ -60,7 +60,8 @@ print_lang_decl (file, node, indent)
       fprintf (file, " sorted-fields ");
       fprintf (file, HOST_PTR_PRINTF, DECL_SORTED_FIELDS (node));
     }
-  if (DECL_TEMPLATE_INFO (node))
+  if ((TREE_CODE (node) == FUNCTION_DECL || TREE_CODE (node) == VAR_DECL)
+      && DECL_TEMPLATE_INFO (node))
     {
       fprintf (file, " template-info ");
       fprintf (file, HOST_PTR_PRINTF,  DECL_TEMPLATE_INFO (node));