Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions lib/symboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6568,10 +6568,18 @@ void SymbolDatabase::setValueType(Token* tok, const Variable& var, const SourceL
if (parsedecl(var.typeStartToken(), &valuetype, mDefaultSignedness, mSettings)) {
if (tok->str() == "." && tok->astOperand1()) {
const ValueType * const vt = tok->astOperand1()->valueType();
if (vt && (vt->constness & 1) != 0)
valuetype.constness |= 1;
if (vt && (vt->volatileness & 1) != 0)
valuetype.volatileness |= 1;
if (vt && (vt->constness & 1) != 0) {
if (var.isArray()) // constness propagates to arrays, but not to regular pointers
valuetype.constness |= 1;
else
valuetype.constness |= (1 << valuetype.pointer);
}
if (vt && (vt->volatileness & 1) != 0) {
if (var.isArray())
valuetype.volatileness |= 1;
else
valuetype.volatileness |= (1 << valuetype.pointer);
}
}
setValueType(tok, valuetype);
}
Expand Down
19 changes: 19 additions & 0 deletions test/testsymboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ class TestSymbolDatabase : public TestFixture {
TEST_CASE(auto20);
TEST_CASE(auto21);
TEST_CASE(auto22);
TEST_CASE(auto23);

TEST_CASE(unionWithConstructor);

Expand Down Expand Up @@ -10677,6 +10678,24 @@ class TestSymbolDatabase : public TestFixture {
ASSERT(s->variable() && s->variable()->isReference());
}

void auto23() {
GET_SYMBOL_DB("struct S { int* p; };\n" // #12168
"void f(const S& s) {\n"
" auto q = s.p;\n"
"}\n");
ASSERT_EQUALS("", errout_str());
const Token* a = Token::findsimplematch(tokenizer.tokens(), "auto");
ASSERT(a && a->valueType());
ASSERT_EQUALS(a->valueType()->type, ValueType::INT);
ASSERT_EQUALS(a->valueType()->pointer, 1);
ASSERT_EQUALS(a->valueType()->constness, 0);
const Token* dot = Token::findsimplematch(a, ".");
ASSERT(dot && dot->valueType());
ASSERT_EQUALS(dot->valueType()->type, ValueType::INT);
ASSERT_EQUALS(dot->valueType()->pointer, 1);
ASSERT_EQUALS(dot->valueType()->constness, 2);
}

void unionWithConstructor() {
GET_SYMBOL_DB("union Fred {\n"
" Fred(int x) : i(x) { }\n"
Expand Down