* builtins.c (expand_builtin_profile_func): Avoid C++ keywords.

	* calls.c (avoid_likely_spilled_reg): Likewise.
	* cfgexpand.c (gimple_assign_rhs_to_tree): Likewise.
	* cgraph.c (cgraph_clone_edge, cgraph_clone_node): Likewise.
	* config/i386/i386.c (ix86_expand_special_args_builtin,
	ix86_secondary_reload): Likewise.
	* except.c (struct eh_region, gen_eh_region_catch,
	remove_unreachable_regions, duplicate_eh_regions,
	assign_filter_values, build_post_landing_pads,
	sjlj_find_directly_reachable_regions, remove_eh_handler,
	reachable_next_level, foreach_reachable_handler,
	can_throw_internal_1, can_throw_external_1,
	collect_one_action_chain): Likewise.
	* expr.c (expand_expr_real_1, vector_mode_valid_p): Likewise.
	* fold-const.c (twoval_comparison_p, eval_subst): Likewise.
	* function.c (update_temp_slot_address, instantiate_new_reg,
	instantiate_virtual_regs_in_rtx,
	instantiate_virtual_regs_in_insn): Likewise.
	* gimple.c (extract_ops_from_tree, gimple_seq_copy): Likewise.
	* gimplify.c (gimplify_call_expr, gimplify_init_constructor,
	gimplify_cleanup_point_expr): Likewise.
	* ipa-cp.c (ipcp_lattice_changed): Likewise.
	* passes.c (next_pass_1): Likewise.
	* print-tree.c (print_node_brief, print_node): Likewise.
	* profile.c (branch_prob): Likewise.
	* tree-dump.c (dump_register): Likewise.
	* tree-eh.c (replace_goto_queue_cond_clause, lower_catch):
	Likewise.
	* tree-inline.c (remap_ssa_name, remap_type_1, remap_blocks,
	copy_statement_list, remap_gimple_op_r, copy_tree_body_r,
	copy_edges_for_bb, copy_cfg_body, copy_tree_r,
	copy_arguments_for_versioning, copy_static_chain): Likewise.
	* tree-into-ssa.c (names_replaced_by, add_to_repl_tbl,
	add_new_name_mapping, register_new_name_mapping): Likewise.
	* tree-mudflap.c (mf_xform_derefs): Likewise.
	* tree-predcom.c (struct chain, dump_chain, replace_ref_with,
	get_init_expr, combine_chains): Likewise.
	* tree-pretty-print.c (dump_generic_node): Likewise.
	* tree-ssa-structalias.c (create_variable_info_for): Likewise.
	* tree-vrp.c (simplify_cond_using_ranges): Likewise.
	* tree.c (substitute_in_expr, iterative_hash_expr): Likewise.
	* value-prof.c (gimple_duplicate_stmt_histograms): Likewise.



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

1 files changed, 14 insertions, 14 deletions

diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index 140cbc54953..a8885e36d1a 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -480,18 +480,18 @@ replace_goto_queue_cond_clause (tree *tp, struct leh_tf_state *tf,
 				gimple_stmt_iterator *gsi)
 {
   tree label;
-  gimple_seq new;
+  gimple_seq new_seq;
   treemple temp;
 
   temp.tp = tp;
-  new = find_goto_replacement (tf, temp);
-  if (!new)
+  new_seq = find_goto_replacement (tf, temp);
+  if (!new_seq)
     return;
 
-  if (gimple_seq_singleton_p (new)
-      && gimple_code (gimple_seq_first_stmt (new)) == GIMPLE_GOTO)
+  if (gimple_seq_singleton_p (new_seq)
+      && gimple_code (gimple_seq_first_stmt (new_seq)) == GIMPLE_GOTO)
     {
-      *tp = gimple_goto_dest (gimple_seq_first_stmt (new));
+      *tp = gimple_goto_dest (gimple_seq_first_stmt (new_seq));
       return;
     }
 
@@ -500,7 +500,7 @@ replace_goto_queue_cond_clause (tree *tp, struct leh_tf_state *tf,
   *tp = label;
 
   gsi_insert_after (gsi, gimple_build_label (label), GSI_CONTINUE_LINKING);
-  gsi_insert_seq_after (gsi, gimple_seq_copy (new), GSI_CONTINUE_LINKING);
+  gsi_insert_seq_after (gsi, gimple_seq_copy (new_seq), GSI_CONTINUE_LINKING);
 }
 
 /* The real work of replace_goto_queue.  Returns with TSI updated to
@@ -1665,15 +1665,15 @@ lower_catch (struct leh_state *state, gimple tp)
     {
       struct eh_region *catch_region;
       tree eh_label;
-      gimple x, catch;
+      gimple x, gcatch;
 
-      catch = gsi_stmt (gsi);
+      gcatch = gsi_stmt (gsi);
       catch_region = gen_eh_region_catch (try_region,
-                                          gimple_catch_types (catch));
+                                          gimple_catch_types (gcatch));
 
       this_state.cur_region = catch_region;
       this_state.prev_try = state->prev_try;
-      lower_eh_constructs_1 (&this_state, gimple_catch_handler (catch));
+      lower_eh_constructs_1 (&this_state, gimple_catch_handler (gcatch));
 
       eh_label = create_artificial_label ();
       set_eh_region_tree_label (catch_region, eh_label);
@@ -1681,16 +1681,16 @@ lower_catch (struct leh_state *state, gimple tp)
       x = gimple_build_label (eh_label);
       gsi_insert_before (&gsi, x, GSI_SAME_STMT);
 
-      if (gimple_seq_may_fallthru (gimple_catch_handler (catch)))
+      if (gimple_seq_may_fallthru (gimple_catch_handler (gcatch)))
 	{
 	  if (!out_label)
 	    out_label = create_artificial_label ();
 
 	  x = gimple_build_goto (out_label);
-	  gimple_seq_add_stmt (gimple_catch_handler_ptr (catch), x);
+	  gimple_seq_add_stmt (gimple_catch_handler_ptr (gcatch), x);
 	}
 
-      gsi_insert_seq_before (&gsi, gimple_catch_handler (catch),
+      gsi_insert_seq_before (&gsi, gimple_catch_handler (gcatch),
 			     GSI_SAME_STMT);
       gsi_remove (&gsi, false);
     }