diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ipa-inline.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ipa/ipa-1.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ipa/ipa-2.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ipa/ipa-3.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ipa/ipa-5.c | 2 |
7 files changed, 19 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index adefc69b97c..3f14ac8f474 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-04-05 Richard Guenther <rguenther@suse.de> + + PR tree-optimization/26919 + * ipa-inline.c (cgraph_decide_inlining_incrementally): Fix argument + to cgraph_estimate_size_after_inlining. + 2006-04-05 Alan Modra <amodra@bigpond.net.au> * reload.c (find_dummy_reload): Fix typo in 2006-04-03 change. diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 4765b00ac90..53488473da0 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -1077,7 +1077,7 @@ cgraph_decide_inlining_incrementally (struct cgraph_node *node, bool early) && !e->callee->local.disregard_inline_limits && !cgraph_recursive_inlining_p (node, e->callee, &e->inline_failed) && (!early - || (cgraph_estimate_size_after_inlining (1, e->caller, node) + || (cgraph_estimate_size_after_inlining (1, e->caller, e->callee) <= e->caller->global.insns)) && cgraph_check_inline_limits (node, e->callee, &e->inline_failed) && (DECL_SAVED_TREE (e->callee->decl) || e->callee->inline_decl)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 109316ca668..d21f41cc011 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,13 @@ 2006-04-05 Richard Guenther <rguenther@suse.de> + PR tree-optimization/26919 + * gcc.dg/ipa/ipa-1.c: Use -fno-early-inlining. + * gcc.dg/ipa/ipa-2.c: Likewise. + * gcc.dg/ipa/ipa-3.c: Likewise. + * gcc.dg/ipa/ipa-5.c: Likewise. + +2006-04-05 Richard Guenther <rguenther@suse.de> + PR tree-optimization/26763 * gcc.dg/torture/pr26763-1.c: New testcase. * gcc.dg/torture/pr26763-2.c: Likewise. diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-1.c b/gcc/testsuite/gcc.dg/ipa/ipa-1.c index cdac76e701a..ddf4a66ce1a 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-1.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp" } */ +/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp -fno-early-inlining" } */ /* { dg-skip-if "PR 25442" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */ #include <stdio.h> diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-2.c b/gcc/testsuite/gcc.dg/ipa/ipa-2.c index 6255e5c1f45..63ae8026fce 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-2.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-2.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp" } */ +/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp -fno-early-inlining" } */ /* { dg-skip-if "PR 25442" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */ #include <stdio.h> diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-3.c b/gcc/testsuite/gcc.dg/ipa/ipa-3.c index 5abe16ea7cd..32b42c8ae87 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-3.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-3.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp" } */ +/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp -fno-early-inlining" } */ /* { dg-skip-if "PR 25442" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */ diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-5.c b/gcc/testsuite/gcc.dg/ipa/ipa-5.c index c99079de694..1485d372543 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-5.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-5.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp" } */ +/* { dg-options "-O3 -fipa-cp -fdump-ipa-cp -fno-early-inlining" } */ /* { dg-skip-if "PR 25442" { "*-*-*" } { "-fpic" "-fPIC" } { "" } } */ /* Float & short constants. */ |