From a5c3d18c25527d20882a575274f2a06a73f54863 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Tue, 13 Dec 2011 12:54:57 +0000 Subject: [PATCH] re PR tree-optimization/51519 (ICE: in inline_small_functions, at ipa-inline.c:1410 with -O -fno-guess-branch-probability -findirect-inlining) 2011-12-13 Richard Guenther PR tree-optimization/51519 * ipa-inline.c (edge_badness): Use edge growth in non-guessed branch probability case as well. * gcc.dg/pr51519.c: New testcase. From-SVN: r182279 --- gcc/ChangeLog | 6 ++++++ gcc/ipa-inline.c | 2 +- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr51519.c | 39 ++++++++++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/pr51519.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index efb53022981..df45f4448c4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-12-13 Richard Guenther + + PR tree-optimization/51519 + * ipa-inline.c (edge_badness): Use edge growth in non-guessed + branch probability case as well. + 2011-12-13 Revital Eres * modulo-sched.c (mark_loop_unsched): Free bbs. diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 3cb35e924c1..14bd89a67bc 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -861,7 +861,7 @@ edge_badness (struct cgraph_edge *edge, bool dump) else { int nest = MIN (inline_edge_summary (edge)->loop_depth, 8); - badness = estimate_growth (callee) * 256; + badness = growth * 256; /* Decrease badness if call is nested. */ if (badness > 0) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 70269cdf830..5de35b0d7ff 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-13 Richard Guenther + + PR tree-optimization/51519 + * gcc.dg/pr51519.c: New testcase. + 2011-12-13 Richard Guenther * gcc.dg/lto/20111213-1_0.c: New testcase. diff --git a/gcc/testsuite/gcc.dg/pr51519.c b/gcc/testsuite/gcc.dg/pr51519.c new file mode 100644 index 00000000000..3d5d3f24396 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr51519.c @@ -0,0 +1,39 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fno-guess-branch-probability -findirect-inlining" } */ + +void fe (void); +int i; + +static inline void +FX (void (*f) (void)) +{ + fe (); + (*f) (); +} + +static inline void +f4 () +{ + if (i) + FX (fe); +} + +static inline void +f3 (void) +{ + f4 (); + if (i) + FX (f4); +} + +static inline void +f2 (void) +{ + FX (&f3); +} + +void +f1 (void) +{ + FX (&f2); +} -- 2.30.2