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

TemplateSimplifier optimisation. measured time improvement for cryptopp/test.cpp is ~8.4s => ~8.35s

This commit is contained in:
rebnridgway 2018-06-02 13:49:14 +02:00 committed by Daniel Marjamäki
parent 558a2f0cc7
commit d3b231214d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/templatesimplifier.cpp
View File

@ -492,7 +492,10 @@ std::list<TemplateSimplifier::TokenAndName> TemplateSimplifier::getTemplateDecla
std::list<ScopeInfo2> scopeInfo; std::list<ScopeInfo2> scopeInfo;
std::list<TokenAndName> declarations; std::list<TokenAndName> declarations;
for (Token *tok = tokens; tok; tok = tok->next()) { for (Token *tok = tokens; tok; tok = tok->next()) {
setScopeInfo(tok, &scopeInfo); if (Token::Match(tok, "}|namespace|class|struct")) {
setScopeInfo(tok, &scopeInfo);
continue;
}
if (!Token::simpleMatch(tok, "template <")) if (!Token::simpleMatch(tok, "template <"))
continue; continue;
// Some syntax checks, see #6865 // Some syntax checks, see #6865
@ -530,7 +533,10 @@ std::list<TemplateSimplifier::TokenAndName> TemplateSimplifier::getTemplateInsta
std::list<ScopeInfo2> scopeList; std::list<ScopeInfo2> scopeList;
for (Token *tok = tokens; tok; tok = tok->next()) { for (Token *tok = tokens; tok; tok = tok->next()) {
setScopeInfo(tok, &scopeList); if (Token::Match(tok, "}|namespace|class|struct")) {
setScopeInfo(tok, &scopeList);
continue;
}
// template definition.. skip it // template definition.. skip it
if (Token::simpleMatch(tok, "template <")) { if (Token::simpleMatch(tok, "template <")) {
tok = tok->next()->findClosingBracket(); tok = tok->next()->findClosingBracket();
@ -949,7 +955,10 @@ void TemplateSimplifier::expandTemplate(
const Token *endOfTemplateDefinition = nullptr; const Token *endOfTemplateDefinition = nullptr;
const Token * const templateDeclarationNameToken = templateDeclarationToken->tokAt(getTemplateNamePosition(templateDeclarationToken)); const Token * const templateDeclarationNameToken = templateDeclarationToken->tokAt(getTemplateNamePosition(templateDeclarationToken));
for (const Token *tok3 = tokenlist.front(); tok3; tok3 = tok3 ? tok3->next() : nullptr) { for (const Token *tok3 = tokenlist.front(); tok3; tok3 = tok3 ? tok3->next() : nullptr) {
setScopeInfo(const_cast<Token *>(tok3), &scopeInfo); if (Token::Match(tok3, "}|namespace|class|struct")) {
setScopeInfo(tok3, &scopeInfo);
continue;
}
if (inTemplateDefinition) { if (inTemplateDefinition) {
if (!endOfTemplateDefinition && tok3->str() == "{") if (!endOfTemplateDefinition && tok3->str() == "{")
endOfTemplateDefinition = tok3->link(); endOfTemplateDefinition = tok3->link();
@ -1640,7 +1649,10 @@ void TemplateSimplifier::replaceTemplateUsage(Token * const instantiationToken,
std::list<ScopeInfo2> scopeInfo; std::list<ScopeInfo2> scopeInfo;
std::list< std::pair<Token *, Token *> > removeTokens; std::list< std::pair<Token *, Token *> > removeTokens;
for (Token *nameTok = instantiationToken; nameTok; nameTok = nameTok->next()) { for (Token *nameTok = instantiationToken; nameTok; nameTok = nameTok->next()) {
setScopeInfo(nameTok, &scopeInfo); if (Token::Match(nameTok, "}|namespace|class|struct")) {
setScopeInfo(nameTok, &scopeInfo);
continue;
}
if (!Token::Match(nameTok, "%name% <")) if (!Token::Match(nameTok, "%name% <"))
continue; continue;
if (!matchTemplateParameters(nameTok, typeStringsUsedInTemplateInstantiation)) if (!matchTemplateParameters(nameTok, typeStringsUsedInTemplateInstantiation))