Fix leftover optimize checks

Message ID 20191128175416.7n5qyohxedddjcpk@kam.mff.cuni.cz
State New
Headers show
Series
  • Fix leftover optimize checks
Related show

Commit Message

Jan Hubicka Nov. 28, 2019, 5:54 p.m.
Hi,
these optimize flag checks was forgotten after the params conversion.

Comitted as obvious.
Honza

	* ipa-inline.c (want_early_inline_function_p): Remove leftover optimize
	checks.

Patch

Index: ipa-inline.c
===================================================================
--- ipa-inline.c	(revision 278778)
+++ ipa-inline.c	(working copy)
@@ -701,10 +701,8 @@  want_early_inline_function_p (struct cgr
 	  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 cgr
 	  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 cgr
 		- 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