Checked all redeclarations when parsing function bodies which is back…

… on.
mono · Feb 1, 2017 · fc7452b · fc7452b
1 parent ac6be2e
commit fc7452b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
@@ -2844,6 +2844,22 @@ Parameter* Parser::WalkParameter(const clang::ParmVarDecl* PVD,
     return P;
 }
 
+void Parser::SetBodyIfInline(const clang::FunctionDecl* FD, Function* F)
+{
+    F->isInline = FD->isInlined();
+    F->Body = GetFunctionBody(FD);
+    if (F->isInline && !F->Body.empty())
+        return;
+    for (const auto& R : FD->redecls())
+    {
+        F->isInline |= R->isInlined();
+        if (F->Body.empty())
+            F->Body = GetFunctionBody(R);
+        if (F->isInline && !F->Body.empty())
+            break;
+    }
+}
+
 void Parser::WalkFunction(const clang::FunctionDecl* FD, Function* F,
                           bool IsDependent)
 {
@@ -2859,18 +2875,10 @@ void Parser::WalkFunction(const clang::FunctionDecl* FD, Function* F,
     F->_namespace = NS;
     F->isConstExpr = FD->isConstexpr();
     F->isVariadic = FD->isVariadic();
-    F->isInline = FD->isInlined();
-    for (const auto& R : FD->redecls())
-    {
-        if (R->isInlined())
-        {
-            F->isInline = true;
-            break;
-        }
-    }
     F->isDependent = FD->isDependentContext();
     F->isPure = FD->isPure();
     F->isDeleted = FD->isDeleted();
+    SetBodyIfInline(FD, F);
     if (auto InstantiatedFrom = FD->getTemplateInstantiationPattern())
         F->instantiatedFrom = static_cast<Function*>(WalkDeclaration(InstantiatedFrom));
 
@@ -3920,7 +3928,7 @@ ParserResult* Parser::ParseHeader(const std::vector<std::string>& SourceFiles, P
     clang::DiagnosticConsumer* client = c->getDiagnostics().getClient();
     client->BeginSourceFile(c->getLangOpts(), &c->getPreprocessor());
 
-    ParseAST(c->getSema(), /*PrintStats=*/false, /*SkipFunctionBodies=*/true);
+    ParseAST(c->getSema());
 
     client->EndSourceFile();
 

diff --git a/src/CppParser/Parser.h b/src/CppParser/Parser.h
@@ -122,6 +122,7 @@ class Parser
     bool CanCheckCodeGenInfo(clang::Sema & S, const clang::Type * Ty);
     Parameter* WalkParameter(const clang::ParmVarDecl* PVD,
         const clang::SourceLocation& ParamStartLoc);
+    void SetBodyIfInline(const clang::FunctionDecl* FD, Function* F);
     void WalkFunction(const clang::FunctionDecl* FD, Function* F,
         bool IsDependent = false);
     void HandlePreprocessedEntities(Declaration* Decl);

diff --git a/src/Generator.Tests/AST/TestAST.cs b/src/Generator.Tests/AST/TestAST.cs
@@ -302,7 +302,7 @@ public void TestLineNumberOfFriend()
         public void TestSignature()
         {
             Assert.AreEqual("void testSignature()", AstContext.FindFunction("testSignature").Single().Signature);
-            Assert.AreEqual("void testImpl()", AstContext.FindFunction("testImpl").Single().Signature);
+            Assert.AreEqual("void testImpl()\r\n{\r\n}", AstContext.FindFunction("testImpl").Single().Signature);
             Assert.AreEqual("void testConstSignature() const",
                 AstContext.FindClass("HasConstFunction").Single().FindMethod("testConstSignature").Signature);
             Assert.AreEqual("void testConstSignatureWithTrailingMacro() const",