OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* 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
This commit is contained in:
Jan Hubicka 2015-12-04 19:02:26 +01:00 committed by Jan Hubicka
parent c5404f1c2f
commit 88636b62bc
9 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2015-12-04 Jan Hubicka <hubicka@ucw.cz>
* 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.
2015-12-04 Paolo Bonzini <bonzini@gnu.org>
* c-family/c-common.c (maybe_warn_shift_overflow): Warn on all

2
gcc/cgraph.c
View File

@ -1994,6 +1994,8 @@ cgraph_node::dump (FILE *f)
fprintf (f, " tm_clone");
if (icf_merged)
fprintf (f, " icf_merged");
if (merged_comdat)
fprintf (f, " merged_comdat");
if (nonfreeing_fn)
fprintf (f, " nonfreeing_fn");
if (DECL_STATIC_CONSTRUCTOR (decl))

2
gcc/cgraph.h
View File

@ -1333,7 +1333,7 @@ public:
accesses trapping. */
unsigned nonfreeing_fn : 1;
/* True if there was multiple COMDAT bodies merged by lto-symtab. */
unsigned merged : 1;
unsigned merged_comdat : 1;
/* True if function was created to be executed in parallel. */
unsigned parallelized_function : 1;
/* True if function is part split out by ipa-split. */

2
gcc/cgraphclones.c
View File

@ -433,7 +433,7 @@ cgraph_node::create_clone (tree new_decl, gcov_type gcov_count, int freq,
new_node->tp_first_run = tp_first_run;
new_node->tm_clone = tm_clone;
new_node->icf_merged = icf_merged;
new_node->merged = merged;
new_node->merged_comdat = merged_comdat;
new_node->clone.tree_map = NULL;
new_node->clone.args_to_skip = args_to_skip;

13
gcc/ipa-icf.c
View File

@ -1352,10 +1352,15 @@ sem_function::merge (sem_item *alias_item)
gcc_assert (alias->icf_merged || remove || redirect_callers);
original->icf_merged = true;
/* Inform the inliner about cross-module merging. */
if ((original->lto_file_data || alias->lto_file_data)
&& original->lto_file_data != alias->lto_file_data)
local_original->merged = original->merged = true;
/* We use merged flag to track cases where COMDAT function is known to be
compatible its callers. If we merged in non-COMDAT, we need to give up
on this optimization. */
if (original->merged_comdat && !alias->merged_comdat)
{
if (dump_file)
fprintf (dump_file, "Dropping merged_comdat flag.\n\n");
local_original->merged_comdat = original->merged_comdat = false;
}
if (remove)
{

2
gcc/ipa-inline-analysis.c
View File

@ -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;

2
gcc/ipa-inline.c
View File

@ -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))

5
gcc/lto/ChangeLog
View File

@ -1,3 +1,8 @@
2015-12-04 Jan Hubicka <hubicka@ucw.cz>
* lto-symtab.c (lto_cgraph_replace_node): Update code computing
merged_comdat.
2015-12-01 Jan Hubicka <hubicka@ucw.cz>
* lto.c (compare_tree_sccs_1): Do not compare TYPE_ALIAS_SET.

5
gcc/lto/lto-symtab.c
View File

@ -63,8 +63,9 @@ lto_cgraph_replace_node (struct cgraph_node *node,
gcc_assert (!prevailing_node->global.inlined_to);
prevailing_node->mark_address_taken ();
}
if (node->definition && prevailing_node->definition)
prevailing_node->merged = true;
if (node->definition && prevailing_node->definition
&& DECL_COMDAT (node->decl) && DECL_COMDAT (prevailing_node->decl))
prevailing_node->merged_comdat = true;
/* Redirect all incoming edges. */
compatible_p