Skip to content

fixed #14089 - ProgramMemory: restored usage of hash lookups / use cached expression ID #7769

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
merged 1 commit into from
Aug 26, 2025
Merged

fixed #14089 - ProgramMemory: restored usage of hash lookups / use cached expression ID #7769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions lib/programmemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@

ExprIdToken::ExprIdToken(const Token* tok) : tok(tok), exprid(tok ? tok->exprId() : 0) {}

ExprIdToken::ExprIdToken(nonneg int exprId) : exprid(exprId) {}

nonneg int ExprIdToken::getExpressionId() const {
return tok ? tok->exprId() : exprid;
return exprid;
}

std::size_t ExprIdToken::Hash::operator()(ExprIdToken etok) const
Expand Down Expand Up @@ -239,16 +241,12 @@ void ProgramMemory::copyOnWrite()
ProgramMemory::Map::const_iterator ProgramMemory::find(nonneg int exprid) const
{
const auto& cvalues = utils::as_const(*mValues);
return std::find_if(cvalues.cbegin(), cvalues.cend(), [&exprid](const Map::value_type& entry) {
return entry.first.getExpressionId() == exprid;
});
return cvalues.find(ExprIdToken::create(exprid));
}

ProgramMemory::Map::iterator ProgramMemory::find(nonneg int exprid)
{
return std::find_if(mValues->begin(), mValues->end(), [&exprid](const Map::value_type& entry) {
return entry.first.getExpressionId() == exprid;
});
return mValues->find(ExprIdToken::create(exprid));
}

static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings& settings);
Expand Down
9 changes: 9 additions & 0 deletions lib/programmemory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ struct ExprIdToken {
struct Hash {
std::size_t operator()(ExprIdToken etok) const;
};

/** create object for hashed lookups */
static ExprIdToken create(nonneg int exprId) {
return ExprIdToken(exprId);
}

private:
// for hashed lookups only
explicit ExprIdToken(nonneg int exprId);
};

struct CPPCHECKLIB ProgramMemory {
Expand Down