Skip to content

Fix #11328 FN functionStatic, functionConst with this #4496

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
orbitcowboy merged 2 commits into from
Sep 23, 2022
Merged

Fix #11328 FN functionStatic, functionConst with this #4496

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
eba397d
Fix #11328 FN functionStatic, functionConst with this
chrchr-github Sep 22, 2022
cc609cd
Fix FP
chrchr-github Sep 22, 2022
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
31 changes: 24 additions & 7 deletions lib/checkclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2119,6 +2119,16 @@ void CheckClass::checkConst()
}
}

// tok should point at "this"
static const Token* getFuncTokFromThis(const Token* tok) {
if (!Token::simpleMatch(tok->next(), "."))
return nullptr;
tok = tok->tokAt(2);
while (Token::Match(tok, "%name% ::"))
tok = tok->tokAt(2);
return Token::Match(tok, "%name% (") ? tok : nullptr;
}

bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
{
bool again = false;
Expand All @@ -2128,7 +2138,7 @@ bool CheckClass::isMemberVar(const Scope *scope, const Token *tok) const
again = false;

if (tok->str() == "this") {
return true;
return !getFuncTokFromThis(tok); // function calls are handled elsewhere
} else if (Token::simpleMatch(tok->tokAt(-3), "( * this )")) {
return true;
} else if (Token::Match(tok->tokAt(-3), "%name% ) . %name%")) {
Expand Down Expand Up @@ -2264,6 +2274,14 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
if (mTokenizer->hasIfdef(func->functionScope->bodyStart, func->functionScope->bodyEnd))
return false;

auto getFuncTok = [](const Token* tok) -> const Token* {
if (Token::simpleMatch(tok, "this"))
tok = getFuncTokFromThis(tok);
if ((Token::Match(tok, "%name% (|{") || Token::simpleMatch(tok->astParent(), "return {")) && !tok->isStandardType() && !tok->isKeyword())
return tok;
return nullptr;
};

// if the function doesn't have any assignment nor function call,
// it can be a const function..
for (const Token *tok1 = func->functionScope->bodyStart; tok1 && tok1 != func->functionScope->bodyEnd; tok1 = tok1->next()) {
Expand Down Expand Up @@ -2400,18 +2418,17 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
}

// function/constructor call, return init list
else if ((Token::Match(tok1, "%name% (|{") || Token::simpleMatch(tok1->astParent(), "return {")) && !tok1->isStandardType() &&
!Token::Match(tok1, "return|if|string|switch|while|catch|for")) {
if (isMemberFunc(scope, tok1) && tok1->strAt(-1) != ".") {
if (!isConstMemberFunc(scope, tok1))
else if (const Token* funcTok = getFuncTok(tok1)) {
if (isMemberFunc(scope, funcTok) && (funcTok->strAt(-1) != "." || Token::simpleMatch(funcTok->tokAt(-2), "this ."))) {
if (!isConstMemberFunc(scope, funcTok))
return false;
memberAccessed = true;
}
// Member variable given as parameter
const Token *lpar = tok1->next();
const Token *lpar = funcTok->next();
if (Token::simpleMatch(lpar, "( ) ("))
lpar = lpar->tokAt(2);
for (const Token* tok2 = lpar->next(); tok2 && tok2 != tok1->next()->link(); tok2 = tok2->next()) {
for (const Token* tok2 = lpar->next(); tok2 && tok2 != funcTok->next()->link(); tok2 = tok2->next()) {
if (tok2->str() == "(")
tok2 = tok2->link();
else if ((tok2->isName() && isMemberVar(scope, tok2)) || (tok2->isUnaryOp("&") && (tok2 = tok2->astOperand1()))) {
Expand Down
35 changes: 35 additions & 0 deletions test/testclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class TestClass : public TestFixture {
TEST_CASE(const77); // ticket #10307, #10311
TEST_CASE(const78); // ticket #10315
TEST_CASE(const79); // ticket #9861
TEST_CASE(const80); // ticket #11328
TEST_CASE(const_handleDefaultParameters);
TEST_CASE(const_passThisToMemberOfOtherClass);
TEST_CASE(assigningPointerToPointerIsNotAConstOperation);
Expand Down Expand Up @@ -6152,6 +6153,40 @@ class TestClass : public TestFixture {
errout.str());
}

void const80() { // #11328
checkConst("struct B { static void b(); };\n"
"struct S : B {\n"
" static void f() {}\n"
" void g() const;\n"
" void h();\n"
" void k();\n"
" void m();\n"
" void n();\n"
" int i;\n"
"};\n"
"void S::g() const {\n"
" this->f();\n"
"}\n"
"void S::h() {\n"
" this->f();\n"
"}\n"
"void S::k() {\n"
" if (i)\n"
" this->f();\n"
"}\n"
"void S::m() {\n"
" this->B::b();\n"
"}\n"
"void S::n() {\n"
" this->h();\n"
"}\n");
ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:4]: (performance, inconclusive) Technically the member function 'S::g' can be static (but you may consider moving to unnamed namespace).\n"
"[test.cpp:14] -> [test.cpp:5]: (performance, inconclusive) Technically the member function 'S::h' can be static (but you may consider moving to unnamed namespace).\n"
"[test.cpp:17] -> [test.cpp:6]: (style, inconclusive) Technically the member function 'S::k' can be const.\n"
"[test.cpp:21] -> [test.cpp:7]: (performance, inconclusive) Technically the member function 'S::m' can be static (but you may consider moving to unnamed namespace).\n",
errout.str());
}

void const_handleDefaultParameters() {
checkConst("struct Foo {\n"
" void foo1(int i, int j = 0) {\n"
Expand Down