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

Fix autoNoType with function returning container, rvalue reference (#4926)

This commit is contained in:
chrchr-github 2023-04-12 22:10:10 +02:00 committed by GitHub
parent 1f0376b32d
commit 87755e3bae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 91 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/symboldatabase.cpp
View File

@ -6340,7 +6340,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
// range for loop, auto // range for loop, auto
if (vt2 && if (vt2 &&
parent->str() == ":" && parent->str() == ":" &&
Token::Match(parent->astParent(), "( const| auto *|&| %var% :") && // TODO: east-const, multiple const, ref to ptr, rvalue ref Token::Match(parent->astParent(), "( const| auto *|&|&&| %var% :") && // TODO: east-const, multiple const, ref to ptr
!parent->previous()->valueType() && !parent->previous()->valueType() &&
Token::simpleMatch(parent->astParent()->astOperand1(), "for")) { Token::simpleMatch(parent->astParent()->astOperand1(), "for")) {
const bool isconst = Token::simpleMatch(parent->astParent()->next(), "const"); const bool isconst = Token::simpleMatch(parent->astParent()->next(), "const");
@ -6357,7 +6357,7 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
varvt.reference = Reference::LValue; varvt.reference = Reference::LValue;
if (isconst) { if (isconst) {
if (varvt.pointer && varvt.reference != Reference::None) if (varvt.pointer && varvt.reference != Reference::None)
varvt.constness |= 2; varvt.constness |= (1 << varvt.pointer);
else else
varvt.constness |= 1; varvt.constness |= 1;
} }
@ -6405,6 +6405,16 @@ void SymbolDatabase::setValueType(Token* tok, const ValueType& valuetype, Source
} else if (parsedecl(vt2->containerTypeToken, &autovt, mDefaultSignedness, mSettings, mIsCpp)) { } else if (parsedecl(vt2->containerTypeToken, &autovt, mDefaultSignedness, mSettings, mIsCpp)) {
setType = true; setType = true;
templateArgType = vt2->containerTypeToken->type(); templateArgType = vt2->containerTypeToken->type();
if (Token::simpleMatch(autoToken->next(), "&"))
autovt.reference = Reference::LValue;
else if (Token::simpleMatch(autoToken->next(), "&&"))
autovt.reference = Reference::RValue;
if (autoToken->previous()->str() == "const") {
if (autovt.pointer && autovt.reference != Reference::None)
autovt.constness |= 2;
else
autovt.constness |= 1;
}
} }
} }
@ -6730,6 +6740,7 @@ static const Token* parsedecl(const Token* type,
return nullptr; return nullptr;
valuetype->type = vt->type; valuetype->type = vt->type;
valuetype->pointer = vt->pointer; valuetype->pointer = vt->pointer;
valuetype->reference = vt->reference;
if (vt->sign != ValueType::Sign::UNKNOWN_SIGN) if (vt->sign != ValueType::Sign::UNKNOWN_SIGN)
valuetype->sign = vt->sign; valuetype->sign = vt->sign;
valuetype->constness = vt->constness; valuetype->constness = vt->constness;
@ -7113,6 +7124,15 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
vt.container = contTok->variable()->valueType()->container; vt.container = contTok->variable()->valueType()->container;
vt.containerTypeToken = contTok->variable()->valueType()->containerTypeToken; vt.containerTypeToken = contTok->variable()->valueType()->containerTypeToken;
setValueType(tok, vt); setValueType(tok, vt);
} else if (Token::simpleMatch(contTok, "(") && contTok->astOperand1() && contTok->astOperand1()->function()) {
const Function* func = contTok->astOperand1()->function();
if (const ValueType* funcVt = func->tokenDef->next()->valueType()) {
ValueType vt;
vt.type = ValueType::Type::ITERATOR;
vt.container = funcVt->container;
vt.containerTypeToken = funcVt->containerTypeToken;
setValueType(tok, vt);
}
} }
} }
} }

11
test/testother.cpp
View File

