Partially revert ipa-inline caller_growth_limits

We need to revert one line of code change from r279942 due to
performance degression.

gcc/ChangeLog:

	2020-01-08  Luo Xiong Hu  <luoxhu@linux.ibm.com>

	PR middle-end/93189
	* ipa-inline.c (caller_growth_limits): Restore the AND.

From-SVN: r279986

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ca3b4d441369b8b728aab91521fb6fd7586e6874..44ae44c82609c5764ecf1b1db078f03e2a8b1d94 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-08  Luo Xiong Hu  <luoxhu@linux.ibm.com>
+
+       * ipa-inline.c (caller_growth_limits): Restore the AND.
+
 2020-01-07  Andrew Stubbs  <ams@codesourcery.com>
 
        * config/gcn/gcn-valu.md (VEC_1REG_INT_ALT): Delete iterator.

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;