From 7153ca970bac312f5e52af870560669ffd438b3b Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Thu, 15 Nov 2012 00:03:22 +0100 Subject: [PATCH] re PR bootstrap/55051 (profiledbootstrap failed) PR bootstrap/55051 * ipa-inline.c (edge_badness): Improve dumping; fix overflow. From-SVN: r193512 --- gcc/ChangeLog | 5 +++++ gcc/ipa-inline.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f520ddcc7c3..109ad262df7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-11-14 Jan Hubicka + + PR bootstrap/55051 + * ipa-inline.c (edge_badness): Improve dumping; fix overflow. + 2012-11-14 Matthias Klose * config/sparc/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 9f792ff7aa9..dd25ae33908 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -850,9 +850,11 @@ edge_badness (struct cgraph_edge *edge, bool dump) if (dump) { - fprintf (dump_file, " Badness calculation for %s -> %s\n", + fprintf (dump_file, " Badness calculation for %s/%i -> %s/%i\n", xstrdup (cgraph_node_name (edge->caller)), - xstrdup (cgraph_node_name (callee))); + edge->caller->uid, + xstrdup (cgraph_node_name (callee)), + edge->callee->uid); fprintf (dump_file, " size growth %i, time %i ", growth, edge_time); @@ -917,7 +919,7 @@ edge_badness (struct cgraph_edge *edge, bool dump) { badness = (relative_time_benefit (callee_info, edge, edge_time) * (INT_MIN / 16 / RELATIVE_TIME_BENEFIT_RANGE)); - badness /= (growth * MAX (1, callee_info->growth)); + badness /= (MIN (65536/2, growth) * MIN (65536/2, MAX (1, callee_info->growth))); gcc_checking_assert (badness <=0 && badness >= INT_MIN / 16); if ((hints & (INLINE_HINT_indirect_call | INLINE_HINT_loop_iterations -- 2.11.4.GIT