From: Giovanni Bajo <giovannibajo@gcc.gnu.org>
Date: Fri, 21 Jan 2005 10:02:30 +0000 (+0000)
Subject: re PR c++/17115 (-Winline does not respect __attribute__((__noinline__)))
X-Git-Tag: releases/gcc-3.3.6~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb5efdd1bf766bd3271ada7027e93f3bd8158c90;p=thirdparty%2Fgcc.git

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 36b341273387..415abc4c6891 100644
--- 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 bb002fd24ba3..e967c1de643b 100644
--- 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 43d35c3843de..a4da29adecad 100644
--- 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");