diff options
Diffstat (limited to 'gcc/ipa-prop.c')
| -rw-r--r-- | gcc/ipa-prop.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index a4556f1a494..9632ea85b67 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -2897,7 +2897,7 @@ ipa_make_edge_direct_to_target (struct cgraph_edge *ie, tree target) "converting indirect call in %s to direct call to %s\n", ie->caller->name (), callee->name ()); } - ie = cgraph_make_edge_direct (ie, callee); + ie = ie->make_direct (callee); es = inline_edge_summary (ie); es->call_stmt_size -= (eni_size_weights.indirect_call_cost - eni_size_weights.call_cost); @@ -3510,8 +3510,10 @@ void ipa_set_node_agg_value_chain (struct cgraph_node *node, struct ipa_agg_replacement_value *aggvals) { - if (vec_safe_length (ipa_node_agg_replacements) <= (unsigned) cgraph_max_uid) - vec_safe_grow_cleared (ipa_node_agg_replacements, cgraph_max_uid + 1); + if (vec_safe_length (ipa_node_agg_replacements) + <= (unsigned) symtab->cgraph_max_uid) + vec_safe_grow_cleared (ipa_node_agg_replacements, + symtab->cgraph_max_uid + 1); (*ipa_node_agg_replacements)[node->uid] = aggvals; } @@ -3699,18 +3701,18 @@ ipa_register_cgraph_hooks (void) { if (!edge_removal_hook_holder) edge_removal_hook_holder = - cgraph_add_edge_removal_hook (&ipa_edge_removal_hook, NULL); + symtab->add_edge_removal_hook (&ipa_edge_removal_hook, NULL); if (!node_removal_hook_holder) node_removal_hook_holder = - cgraph_add_node_removal_hook (&ipa_node_removal_hook, NULL); + symtab->add_cgraph_removal_hook (&ipa_node_removal_hook, NULL); if (!edge_duplication_hook_holder) edge_duplication_hook_holder = - cgraph_add_edge_duplication_hook (&ipa_edge_duplication_hook, NULL); + symtab->add_edge_duplication_hook (&ipa_edge_duplication_hook, NULL); if (!node_duplication_hook_holder) node_duplication_hook_holder = - cgraph_add_node_duplication_hook (&ipa_node_duplication_hook, NULL); + symtab->add_cgraph_duplication_hook (&ipa_node_duplication_hook, NULL); function_insertion_hook_holder = - cgraph_add_function_insertion_hook (&ipa_add_new_function, NULL); + symtab->add_cgraph_insertion_hook (&ipa_add_new_function, NULL); } /* Unregister our cgraph hooks if they are not already there. */ @@ -3718,15 +3720,15 @@ ipa_register_cgraph_hooks (void) static void ipa_unregister_cgraph_hooks (void) { - cgraph_remove_edge_removal_hook (edge_removal_hook_holder); + symtab->remove_edge_removal_hook (edge_removal_hook_holder); edge_removal_hook_holder = NULL; - cgraph_remove_node_removal_hook (node_removal_hook_holder); + symtab->remove_cgraph_removal_hook (node_removal_hook_holder); node_removal_hook_holder = NULL; - cgraph_remove_edge_duplication_hook (edge_duplication_hook_holder); + symtab->remove_edge_duplication_hook (edge_duplication_hook_holder); edge_duplication_hook_holder = NULL; - cgraph_remove_node_duplication_hook (node_duplication_hook_holder); + symtab->remove_cgraph_duplication_hook (node_duplication_hook_holder); node_duplication_hook_holder = NULL; - cgraph_remove_function_insertion_hook (function_insertion_hook_holder); + symtab->remove_cgraph_insertion_hook (function_insertion_hook_holder); function_insertion_hook_holder = NULL; } @@ -4256,7 +4258,7 @@ ipa_modify_call_arguments (struct cgraph_edge *cs, gimple stmt, } gsi_replace (&gsi, new_stmt, true); if (cs) - cgraph_set_call_stmt (cs, new_stmt); + cs->set_call_stmt (new_stmt); do { current_node->record_stmt_references (gsi_stmt (gsi)); |