Skip to content

[clang][mutation analyzer][NFC] Simplify code in ExprMutationAnalyzer #125283

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
steakhal merged 2 commits into from
Feb 1, 2025
Merged

[clang][mutation analyzer][NFC] Simplify code in ExprMutationAnalyzer #125283

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9544eb
[clang][NFC] Simplify code in ExprMutationAnalyzer
steakhal Jan 31, 2025
2f48b57
Use try_emplace
steakhal Jan 31, 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
5 changes: 1 addition & 4 deletions clang/lib/Analysis/ExprMutationAnalyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,10 +813,7 @@ FunctionParmMutationAnalyzer::findMutation(const ParmVarDecl *Parm) {
// before analyzing parameters of A. Then when analyzing the second "call A",
// FunctionParmMutationAnalyzer can use this memoized value to avoid infinite
// recursion.
Results[Parm] = nullptr;
if (const Stmt *S = BodyAnalyzer.findMutation(Parm))
return Results[Parm] = S;
return Results[Parm];
return Results[Parm] = BodyAnalyzer.findMutation(Parm);
Copy link
Contributor

@kazutakahirata kazutakahirata Jan 31, 2025

Choose a reason for hiding this comment

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

We have the following a few lines above:

  const auto Memoized = Results.find(Parm);
  if (Memoized != Results.end())
    return Memoized->second;

Could we turn that into something like this and use the iterator from try_emplace?

  auto [Memoized, Inserted] = Results.try_emplace(Parm);
  if (!Inserted)
    return Memoized->second;

  Memoized->second = ...;

Maybe we should rename Memorized. The name would sound strange if the insertion is successful.

Copy link
Contributor Author

@steakhal steakhal Jan 31, 2025

Choose a reason for hiding this comment

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

Fixed. I usually use "Place" or "Slot" for this.

}

} // namespace clang