From afeb887562af17ea235fbec650ff6d16c412682a Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 14 Nov 2019 13:12:26 +0100 Subject: [PATCH] Remove usage of CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT. 2019-11-14 Martin Liska * ipa-inline.c (want_inline_small_function_p): Use CIF_MAX_INLINE_INSNS_AUTO_LIMIT instead of CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT. From-SVN: r278219 --- gcc/ChangeLog | 6 ++++++ gcc/ipa-inline.c | 14 ++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7af5644024b..348cc4107de 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-11-14 Martin Liska + + * ipa-inline.c (want_inline_small_function_p): Use + CIF_MAX_INLINE_INSNS_AUTO_LIMIT instead + of CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT. + 2019-11-14 Martin Liska * ipa-cp.c (devirtualization_time_bonus): Use opt_for_fn diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index effb59784a3..e27859ba5d3 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -820,10 +820,7 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) - ipa_call_summaries->get (e)->call_stmt_size > inline_insns_auto (e->caller, true)) { - if (opt_for_fn (e->caller->decl, optimize) >= 3) - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; - else - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_O2_LIMIT; + e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; want_inline = false; } else if ((DECL_DECLARED_INLINE_P (callee->decl) @@ -838,8 +835,8 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); else e->inline_failed = (DECL_DECLARED_INLINE_P (callee->decl) - ? CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT - : CIF_MAX_INLINE_INSNS_AUTO_O2_LIMIT); + ? CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT + : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); want_inline = false; } else @@ -893,10 +890,7 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) if (growth >= inline_insns_single (e->caller, false) || growth_positive_p (callee, e, growth)) { - if (opt_for_fn (e->caller->decl, optimize) >= 3) - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; - else - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_O2_LIMIT; + e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; want_inline = false; } } -- 2.30.2