* builtin.c (get_pointer_alignment): Use DECL_P and TYPE_P macros.

	* c-common.c (decl_attributes,check_format_info,truthvalue_conversion,
	  c_get_alias_set): Likewise.
	* c-decl.c (duplicate_decls): Likewise.
	* c-typeck.c (default_conversion,build_unary_op): Likewise.
	* calls.c (initialize_argument_information): Likewise.
	* dwarf2out.c (decl_class_context,add_abstract_origin_attribute):
	Likewise.
	* dwarfout.c (decl_class_context,output_type): Likewise.
	* expr.c (get_inner_reference): Likewise.
	* fold-const.c (simple_operand_p,fold): Likewise.
	* function.c (aggregate_value_p): Likewise.
	* stmt.c (expand_asm_operands): Likewise.
	* varasm.c (named_section): Likewise.

	* call.c (check_dtor_name,build_new_method_call): Likewise.
	* decl.c (push_class_binding,poplevel,pushtag,lookup_namespace_name,
	make_typename_type,check_initializer,cp_finish_decl,xref_tag): Likewise.
	* decl2.c (grokfield,build_expr_from_tree,build_expr_from_tree,
	decl_namespace,arg_assoc_template_arg,arg_assoc,
	validate_nonmember_using_decl,do_class_using_decl): Likewise.
	* error.c (dump_template_argument,dump_expr,cp_file_of,cp_line_of,
	args_to_string): Likewise.
	* friend.c (is_friend): Likewise.
	* lex.c (note_got_semicolon,note_list_got_semicolon,is_global): Likewise.
	* method.c (build_overload_nested_name,build_overload_value,
	build_qualified_name,build_qualified_name,hack_identifier): Likewise.
	* parse.y (typename_sub,typename_sub1): Likewise.
	* pt.c (push_inline_template_parms_recursive,check_template_shadow,
	process_partial_specialization,convert_template_argument,
	template_args_equal,add_pending_template,lookup_template_class,
	for_each_template_parm_r,maybe_fold_nontype_arg,
	tsubst,instantiate_template,type_unification_real,unify,
	instantiate_pending_templates,set_mangled_name_for_template_decl):
	Likewise.
	* repo.c (repo_get_id,repo_template_used): Likewise.
	* search.c (lookup_field_1): Likewise.
	* tree.c (walk_tree,get_type_decl,cp_tree_equal,member_p): Likewise.
	* xref.c (classname): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32698 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 5 deletions

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 44dc3abf8a3..9d5defcf09b 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -446,7 +446,7 @@ build_overload_nested_name (decl)
       build_mangled_name_for_type (context);
     else
     {
-      if (TREE_CODE_CLASS (TREE_CODE (context)) == 't')
+      if (TYPE_P (context))
         context = TYPE_NAME (context);
       build_overload_nested_name (context);
     }
@@ -692,7 +692,7 @@ build_overload_value (type, value, flags)
      tree type, value;
      mangling_flags flags;
 {
-  my_friendly_assert (TREE_CODE_CLASS (TREE_CODE (type)) == 't', 0);
+  my_friendly_assert (TYPE_P (type), 0);
 
   while (TREE_CODE (value) == NON_LVALUE_EXPR
 	 || TREE_CODE (value) == NOP_EXPR)
@@ -1044,7 +1044,7 @@ build_qualified_name (decl)
   tree context;
   int i = 1;
 
-  if (TREE_CODE_CLASS (TREE_CODE (decl)) == 't')
+  if (TYPE_P (decl))
     decl = TYPE_NAME (decl);
 
   /* If DECL_ASSEMBLER_NAME has been set properly, use it.  */
@@ -1072,7 +1072,7 @@ build_qualified_name (decl)
 	  if (check_ktype (context, FALSE) != -1)
 	    /* Found one!  */
 	    break;
-	  if (TREE_CODE_CLASS (TREE_CODE (context)) == 't')
+	  if (TYPE_P (context))
 	    context = TYPE_NAME (context);
 	}
     }
@@ -1985,7 +1985,7 @@ hack_identifier (value, name)
 	}
     }
 
-  if (TREE_CODE_CLASS (TREE_CODE (value)) == 'd' && DECL_NONLOCAL (value))
+  if (DECL_P (value) && DECL_NONLOCAL (value))
     {
       if (DECL_CLASS_SCOPE_P (value)
 	  && DECL_CONTEXT (value) != current_class_type)