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.

	* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112709 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index adefc69..3f14ac8 100644 (file)
--- 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 4765b00..5348847 100644 (file)
--- 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 109316c..d21f41c 100644 (file)
--- 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 cdac76e..ddf4a66 100644 (file)
--- 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 6255e5c..63ae802 100644 (file)
--- 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 5abe16e..32b42c8 100644 (file)
--- 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 c99079d..1485d37 100644 (file)
--- 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.  */