From 9c28689a9908c56fffcf7b1acd6dec3fb8a947e2 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Thu, 28 Nov 2019 18:51:40 +0100 Subject: [PATCH] Remove leftover optimize checks. * ipa-inline.c (want_early_inline_function_p): Remove leftover optimize checks. From-SVN: r278816 --- gcc/ChangeLog | 5 +++++ gcc/ipa-inline.c | 21 +++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b85bda2c02a..50b2278b272 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-11-28 Jan Hubicka + + * ipa-inline.c (want_early_inline_function_p): Remove leftover optimize + checks. + 2019-11-28 Jan Hubicka * profile-count.c (profile_count::combine_with_ipa_count): Return diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 08612e79eb0..c742a99bcd7 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -701,10 +701,8 @@ want_early_inline_function_p (struct cgraph_edge *e) if (dump_enabled_p ()) dump_printf_loc (MSG_MISSED_OPTIMIZATION, e->call_stmt, " will not early inline: %C->%C, " - "growth %i exceeds --param early-inlining-insns%s\n", - e->caller, callee, growth, - opt_for_fn (e->caller->decl, optimize) >= 3 - ? "" : "-O2"); + "growth %i exceeds --param early-inlining-insns\n", + e->caller, callee, growth); want_inline = false; } else if ((n = num_calls (callee)) != 0 @@ -713,11 +711,9 @@ want_early_inline_function_p (struct cgraph_edge *e) if (dump_enabled_p ()) dump_printf_loc (MSG_MISSED_OPTIMIZATION, e->call_stmt, " will not early inline: %C->%C, " - "growth %i exceeds --param early-inlining-insns%s " + "growth %i exceeds --param early-inlining-insns " "divided by number of calls\n", - e->caller, callee, growth, - opt_for_fn (e->caller->decl, optimize) >= 3 - ? "" : "-O2"); + e->caller, callee, growth); want_inline = false; } } @@ -861,12 +857,9 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) - ipa_call_summaries->get (e)->call_stmt_size > inline_insns_single (e->caller, true)) { - if (opt_for_fn (e->caller->decl, optimize) >= 3) - e->inline_failed = (DECL_DECLARED_INLINE_P (callee->decl) - ? CIF_MAX_INLINE_INSNS_SINGLE_LIMIT - : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); - else - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; + e->inline_failed = (DECL_DECLARED_INLINE_P (callee->decl) + ? CIF_MAX_INLINE_INSNS_SINGLE_LIMIT + : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); want_inline = false; } else -- 2.30.2