From: Jan Hubicka Date: Sun, 23 Oct 2011 14:30:24 +0000 (+0200) Subject: * ipa-inline.c (estimate_badness): Scale up and handle overflows. X-Git-Tag: releases/gcc-4.7.0~2893 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d621a5fb6d9bd91e30e96ba9ee60ac8ec1350ee1;p=thirdparty%2Fgcc.git * ipa-inline.c (estimate_badness): Scale up and handle overflows. From-SVN: r180336 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82105b415105..2602f76c41fe 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2011-10-23 Jan Hubicka + + * ipa-inline.c (estimate_badness): Scale up and handle overflows. + 2011-10-23 Uros Bizjak PR target/50788 diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index f53f00174a8f..662c6b3cb5db 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -822,8 +822,10 @@ edge_badness (struct cgraph_edge *edge, bool dump) /* Result must be integer in range 0...INT_MAX. Set the base of fixed point calculation so we don't lose much of precision for small bandesses (those are interesting) yet we don't - overflow for growths that are still in interesting range. */ - badness = ((gcov_type)growth) * (1<<18); + overflow for growths that are still in interesting range. + + Fixed point arithmetic with point at 8th bit. */ + badness = ((gcov_type)growth) * (1<<(19+8)); badness = (badness + div / 2) / div; /* Overall growth of inlining all calls of function matters: we want to @@ -838,10 +840,14 @@ edge_badness (struct cgraph_edge *edge, bool dump) We might mix the valud into the fraction by taking into account relative growth of the unit, but for now just add the number into resulting fraction. */ + if (badness > INT_MAX / 2) + { + badness = INT_MAX / 2; + if (dump) + fprintf (dump_file, "Badness overflow\n"); + } growth_for_all = estimate_growth (callee); badness += growth_for_all; - if (badness > INT_MAX - 1) - badness = INT_MAX - 1; if (dump) { fprintf (dump_file,