Skip to content

Fix #11808 FP uselessOverride - grandchildren calling grandfather #5212

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 13 commits into from
Jul 1, 2023
Merged

Fix #11808 FP uselessOverride - grandchildren calling grandfather #5212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
385f62e
Fix #11757 Detect useless overriding functions
chrchr-github Jun 13, 2023
758a28e
Improve, add tests
chrchr-github Jun 14, 2023
976294a
Format
chrchr-github Jun 14, 2023
387bb34
Merge branch 'main' into chr_Fix11757
chrchr-github Jun 29, 2023
f49073d
Fix FPs: uselessOverride
chrchr-github Jun 29, 2023
e10cd1c
Comment
chrchr-github Jun 29, 2023
be9525d
Fix #11803 FP uselessOverride - overloaded virtual member function
chrchr-github Jun 30, 2023
24426ee
Merge
chrchr-github Jun 30, 2023
d64aef2
Fix FP uselessOverride
chrchr-github Jun 30, 2023
5403446
Add test
chrchr-github Jul 1, 2023
1af5a07
Merge
chrchr-github Jul 1, 2023
39f2e98
Merge
chrchr-github Jul 1, 2023
5d80382
Fix merge
chrchr-github Jul 1, 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
4 changes: 2 additions & 2 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4388,13 +4388,13 @@ const Function * Function::getOverriddenFunctionRecursive(const ::Type* baseType
auto range = parent->functionMap.equal_range(tokenDef->str());
for (std::multimap<std::string, const Function*>::const_iterator it = range.first; it != range.second; ++it) {
const Function * func = it->second;
if (func->hasVirtualSpecifier()) { // Base is virtual and of same name
if (func->isImplicitlyVirtual()) { // Base is virtual and of same name
const Token *temp1 = func->tokenDef->previous();
const Token *temp2 = tokenDef->previous();
bool match = true;

// check for matching return parameters
while (temp1->str() != "virtual") {
while (!Token::Match(temp1, "virtual|{|}|;")) {
if (temp1->str() != temp2->str() &&
!(temp1->str() == derivedFromType->name() &&
temp2->str() == baseType->name())) {
Expand Down
9 changes: 9 additions & 0 deletions test/testclass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8440,6 +8440,15 @@ class TestClass : public TestFixture {
" void g() { f(); }\n"
"};");
ASSERT_EQUALS("", errout.str());

checkUselessOverride("struct B { virtual void f(); };\n" // #11808
"struct D : B { void f() override {} };\n"
"struct D2 : D {\n"
" void f() override {\n"
" B::f();\n"
" }\n"
"};");
ASSERT_EQUALS("", errout.str());
}

#define checkUnsafeClassRefMember(code) checkUnsafeClassRefMember_(code, __FILE__, __LINE__)
Expand Down