From 2942c502ee147819b7e57dca78f7a2cf4831279f Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Thu, 29 Apr 2010 09:10:38 +0200 Subject: * lto-symtab.c (lto_symtab_entry_def) Add vnode. (lto_varpool_replace_node): New. (lto_symtab_resolve_symbols): Resolve varpool nodes. (lto_symtab_merge_decls_1): Prefer decls with varpool node. (lto_symtab_merge_cgraph_nodes_1): Merge varpools. * cgraph.h (varpool_node_ptr): New type. (varpool_node_ptr): New vector. (varpool_node_set_def): New structure. (varpool_node_set): New type. (varpool_node_set): New vector. (varpool_node_set_element_def): New structure. (varpool_node_set_element, const_varpool_node_set_element): New types. (varpool_node_set_iterator): New type. (varpool_node): Add prev pointers, add used_from_other_partition, in_other_partition. (varpool_node_set_new, varpool_node_set_find, varpool_node_set_add, varpool_node_set_remove, dump_varpool_node_set, debug_varpool_node_set, varpool_get_node, varpool_remove_node): Declare. (vsi_end_p, vsi_next, vsi_node, vsi_start, varpool_node_in_set_p, varpool_node_set_size): New inlines. * cgraph.c (dump_cgraph_node): Dump asm names of aliases. * tree-pass.h (varpool_node_set_def): Forward declare. (ipa_opt_pass_d): Summary writting takes vnode sets too. (ipa_write_optimization_summaries): Update prototype. * ipa-cp.c (ipcp_write_summary): Update. * ipa-reference.c (ipa_reference_write_summary): Update. * lto-cgraph.c (lto_output_varpool_node): New static function. (output_varpool): New function. (input_varpool_node): New static function. (input_varpool_1): New function. (input_cgraph): Input varpool. * ipa-pure-const.c (pure_const_write_summary): Update. * lto-streamer-out.c (lto_output): Update, output varpool too. (write_global_stream): Kill WPA hack. (produce_asm_for_decls): Update. (output_alias_pair_p): Handle variables. (output_unreferenced_globals): Output only needed partition of varpool. * ipa-inline.c (inline_write_summary): Update. * lto-streamer-in.c (lto_input_tree_ref, lto_input_tree): Do not build cgraph. * lto-section-in.c (lto_section_name): Add varpool and jump funcs. * ipa.c (hash_varpool_node_set_element, eq_varpool_node_set_element, varpool_node_set_new, varpool_node_set_add, varpool_node_set_remove, varpool_node_set_find, dump_varpool_node_set, debug_varpool_node_set): New functions. * passes.c (rest_of_decl_compilation): when in LTO do not finalize. (execute_one_pass): Process new decls too. (ipa_write_summaries_2): Pass around vsets. (ipa_write_summaries_1): Likewise. (ipa_write_summaries): Build vset; be more selective about cgraph nodes to add. (ipa_write_optimization_summaries_1): Pass around vsets. (ipa_write_optimization_summaries): Likewise. * varpool.c (varpool_get_node): New. (varpool_node): Update doubly linked lists. (varpool_remove_node): New. (dump_varpool_node): More dumping. (varpool_enqueue_needed_node): Update doubly linked lists. (decide_is_variable_needed): Kill ltrans hack. (varpool_finalize_decl): Kill lto hack. (varpool_assemble_decl): Skip decls in other partitions. (varpool_assemble_pending_decls): Update doubly linkes lists. (varpool_empty_needed_queue): Likewise. (varpool_extra_name_alias): Likewise. * lto-streamer.c (lto_get_section_name): Add vars section. * lto-streamer.h (lto_section_type): Update. (output_varpool, input_varpool): Declare. * lto.c (lto_varpool_node_sets): New. (lto_1_to_1_map): Partition varpool too. (globalize_context_t, globalize_cross_file_statics, lto_scan_statics_in_ref_table, lto_scan_statics_in_cgraph_node, lto_scan_statics_in_remaining_global_vars): Remove. (lto_promote_cross_file_statics): Rewrite. (get_filename_for_set): Take vset argument. (lto_wpa_write_files): Pass around vsets. From-SVN: r158854 --- gcc/lto-symtab.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) (limited to 'gcc/lto-symtab.c') diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c index 79eb3e4..a35d82f 100644 --- a/gcc/lto-symtab.c +++ b/gcc/lto-symtab.c @@ -44,6 +44,9 @@ struct GTY(()) lto_symtab_entry_def /* The cgraph node if decl is a function decl. Filled in during the merging process. */ struct cgraph_node *node; + /* The varpool node if decl is a variable decl. Filled in during the + merging process. */ + struct varpool_node *vnode; /* LTO file-data and symbol resolution for this decl. */ struct lto_file_decl_data * GTY((skip (""))) file_data; enum ld_plugin_symbol_resolution resolution; @@ -244,6 +247,26 @@ lto_cgraph_replace_node (struct cgraph_node *node, cgraph_remove_node (node); } +/* Replace the cgraph node NODE with PREVAILING_NODE in the cgraph, merging + all edges and removing the old node. */ + +static void +lto_varpool_replace_node (struct varpool_node *vnode, + struct varpool_node *prevailing_node) +{ + /* Merge node flags. */ + if (vnode->needed) + { + gcc_assert (prevailing_node->analyzed); + varpool_mark_needed_node (prevailing_node); + } + gcc_assert (!vnode->finalized || prevailing_node->finalized); + gcc_assert (!vnode->analyzed || prevailing_node->analyzed); + + /* Finally remove the replaced node. */ + varpool_remove_node (vnode); +} + /* Merge two variable or function symbol table entries PREVAILING and ENTRY. Return false if the symbols are not fully compatible and a diagnostic should be emitted. */ @@ -406,6 +429,8 @@ lto_symtab_resolve_symbols (void **slot) { if (TREE_CODE (e->decl) == FUNCTION_DECL) e->node = cgraph_get_node (e->decl); + else if (TREE_CODE (e->decl) == VAR_DECL) + e->vnode = varpool_get_node (e->decl); } e = (lto_symtab_entry_t) *slot; @@ -559,6 +584,10 @@ lto_symtab_merge_decls_1 (void **slot, void *data ATTRIBUTE_UNUSED) while (!prevailing->node && prevailing->next) prevailing = prevailing->next; + if (TREE_CODE (prevailing->decl) == VAR_DECL) + while (!prevailing->vnode + && prevailing->next) + prevailing = prevailing->next; /* We do not stream varpool nodes, so the first decl has to be good enough for now. ??? For QOI choose a variable with readonly initializer @@ -625,7 +654,8 @@ lto_symtab_merge_decls_1 (void **slot, void *data ATTRIBUTE_UNUSED) lto_symtab_merge_decls_2 (slot); /* Drop all but the prevailing decl from the symtab. */ - if (TREE_CODE (prevailing->decl) != FUNCTION_DECL) + if (TREE_CODE (prevailing->decl) != FUNCTION_DECL + && TREE_CODE (prevailing->decl) != VAR_DECL) prevailing->next = NULL; return 1; @@ -650,8 +680,6 @@ lto_symtab_merge_cgraph_nodes_1 (void **slot, void *data ATTRIBUTE_UNUSED) if (!prevailing->next) return 1; - gcc_assert (TREE_CODE (prevailing->decl) == FUNCTION_DECL); - /* Replace the cgraph node of each entry with the prevailing one. */ for (e = prevailing->next; e; e = e->next) { @@ -672,6 +700,8 @@ lto_symtab_merge_cgraph_nodes_1 (void **slot, void *data ATTRIBUTE_UNUSED) } lto_cgraph_replace_node (e->node, prevailing->node); } + if (e->vnode != NULL) + lto_varpool_replace_node (e->vnode, prevailing->vnode); } /* Drop all but the prevailing decl from the symtab. */ -- cgit v1.1