commit 48eda2c5d6d2a5c95775a1a3a8a22428bb6869c6
author Anders Carlsson <andersca@mac.com> Fri Dec 04 22:35:50 2009 +0000
committer Anders Carlsson <andersca@mac.com> Fri Dec 04 22:35:50 2009 +0000
tree ef374db0e826725721d861821245a029c8aa8222
parent 99369081447e9b7b2c2f724d39e9ec8409291d08

Be a little more clever about inline member functions that are marked inline in the inline class declaration but not in the actual definition:

class A {
  inline void f();
}

void A::f() { }

This is not the most ideal solution, since it doesn't work 100% with regular functions (as my FIXME comment states).



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90607 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/Decl.cpp

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 572d76f..51a4731 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -838,8 +838,20 @@
 }
 
 bool FunctionDecl::isInlined() const {
-  if (isInlineSpecified() || (isa<CXXMethodDecl>(this) && !isOutOfLine()))
+  // FIXME: This is not enough. Consider:
+  //
+  // inline void f();
+  // void f() { }
+  //
+  // f is inlined, but does not have inline specified.
+  // To fix this we should add an 'inline' flag to FunctionDecl.
+  if (isInlineSpecified())
     return true;
+  
+  if (isa<CXXMethodDecl>(this)) {
+    if (!isOutOfLine() || getCanonicalDecl()->isInlineSpecified())
+      return true;
+  }
 
   switch (getTemplateSpecializationKind()) {
   case TSK_Undeclared: