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

ipa-inline-analysis.c (simple_edge_hints): Fix check for cross-module inlining.

Browse Source 
* ipa-inline-analysis.c (simple_edge_hints): Fix check for
	cross-module inlining.
	* cgraph.h (cgraph_node): Add flag merged.
	* ipa-icf.c (sem_function::merge): Maintain it.

	* lto-symtab.c (lto_cgraph_replace_node): Maintain merged flag.

From-SVN: r220372
This commit is contained in:
Jan Hubicka 2015-02-03 17:57:20 +01:00 committed by Jan Hubicka
parent 901e59b2bd
commit ebc8f0bb3a
6 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2015-02-03 Jan Hubicka <hubicka@ucw.cz>
* ipa-inline-analysis.c (simple_edge_hints): Fix check for
cross-module inlining.
* cgraph.h (cgraph_node): Add flag merged.
* ipa-icf.c (sem_function::merge): Maintain it.
2015-02-03 Richard Sandiford <richard.sandiford@arm.com>
* config/arm/arm.c (thumb2_reorg): Test UNARY_P and BINARY_P

2
gcc/cgraph.h
View File

@ -1296,6 +1296,8 @@ public:
other operation that could make previously non-trapping memory
accesses trapping. */
unsigned nonfreeing_fn : 1;
/* True if there was multiple COMDAT bodies merged by lto-symtab. */
unsigned merged : 1;
};
/* A cgraph node set is a collection of cgraph nodes. A cgraph node

12
gcc/ipa-icf.c
View File

@ -711,6 +711,10 @@ sem_function::merge (sem_item *alias_item)
}
alias->icf_merged = true;
if (local_original->lto_file_data
&& alias->lto_file_data
&& local_original->lto_file_data != alias->lto_file_data)
local_original->merged = true;
/* The alias function is removed if symbol address
does not matter. */
@ -725,6 +729,10 @@ sem_function::merge (sem_item *alias_item)
else if (create_alias)
{
alias->icf_merged = true;
if (local_original->lto_file_data
&& alias->lto_file_data
&& local_original->lto_file_data != alias->lto_file_data)
local_original->merged = true;
/* Remove the function's body. */
ipa_merge_profiles (original, alias);
@ -762,6 +770,10 @@ sem_function::merge (sem_item *alias_item)
}
alias->icf_merged = true;
if (local_original->lto_file_data
&& alias->lto_file_data
&& local_original->lto_file_data != alias->lto_file_data)
local_original->merged = true;
ipa_merge_profiles (local_original, alias, true);
alias->create_wrapper (local_original);

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

@ -3702,13 +3702,16 @@ simple_edge_hints (struct cgraph_edge *edge)
int hints = 0;
struct cgraph_node *to = (edge->caller->global.inlined_to
? edge->caller->global.inlined_to : edge->caller);
struct cgraph_node *callee = edge->callee->ultimate_alias_target ();
if (inline_summaries->get (to)->scc_no
&& inline_summaries->get (to)->scc_no == inline_summaries->get (edge->callee)->scc_no
&& inline_summaries->get (to)->scc_no
== inline_summaries->get (callee)->scc_no
&& !edge->recursive_p ())
hints |= INLINE_HINT_same_scc;
if (to->lto_file_data && edge->callee->lto_file_data
&& to->lto_file_data != edge->callee->lto_file_data)
if (callee->lto_file_data && edge->caller->lto_file_data
&& edge->caller->lto_file_data != callee->lto_file_data
&& !callee->merged)
hints |= INLINE_HINT_cross_module;
return hints;

4
gcc/lto/ChangeLog
View File

@ -1,3 +1,7 @@
2015-02-03 Jan Hubicka <hubicka@ucw.cz>
* lto-symtab.c (lto_cgraph_replace_node): Maintain merged flag.
2015-01-30 Joseph Myers <joseph@codesourcery.com>
* lto-object.c, lto-symtab.c, lto.c: All callers of fatal_error

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

@ -88,6 +88,8 @@ 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;
/* Redirect all incoming edges. */
compatible_p