tree-ssa-alias-warnings.c (maybe_add_match): Cast according to the coding conventions.

	* tree-ssa-alias-warnings.c (maybe_add_match): Cast according to the
	coding conventions.
	(add_key): Likewise.
	* tree-ssa.c (init_tree_ssa): Use type safe memory macros.
	* tree-ssa-ccp.c (ccp_fold_builtin): Avoid using C++ keywords as
	variable names.
	* tree-ssa-coalesce.c (find_coalesce_pair): Use type safe memory macros.
	(add_cost_one_coalesce): Likewise.
	* tree-ssa-copy.c (merge_alias_info): Avoid using C++ keywords as
	variable names. Rename orig to orig_name for consistency.
	* tree-ssa-dom.c (dom_thread_across_edge): Cast according to the coding
	conventions.
	(cprop_into_successor_phis): Avoid using C++ keywords as variable names.
	(record_equivalences_from_stmt): Likewise.
	* tree-ssa-dse.c (dse_initialize_block_local_data): Cast according to
	the coding conventions.
	(memory_ssa_name_same): Likewise.
	(dse_optimize_stmt): Likewise.
	(dse_record_phis): Likewise.
	(dse_finalize_block): Likewise.
	* tree-ssa-loop-im.c (outermost_invariant_loop_expr): Avoid using C++
	keywords as variable names.
	(may_move_till): Cast according to the coding conventions.
	(force_move_till_expr): Avoid using C++ keywords as variable names.
	(force_move_till): Cast according to the coding conventions.
	(memref_hash): Likewise.
	(memref_eq): Likewise.
	(gather_mem_refs_stmt): Likewise.
	* tree-ssa-loop-ivopts.c (contains_abnormal_ssa_name_p): Avoid using C++
	keywords as variable names.
	(idx_find_step): Cast according to the coding conventions.
	(idx_record_use): Likewise.
	(find_depends): Likewise.
	(prepare_decl_rtl): Likewise.
	(mbc_entry_hash): Likewise.
	(mbc_entry_eq): Likewise.
	* tree-ssa-loop-niter.c (SWAP): Use the correct the type for tmp.
	(simplify_replace_tree): Avoid using C++ keywords as variable names.
	(idx_infer_loop_bounds): Cast according to the coding conventions.
	* tree-ssa-loop-prefetch.c (idx_analyze_ref): Likewise.
	* tree-ssa-math-opts.c (occ_new ): Likwise.
	* tree-ssanames.c (duplicate_ssa_name_ptr_info): Use type safe memory
	macros.
	* tree-ssa-operands.c (add_def_op): Avoid using C++ keywords as variable
	names.
	(add_use_op): Likewise.
	(add_vop): Likewise.
	(add_vuse_op): Likewise.
	(add_vdef_op): Likewise.
	(get_expr_operands): Likewise.
	(push_stmt_changes): Use type safe memory macros.
	* tree-ssa-phiopt.c (replace_phi_edge_with_variable): Avoid using C++
	keywords as variable names.
	(conditional_replacement): Likewise.
	(minmax_replacement): Likewise.
	(abs_replacement): Likewise.
	* tree-ssa-pre.c (create_expression_by_pieces): Cast according to the
	coding conventions.
	(insert_fake_stores): Avoid using C++ keywords as variable names.
	* tree-ssa-reassoc.c (add_to_ops_vec): Cast according to the coding
	conventions.
	* tree-ssa-structalias.c (heapvar_lookup): Likewise.
	(heapvar_insert): Use type safe memory macros.
	(new_var_info): Cast according to the coding conventions.
	(new_constraint): Likewise.
	(remove_preds_and_fake_succs): Use type safe memory macros.
	* tree-ssa-threadupdate.c (thread_block): Cast according to the coding
	conventions.
	(thread_single_edge): Likewise.

From-SVN: r125504

1 files changed, 24 insertions, 24 deletions

diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index f8e96bd..0c756d9 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -322,14 +322,14 @@ empty_block_p (basic_block bb)
 
 static void
 replace_phi_edge_with_variable (basic_block cond_block,
-				edge e, tree phi, tree new)
+				edge e, tree phi, tree new_tree)
 {
   basic_block bb = bb_for_stmt (phi);
   basic_block block_to_remove;
   block_stmt_iterator bsi;
 
   /* Change the PHI argument to new.  */
-  SET_USE (PHI_ARG_DEF_PTR (phi, e->dest_idx), new);
+  SET_USE (PHI_ARG_DEF_PTR (phi, e->dest_idx), new_tree);
 
   /* Remove the empty basic block.  */
   if (EDGE_SUCC (cond_block, 0)->dest == bb)
@@ -377,7 +377,7 @@ conditional_replacement (basic_block cond_bb, basic_block middle_bb,
 {
   tree result;
   tree old_result = NULL;
-  tree new, cond;
+  tree new_stmt, cond;
   block_stmt_iterator bsi;
   edge true_edge, false_edge;
   tree new_var = NULL;
@@ -470,7 +470,7 @@ conditional_replacement (basic_block cond_bb, basic_block middle_bb,
       || (e1 == true_edge && integer_onep (arg1))
       || (e1 == false_edge && integer_zerop (arg1)))
     {
-      new = build_gimple_modify_stmt (new_var1, cond);
+      new_stmt = build_gimple_modify_stmt (new_var1, cond);
     }
   else
     {
@@ -514,19 +514,19 @@ conditional_replacement (basic_block cond_bb, basic_block middle_bb,
 	  tmp = create_tmp_var (TREE_TYPE (op0), NULL);
 	  add_referenced_var (tmp);
 	  cond_tmp = make_ssa_name (tmp, NULL);
-	  new = build_gimple_modify_stmt (cond_tmp, op0);
-	  SSA_NAME_DEF_STMT (cond_tmp) = new;
+	  new_stmt = build_gimple_modify_stmt (cond_tmp, op0);
+	  SSA_NAME_DEF_STMT (cond_tmp) = new_stmt;
 
-	  bsi_insert_after (&bsi, new, BSI_NEW_STMT);
+	  bsi_insert_after (&bsi, new_stmt, BSI_NEW_STMT);
 	  cond = fold_convert (TREE_TYPE (result), cond_tmp);
 	}
 
-      new = build_gimple_modify_stmt (new_var1, cond);
+      new_stmt = build_gimple_modify_stmt (new_var1, cond);
     }
 
-  bsi_insert_after (&bsi, new, BSI_NEW_STMT);
+  bsi_insert_after (&bsi, new_stmt, BSI_NEW_STMT);
 
-  SSA_NAME_DEF_STMT (new_var1) = new;
+  SSA_NAME_DEF_STMT (new_var1) = new_stmt;
 
   replace_phi_edge_with_variable (cond_bb, e1, phi, new_var1);
 
@@ -624,7 +624,7 @@ minmax_replacement (basic_block cond_bb, basic_block middle_bb,
 		    tree arg0, tree arg1)
 {
   tree result, type;
-  tree cond, new;
+  tree cond, new_stmt;
   edge true_edge, false_edge;
   enum tree_code cmp, minmax, ass_code;
   tree smaller, larger, arg_true, arg_false;
@@ -853,10 +853,10 @@ minmax_replacement (basic_block cond_bb, basic_block middle_bb,
 
   /* Emit the statement to compute min/max.  */
   result = duplicate_ssa_name (PHI_RESULT (phi), NULL);
-  new = build_gimple_modify_stmt (result, build2 (minmax, type, arg0, arg1));
-  SSA_NAME_DEF_STMT (result) = new;
+  new_stmt = build_gimple_modify_stmt (result, build2 (minmax, type, arg0, arg1));
+  SSA_NAME_DEF_STMT (result) = new_stmt;
   bsi = bsi_last (cond_bb);
-  bsi_insert_before (&bsi, new, BSI_NEW_STMT);
+  bsi_insert_before (&bsi, new_stmt, BSI_NEW_STMT);
 
   replace_phi_edge_with_variable (cond_bb, e1, phi, result);
   return true;
@@ -874,7 +874,7 @@ abs_replacement (basic_block cond_bb, basic_block middle_bb,
 		 tree phi, tree arg0, tree arg1)
 {
   tree result;
-  tree new, cond;
+  tree new_stmt, cond;
   block_stmt_iterator bsi;
   edge true_edge, false_edge;
   tree assign;
@@ -965,24 +965,24 @@ abs_replacement (basic_block cond_bb, basic_block middle_bb,
     lhs = result;
 
   /* Build the modify expression with abs expression.  */
-  new = build_gimple_modify_stmt (lhs,
-				  build1 (ABS_EXPR, TREE_TYPE (lhs), rhs));
-  SSA_NAME_DEF_STMT (lhs) = new;
+  new_stmt = build_gimple_modify_stmt (lhs,
+				       build1 (ABS_EXPR, TREE_TYPE (lhs), rhs));
+  SSA_NAME_DEF_STMT (lhs) = new_stmt;
 
   bsi = bsi_last (cond_bb);
-  bsi_insert_before (&bsi, new, BSI_NEW_STMT);
+  bsi_insert_before (&bsi, new_stmt, BSI_NEW_STMT);
 
   if (negate)
     {
       /* Get the right BSI.  We want to insert after the recently
 	 added ABS_EXPR statement (which we know is the first statement
 	 in the block.  */
-      new = build_gimple_modify_stmt (result,
-				      build1 (NEGATE_EXPR, TREE_TYPE (lhs),
-					      lhs));
-      SSA_NAME_DEF_STMT (result) = new;
+      new_stmt = build_gimple_modify_stmt (result,
+				           build1 (NEGATE_EXPR, TREE_TYPE (lhs),
+					           lhs));
+      SSA_NAME_DEF_STMT (result) = new_stmt;
 
-      bsi_insert_after (&bsi, new, BSI_NEW_STMT);
+      bsi_insert_after (&bsi, new_stmt, BSI_NEW_STMT);
     }
 
   replace_phi_edge_with_variable (cond_bb, e1, phi, result);