From d122681a3c4491cec5152d5c528005c1f5083e83 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 25 Jun 2014 18:55:46 +0200 Subject: IPA REF refactoring * Makefile.in: Removed header file (ipa-ref-inline.h). * cgraph.c (cgraph_turn_edge_to_speculative): New IPA REF function called. (cgraph_speculative_call_info): Likewise. (cgraph_for_node_thunks_and_aliases): Likewise. (cgraph_for_node_and_aliases): Likewise. (verify_cgraph_node): Likewise. * cgraph.h: Batch of IPA REF functions become member functions of symtab_node: add_reference, maybe_add_reference, clone_references, clone_referring, clone_reference, find_reference, remove_stmt_references, remove_all_references, remove_all_referring, dump_references, dump_referring, has_alias_p, iterate_reference, iterate_referring. * cgraphbuild.c (record_reference): New IPA REF function used. (record_type_list): Likewise. (record_eh_tables): Likewise. (mark_address): Likewise. (mark_load): Likewise. (mark_store): Likewise. (pass_build_cgraph_edges): Likewise. (rebuild_cgraph_edge): Likewise. (cgraph_rebuild_references): Likewise. (pass_remove_cgraph_callee_edges): Likewise. * cgraphclones.c (cgraph_clone_node): Likewise. (cgraph_create_virtual_clone): Likewise. (cgraph_materialize_clone): Likewise. (cgraph_materialize_all_clones): Likewise. * cgraphunit.c (cgraph_reset_node): Likewise. (cgraph_reset_node): Likewise. (analyze_function): Likewise. (assemble_thunks_and_aliases): Likewise. (expand_function): Likewise. * ipa-comdats.c (propagate_comdat_group): Likewise. (enqueue_references): Likewise. * ipa-cp.c (ipcp_discover_new_direct_edges): Likewise. (create_specialized_node): Likewise. * ipa-devirt.c (referenced_from_vtable_p): Likewise. * ipa-inline-transform.c (can_remove_node_now_p_1): Likewise. * ipa-inline.c (reset_edge_caches): Likewise. (update_caller_keys): Likewise. (execute): Likewise. * ipa-prop.c (remove_described_reference): Likewise. (propagate_controlled_uses): Likewise. (ipa_edge_duplication_hook): Likewise. (ipa_modify_call_arguments): Likewise. * ipa-pure-const.c (propagate_pure_const): Likewise. * ipa-ref-inline.h: Header file removed, functions moved to symtab_node class. * ipa-ref.c (remove_reference): New class member function. (cannot_lead_to_return): New class member function. (referring_ref_list): Likewise. (referred_ref_list): Likewise. Rest of functions moved to symtab_node class. * ipa-ref.h: New member functions remove_reference, cannot_lead_to_return, referring_ref_list, referred_ref_list added to ipa_ref class. ipa_ref_list class has new member functions: first_reference, first_referring, clear, nreferences. * ipa-reference.c (analyze_function): New IPA REF function used. (write_node_summary_p): Likewise. (ipa_reference_write_optimization_summary): Likewise. * ipa-split.c (split_function): Likewise. * ipa-utils.c (ipa_reverse_postorder): Likewise. * ipa-visibility.c (cgraph_non_local_node_p_1): Likewise. (function_and_variable_visibility): Likewise. * ipa.c (has_addr_references_p): Likewise. (process_references): Argument type changed. (symtab_remove_unreachable_nodes): New IPA REF function used. (process_references): Likewise. (set_writeonly_bit): Likewise. * lto-cgraph.c: Implementation of new symtab_node member functions that uses new IPA REF functions. * lto-streamer-in.c (fixup_call_stmt_edges_1): New IPA REF function used. * lto-streamer-out.c (output_symbol_p): Likewise. * lto-streamer.h (referenced_from_this_partition_p): Argument type changed. * lto/lto-partition.c (add_references_to_partition): New IPA REF function used. (add_symbol_to_partition_1): Likewise. (lto_balanced_map): Likewise. * lto/lto-symtab.c (lto_cgraph_replace_node): Likewise. * symtab.c: Implementation of new IPA REF API. * trans-mem.c (ipa_tm_create_version_alias): New IPA REF function used. (ipa_tm_create_version): Likewise. (ipa_tm_execute): Likewise. * tree-emutls.c (gen_emutls_addr): Likewise. * tree-inline.c (copy_bb): Likewise. (delete_unreachable_blocks_update_callgraph): Likewise. * varpool.c (varpool_remove_unreferenced_decls): Likewise. (varpool_for_node_and_aliases): Likewise. From-SVN: r211987 --- gcc/lto/lto-partition.c | 28 ++++++++++++++-------------- gcc/lto/lto-symtab.c | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'gcc/lto') diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c index 5a8c843..4d19ef6 100644 --- a/gcc/lto/lto-partition.c +++ b/gcc/lto/lto-partition.c @@ -86,10 +86,10 @@ static void add_references_to_partition (ltrans_partition part, symtab_node *node) { int i; - struct ipa_ref *ref; + struct ipa_ref *ref = NULL; /* Add all duplicated references to the partition. */ - for (i = 0; ipa_ref_list_reference_iterate (&node->ref_list, i, ref); i++) + for (i = 0; node->iterate_reference (i, ref); i++) if (symtab_get_symbol_partitioning_class (ref->referred) == SYMBOL_DUPLICATE) add_symbol_to_partition (part, ref->referred); /* References to a readonly variable may be constant foled into its value. @@ -114,7 +114,7 @@ add_symbol_to_partition_1 (ltrans_partition part, symtab_node *node) { enum symbol_partitioning_class c = symtab_get_symbol_partitioning_class (node); int i; - struct ipa_ref *ref; + struct ipa_ref *ref = NULL; symtab_node *node1; /* If NODE is already there, we have nothing to do. */ @@ -168,7 +168,7 @@ add_symbol_to_partition_1 (ltrans_partition part, symtab_node *node) add_references_to_partition (part, node); /* Add all aliases associated with the symbol. */ - for (i = 0; ipa_ref_list_referring_iterate (&node->ref_list, i, ref); i++) + for (i = 0; node->iterate_referring (i, ref); i++) if (ref->use == IPA_REF_ALIAS && !node->weakref) add_symbol_to_partition_1 (part, ref->referring); @@ -516,9 +516,9 @@ lto_balanced_map (int n_lto_partitions) it and thus we need to subtract it from COST. */ while (last_visited_node < lto_symtab_encoder_size (partition->encoder)) { - struct ipa_ref_list *refs; + symtab_node *refs_node; int j; - struct ipa_ref *ref; + struct ipa_ref *ref = NULL; symtab_node *snode = lto_symtab_encoder_deref (partition->encoder, last_visited_node); @@ -526,7 +526,7 @@ lto_balanced_map (int n_lto_partitions) { struct cgraph_edge *edge; - refs = &node->ref_list; + refs_node = node; last_visited_node++; @@ -570,18 +570,18 @@ lto_balanced_map (int n_lto_partitions) } else { - refs = &snode->ref_list; + refs_node = snode; last_visited_node++; } /* Compute boundary cost of IPA REF edges and at the same time look into variables referenced from current partition and try to add them. */ - for (j = 0; ipa_ref_list_reference_iterate (refs, j, ref); j++) + for (j = 0; refs_node->iterate_reference (j, ref); j++) if (is_a (ref->referred)) { int index; - vnode = ipa_ref_varpool_node (ref); + vnode = dyn_cast (ref->referred); if (!vnode->definition) continue; if (!symbol_partitioned_p (vnode) && flag_toplevel_reorder @@ -599,7 +599,7 @@ lto_balanced_map (int n_lto_partitions) { int index; - node = ipa_ref_node (ref); + node = dyn_cast (ref->referred); if (!node->definition) continue; index = lto_symtab_encoder_lookup (partition->encoder, @@ -610,12 +610,12 @@ lto_balanced_map (int n_lto_partitions) else cost++; } - for (j = 0; ipa_ref_list_referring_iterate (refs, j, ref); j++) + for (j = 0; refs_node->iterate_referring (j, ref); j++) if (is_a (ref->referring)) { int index; - vnode = ipa_ref_referring_varpool_node (ref); + vnode = dyn_cast (ref->referring); gcc_assert (vnode->definition); /* It is better to couple variables with their users, because it allows them to be removed. Coupling with objects they refer to only helps to reduce @@ -636,7 +636,7 @@ lto_balanced_map (int n_lto_partitions) { int index; - node = ipa_ref_referring_node (ref); + node = dyn_cast (ref->referring); gcc_assert (node->definition); index = lto_symtab_encoder_lookup (partition->encoder, node); diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c index c02f987..82ee827 100644 --- a/gcc/lto/lto-symtab.c +++ b/gcc/lto/lto-symtab.c @@ -84,7 +84,7 @@ lto_cgraph_replace_node (struct cgraph_node *node, e->call_stmt_cannot_inline_p = 1; } /* Redirect incomming references. */ - ipa_clone_referring (prevailing_node, &node->ref_list); + prevailing_node->clone_referring (node); ipa_merge_profiles (prevailing_node, node); lto_free_function_in_decl_state_for_node (node); @@ -106,7 +106,7 @@ lto_varpool_replace_node (varpool_node *vnode, gcc_assert (!vnode->definition || prevailing_node->definition); gcc_assert (!vnode->analyzed || prevailing_node->analyzed); - ipa_clone_referring (prevailing_node, &vnode->ref_list); + prevailing_node->clone_referring (vnode); if (vnode->force_output) prevailing_node->force_output = true; if (vnode->forced_by_abi) -- cgit v1.1