From: Jan Hubicka <hubicka@ucw.cz>
Date: Fri, 15 Nov 2019 17:13:21 +0000 (+0100)
Subject: ipa-inline.c (edge_badness, [...]): Revert accidental commit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03f00a6d0da20646b989d4bb865b87c337a52c8e;p=gcc.git

ipa-inline.c (edge_badness, [...]): Revert accidental commit.


	* ipa-inline.c (edge_badness, inline_small_functions): Revert
	accidental commit.

From-SVN: r278307
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fcc4f7bd285..3eb468cbd35 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-15  Jan Hubicka  <hubicka@ucw.cz>
+
+	* ipa-inline.c (edge_badness, inline_small_functions): Revert
+	accidental commit.
+
 2019-11-15  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	* config/gcn/gcn.h (FIXED_REGISTERS): Unfix frame pointer.
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 55e3c5ce15a..7fcb2008172 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1163,7 +1163,6 @@ edge_badness (struct cgraph_edge *edge, bool dump)
 
       overall_growth = callee_info->growth;
 
-#if 1
       /* Look for inliner wrappers of the form:
 
 	 inline_caller ()
@@ -1215,7 +1214,6 @@ edge_badness (struct cgraph_edge *edge, bool dump)
 	      overall_growth = caller_growth;
 	    }
 	}
-#endif
       if (overall_growth > 0)
         {
 	  /* Strongly preffer functions with few callers that can be inlined
@@ -2137,23 +2135,12 @@ inline_small_functions (void)
 	    fprintf (dump_file, " Peeling recursion with depth %i\n", depth);
 
 	  gcc_checking_assert (!callee->inlined_to);
-
-	  int old_size = ipa_size_summaries->get (where)->size;
-	  sreal old_time = ipa_fn_summaries->get (where)->time;
-
 	  inline_call (edge, true, &new_indirect_edges, &overall_size, true);
 	  add_new_edges_to_heap (&edge_heap, new_indirect_edges);
 
 	  reset_edge_caches (edge->callee);
 
-	  /* If caller's size and time increased we do not need to update
-	     all edges becuase badness is not going to decrease.  */
-	  if (old_size <= ipa_size_summaries->get (where)->size
-	      && old_time <= ipa_fn_summaries->get (where)->time
-	      && 0)
-	    update_callee_keys (&edge_heap, edge->callee, updated_nodes);
-	  else
-	    update_callee_keys (&edge_heap, where, updated_nodes);
+	  update_callee_keys (&edge_heap, where, updated_nodes);
 	}
       where = edge->caller;
       if (where->inlined_to)