[clang] 2d7f53b - Thread Safety Analysis: Use replaceLock instead of removeLock+addLock (#141500)

[via cfe-commits]

Author: Marco Elver
Date: 2025-06-05T16:05:59+02:00
New Revision: 2d7f53bc27c345b844013b0a64040119bd362e51

URL: https://github.com/llvm/llvm-project/commit/2d7f53bc27c345b844013b0a64040119bd362e51
DIFF: https://github.com/llvm/llvm-project/commit/2d7f53bc27c345b844013b0a64040119bd362e51.diff

LOG: Thread Safety Analysis: Use replaceLock instead of removeLock+addLock (#141500)

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.

Added: 
    

Modified: 
    clang/lib/Analysis/ThreadSafety.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp
index d4d06b6dedcae..80e7c8eff671a 100644
--- a/clang/lib/Analysis/ThreadSafety.cpp
+++ b/clang/lib/Analysis/ThreadSafety.cpp
@@ -1066,9 +1066,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))