c-common.c: Include c-common.h, not c-lex.h or c-tree.h.

	* c-common.c: Include c-common.h, not c-lex.h or c-tree.h.
	* c-common.h (flag_const_strings): Declare.
	(warn_format): Likewise.
	(flag_traditional): Likewise.
	(flag_isoc99): Likewise.
	(warn_parentheses): Likewise.
	(warn_conversion): Likewise.
	(C_TYPE_OBJECT_P): Likewise.
	(C_TYPE_INCOMPLETE_P): Likewise.
	(C_TYPE_FUNCTION_P): Likewise.
	(C_TYPE_OBJECT_OR_INCOMPLETE_P): Likewise.
	(C_EXP_ORIGINAL_CODE): Likewise.
	(build_unary_op): Likewise.
	(build_binary_op): Likewise.
	(lvalue_p): Likewise.
	(default_conversion): Likewise.
	(common_type): Likewise.
	* c-tree.h (C_TYPE_OBJECT_P): Remove.
	(C_TYPE_INCOMPLETE_P): Likewise.
	(C_TYPE_FUNCTION_P): Likewise.
	(C_TYPE_OBJECT_OR_INCOMPLETE_P): Likewise.
	(C_EXP_ORIGINAL_CODE): Likewise.
	(common_type): Likewise.
	(default_conversion): Likewise.
	(build_binary_op): Likewise.
	(build_unary_op): Likewise.
	(lvalue_p): Likewise.
	(flag_const_strings): Likewise.
	(warn_format): Likewise.
	(warn_conversion): Likewise.
	(flag_traditional): Likewise.
	(flag_isoc99): Likewise.
	(warn_parentheses): Likewise.

	* cp-tree.h (flag_const_strings): Remove.
	(warn_parentheses): Likewise.
	(warn_format): Likewise.
	(common_type): Likewise.
	(default_conversion): Likewise.
	(build_binary_op): Likewise.
	(cp_build_binary_op): New macro.
	* call.c (build_new_op): Use cp_build_binary_op instead of
	build_binary_op.
	* class.c (build_vtable_entry_ref): Likewise.
	* decl.c (expand_static_init): Likewise.
	(compute_array_index_type): Likewise.
	(build_enumerator): Likewise.
	* decl2.c (delete_sanity): Likewise.
	(start_static_initialization_or_destruction): Likewise.
	* error.c (dump_type_suffix): Likewise.
	* init.c (resolve_offset_ref): Likewise.
	(build_new): Likewise.
	(build_new_1): Likewise.
	(build_vec_delete_1): Likewise.
	(build_vec_init): Likewise.
	(build_delete): Likewise.
	* rtti.c (synthesize_tinfo_fn): Likewise.
	(synthesize_tinfo_var): Likewise.
	* search.c (expand_upcast_fixups): Likewise.
	(fixup_all_virtual_upcast_offsets): Likewise.
	* typeck.c (build_array_ref): Likewise.
	(get_member_function_from_ptrfunc): Likewise.
	(build_binary_op): Add parameter.
	(pointer_int_sum): Use cp_build_binary_op.
	(pointer_diff): Likewise.
	(build_modify_expr): Likewise.
	(get_delta_difference): Likewise.
	(build_ptrmemfunc): Likewise.

From-SVN: r34796

1 files changed, 22 insertions, 20 deletions

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index e4dcdea..f21187e 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1266,7 +1266,7 @@ delete_sanity (exp, size, doing_vec, use_global_delete)
 
   if (doing_vec == 2)
     {
-      maxindex = build_binary_op (MINUS_EXPR, size, integer_one_node);
+      maxindex = cp_build_binary_op (MINUS_EXPR, size, integer_one_node);
       pedwarn ("anachronistic use of array size in vector delete");
     }
 
@@ -3248,14 +3248,14 @@ start_static_initialization_or_destruction (decl, initp)
   /* Conditionalize this initialization on being in the right priority
      and being initializing/finalizing appropriately.  */
   sentry_if_stmt = begin_if_stmt ();
-  cond = build_binary_op (EQ_EXPR,
-			  priority_decl,
-			  build_int_2 (priority, 0));
+  cond = cp_build_binary_op (EQ_EXPR,
+			     priority_decl,
+			     build_int_2 (priority, 0));
   init_cond = initp ? integer_one_node : integer_zero_node;
-  init_cond = build_binary_op (EQ_EXPR,
-			       initialize_p_decl,
-			       init_cond);
-  cond = build_binary_op (TRUTH_ANDIF_EXPR, cond, init_cond);
+  init_cond = cp_build_binary_op (EQ_EXPR,
+				  initialize_p_decl,
+				  init_cond);
+  cond = cp_build_binary_op (TRUTH_ANDIF_EXPR, cond, init_cond);
 
   /* We need a sentry if this is an object with external linkage that
      might be initialized in more than one place.  (For example, a
@@ -3275,19 +3275,21 @@ start_static_initialization_or_destruction (decl, initp)
 	 only if the SENTRY is one, i.e., if we are the last to
 	 destroy the variable.  */
       if (initp)
-	sentry_cond = build_binary_op (EQ_EXPR,
-				       build_unary_op (PREINCREMENT_EXPR,
-						       sentry,
-						       /*noconvert=*/1),
-				       integer_one_node);
+	sentry_cond 
+	  = cp_build_binary_op (EQ_EXPR,
+				build_unary_op (PREINCREMENT_EXPR,
+						sentry,
+						/*noconvert=*/1),
+				integer_one_node);
       else
-	sentry_cond = build_binary_op (EQ_EXPR,
-				       build_unary_op (PREDECREMENT_EXPR,
-						       sentry,
-						       /*noconvert=*/1),
-				       integer_zero_node);
-
-      cond = build_binary_op (TRUTH_ANDIF_EXPR, cond, sentry_cond);
+	sentry_cond 
+	  = cp_build_binary_op (EQ_EXPR,
+				build_unary_op (PREDECREMENT_EXPR,
+						sentry,
+						/*noconvert=*/1),
+				integer_zero_node);
+
+      cond = cp_build_binary_op (TRUTH_ANDIF_EXPR, cond, sentry_cond);
     }
 
   finish_if_stmt_cond (cond, sentry_if_stmt);