diff options
author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-06 15:57:09 +0000 |
---|---|---|
committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-06 15:57:09 +0000 |
commit | f4e36c337a3d5f2c1f558538fd2a489fd207938f (patch) | |
tree | bdfccfe6a5eaa20f5e70f9bb36ae6a07f0e85aa5 /gcc/cgraph.c | |
parent | 755ece1f7308998afbce633136284a1353675ced (diff) | |
download | gcc-f4e36c337a3d5f2c1f558538fd2a489fd207938f.tar.gz |
* 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
Diffstat (limited to 'gcc/cgraph.c')
-rw-r--r-- | gcc/cgraph.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/gcc/cgraph.c b/gcc/cgraph.c index b5564b679d4..37ad9f1606f 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -1159,25 +1159,25 @@ cgraph_clone_edge (struct cgraph_edge *e, struct cgraph_node *n, gimple call_stmt, gcov_type count_scale, int freq_scale, int loop_nest, bool update_original) { - struct cgraph_edge *new; + struct cgraph_edge *new_edge; gcov_type count = e->count * count_scale / REG_BR_PROB_BASE; gcov_type freq = e->frequency * (gcov_type) freq_scale / CGRAPH_FREQ_BASE; if (freq > CGRAPH_FREQ_MAX) freq = CGRAPH_FREQ_MAX; - new = cgraph_create_edge (n, e->callee, call_stmt, count, freq, + new_edge = cgraph_create_edge (n, e->callee, call_stmt, count, freq, e->loop_nest + loop_nest); - new->inline_failed = e->inline_failed; - new->indirect_call = e->indirect_call; + new_edge->inline_failed = e->inline_failed; + new_edge->indirect_call = e->indirect_call; if (update_original) { - e->count -= new->count; + e->count -= new_edge->count; if (e->count < 0) e->count = 0; } - cgraph_call_edge_duplication_hooks (e, new); - return new; + cgraph_call_edge_duplication_hooks (e, new_edge); + return new_edge; } /* Create node representing clone of N executed COUNT times. Decrease @@ -1190,25 +1190,25 @@ struct cgraph_node * cgraph_clone_node (struct cgraph_node *n, gcov_type count, int freq, int loop_nest, bool update_original) { - struct cgraph_node *new = cgraph_create_node (); + struct cgraph_node *new_node = cgraph_create_node (); struct cgraph_edge *e; gcov_type count_scale; - new->decl = n->decl; - new->origin = n->origin; - if (new->origin) + new_node->decl = n->decl; + new_node->origin = n->origin; + if (new_node->origin) { - new->next_nested = new->origin->nested; - new->origin->nested = new; + new_node->next_nested = new_node->origin->nested; + new_node->origin->nested = new_node; } - new->analyzed = n->analyzed; - new->local = n->local; - new->global = n->global; - new->rtl = n->rtl; - new->master_clone = n->master_clone; - new->count = count; + new_node->analyzed = n->analyzed; + new_node->local = n->local; + new_node->global = n->global; + new_node->rtl = n->rtl; + new_node->master_clone = n->master_clone; + new_node->count = count; if (n->count) - count_scale = new->count * REG_BR_PROB_BASE / n->count; + count_scale = new_node->count * REG_BR_PROB_BASE / n->count; else count_scale = 0; if (update_original) @@ -1219,17 +1219,17 @@ cgraph_clone_node (struct cgraph_node *n, gcov_type count, int freq, } for (e = n->callees;e; e=e->next_callee) - cgraph_clone_edge (e, new, e->call_stmt, count_scale, freq, loop_nest, + cgraph_clone_edge (e, new_node, e->call_stmt, count_scale, freq, loop_nest, update_original); - new->next_clone = n->next_clone; - new->prev_clone = n; - n->next_clone = new; - if (new->next_clone) - new->next_clone->prev_clone = new; + new_node->next_clone = n->next_clone; + new_node->prev_clone = n; + n->next_clone = new_node; + if (new_node->next_clone) + new_node->next_clone->prev_clone = new_node; - cgraph_call_node_duplication_hooks (n, new); - return new; + cgraph_call_node_duplication_hooks (n, new_node); + return new_node; } /* Return true if N is an master_clone, (see cgraph_master_clone). */ |