Skip to content

Suppression file name cache. #8684

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

Open
MartinBP wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −1
Open

Suppression file name cache. #8684

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
f45c7cb
Suppression file name cache.
MartinBP Jul 1, 2026
1e97436
Fix naming violation of private member variable.
MartinBP Jul 1, 2026
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
17 changes: 16 additions & 1 deletion lib/suppressions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(
if (!thisAndNextLine || lineNumber + 1 != errmsg.lineNumber)
return Result::None;
}
if (!fileName.empty() && !PathMatch::match(fileName, errmsg.getFileName()))
if (!fileName.empty() && !isFileNameMatch(errmsg.getFileName()))
return Result::None;
if (hash > 0 && hash != errmsg.hash)
return Result::Checked;
Expand Down Expand Up @@ -453,6 +453,21 @@ SuppressionList::Suppression::Result SuppressionList::Suppression::isSuppressed(
return Result::Matched;
}

bool SuppressionList::Suppression::isFileNameMatch(const std::string &errorFileName) const
{
const auto it = mFileNameMatchCache.find(errorFileName);
if (it != mFileNameMatchCache.end())
return it->second;

const bool isMatch = PathMatch::match(fileName, errorFileName);

if (mFileNameMatchCache.size() >= mFileNameMatchCacheMaxEntries)
mFileNameMatchCache.clear();

mFileNameMatchCache.emplace(errorFileName, isMatch);
return isMatch;
}

bool SuppressionList::Suppression::isMatch(const SuppressionList::ErrorMessage &errmsg)
{
switch (isSuppressed(errmsg)) {
Expand Down
6 changes: 6 additions & 0 deletions lib/suppressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ class CPPCHECKLIB SuppressionList {
bool isPolyspace{};

enum : std::int8_t { NO_LINE = -1 };

private:
bool isFileNameMatch(const std::string &errorFileName) const;

static constexpr std::size_t mFileNameMatchCacheMaxEntries = 256;
mutable std::map<std::string, bool> mFileNameMatchCache;
};

/**
Expand Down
Loading