Skip to content
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

Jump to bottom

Fix #12660 (Tokenizer::setVarId: varid is wrongly set for argument name that shadows method name) #6347

Merged
merged 3 commits into from
Apr 26, 2024
Merged

Fix #12660 (Tokenizer::setVarId: varid is wrongly set for argument name that shadows method name) #6347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c899e0f
Fix #12660 (Tokenizer::setVarId: varid is wrongly set for argument na…
danmar Apr 26, 2024
51784ed
less strict
danmar Apr 26, 2024
28b3326
added testcase
danmar Apr 26, 2024
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
7 changes: 6 additions & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &end
return nullptr;
if (tok->str() == "(")
tok = tok->link();
if (tok->str() != ")")
return nullptr;
if (!tok->isCpp() && !Token::Match(tok->link()->previous(), "%name%|)"))
return nullptr;
if (Token::Match(tok, ") ;|{|[")) {
tok = tok->next();
while (tok && tok->str() == "[" && tok->link()) {
Expand Down Expand Up @@ -131,7 +135,8 @@ const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &end
tok = tok->next();
if (Token::Match(tok, "= 0|default|delete ;"))
tok = tok->tokAt(2);

if (tok && tok->str() == ":" && !Token::Match(tok->next(), "%name%|::"))
return nullptr;
return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
}
return nullptr;
Expand Down
24 changes: 24 additions & 0 deletions test/testvarid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class TestVarID : public TestFixture {
TEST_CASE(varid67); // #11711 - NOT function pointer
TEST_CASE(varid68); // #11740 - switch (str_chars(&strOut)[0])
TEST_CASE(varid69);
TEST_CASE(varid70); // #12660 - function
TEST_CASE(varid_for_1);
TEST_CASE(varid_for_2);
TEST_CASE(varid_cpp_keywords_in_c_code);
Expand Down Expand Up @@ -1270,6 +1271,29 @@ class TestVarID : public TestFixture {
ASSERT_EQUALS(expected1, tokenize(code1, true));
}

void varid70() {
// isFunctionHead
const char code1[] = "int x = 1 ? (1 << 0) : 0;\n"
"void foo(bool init);\n"
"void init();\n";
const char expected1[] = "1: int x@1 ; x@1 = 1 ? ( 1 << 0 ) : 0 ;\n"
"2: void foo ( bool init@2 ) ;\n"
"3: void init ( ) ;\n";
ASSERT_EQUALS(expected1, tokenize(code1, true));

const char code2[] = "int x = 1 ? f(1 << 0) : 0;\n"
"void foo(bool init);\n"
"void init();\n";
const char expected2[] = "1: int x@1 ; x@1 = 1 ? f ( 1 << 0 ) : 0 ;\n"
"2: void foo ( bool init@2 ) ;\n"
"3: void init ( ) ;\n";
ASSERT_EQUALS(expected2, tokenize(code2, true));

const char code3[] = "extern void (*arr[10])(uint32_t some);\n";
const char expected3[] = "1: extern void ( * arr@1 [ 10 ] ) ( uint32_t some@2 ) ;\n";
ASSERT_EQUALS(expected3, tokenize(code3, true));
}

void varid_for_1() {
const char code[] = "void foo(int a, int b) {\n"
" for (int a=1,b=2;;) {}\n"
Expand Down
Loading