Skip to content

Fix #11497 debug: CheckClass::isMemberVar found used member variable 'x' with varid 0 (inconclusive) #4736

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

Merged
danmar merged 4 commits into from
Jan 26, 2023
Merged

Fix #11497 debug: CheckClass::isMemberVar found used member variable 'x' with varid 0 (inconclusive) #4736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6cd56c
Minor performance optimization
chrchr-github Jan 23, 2023
0e402e4
'this' must be processed
chrchr-github Jan 23, 2023
50aa20d
Fix #11497 debug: CheckClass::isMemberVar found used member variable …
chrchr-github Jan 23, 2023
22d75c6
Move flag check
chrchr-github Jan 23, 2023
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
3 changes: 3 additions & 0 deletions lib/checkclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2173,6 +2173,9 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
}
} while (again);

if (tok->isKeyword() || tok->isStandardType())
return false;

for (const Variable& var : scope->varlist) {
if (var.name() == tok->str()) {
if (Token::Match(tok, "%name% ::"))
Expand Down
16 changes: 15 additions & 1 deletion lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,6 +1208,8 @@ void SymbolDatabase::fixVarId(VarIdMap & varIds, const Token * vartok, Token * m
membertok->varId(memberId->second);
}

static bool isContainerYieldElement(Library::Container::Yield yield);

void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
{
VarIdMap varIds;
Expand All @@ -1222,6 +1224,8 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()

// Set variable pointers
for (const Token* tok = mTokenizer->list.front(); tok != mTokenizer->list.back(); tok = tok->next()) {
if (!tok->isName() || tok->isKeyword() || tok->isStandardType())
continue;
if (tok->varId())
const_cast<Token*>(tok)->variable(getVariableFromVarId(tok->varId()));

Expand Down Expand Up @@ -1310,6 +1314,16 @@ void SymbolDatabase::createSymbolDatabaseSetVariablePointers()
}
}
}
else if (Token::simpleMatch(tok->astParent(), ".") && tok->next()->str() == "(" &&
astIsContainer(tok->astParent()->astOperand1()) && Token::Match(tok->next()->link(), ") . %name% !!(")) {
const ValueType* vt = tok->astParent()->astOperand1()->valueType();
const Library::Container* cont = vt->container;
auto it = cont->functions.find(tok->str());
if (it != cont->functions.end() && isContainerYieldElement(it->second.yield) && vt->containerTypeToken && vt->containerTypeToken->scope()) {
Token* memberTok = tok->next()->link()->tokAt(2);
setMemberVar(vt->containerTypeToken->scope()->getVariable(memberTok->str()), memberTok, vt->containerTypeToken);
}
}
}
}

Expand Down Expand Up @@ -6049,7 +6063,7 @@ static void setAutoTokenProperties(Token * const autoTok)
autoTok->isStandardType(true);
}

static bool isContainerYieldElement(Library::Container::Yield yield)
bool isContainerYieldElement(Library::Container::Yield yield)
{
return yield == Library::Container::Yield::ITEM || yield == Library::Container::Yield::AT_INDEX ||
yield == Library::Container::Yield::BUFFER || yield == Library::Container::Yield::BUFFER_NT;
Expand Down
48 changes: 29 additions & 19 deletions test/testvarid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,15 @@ struct InternalError;

class TestVarID : public TestFixture {
public:
TestVarID() : TestFixture("TestVarID") {}
TestVarID() : TestFixture("TestVarID") {
settings.platform(Settings::Unix64);
settings.standards.c = Standards::C89;
settings.standards.cpp = Standards::CPPLatest;
settings.checkUnusedTemplates = true;
}

private:
Settings settings;
void run() override {
TEST_CASE(varid1);
TEST_CASE(varid2);
Expand Down Expand Up @@ -137,6 +143,7 @@ class TestVarID : public TestFixture {
TEST_CASE(varid_in_class22); // #10872
TEST_CASE(varid_in_class23); // #11293
TEST_CASE(varid_in_class24);
TEST_CASE(varid_in_class25);
TEST_CASE(varid_namespace_1); // #7272
TEST_CASE(varid_namespace_2); // #7000
TEST_CASE(varid_namespace_3); // #8627
Expand Down Expand Up @@ -235,12 +242,6 @@ class TestVarID : public TestFixture {
std::string tokenize_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
errout.str("");

Settings settings;
settings.platform(Settings::Unix64);
settings.standards.c = Standards::C89;
settings.standards.cpp = Standards::CPPLatest;
settings.checkUnusedTemplates = true;

Tokenizer tokenizer(&settings, this);
std::istringstream istr(code);
ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
Expand All @@ -255,12 +256,6 @@ class TestVarID : public TestFixture {
std::string tokenizeExpr_(const char* file, int line, const char code[], const char filename[] = "test.cpp") {
errout.str("");

Settings settings;
settings.platform(Settings::Unix64);
settings.standards.c = Standards::C89;
settings.standards.cpp = Standards::CPPLatest;
settings.checkUnusedTemplates = true;

Tokenizer tokenizer(&settings, this);
std::istringstream istr(code);
ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
Expand All @@ -275,12 +270,6 @@ class TestVarID : public TestFixture {
std::string compareVaridsForVariable_(const char* file, int line, const char code[], const char varname[], const char filename[] = "test.cpp") {
errout.str("");

Settings settings;
settings.platform(Settings::Unix64);
settings.standards.c = Standards::C89;
settings.standards.cpp = Standards::CPP11;
settings.checkUnusedTemplates = true;

Tokenizer tokenizer(&settings, this);
std::istringstream istr(code);
ASSERT_LOC((tokenizer.tokenize)(istr, filename), file, line);
Expand Down Expand Up @@ -2015,6 +2004,27 @@ class TestVarID : public TestFixture {
ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
}

void varid_in_class25() { // #11497
const char *code{}, *expected{};
Settings oldSettings = settings;
LOAD_LIB_2(settings.library, "std.cfg");

code = "struct F {\n"
" int i;\n"
" void f(const std::vector<F>&v) {\n"
" if (v.front().i) {}\n"
" }\n"
"};\n";
expected = "1: struct F {\n"
"2: int i@1 ;\n"
"3: void f ( const std :: vector < F > & v@2 ) {\n"
"4: if ( v@2 . front ( ) . i@3 ) { }\n"
"5: }\n"
"6: } ;\n";
ASSERT_EQUALS(expected, tokenize(code, "test.cpp"));
settings = oldSettings;
}

void varid_namespace_1() { // #7272
const char code[] = "namespace Blah {\n"
" struct foo { int x;};\n"
Expand Down