Skip to content

[clang] [NFC] explicitly check if ParentMap contains key #121736

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 2 commits into from
Jan 8, 2025
Merged

[clang] [NFC] explicitly check if ParentMap contains key #121736

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cae10e
[clang] explicitly check if ParentMap contains key
ssahasra Jan 2, 2025
028e464
eliminate multiple lookups
ssahasra Jan 7, 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
8 changes: 4 additions & 4 deletions clang/lib/AST/ParentMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ static void BuildParentMap(MapTy& M, Stmt* S,
case Stmt::PseudoObjectExprClass: {
PseudoObjectExpr *POE = cast<PseudoObjectExpr>(S);

if (OVMode == OV_Opaque && M[POE->getSyntacticForm()])
if (OVMode == OV_Opaque && M.contains(POE->getSyntacticForm()))
Copy link
Contributor

@jayfoad jayfoad Jan 6, 2025

Choose a reason for hiding this comment

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

Could put this and the next if inside one big if (M.contains) check to avoid a duplicated map lookup.

Copy link
Collaborator Author

@ssahasra ssahasra Jan 7, 2025

Choose a reason for hiding this comment

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

Fixed with try_emplace() to avoid the second lookup as well, which inserts when the key is already present.

break;

// If we are rebuilding the map, clear out any existing state.
if (M[POE->getSyntacticForm()])
if (M.contains(POE->getSyntacticForm()))
for (Stmt *SubStmt : S->children())
M[SubStmt] = nullptr;
M.erase(SubStmt);

M[POE->getSyntacticForm()] = S;
BuildParentMap(M, POE->getSyntacticForm(), OV_Transparent);
Expand Down Expand Up @@ -78,7 +78,7 @@ static void BuildParentMap(MapTy& M, Stmt* S,
// The right thing to do is to give the OpaqueValueExpr its syntactic
// parent, then not reassign that when traversing the semantic expressions.
OpaqueValueExpr *OVE = cast<OpaqueValueExpr>(S);
if (OVMode == OV_Transparent || !M[OVE->getSourceExpr()]) {
if (OVMode == OV_Transparent || !M.contains(OVE->getSourceExpr())) {
M[OVE->getSourceExpr()] = S;
Copy link
Contributor

@jayfoad jayfoad Jan 6, 2025

Choose a reason for hiding this comment

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

Could use M.find to avoid the duplicated lookup here?

Copy link
Collaborator Author

@ssahasra ssahasra Jan 7, 2025

Choose a reason for hiding this comment

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

Fixed with try_emplace() to avoid the second lookup as well, which inserts when the key is already present.

BuildParentMap(M, OVE->getSourceExpr(), OV_Transparent);
}
Expand Down
Loading