From 6971d714fe697f099327fcfac909497e1a7e906d Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 14 Mar 2006 09:57:43 +0000 Subject: [PATCH] re PR tree-optimization/26667 (Inlining always_inline functions causes further inlining that reduces function size to fail) 2006-03-14 Richard Guenther PR tree-optimization/26667 * ipa-inline.c (cgraph_check_inline_limits): Walk the correct node for the callees. Always allow inlining if it will shrink the function size. From-SVN: r112049 --- gcc/ChangeLog | 7 +++++++ gcc/ipa-inline.c | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 58b6eee21db..63d589b0e7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2006-03-14 Richard Guenther + + PR tree-optimization/26667 + * ipa-inline.c (cgraph_check_inline_limits): Walk the correct + node for the callees. Always allow inlining if it will shrink + the function size. + 2006-03-14 Richard Guenther PR middle-end/26659 diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 9ba2f109b3c..4765b00ac90 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -254,13 +254,13 @@ cgraph_check_inline_limits (struct cgraph_node *to, struct cgraph_node *what, int newsize; int limit; - if (to->global.inlined_to) - to = to->global.inlined_to; - for (e = to->callees; e; e = e->next_callee) if (e->callee == what) times++; + if (to->global.inlined_to) + to = to->global.inlined_to; + /* When inlining large function body called once into small function, take the inlined function as base for limiting the growth. */ if (to->local.self_insns > what->local.self_insns) @@ -270,8 +270,11 @@ cgraph_check_inline_limits (struct cgraph_node *to, struct cgraph_node *what, limit += limit * PARAM_VALUE (PARAM_LARGE_FUNCTION_GROWTH) / 100; + /* Check the size after inlining against the function limits. But allow + the function to shrink if it went over the limits by forced inlining. */ newsize = cgraph_estimate_size_after_inlining (times, to, what); - if (newsize > PARAM_VALUE (PARAM_LARGE_FUNCTION_INSNS) + if (newsize >= to->global.insns + && newsize > PARAM_VALUE (PARAM_LARGE_FUNCTION_INSNS) && newsize > limit) { if (reason) -- 2.30.2