Skip to content

Fix #14782: Partially or fully missing valuetype info for auto declarations #8599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ludviggunne wants to merge 2 commits into
base: main
Choose a base branch
from
+71 −9
Open

Fix #14782: Partially or fully missing valuetype info for auto declarations #8599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db25ed
add test
ludviggunne May 22, 2026
e5d9879
fix
ludviggunne May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7017,6 +7017,10 @@
setAutoTokenProperties(autoTok);
if (vt2->pointer > vt.pointer)
vt.pointer++;
if (Token::simpleMatch(autoTok->next(), "&"))
vt.reference = Reference::LValue;
if (Token::simpleMatch(autoTok->next(), "&&"))
vt.reference = Reference::RValue;
setValueType(var1Tok, vt);
if (var1Tok != parent->previous())
setValueType(parent->previous(), vt);
Expand Down Expand Up @@ -7291,15 +7295,42 @@
}

// c++17 auto type deduction of braced init list
if (parent->isCpp() && mSettings.standards.cpp >= Standards::CPP17 && vt2 && Token::Match(parent->tokAt(-2), "auto %var% {")) {
Token *autoTok = parent->tokAt(-2);
setValueType(autoTok, *vt2);
setAutoTokenProperties(autoTok);
if (parent->previous()->variable())
const_cast<Variable*>(parent->previous()->variable())->setValueType(*vt2);
else
debugMessage(parent->previous(), "debug", "Missing variable class for variable with varid");
return;
if (parent->isCpp() && mSettings.standards.cpp >= Standards::CPP17 && vt2) {
Token *autoTok = nullptr;
if (Token::Match(parent->tokAt(-2), "auto %var% {"))

Check warning

Code scanning / Cppcheck Premium

Use meaningful symbolic constants to represent literal values. Warning

Use meaningful symbolic constants to represent literal values.
autoTok = parent->tokAt(-2);

Check warning

Code scanning / Cppcheck Premium

Use meaningful symbolic constants to represent literal values. Warning

Use meaningful symbolic constants to represent literal values.
else if (Token::Match(parent->tokAt(-3), "auto &|&&|* %var% {"))

Check warning

Code scanning / Cppcheck Premium

Use meaningful symbolic constants to represent literal values. Warning

Use meaningful symbolic constants to represent literal values.
autoTok = parent->tokAt(-3);

Check warning

Code scanning / Cppcheck Premium

Use meaningful symbolic constants to represent literal values. Warning

Use meaningful symbolic constants to represent literal values.
if (autoTok) {
setValueType(autoTok, *vt2);
setAutoTokenProperties(autoTok);

Token *varTok = parent->astOperand1();
auto *varVt = new ValueType(*vt2);
for (Token *qualTok = autoTok->next(); qualTok != varTok; qualTok = qualTok->next()) {
if (Token::simpleMatch(qualTok, "&")) {
varVt->reference = Reference::LValue;
continue;
}
if (Token::simpleMatch(qualTok, "&&")) {
varVt->reference = Reference::RValue;
continue;
}
if (Token::simpleMatch(qualTok, "*")) {
varVt->pointer++;
continue;
}
break;
}

varTok->setValueType(varVt);

if (parent->previous()->variable())
const_cast<Variable*>(parent->previous()->variable())->setValueType(*varVt);
else
debugMessage(parent->previous(), "debug", "Missing variable class for variable with varid");
return;
}
}

if (!vt1)
Expand Down
31 changes: 31 additions & 0 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ class TestSymbolDatabase : public TestFixture {
TEST_CASE(VariableValueType4); // smart pointer type
TEST_CASE(VariableValueType5); // smart pointer type
TEST_CASE(VariableValueType6); // smart pointer type
TEST_CASE(VariableValueType7);
TEST_CASE(VariableValueTypeReferences);
TEST_CASE(VariableValueTypeTemplate);

Expand Down Expand Up @@ -1315,6 +1316,36 @@ class TestSymbolDatabase : public TestFixture {
ASSERT(check->valueType()->smartPointerTypeToken);
}

void VariableValueType7() {
GET_SYMBOL_DB("void f() {\n"
" auto x0 = 0;\n"
" auto &x1 = x0;\n"
" auto &x2 {x0};\n"
" auto &&x3 = 0;\n"
" auto &&x4 {0};\n"
"}\n");

const Token* x1 = Token::findsimplematch(tokenizer.tokens(), "x1");
const Token* x2 = Token::findsimplematch(tokenizer.tokens(), "x2");
const Token* x3 = Token::findsimplematch(tokenizer.tokens(), "x3");
const Token* x4 = Token::findsimplematch(tokenizer.tokens(), "x4");

ASSERT(x1);
ASSERT(x2);
ASSERT(x3);
ASSERT(x4);

ASSERT_EQUALS_ENUM(ValueType::INT, x1->valueType()->type);
ASSERT_EQUALS_ENUM(ValueType::INT, x2->valueType()->type);
ASSERT_EQUALS_ENUM(ValueType::INT, x3->valueType()->type);
ASSERT_EQUALS_ENUM(ValueType::INT, x4->valueType()->type);

ASSERT_EQUALS_ENUM(Reference::LValue, x1->valueType()->reference);
ASSERT_EQUALS_ENUM(Reference::LValue, x2->valueType()->reference);
ASSERT_EQUALS_ENUM(Reference::RValue, x3->valueType()->reference);
ASSERT_EQUALS_ENUM(Reference::RValue, x4->valueType()->reference);
}

void VariableValueTypeReferences() {
{
GET_SYMBOL_DB("void foo(int x) {}\n");
Expand Down
Loading