Revert a patch from luoxhu@linux.ibm.com

From-SVN: r279971

diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 8b400fff65aedbe1dcc1396223086944c6e0972a..eb42caeb7aeb3f26cc250efc215df5629c966a45 100644 (file)
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -462,7 +462,7 @@ offline_size (struct cgraph_node *node, ipa_size_summary *info)
   return 0;
 }
 
-/* Estimate the growth caused by inlining NODE into all callers.  */
+/* Estimate the growth caused by inlining NODE into all callees.  */
 
 int
 estimate_growth (struct cgraph_node *node)

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 302badf1fcae6437fee3e168fd39aebb267f7e8c..3b68fc47d013d73a9ab1127bbb8b724813bfac42 100644 (file)
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -184,8 +184,8 @@ caller_growth_limits (struct cgraph_edge *e)
      the function to shrink if it went over the limits by forced inlining.  */
   newsize = estimate_size_after_inlining (to, e);
   if (newsize >= ipa_size_summaries->get (what)->size
-      && (newsize > opt_for_fn (to->decl, param_large_function_insns)
-         || newsize > limit))
+      && newsize > opt_for_fn (to->decl, param_large_function_insns)
+      && newsize > limit)
     {
       e->inline_failed = CIF_LARGE_FUNCTION_GROWTH_LIMIT;
       return false;