walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Refactorized CheckUnusedVar::checkStructMemberUsage(): Drastically reduced number of Token::findmatch() calls to improve performance

This commit is contained in:
PKEuS 2016-05-24 23:10:39 +02:00
parent 686cc6640e
commit 43bf1bb685
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lib/checkunusedvar.cpp
View File

@ -1213,6 +1213,8 @@ void CheckUnusedVar::checkStructMemberUsage()
if (!_settings->isEnabled("style")) if (!_settings->isEnabled("style"))
return; return;
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
std::string structname; std::string structname;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
if (tok->fileIndex() != 0) if (tok->fileIndex() != 0)
@ -1232,44 +1234,43 @@ void CheckUnusedVar::checkStructMemberUsage()
break; break;
} }
if (structname.empty())
continue;
// bail out if struct is inherited // bail out if struct is inherited
if (!structname.empty() && Token::findmatch(tok, (",|private|protected|public " + structname).c_str())) { bool bailout = false;
for (std::list<Scope>::const_iterator i = symbolDatabase->scopeList.cbegin(); i != symbolDatabase->scopeList.cend(); ++i) {
if (i->definedType) {
for (size_t j = 0; j < i->definedType->derivedFrom.size(); j++) {
if (i->definedType->derivedFrom[j].type == tok->tokAt(3)->scope()->definedType) {
bailout = true;
break;
}
}
}
}
if (bailout) {
structname.clear(); structname.clear();
continue; continue;
} }
// Bail out if some data is casted to struct.. // bail out for extern/global struct
const std::string castPattern("( struct| " + tok->next()->str() + " * ) & %name% ["); for (size_t i = 0; i < symbolDatabase->getVariableListSize(); i++) {
if (Token::findmatch(tok, castPattern.c_str())) const Variable* var = symbolDatabase->getVariableFromVarId(i);
structname.clear(); if (var && (var->isExtern() || (var->isGlobal() && !var->isStatic())) && var->typeEndToken()->str() == structname) {
structname.clear();
// Bail out if instance is initialized with {}.. break;
if (!structname.empty()) {
const std::string pattern1(structname + " %name% ;");
const Token *tok2 = tok;
while (nullptr != (tok2 = Token::findmatch(tok2->next(), pattern1.c_str()))) {
if (Token::simpleMatch(tok2->tokAt(3), (tok2->strAt(1) + " = {").c_str())) {
structname.clear();
break;
}
} }
} }
if (structname.empty()) if (structname.empty())
continue; continue;
// bail out for extern/global struct // Bail out if some data is casted to struct..
const std::string definitionPattern(structname + " %name%"); const std::string castPattern("( struct| " + tok->next()->str() + " * ) & %name% [");
for (const Token *tok2 = Token::findmatch(tok, definitionPattern.c_str()); if (Token::findmatch(tok, castPattern.c_str()))
tok2 && tok2->next(); structname.clear();
tok2 = Token::findmatch(tok2->next(), definitionPattern.c_str())) {
const Variable *var = tok2->next()->variable();
if (var && (var->isExtern() || (var->isGlobal() && !var->isStatic()))) {
structname.clear();
break;
}
}
if (structname.empty()) if (structname.empty())
continue; continue;