commit 583dcafce43f5249c808af1e65cb321489549b0b
author Douglas Gregor <dgregor@apple.com> Tue Oct 27 21:11:48 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Oct 27 21:11:48 2009 +0000
tree 2654ef8fe4495d6c5136e14dcf67afe2d1fe2df1
parent e4801f7844bbdac6345870a2dbb8d682398f6e05

Introduce FunctionDecl::isInlined() to tell whether a function should
be inlined.

llvm-svn: 85307

clang/lib/CodeGen/CodeGenModule.cpp

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index dd31663..a407018 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -262,7 +262,7 @@
 
   if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(FD)) {
     // C++ member functions defined inside the class are always inline.
-    if (MD->isInlineSpecified() || !MD->isOutOfLine())
+    if (MD->isInlined())
       return CodeGenModule::GVA_CXXInline;
 
     return External;
@@ -272,7 +272,7 @@
   if (FD->getStorageClass() == FunctionDecl::Static)
     return CodeGenModule::GVA_Internal;
 
-  if (!FD->isInlineSpecified())
+  if (!FD->isInlined())
     return External;
 
   if (!Features.CPlusPlus || FD->hasAttr<GNUInlineAttr>()) {