@ -3298,7 +3298,7 @@ private:
" for (const auto& h : v)\n" " for (const auto& h : v)\n"
" if (h) {}\n" " if (h) {}\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'h' can be declared as pointer to const\n", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'h' can be declared as pointer to const\n", "", errout.str());
check("void f(const std::vector<int*>& v) {\n" check("void f(const std::vector<int*>& v) {\n"
" for (const auto& p : v)\n" " for (const auto& p : v)\n"
@ -3306,7 +3306,7 @@ private:
" for (const auto* p : v)\n" " for (const auto* p : v)\n"
" if (p == nullptr) {}\n" " if (p == nullptr) {}\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n", "", errout.str());
check("void f(std::vector<int*>& v) {\n" check("void f(std::vector<int*>& v) {\n"
" for (const auto& p : v)\n" " for (const auto& p : v)\n"
@ -3318,9 +3318,10 @@ private:
" for (const int* p : v)\n" " for (const int* p : v)\n"
" if (p == nullptr) {}\n" " if (p == nullptr) {}\n"
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n" TODO_ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n"
"[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n", "[test.cpp:2]: (style) Variable 'p' can be declared as pointer to const\n",
errout.str()); "[test.cpp:1]: (style) Parameter 'v' can be declared as reference to const\n",
errout.str());
check("void f(std::vector<const int*>& v) {\n" check("void f(std::vector<const int*>& v) {\n"
" for (const auto& p : v)\n" " for (const auto& p : v)\n"

66
test/testsymboldatabase.cpp
View File

@ -8278,6 +8278,18 @@ private:
ASSERT(tok && tok->valueType()); ASSERT(tok && tok->valueType());
ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str()); ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str());
} }
{
GET_SYMBOL_DB("std::vector<int>& g();\n"
"void f() {\n"
" auto it = std::find(g().begin(), g().end(), 0);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
const Token* tok = tokenizer.tokens();
tok = Token::findsimplematch(tok, "auto");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("iterator(std :: vector <)", tok->valueType()->str());
}
{ {
GET_SYMBOL_DB("struct T { std::set<std::string> s; };\n" GET_SYMBOL_DB("struct T { std::set<std::string> s; };\n"
"struct U { std::shared_ptr<T> get(); };\n" "struct U { std::shared_ptr<T> get(); };\n"
@ -8289,7 +8301,55 @@ private:
const Token* tok = tokenizer.tokens(); const Token* tok = tokenizer.tokens();
tok = Token::findsimplematch(tok, "auto"); tok = Token::findsimplematch(tok, "auto");
ASSERT(tok && tok->valueType()); ASSERT(tok && tok->valueType());
ASSERT_EQUALS("container(std :: string|wstring|u16string|u32string)", tok->valueType()->str()); ASSERT_EQUALS("const container(std :: string|wstring|u16string|u32string) &", tok->valueType()->str());
}
{
GET_SYMBOL_DB("void f(std::vector<int>& v) {\n"
" for (auto& i : v)\n"
" i = 0;\n"
" for (auto&& j : v)\n"
" j = 1;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
const Token* tok = tokenizer.tokens();
tok = Token::findsimplematch(tok, "auto &");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("signed int &", tok->valueType()->str());
tok = Token::findsimplematch(tok, "i :");
ASSERT(tok && tok->valueType());
ASSERT(tok->valueType()->reference == Reference::LValue);
tok = Token::findsimplematch(tok, "i =");
ASSERT(tok && tok->valueType());
ASSERT(tok->valueType()->reference == Reference::LValue);
tok = Token::findsimplematch(tok, "auto &&");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("signed int &&", tok->valueType()->str());
tok = Token::findsimplematch(tok, "j =");
ASSERT(tok && tok->valueType());
ASSERT(tok->valueType()->reference == Reference::RValue);
}
{
GET_SYMBOL_DB("void f(std::vector<int*>& v) {\n"
" for (const auto& p : v)\n"
" if (p == nullptr) {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
const Token* tok = tokenizer.tokens();
tok = Token::findsimplematch(tok, "auto");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("signed int * const &", tok->valueType()->str());
tok = Token::findsimplematch(tok, "p :");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("signed int * const &", tok->valueType()->str());
ASSERT(tok->variable() && tok->variable()->valueType());
ASSERT_EQUALS("signed int * const &", tok->variable()->valueType()->str());
tok = Token::findsimplematch(tok, "p ==");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("signed int * const &", tok->valueType()->str());
ASSERT(tok->variable() && tok->variable()->valueType());
ASSERT_EQUALS("signed int * const &", tok->variable()->valueType()->str());
} }
} }
@ -8630,7 +8690,7 @@ private:
ASSERT(autotok && autotok->type() && autotok->type()->name() == "S"); ASSERT(autotok && autotok->type() && autotok->type()->name() == "S");
autotok = Token::findsimplematch(autotok->next(), "auto & c"); autotok = Token::findsimplematch(autotok->next(), "auto & c");
ASSERT(autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 0 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S"); ASSERT(autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 1 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S");
ASSERT(autotok && autotok->type() && autotok->type()->name() == "S"); ASSERT(autotok && autotok->type() && autotok->type()->name() == "S");
autotok = Token::findsimplematch(autotok->next(), "auto * d"); autotok = Token::findsimplematch(autotok->next(), "auto * d");
@ -8638,7 +8698,7 @@ private:
ASSERT(autotok && autotok->type() && autotok->type()->name() == "S"); ASSERT(autotok && autotok->type() && autotok->type()->name() == "S");
autotok = Token::findsimplematch(autotok->next(), "auto * e"); autotok = Token::findsimplematch(autotok->next(), "auto * e");
ASSERT(autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 0 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S"); ASSERT(autotok && autotok->valueType() && autotok->valueType()->pointer == 0 && autotok->valueType()->constness == 1 && autotok->valueType()->typeScope && autotok->valueType()->typeScope->definedType && autotok->valueType()->typeScope->definedType->name() == "S");
ASSERT(autotok && autotok->type() && autotok->type()->name() == "S"); ASSERT(autotok && autotok->type() && autotok->type()->name() == "S");
vartok = Token::findsimplematch(tokenizer.tokens(), "a :"); vartok = Token::findsimplematch(tokenizer.tokens(), "a :");