aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2019-11-28 17:51:40 +0000
committerJan Hubicka <hubicka@ucw.cz>2019-11-28 17:51:40 +0000
commit72dd2ee4a081c3681fa8985be4bf42539ac7f7be (patch)
tree3b335bf7ed2cbd136366f31094ae0dbe8a57db5c
parent59b9aeafed439cacf859f7cad873057fcce79232 (diff)
Remove leftover optimize checks.
* ipa-inline.c (want_early_inline_function_p): Remove leftover optimize checks. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@278816 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ipa-inline.c21
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,5 +1,10 @@
2019-11-28 Jan Hubicka <hubicka@ucw.cz>
+ * ipa-inline.c (want_early_inline_function_p): Remove leftover optimize
+ checks.
+
+2019-11-28 Jan Hubicka <hubicka@ucw.cz>
+
* profile-count.c (profile_count::combine_with_ipa_count): Return
uninitialized count if called on ininitialized count.
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