diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2015-11-29 23:33:23 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2015-11-29 22:33:23 +0000 |
| commit | f1703a2e2b3fefa60a70e08f30be5fb4a7fd8b4f (patch) | |
| tree | b119bcfa394a1eeb2b5f120d0165f4e631cf136b /gcc/ipa-visibility.c | |
| parent | a4850ce9b58d12158248dc7fbe1015646757c813 (diff) | |
cgraph.c (cgraph_node::make_local): No name is unique during incremental linking.
* cgraph.c (cgraph_node::make_local): No name is unique during
incremental linking.
* cgraph.h (can_be_discarded_p): Update comment; also common and
WEAK in named sections can be discarded; when doing incremental
link do not rely on resolution being the final one.
* varasm.c (default_binds_local_p_3, decl_binds_to_current_def_p):
When symbol can be discarded, do not rely on resolution info.
* symtab.c (symtab_node::nonzero_address): Take into account that
symbol can be discarded.
* ipa-visibility.c (update_visibility_by_resolution_info): Handle
definition correctly.
(function_and_variable_visibility): Do not set unique_name when
incrementally linking.
From-SVN: r231050
Diffstat (limited to 'gcc/ipa-visibility.c')
| -rw-r--r-- | gcc/ipa-visibility.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/gcc/ipa-visibility.c b/gcc/ipa-visibility.c index 41ed4db6745..2eab214243e 100644 --- a/gcc/ipa-visibility.c +++ b/gcc/ipa-visibility.c @@ -413,10 +413,10 @@ update_visibility_by_resolution_info (symtab_node * node) DECL_WEAK (next->decl) = false; next->set_comdat_group (NULL); } - if (next->externally_visible - && !define) + if (!define) { - DECL_EXTERNAL (next->decl) = true; + if (next->externally_visible) + DECL_EXTERNAL (next->decl) = true; next->set_comdat_group (NULL); } } @@ -513,10 +513,10 @@ function_and_variable_visibility (bool whole_program) { gcc_assert (whole_program || in_lto_p || !TREE_PUBLIC (node->decl)); - node->unique_name = ((node->resolution == LDPR_PREVAILING_DEF_IRONLY - || node->unique_name - || node->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) - && TREE_PUBLIC (node->decl)); + node->unique_name |= ((node->resolution == LDPR_PREVAILING_DEF_IRONLY + || node->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) + && TREE_PUBLIC (node->decl) + && !flag_incremental_link); node->resolution = LDPR_PREVAILING_DEF_IRONLY; if (node->same_comdat_group && TREE_PUBLIC (node->decl)) { @@ -532,10 +532,10 @@ function_and_variable_visibility (bool whole_program) if (!next->alias) next->set_section (NULL); next->make_decl_local (); - next->unique_name = ((next->resolution == LDPR_PREVAILING_DEF_IRONLY - || next->unique_name - || next->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) - && TREE_PUBLIC (next->decl)); + next->unique_name |= ((next->resolution == LDPR_PREVAILING_DEF_IRONLY + || next->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) + && TREE_PUBLIC (next->decl) + && !flag_incremental_link); } /* cgraph_externally_visible_p has already checked all other nodes in the group and they will all be made local. We need to @@ -657,10 +657,11 @@ function_and_variable_visibility (bool whole_program) && !vnode->weakref) { gcc_assert (in_lto_p || whole_program || !TREE_PUBLIC (vnode->decl)); - vnode->unique_name = ((vnode->resolution == LDPR_PREVAILING_DEF_IRONLY - || vnode->resolution + vnode->unique_name |= ((vnode->resolution == LDPR_PREVAILING_DEF_IRONLY + || vnode->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) - && TREE_PUBLIC (vnode->decl)); + && TREE_PUBLIC (vnode->decl) + && !flag_incremental_link); if (vnode->same_comdat_group && TREE_PUBLIC (vnode->decl)) { symtab_node *next = vnode; @@ -675,10 +676,10 @@ function_and_variable_visibility (bool whole_program) if (!next->alias) next->set_section (NULL); next->make_decl_local (); - next->unique_name = ((next->resolution == LDPR_PREVAILING_DEF_IRONLY - || next->unique_name - || next->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) - && TREE_PUBLIC (next->decl)); + next->unique_name |= ((next->resolution == LDPR_PREVAILING_DEF_IRONLY + || next->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) + && TREE_PUBLIC (next->decl) + && !flag_incremental_link); } vnode->dissolve_same_comdat_group_list (); } |