diff options
| author | Martin Liska <mliska@suse.cz> | 2019-11-14 13:12:26 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-11-14 12:12:26 +0000 |
| commit | afeb887562af17ea235fbec650ff6d16c412682a (patch) | |
| tree | 9d19f5c4748bbee7c0a6c04e61225f7ec880065d /gcc | |
| parent | 78a502caec5371cf5d107c3a6cf944bac0aaeb7c (diff) | |
| download | gcc-afeb887562af17ea235fbec650ff6d16c412682a.zip gcc-afeb887562af17ea235fbec650ff6d16c412682a.tar.gz gcc-afeb887562af17ea235fbec650ff6d16c412682a.tar.bz2 | |
Remove usage of CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT.
2019-11-14 Martin Liska <mliska@suse.cz>
* ipa-inline.c (want_inline_small_function_p): Use
CIF_MAX_INLINE_INSNS_AUTO_LIMIT instead
of CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT.
From-SVN: r278219
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-inline.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7af5644..348cc41 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2019-11-14 Martin Liska <mliska@suse.cz> + * ipa-inline.c (want_inline_small_function_p): Use + CIF_MAX_INLINE_INSNS_AUTO_LIMIT instead + of CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT. + +2019-11-14 Martin Liska <mliska@suse.cz> + * ipa-cp.c (devirtualization_time_bonus): Use opt_for_fn of a callee to get value of the param. * ipa-inline.c (inline_insns_auto): Use proper diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index effb597..e27859b 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -820,10 +820,7 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) - ipa_call_summaries->get (e)->call_stmt_size > inline_insns_auto (e->caller, true)) { - if (opt_for_fn (e->caller->decl, optimize) >= 3) - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; - else - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_O2_LIMIT; + e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; want_inline = false; } else if ((DECL_DECLARED_INLINE_P (callee->decl) @@ -838,8 +835,8 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); else e->inline_failed = (DECL_DECLARED_INLINE_P (callee->decl) - ? CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT - : CIF_MAX_INLINE_INSNS_AUTO_O2_LIMIT); + ? CIF_MAX_INLINE_INSNS_SINGLE_O2_LIMIT + : CIF_MAX_INLINE_INSNS_AUTO_LIMIT); want_inline = false; } else @@ -893,10 +890,7 @@ want_inline_small_function_p (struct cgraph_edge *e, bool report) if (growth >= inline_insns_single (e->caller, false) || growth_positive_p (callee, e, growth)) { - if (opt_for_fn (e->caller->decl, optimize) >= 3) - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; - else - e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_O2_LIMIT; + e->inline_failed = CIF_MAX_INLINE_INSNS_AUTO_LIMIT; want_inline = false; } } |