diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2015-12-04 19:02:26 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2015-12-04 18:02:26 +0000 |
| commit | 88636b62bc7fae0ef7eaac6a22e5cd8107e69be8 (patch) | |
| tree | 1f9f6f9c155b3d1c4819fc258a6fabfc90f13049 /gcc/ipa-inline.c | |
| parent | c5404f1c2fc79761392acf49af2c46079d907756 (diff) | |
| download | gcc-88636b62bc7fae0ef7eaac6a22e5cd8107e69be8.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.
From-SVN: r231291
Diffstat (limited to 'gcc/ipa-inline.c')
| -rw-r--r-- | gcc/ipa-inline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 01bfe0effda..f2fd84ba66b 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -466,7 +466,7 @@ can_inline_edge_p (struct cgraph_edge *e, bool report, optimized with the optimization flags of module they are used in. Also do not care about mixing up size/speed optimization when DECL_DISREGARD_INLINE_LIMITS is set. */ - else if ((callee->merged + else if ((callee->merged_comdat && !lookup_attribute ("optimize", DECL_ATTRIBUTES (caller->decl))) || DECL_DISREGARD_INLINE_LIMITS (callee->decl)) |