ipa-inline.c (cgraph_decide_inlining_incrementally): Do not inline regular functions...

2010-01-06  Richard Guenther  <rguenther@suse.de>

	* ipa-inline.c (cgraph_decide_inlining_incrementally): Do
	not inline regular functions into always-inline functions.

	* gcc.c-torture/compile/pr42632.c: New testcase.

From-SVN: r155679

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8b61a345403d6aa48214168d3b54782a9d0e8fa..6435d2a5533d1b55fe2e6a02790b5f45e4447255 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-06  Richard Guenther  <rguenther@suse.de>
+
+       * ipa-inline.c (cgraph_decide_inlining_incrementally): Do
+       not inline regular functions into always-inline functions.
+
 2010-01-06  Nick Clifton  <nickc@redhat.com>
 
        * config/rx/rx.h (enum rx_cpu_type): Add RX200.

diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 7dbafb8f7c22ef2aa877a8e3364da53007183473..c6c84f99572fff17117d71c03093d32e165e39c0 100644 (file)
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1506,7 +1506,10 @@ cgraph_decide_inlining_incrementally (struct cgraph_node *node,
       }
 
   /* Now do the automatic inlining.  */
-  if (mode != INLINE_ALL && mode != INLINE_ALWAYS_INLINE)
+  if (mode != INLINE_ALL && mode != INLINE_ALWAYS_INLINE
+      /* Never inline regular functions into always-inline functions
+        during incremental inlining.  */
+      && !node->local.disregard_inline_limits)
     for (e = node->callees; e; e = e->next_callee)
       {
         int allowed_growth = 0;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e9c215d64e50725d5fae940bd7a4973f80e60123..ef879dedc299bfe602f50aa9ef90b523374260d2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-06  Richard Guenther  <rguenther@suse.de>
+
+       * gcc.c-torture/compile/pr42632.c: New testcase.
+
 2010-01-05  H.J. Lu  <hongjiu.lu@intel.com>
  
        PR target/42542

diff --git a/gcc/testsuite/gcc.c-torture/compile/pr42632.c b/gcc/testsuite/gcc.c-torture/compile/pr42632.c
new file mode 100644 (file)
index 0000000..a677853
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr42632.c
@@ -0,0 +1,16 @@
+static inline __attribute__((always_inline)) int
+__pskb_trim(void)
+{
+  return ___pskb_trim();
+}
+static inline __attribute__((always_inline))
+int pskb_trim(void)
+{
+  return __pskb_trim();
+}
+int ___pskb_trim(void)
+{
+  pskb_trim();
+  return 0;
+}
+