Clang import

danmar · danmar · commit b6833b525fbd · 2020-01-25T17:01:17.000+01:00
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -175,6 +175,9 @@ void CheckLeakAutoVar::doubleFreeError(const Token *tok, const Token *prevFreeTo
 
 void CheckLeakAutoVar::check()
 {
+    if (mSettings->clang)
+        return;
+
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
     // Local variables that are known to be non-zero.
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -759,6 +759,9 @@ void CheckMemoryLeakInClass::publicAllocationError(const Token *tok, const std::
 
 void CheckMemoryLeakStructMember::check()
 {
+    if (mSettings->clang)
+        return;
+
     const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || !var->isLocal() || var->isStatic() || var->isReference())
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -866,6 +866,9 @@ void CheckOther::unreachableCodeError(const Token *tok, bool inconclusive)
 //---------------------------------------------------------------------------
 void CheckOther::checkVariableScope()
 {
+    if (mSettings->clang)
+        return;
+
     if (!mSettings->isEnabled(Settings::STYLE))
         return;
 
diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -62,6 +62,9 @@ class CPPCHECKLIB CheckUninitVar : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) OVERRIDE {
+        if (settings->clang)
+            return;
+
         CheckUninitVar checkUninitVar(tokenizer, settings, errorLogger);
         checkUninitVar.check();
         checkUninitVar.valueFlowUninit();
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1091,6 +1091,9 @@ void CheckUnusedVar::checkFunctionVariableUsage()
     if (!mSettings->isEnabled(Settings::STYLE))
         return;
 
+    if (mSettings->clang)
+        return;
+
     // Parse all executing scopes..
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
 
diff --git a/lib/checkvaarg.cpp b/lib/checkvaarg.cpp
@@ -96,6 +96,8 @@ void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string&
 
 void CheckVaarg::va_list_usage()
 {
+    if (mSettings->clang)
+        return;
     const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Variable* var : symbolDatabase->variableList()) {
         if (!var || var->isPointer() || var->isReference() || var->isArray() || !var->scope() || var->typeStartToken()->str() != "va_list")
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -1030,7 +1030,6 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
     Scope *nestedIn = const_cast<Scope *>(nameToken->scope());
     symbolDatabase->scopeList.push_back(Scope(nullptr, nullptr, nestedIn));
     Scope &scope = symbolDatabase->scopeList.back();
-    symbolDatabase->functionScopes.push_back(&scope);
     nestedIn->functionList.push_back(Function(nameToken));
     scope.function = &nestedIn->functionList.back();
     scope.type = Scope::ScopeType::eFunction;
@@ -1060,6 +1059,7 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
     par2->link(par1);
     // Function body
     if (mFile == 0 && !children.empty() && children.back()->nodeType == CompoundStmt) {
+        symbolDatabase->functionScopes.push_back(&scope);
         Token *bodyStart = addtoken(tokenList, "{");
         bodyStart->scope(&scope);
         children.back()->createTokens(tokenList);
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -890,6 +890,10 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
             check->runChecks(&tokenizer, &mSettings, this);
         }
 
+        if (mSettings.clang)
+            // TODO: Use CTU for Clang analysis
+            return;
+
         // Analyse the tokens..
 
         CTU::FileInfo *fi1 = CTU::getFileInfo(&tokenizer);
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -888,8 +888,9 @@ class TestClangImport: public TestFixture {
 
     void symbolDatabaseFunction1() {
         const char clang[] = "|-FunctionDecl 0x3aea7a0 <1.cpp:2:1, col:22> col:6 used foo 'void (int, int)'\n"
-                             "| |-ParmVarDecl 0x3aea650 <col:10, col:14> col:14 x 'int'\n"
-                             "| `-ParmVarDecl 0x3aea6c8 <col:17, col:21> col:21 y 'int'\n";
+                             "  |-ParmVarDecl 0x3aea650 <col:10, col:14> col:14 x 'int'\n"
+                             "  |-ParmVarDecl 0x3aea6c8 <col:17, col:21> col:21 y 'int'\n"
+                             "  `-CompoundStmt 0x3d45c48 <col:12>\n";
 
         GET_SYMBOL_DB(clang);
 
@@ -907,7 +908,8 @@ class TestClangImport: public TestFixture {
     void symbolDatabaseFunction2() {
         const char clang[] = "|-FunctionDecl 0x3aea7a0 <1.cpp:2:1, col:22> col:6 used foo 'void (int, int)'\n"
                              "| |-ParmVarDecl 0x3aea650 <col:10, col:14> col:14 'int'\n"
-                             "| `-ParmVarDecl 0x3aea6c8 <col:17, col:21> col:21 'int'\n";
+                             "| |-ParmVarDecl 0x3aea6c8 <col:17, col:21> col:21 'int'\n"
+                             "  `-CompoundStmt 0x3d45c48 <col:12>\n";
 
         GET_SYMBOL_DB(clang);
 

Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,9 @@ void CheckLeakAutoVar::doubleFreeError(const Token tok, const Token prevFreeTo`
`175`	`175`
`176`	`176`	`void CheckLeakAutoVar::check()`
`177`	`177`	`{`
	`178`	`+ if (mSettings->clang)`
	`179`	`+ return;`
	`180`	`+`
`178`	`181`	`const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();`
`179`	`182`
`180`	`183`	`// Local variables that are known to be non-zero.`
Original file line number	Diff line number	Diff line change
`@@ -759,6 +759,9 @@ void CheckMemoryLeakInClass::publicAllocationError(const Token *tok, const std::`
`759`	`759`
`760`	`760`	`void CheckMemoryLeakStructMember::check()`
`761`	`761`	`{`
	`762`	`+ if (mSettings->clang)`
	`763`	`+ return;`
	`764`	`+`
`762`	`765`	`const SymbolDatabase* symbolDatabase = mTokenizer->getSymbolDatabase();`
`763`	`766`	`for (const Variable* var : symbolDatabase->variableList()) {`
`764`	`767`	`if (!var \|\| !var->isLocal() \|\| var->isStatic() \|\| var->isReference())`
Original file line number	Diff line number	Diff line change
`@@ -866,6 +866,9 @@ void CheckOther::unreachableCodeError(const Token *tok, bool inconclusive)`
`866`	`866`	`//---------------------------------------------------------------------------`
`867`	`867`	`void CheckOther::checkVariableScope()`
`868`	`868`	`{`
	`869`	`+ if (mSettings->clang)`
	`870`	`+ return;`
	`871`	`+`
`869`	`872`	`if (!mSettings->isEnabled(Settings::STYLE))`
`870`	`873`	`return;`
`871`	`874`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ void CheckVaarg::referenceAs_va_start_error(const Token *tok, const std::string&`
`96`	`96`
`97`	`97`	`void CheckVaarg::va_list_usage()`
`98`	`98`	`{`
	`99`	`+ if (mSettings->clang)`
	`100`	`+ return;`
`99`	`101`	`const SymbolDatabase* const symbolDatabase = mTokenizer->getSymbolDatabase();`
`100`	`102`	`for (const Variable* var : symbolDatabase->variableList()) {`
`101`	`103`	`if (!var \|\| var->isPointer() \|\| var->isReference() \|\| var->isArray() \|\| !var->scope() \|\| var->typeStartToken()->str() != "va_list")`
Original file line number	Diff line number	Diff line change
`@@ -890,6 +890,10 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)`
`890`	`890`	`check->runChecks(&tokenizer, &mSettings, this);`
`891`	`891`	`}`
`892`	`892`
	`893`	`+ if (mSettings.clang)`
	`894`	`+ // TODO: Use CTU for Clang analysis`
	`895`	`+ return;`
	`896`	`+`
`893`	`897`	`// Analyse the tokens..`
`894`	`898`
`895`	`899`	`CTU::FileInfo *fi1 = CTU::getFileInfo(&tokenizer);`