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

tree-inline.c (tree_inlinable_function_p): Do not test DECL_REPLACEABLE_P.

Browse Source 
* tree-inline.c (tree_inlinable_function_p): Do not test DECL_REPLACEABLE_P.
	* ipa-inline.c (cgraph_default_inline_p, update_caller_keys, update_callee_keys,
	cgraph_decide_inlining): Test function availability.
	* cif-code.def (OVERWRITABLE): New code.

From-SVN: r163972
This commit is contained in:
Jan Hubicka 2010-09-07 23:26:34 +02:00 committed by Jan Hubicka
parent a0766cdbb9
commit f27e50db1a
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2010-09-07 Jan Hubicka <jh@suse.cz>
* tree-inline.c (tree_inlinable_function_p): Do not test DECL_REPLACEABLE_P.
* ipa-inline.c (cgraph_default_inline_p, update_caller_keys, update_callee_keys,
cgraph_decide_inlining): Test function availability.
* cif-code.def (OVERWRITABLE): New code.
2010-09-07 H.J. Lu <hjl.tools@gmail.com>
Jack Howarth <howarth@bromo.med.uc.edu>

2
gcc/cif-code.def
View File

@ -88,3 +88,5 @@ DEFCIFCODE(ORIGINALLY_INDIRECT_CALL,
/* Ths edge represents an indirect edge with a yet-undetermined callee . */
DEFCIFCODE(INDIRECT_UNKNOWN_CALL,
N_("indirect function call with a yet undetermined callee"))
DEFCIFCODE(OVERWRITABLE, N_("function body can be overwriten at linktime"))

11
gcc/ipa-inline.c
View File

@ -480,13 +480,19 @@ cgraph_default_inline_p (struct cgraph_node *n, cgraph_inline_failed_t *reason)
*reason = CIF_FUNCTION_NOT_INLINE_CANDIDATE;
return false;
}
if (!n->analyzed)
{
if (reason)
*reason = CIF_BODY_NOT_AVAILABLE;
return false;
}
if (cgraph_function_body_availability (n) <= AVAIL_OVERWRITABLE)
{
if (reason)
*reason = CIF_OVERWRITABLE;
return false;
}
if (DECL_DECLARED_INLINE_P (decl))
{
@ -697,6 +703,7 @@ update_caller_keys (fibheap_t heap, struct cgraph_node *node,
cgraph_inline_failed_t failed_reason;
if (!node->local.inlinable
|| cgraph_function_body_availability (node) <= AVAIL_OVERWRITABLE
|| node->global.inlined_to)
return;
if (!bitmap_set_bit (updated_nodes, node->uid))
@ -749,6 +756,7 @@ update_callee_keys (fibheap_t heap, struct cgraph_node *node,
{
if (e->inline_failed
&& e->callee->local.inlinable
&& cgraph_function_body_availability (e->callee) >= AVAIL_AVAILABLE
&& !bitmap_bit_p (updated_nodes, e->callee->uid))
{
node->global.estimated_growth = INT_MIN;
@ -1499,6 +1507,7 @@ cgraph_decide_inlining (void)
&& !node->callers->next_caller
&& cgraph_will_be_removed_from_program_if_no_direct_calls (node)
&& node->local.inlinable
&& cgraph_function_body_availability (node) >= AVAIL_AVAILABLE
&& node->callers->inline_failed
&& node->callers->caller != node
&& node->callers->caller->global.inlined_to != node

6
gcc/tree-inline.c
View File

@ -3197,12 +3197,6 @@ tree_inlinable_function_p (tree fn)
inlinable = false;
}
/* Don't auto-inline anything that might not be bound within
this unit of translation. */
else if (!DECL_DECLARED_INLINE_P (fn)
&& DECL_REPLACEABLE_P (fn))
inlinable = false;
else if (!function_attribute_inlinable_p (fn))
{
if (do_warning)