diff options
| author | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-12-04 18:02:26 +0000 |
|---|---|---|
| committer | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-12-04 18:02:26 +0000 |
| commit | 7d38b7bc167046181fc8c3ce42d4a00db04e1c1d (patch) | |
| tree | 1f9f6f9c155b3d1c4819fc258a6fabfc90f13049 /gcc/ipa-inline-analysis.c | |
| parent | 99e82b02af9f161d5c291da873583e7398050b6a (diff) | |
| download | gcc-7d38b7bc167046181fc8c3ce42d4a00db04e1c1d.tar.gz | |
* ipa-inline.c (can_inline_edge_p) Use merged_comdat.
* cgraphclones.c (cgraph_node::create_clone): Use merged_comdat.
* cgraph.c (cgraph_node::dump): Dump merged_comdat.
* ipa-icf.c (sem_function::merge): Drop merged_comdat when merging
comdat and non-comdat.
* cgraph.h (cgraph_node): Rename merged to merged_comdat.
* ipa-inline-analysis.c (simple_edge_hints): Check both merged_comdat
and icf_merged.
* lto-symtab.c (lto_cgraph_replace_node): Update code computing
merged_comdat.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231291 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ipa-inline-analysis.c')
| -rw-r--r-- | gcc/ipa-inline-analysis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index cf7766b7d14..6392083d6be 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -3708,7 +3708,7 @@ simple_edge_hints (struct cgraph_edge *edge) if (callee->lto_file_data && edge->caller->lto_file_data && edge->caller->lto_file_data != callee->lto_file_data - && !callee->merged) + && !callee->merged_comdat && !callee->icf_merged) hints |= INLINE_HINT_cross_module; return hints; |