re PR c++/17115 (-Winline does not respect __attribute__((__noinline__)))

	PR c++/17115
	* tree-inline.c (expand_call_inline): Do not warn for functions
	marked with attribute noinline.

	PR c++/17115
	* g++.dg/warn/Winline-4.C: New test.

From-SVN: r94009

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 36b341273387ba9c5b4186877548f290e3b8994f..415abc4c6891894566cdb40dc60f1ba4615db3ff 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-21  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
+
+       PR c++/17115
+       * tree-inline.c (expand_call_inline): Do not warn for functions
+       marked with attribute noinline.
+
 2005-01-18  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR rtl-optimization/19296

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bb002fd24ba374c455ceb549182aba0ee06f7650..e967c1de643b4944ca514048ce24070598e5ceb8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-21  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
+
+       PR c++/17115
+       * g++.dg/warn/Winline-4.C: New test.
+
 2005-01-18  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * gcc.dg/short-compare-1.c: New test.

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 43d35c3843de8f634a05e61090d7aaf8b0fd8efc..a4da29adecadae720e7235cc29ebec9255f48a22 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1173,7 +1173,8 @@ expand_call_inline (tp, walk_subtrees, data)
   if (!inlinable_function_p (fn, id))
     {
       if (warn_inline && DECL_INLINE (fn) && !DID_INLINE_FUNC (fn)
-         && !DECL_IN_SYSTEM_HEADER (fn))
+         && !DECL_IN_SYSTEM_HEADER (fn)
+         && !lookup_attribute ("noinline", DECL_ATTRIBUTES (fn)))
        {
          warning_with_decl (fn, "inlining failed in call to `%s'");
          warning ("called from here");