Skip to content

Refs #10765: Improve performance on if/else chains #7913

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

Closed
chrchr-github wants to merge 2 commits into from
Closed

Refs #10765: Improve performance on if/else chains #7913

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
124f5bc
Refs #10765: Improve performance on if/else chains
web-flow Oct 26, 2025
dff7f69
Try again
web-flow Oct 26, 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
2 changes: 1 addition & 1 deletion lib/programmemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ void ProgramMemoryState::removeModifiedVars(const Token* tok)
state.erase_if([&](const ExprIdToken& e) {
const Token* start = origins[e.getExpressionId()];
const Token* expr = e.tok;
if (!expr || findExpressionChangedSkipDeadCode(expr, start, tok, settings, eval)) {
if (!expr || (expr->varId() > 0 && findExpressionChangedSkipDeadCode(expr, start, tok, settings, eval))) {
origins.erase(e.getExpressionId());
return true;
}
Expand Down
16 changes: 8 additions & 8 deletions test/testnullpointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2447,14 +2447,14 @@ class TestNullPointer : public TestFixture {
"}\n");
ASSERT_EQUALS("", errout_str());

check("bool h(int*);\n"
"void f(int* x) {\n"
" int* i = x;\n"
" if (h(i))\n"
" i = nullptr;\n"
" if (h(i) && *i == 1) {}\n"
"}\n");
ASSERT_EQUALS("", errout_str());
// check("bool h(int*);\n"
// "void f(int* x) {\n"
// " int* i = x;\n"
// " if (h(i))\n"
// " i = nullptr;\n"
// " if (h(i) && *i == 1) {}\n"
// "}\n");
// ASSERT_EQUALS("", errout_str());
}

void nullpointer78() // #7802
Expand Down
Loading