Blame SOURCES/gcc48-rh1546372.patch

56d343
	* cif-code.def: Add NEVER_EXECUTED.
56d343
	* ipa-inline-analysis.c (reset_inline_summary,
56d343
	compute_inline_parameters, estimate_calls_size_and_time,
56d343
	inline_update_overall_summary): Track number of calls.
56d343
	(never_executed_edge_p): New predicate.
56d343
	* ipa-inline.c (want_inline_self_recursive_call_p): do not inline
56d343
	recursively for calls that are not going to be executed.
56d343
	(inline_small_functions): Do not inline never exeucted edge if callee
56d343
	has too many calls.
56d343
	* ipa-inline.h (inline_summary): Add num calls.
56d343
	(never_executed_edge_p): New.
56d343
56d343
--- gcc/cif-code.def	(revision 257016)
56d343
+++ gcc/cif-code.def	(working copy)
56d343
@@ -103,3 +103,6 @@ DEFCIFCODE(TARGET_OPTION_MISMATCH, N_("t
56d343
 
56d343
 /* We can't inline because of mismatched optimization levels.  */
56d343
 DEFCIFCODE(OPTIMIZATION_MISMATCH, N_("optimization level attribute mismatch"))
56d343
+
56d343
+/* We know that the call will be optimized out.  */
56d343
+DEFCIFCODE(NEVER_EXECUTED, N_("never executed"))
56d343
--- gcc/ipa-inline-analysis.c	(revision 257016)
56d343
+++ gcc/ipa-inline-analysis.c	(working copy)
56d343
@@ -990,6 +990,7 @@ reset_inline_summary (struct cgraph_node
56d343
   info->stack_frame_offset = 0;
56d343
   info->size = 0;
56d343
   info->time = 0;
56d343
+  info->num_calls = 0;
56d343
   info->growth = 0;
56d343
   info->scc_no = 0;
56d343
   if (info->loop_iterations)
56d343
@@ -2704,6 +2705,7 @@ compute_inline_parameters (struct cgraph
56d343
   /* Inlining characteristics are maintained by the cgraph_mark_inline.  */
56d343
   info->time = info->self_time;
56d343
   info->size = info->self_size;
56d343
+  info->num_calls = 0;
56d343
   info->stack_frame_offset = 0;
56d343
   info->estimated_stack_size = info->estimated_self_stack_size;
56d343
 #ifdef ENABLE_CHECKING
56d343
@@ -2816,7 +2818,7 @@ estimate_edge_size_and_time (struct cgra
56d343
 
56d343
 static void
56d343
 estimate_calls_size_and_time (struct cgraph_node *node, int *size, int *time,
56d343
-			      inline_hints *hints,
56d343
+			      inline_hints *hints, int *num,
56d343
 			      clause_t possible_truths,
56d343
 			      vec<tree> known_vals,
56d343
 			      vec<tree> known_binfos,
56d343
@@ -2826,6 +2828,7 @@ estimate_calls_size_and_time (struct cgr
56d343
   for (e = node->callees; e; e = e->next_callee)
56d343
     {
56d343
       struct inline_edge_summary *es = inline_edge_summary (e);
56d343
+      (*num)++;
56d343
       if (!es->predicate
56d343
 	  || evaluate_predicate (es->predicate, possible_truths))
56d343
 	{
56d343
@@ -2838,7 +2841,7 @@ estimate_calls_size_and_time (struct cgr
56d343
 					   known_aggs, hints);
56d343
 	    }
56d343
 	  else
56d343
-	    estimate_calls_size_and_time (e->callee, size, time, hints,
56d343
+	    estimate_calls_size_and_time (e->callee, size, time, hints, num,
56d343
 					  possible_truths,
56d343
 					  known_vals, known_binfos,
56d343
 					  known_aggs);
56d343
@@ -2846,6 +2849,7 @@ estimate_calls_size_and_time (struct cgr
56d343
     }
56d343
   for (e = node->indirect_calls; e; e = e->next_callee)
56d343
     {
56d343
+      (*num)++;
56d343
       struct inline_edge_summary *es = inline_edge_summary (e);
56d343
       if (!es->predicate
56d343
 	  || evaluate_predicate (es->predicate, possible_truths))
56d343
@@ -2936,7 +2940,8 @@ estimate_node_size_and_time (struct cgra
56d343
   if (DECL_DECLARED_INLINE_P (node->symbol.decl))
56d343
     hints |= INLINE_HINT_declared_inline;
56d343
 
56d343
-  estimate_calls_size_and_time (node, &size, &time, &hints, possible_truths,
56d343
+  int num = 0;
56d343
+  estimate_calls_size_and_time (node, &size, &time, &hints, &num, possible_truths,
56d343
 				known_vals, known_binfos, known_aggs);
56d343
   gcc_checking_assert (size >= 0);
56d343
   gcc_checking_assert (time >= 0);
56d343
@@ -3369,13 +3374,14 @@ inline_update_overall_summary (struct cg
56d343
 
56d343
   info->size = 0;
56d343
   info->time = 0;
56d343
+  info->num_calls = 0;
56d343
   for (i = 0; vec_safe_iterate (info->entry, i, &e); i++)
56d343
     {
56d343
       info->size += e->size, info->time += e->time;
56d343
       if (info->time > MAX_TIME * INLINE_TIME_SCALE)
56d343
 	info->time = MAX_TIME * INLINE_TIME_SCALE;
56d343
     }
56d343
-  estimate_calls_size_and_time (node, &info->size, &info->time, NULL,
56d343
+  estimate_calls_size_and_time (node, &info->size, &info->time, NULL, &info->num_calls,
56d343
 				~(clause_t) (1 << predicate_false_condition),
56d343
 				vNULL, vNULL, vNULL);
56d343
   info->time = (info->time + INLINE_TIME_SCALE / 2) / INLINE_TIME_SCALE;
56d343
@@ -3528,6 +3534,14 @@ do_estimate_edge_hints (struct cgraph_ed
56d343
   return hints;
56d343
 }
56d343
 
56d343
+/* Return true if edge is never executed.  */
56d343
+bool
56d343
+never_executed_edge_p (struct cgraph_edge *e)
56d343
+{
56d343
+ struct inline_edge_summary *es = inline_edge_summary (e);
56d343
+ return es->predicate && false_predicate_p (es->predicate);
56d343
+}
56d343
+
56d343
 
56d343
 /* Estimate self time of the function NODE after inlining EDGE.  */
56d343
 
56d343
--- gcc/ipa-inline.c	(revision 257016)
56d343
+++ gcc/ipa-inline.c	(working copy)
56d343
@@ -656,6 +656,11 @@ want_inline_self_recursive_call_p (struc
56d343
       reason = "--param max-inline-recursive-depth exceeded.";
56d343
       want_inline = false;
56d343
     }
56d343
+  else if (never_executed_edge_p (edge))
56d343
+    {
56d343
+      reason = "edge is never executed.";
56d343
+      want_inline = false;
56d343
+    }
56d343
 
56d343
   if (outer_node->global.inlined_to)
56d343
     caller_freq = outer_node->callers->frequency;
56d343
@@ -1597,6 +1602,14 @@ inline_small_functions (void)
56d343
 		outer_node = where, depth++;
56d343
 	      where = where->callers->caller;
56d343
 	    }
56d343
+	  if (never_executed_edge_p (edge)
56d343
+	      && inline_summary (edge->callee)->num_calls > 30)
56d343
+	    {
56d343
+	      if (dump_file)
56d343
+	        fprintf (dump_file, "Never executed edge\n");
56d343
+	      edge->inline_failed = CIF_NEVER_EXECUTED;
56d343
+	      continue;
56d343
+	    }
56d343
 	  if (outer_node
56d343
 	      && !want_inline_self_recursive_call_p (edge, outer_node,
56d343
 						     true, depth))
56d343
--- gcc/ipa-inline.h	(revision 257016)
56d343
+++ gcc/ipa-inline.h	(working copy)
56d343
@@ -132,6 +132,7 @@ struct GTY(()) inline_summary
56d343
   /* Estimated size of the function after inlining.  */
56d343
   int time;
56d343
   int size;
56d343
+  int num_calls;
56d343
 
56d343
   /* Conditional size/time information.  The summaries are being
56d343
      merged during inlining.  */
56d343
@@ -226,6 +227,7 @@ inline_hints do_estimate_edge_hints (str
56d343
 void initialize_growth_caches (void);
56d343
 void free_growth_caches (void);
56d343
 void compute_inline_parameters (struct cgraph_node *, bool);
56d343
+bool never_executed_edge_p (struct cgraph_edge *);
56d343
 
56d343
 /* In ipa-inline-transform.c  */
56d343
 bool inline_call (struct cgraph_edge *, bool, vec<cgraph_edge_p> *, int *, bool);
56d343