Skip to content

Fix #14064 Files are reanalyzed with --cppcheck-build-dir and inline suppressions (regression) #7741

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
chrchr-github merged 11 commits into from
Aug 19, 2025
Merged

Fix #14064 Files are reanalyzed with --cppcheck-build-dir and inline suppressions (regression) #7741

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dc8190b
Update suppressions.h
chrchr-github Aug 14, 2025
5ae3576
Update suppressions.cpp
chrchr-github Aug 14, 2025
333a2d9
Update cppcheck.h
chrchr-github Aug 14, 2025
43604ad
Update cppcheck.cpp
chrchr-github Aug 14, 2025
31566a8
Update cppcheck.cpp
chrchr-github Aug 14, 2025
cded2bd
Update cppcheck.cpp
chrchr-github Aug 14, 2025
ab8907b
Update suppressions.cpp
chrchr-github Aug 14, 2025
b046180
Add test
web-flow Aug 14, 2025
adb34f2
Fix
web-flow Aug 14, 2025
17f17ed
Update inline-suppress_test.py
chrchr-github Aug 15, 2025
8b97065
Update inline-suppress_test.py
chrchr-github Aug 15, 2025
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
6 changes: 3 additions & 3 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ static simplecpp::TokenList createTokenList(const std::string& filename, std::ve
return {filename, files, outputList};
}

std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const simplecpp::TokenList& tokens) const
std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const simplecpp::TokenList& tokens, const std::string& filePath) const
{
std::ostringstream toolinfo;
toolinfo << (mSettings.cppcheckCfgProductName.empty() ? CPPCHECK_VERSION_STRING : mSettings.cppcheckCfgProductName);
Expand All @@ -867,7 +867,7 @@ std::size_t CppCheck::calculateHash(const Preprocessor& preprocessor, const simp
}
toolinfo << mSettings.premiumArgs;
// TODO: do we need to add more options?
mSuppressions.nomsg.dump(toolinfo);
mSuppressions.nomsg.dump(toolinfo, filePath);
return preprocessor.calculateHash(tokens, toolinfo.str());
}

Expand Down Expand Up @@ -1020,7 +1020,7 @@ unsigned int CppCheck::checkFile(const FileWithDetails& file, const std::string

if (analyzerInformation) {
// Calculate hash so it can be compared with old hash / future hashes
const std::size_t hash = calculateHash(preprocessor, tokens1);
const std::size_t hash = calculateHash(preprocessor, tokens1, file.spath());
std::list<ErrorMessage> errors;
if (!analyzerInformation->analyzeFile(mSettings.buildDir, file.spath(), cfgname, fileIndex, hash, errors)) {
while (!errors.empty()) {
Expand Down
2 changes: 1 addition & 1 deletion lib/cppcheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class CPPCHECKLIB CppCheck {
* @param tokens Token list from preprocessed file.
* @return hash
*/
std::size_t calculateHash(const Preprocessor &preprocessor, const simplecpp::TokenList &tokens) const;
std::size_t calculateHash(const Preprocessor &preprocessor, const simplecpp::TokenList &tokens, const std::string& filePath = {}) const;

/**
* @brief Check a file using stream
Expand Down
4 changes: 3 additions & 1 deletion lib/suppressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,12 +512,14 @@ bool SuppressionList::isSuppressed(const ::ErrorMessage &errmsg, const std::set<
return isSuppressed(SuppressionList::ErrorMessage::fromErrorMessage(errmsg, macroNames));
}

void SuppressionList::dump(std::ostream & out) const
void SuppressionList::dump(std::ostream & out, const std::string& filePath) const
{
std::lock_guard<std::mutex> lg(mSuppressionsSync);

out << " <suppressions>" << std::endl;
for (const Suppression &suppression : mSuppressions) {
if (!filePath.empty() && !suppression.fileName.empty() && filePath != suppression.fileName)
Copy link
Collaborator

@firewave firewave Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the suppression could contain a pattern we need to use the matching logic of the suppressions.

Copy link
Collaborator Author

@chrchr-github chrchr-github Aug 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I follow. There is only one suppression at a time, and we only care about inline suppressions.

continue;
out << " <suppression";
out << " errorId=\"" << ErrorLogger::toxml(suppression.errorId) << '"';
if (!suppression.fileName.empty())
Expand Down
2 changes: 1 addition & 1 deletion lib/suppressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ class CPPCHECKLIB SuppressionList {
* @brief Create an xml dump of suppressions
* @param out stream to write XML to
*/
void dump(std::ostream &out) const;
void dump(std::ostream &out, const std::string& filePath = {}) const;

/**
* @brief Returns list of unmatched local (per-file) suppressions.
Expand Down
Loading