Imported Upstream version 1.6.0+dfsg1

[rustc.git] / src / compiler-rt / lib / tsan / rtl / tsan_mutex.h

diff --git a/src/compiler-rt/lib/tsan/rtl/tsan_mutex.h b/src/compiler-rt/lib/tsan/rtl/tsan_mutex.h
index 12580fa9bd0dd8e8130b6c1994bb828c471ecc68..27f55385c959aba46d22618ab02a4bf3decd4e6f 100644 (file)
--- a/src/compiler-rt/lib/tsan/rtl/tsan_mutex.h
+++ b/src/compiler-rt/lib/tsan/rtl/tsan_mutex.h
@@ -32,6 +32,8 @@ enum MutexType {
   MutexTypeMBlock,
   MutexTypeJavaMBlock,
   MutexTypeDDetector,
+  MutexTypeFired,
+  MutexTypeRacy,
 
   // This must be the last.
   MutexTypeCount
@@ -52,7 +54,7 @@ class Mutex {
 
  private:
   atomic_uintptr_t state_;
-#if TSAN_DEBUG
+#if SANITIZER_DEBUG
   MutexType type_;
 #endif
 #if TSAN_COLLECT_STATS
@@ -71,6 +73,7 @@ class InternalDeadlockDetector {
   InternalDeadlockDetector();
   void Lock(MutexType t);
   void Unlock(MutexType t);
+  void CheckNoLocks();
  private:
   u64 seq_;
   u64 locked_[MutexTypeCount];
@@ -78,6 +81,10 @@ class InternalDeadlockDetector {
 
 void InitializeMutex();
 
+// Checks that the current thread does not hold any runtime locks
+// (e.g. when returning from an interceptor).
+void CheckNoLocks(ThreadState *thr);
+
 }  // namespace __tsan
 
 #endif  // TSAN_MUTEX_H