merge #19249: Add means to handle negative capabilities in thread safety annotations

This commit is contained in:
Kittywhiskers Van Gogh 2020-06-09 16:50:45 +03:00
parent 51fababb9c
commit cbc6186b64
2 changed files with 13 additions and 0 deletions

View File

@ -100,6 +100,12 @@ public:
} }
using UniqueLock = std::unique_lock<PARENT>; using UniqueLock = std::unique_lock<PARENT>;
#ifdef __clang__
//! For negative capabilities in the Clang Thread Safety Analysis.
//! A negative requirement uses the EXCLUSIVE_LOCKS_REQUIRED attribute, in conjunction
//! with the ! operator, to indicate that a mutex should not be held.
const AnnotatedMixin& operator!() const { return *this; }
#endif // __clang__
}; };
/** /**

View File

@ -60,6 +60,13 @@
// and should only be used when sync.h Mutex/LOCK/etc are not usable. // and should only be used when sync.h Mutex/LOCK/etc are not usable.
class LOCKABLE StdMutex : public std::mutex class LOCKABLE StdMutex : public std::mutex
{ {
public:
#ifdef __clang__
//! For negative capabilities in the Clang Thread Safety Analysis.
//! A negative requirement uses the EXCLUSIVE_LOCKS_REQUIRED attribute, in conjunction
//! with the ! operator, to indicate that a mutex should not be held.
const StdMutex& operator!() const { return *this; }
#endif // __clang__
}; };
// StdLockGuard provides an annotated version of std::lock_guard for us, // StdLockGuard provides an annotated version of std::lock_guard for us,