Thread Safety Analysis: Use replaceLock instead of removeLock+addLock #141500
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
In ScopedLockableFactEntry::unlock(), we can avoid a second search, pop_back(), and push_back() if we use the already obtained iterator into the FactSet to replace the old FactEntry and take its position in the vector.
llvmbot added clang 
Member
| @llvm/pr-subscribers-clang Author: Marco Elver (melver) ChangesIn ScopedLockableFactEntry::unlock(), we can avoid a second search, pop_back(), and push_back() if we use the already obtained iterator into the FactSet to replace the old FactEntry and take its position in the vector. Full diff: https://github.com/llvm/llvm-project/pull/141500.diff 1 Files Affected:
diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp index 198e324414be9..9dffb8fcd2204 100644 --- a/clang/lib/Analysis/ThreadSafety.cpp +++ b/clang/lib/Analysis/ThreadSafety.cpp @@ -1071,9 +1071,9 @@ class ScopedLockableFactEntry : public FactEntry { return; } - FSet.removeLock(FactMan, Cp); - FSet.addLock(FactMan, - std::make_unique<LockableFactEntry>(!Cp, LK_Exclusive, loc)); + FSet.replaceLock( + FactMan, It, + std::make_unique<LockableFactEntry>(!Cp, LK_Exclusive, loc)); } else if (Handler) { SourceLocation PrevLoc; if (const FactEntry *Neg = FSet.findLock(FactMan, !Cp)) |
Member
| @llvm/pr-subscribers-clang-analysis Author: Marco Elver (melver) ChangesIn ScopedLockableFactEntry::unlock(), we can avoid a second search, pop_back(), and push_back() if we use the already obtained iterator into the FactSet to replace the old FactEntry and take its position in the vector. Full diff: https://github.com/llvm/llvm-project/pull/141500.diff 1 Files Affected:
diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp index 198e324414be9..9dffb8fcd2204 100644 --- a/clang/lib/Analysis/ThreadSafety.cpp +++ b/clang/lib/Analysis/ThreadSafety.cpp @@ -1071,9 +1071,9 @@ class ScopedLockableFactEntry : public FactEntry { return; } - FSet.removeLock(FactMan, Cp); - FSet.addLock(FactMan, - std::make_unique<LockableFactEntry>(!Cp, LK_Exclusive, loc)); + FSet.replaceLock( + FactMan, It, + std::make_unique<LockableFactEntry>(!Cp, LK_Exclusive, loc)); } else if (Handler) { SourceLocation PrevLoc; if (const FactEntry *Neg = FSet.findLock(FactMan, !Cp)) |
AaronBallman approved these changes Jun 5, 2025
Collaborator
AaronBallman left a comment
AaronBallman left a comment There was a problem hiding this comment.
LGTM, nice improvement!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
In ScopedLockableFactEntry::unlock(), we can avoid a second search, pop_back(), and push_back() if we use the already obtained iterator into the FactSet to replace the old FactEntry and take its position in the vector.