Remove leftover optimize checks.

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

From-SVN: r278816

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b85bda2c02a44beb4e219ecd64bd2d3d5d9c880b..50b2278b2729d4a0117d19bf5da2def6562a80e5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 08612e79eb09c6314e0071313cad5102d234e0c2..c742a99bcd7f0edd45cbc1714f596bd6976f3268 100644 (file)
--- 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