Backed out changeset 3b8c7fa73e82 (bug 1207753) for causing build bustages on Monitor.h CLOSED TREE

Author: Cristian Tuns

mfbt/Maybe.h

@@ -21,7 +21,6 @@
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/OperatorNewExtensions.h"
 #include "mozilla/Poison.h"
-#include "mozilla/ThreadSafety.h"
 
 class nsCycleCollectionTraversalCallback;
 
@@ -637,13 +636,7 @@ class MOZ_INHERIT_TYPE_ANNOTATIONS_FROM_TEMPLATE_ARGS Maybe
   constexpr void reset() {
     if (isSome()) {
       if constexpr (!std::is_trivially_destructible_v<T>) {
-        /*
-         * Static analyzer gets confused if we have Maybe<MutexAutoLock>,
-         * so we suppress thread-safety warnings here
-         */
-        PUSH_IGNORE_THREAD_SAFETY
         ref().T::~T();
-        POP_THREAD_SAFETY
         poisonData();
       }
       mIsSome = false;

mfbt/ThreadSafety.h

@@ -108,7 +108,6 @@ EXPORTS.mozilla = [
     "TemplateLib.h",
     "TextUtils.h",
     "ThreadLocal.h",
-    "ThreadSafety.h",
     "ThreadSafeWeakPtr.h",
     "ToString.h",
     "Tuple.h",

mfbt/moz.build

@@ -10,7 +10,6 @@
 #define BaseProfilerDetail_h
 
 #include "mozilla/Atomics.h"
-#include "mozilla/Attributes.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PlatformMutex.h"
 #include "mozilla/PlatformRWLock.h"

mozglue/baseprofiler/public/BaseProfilerDetail.h

@@ -9,11 +9,10 @@
 
 #include "mozilla/Atomics.h"
 #include "mozilla/CondVar.h"
-#include "mozilla/ThreadSafety.h"
 
 namespace mozilla {
 
-class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS CAPABILITY StaticMonitor {
+class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS StaticMonitor {
  public:
   // In debug builds, check that mMutex is initialized for us as we expect by
   // the compiler.  In non-debug builds, don't declare a constructor so that
@@ -22,20 +21,17 @@ class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS CAPABILITY StaticMonitor {
   StaticMonitor() { MOZ_ASSERT(!mMutex); }
 #endif
 
-  void Lock() CAPABILITY_ACQUIRE() { Mutex()->Lock(); }
+  void Lock() { Mutex()->Lock(); }
 
-  void Unlock() CAPABILITY_RELEASE() { Mutex()->Unlock(); }
+  void Unlock() { Mutex()->Unlock(); }
 
   void Wait() { CondVar()->Wait(); }
-  CVStatus Wait(TimeDuration aDuration) {
-    AssertCurrentThreadOwns();
-    return CondVar()->Wait(aDuration);
-  }
+  CVStatus Wait(TimeDuration aDuration) { return CondVar()->Wait(aDuration); }
 
   void Notify() { CondVar()->Notify(); }
   void NotifyAll() { CondVar()->NotifyAll(); }
 
-  void AssertCurrentThreadOwns() ASSERT_CAPABILITY(this) {
+  void AssertCurrentThreadOwns() {
 #ifdef DEBUG
     Mutex()->AssertCurrentThreadOwns();
 #endif
@@ -86,14 +82,14 @@ class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS CAPABILITY StaticMonitor {
   static void operator delete(void*);
 };
 
-class MOZ_STACK_CLASS SCOPED_CAPABILITY StaticMonitorAutoLock {
+class MOZ_STACK_CLASS StaticMonitorAutoLock {
  public:
-  explicit StaticMonitorAutoLock(StaticMonitor& aMonitor) CAPABILITY_ACQUIRE(aMonitor)
+  explicit StaticMonitorAutoLock(StaticMonitor& aMonitor)
       : mMonitor(&aMonitor) {
     mMonitor->Lock();
   }
 
-  ~StaticMonitorAutoLock() CAPABILITY_RELEASE() { mMonitor->Unlock(); }
+  ~StaticMonitorAutoLock() { mMonitor->Unlock(); }
 
   void Wait() { mMonitor->Wait(); }
   CVStatus Wait(TimeDuration aDuration) { return mMonitor->Wait(aDuration); }

xpcom/base/StaticMonitor.h

@@ -26,7 +26,7 @@ namespace mozilla {
  * initialized to 0 in order to initialize mMutex.  It is only safe to use
  * StaticMutex as a global or static variable.
  */
-class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS CAPABILITY StaticMutex {
+class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS StaticMutex {
  public:
   // In debug builds, check that mMutex is initialized for us as we expect by
   // the compiler.  In non-debug builds, don't declare a constructor so that
@@ -35,11 +35,11 @@ class MOZ_ONLY_USED_TO_AVOID_STATIC_CONSTRUCTORS CAPABILITY StaticMutex {
   StaticMutex() { MOZ_ASSERT(!mMutex); }
 #endif
 
-  void Lock() CAPABILITY_ACQUIRE() { Mutex()->Lock(); }
+  void Lock() { Mutex()->Lock(); }
 
-  void Unlock() CAPABILITY_RELEASE() { Mutex()->Unlock(); }
+  void Unlock() { Mutex()->Unlock(); }
 
-  void AssertCurrentThreadOwns() ASSERT_CAPABILITY(this) {
+  void AssertCurrentThreadOwns() {
 #ifdef DEBUG
     Mutex()->AssertCurrentThreadOwns();
 #endif

xpcom/base/StaticMutex.h

@@ -71,7 +71,7 @@ static void DisableCrashReporter() {
 // Single-threaded sanity tests
 
 // Stupidest possible deadlock.
-static int Sanity_Child() NO_THREAD_SAFETY_ANALYSIS {
+static int Sanity_Child() {
   DisableCrashReporter();
 
   MUTEX m1("dd.sanity.m1");
@@ -92,7 +92,7 @@ TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(SanityDeathTest)) {
 }
 
 // Slightly less stupid deadlock.
-static int Sanity2_Child() NO_THREAD_SAFETY_ANALYSIS {
+static int Sanity2_Child() {
   DisableCrashReporter();
 
   MUTEX m1("dd.sanity2.m1");
@@ -118,7 +118,7 @@ TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity2DeathTest)) {
 #if 0
 // Temporarily disabled, see bug 1370644.
 int
-Sanity3_Child() NO_THREAD_SAFETY_ANALYSIS
+Sanity3_Child()
 {
     DisableCrashReporter();
 
@@ -156,7 +156,7 @@ TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity3DeathTest))
 }
 #endif
 
-static int Sanity4_Child() NO_THREAD_SAFETY_ANALYSIS {
+static int Sanity4_Child() {
   DisableCrashReporter();
 
   mozilla::ReentrantMonitor m1 MOZ_UNANNOTATED("dd.sanity4.m1");
@@ -179,7 +179,7 @@ TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity4DeathTest)) {
   ASSERT_DEATH_IF_SUPPORTED(Sanity4_Child(), regex);
 }
 
-static int Sanity5_Child() NO_THREAD_SAFETY_ANALYSIS {
+static int Sanity5_Child() {
   DisableCrashReporter();
 
   mozilla::RecursiveMutex m1 MOZ_UNANNOTATED("dd.sanity4.m1");
@@ -225,7 +225,7 @@ struct ThreadState {
 #if 0
 // Temporarily disabled, see bug 1370644.
 static void
-TwoThreads_thread(void* arg) NO_THREAD_SAFETY_ANALYSIS
+TwoThreads_thread(void* arg)
 {
     ThreadState* state = static_cast<ThreadState*>(arg);
 
@@ -247,7 +247,7 @@ TwoThreads_thread(void* arg) NO_THREAD_SAFETY_ANALYSIS
 }
 
 int
-TwoThreads_Child() NO_THREAD_SAFETY_ANALYSIS
+TwoThreads_Child()
 {
     DisableCrashReporter();
 
@@ -284,7 +284,7 @@ TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(TwoThreadsDeathTest))
 }
 #endif
 
-static void ContentionNoDeadlock_thread(void* arg) NO_THREAD_SAFETY_ANALYSIS {
+static void ContentionNoDeadlock_thread(void* arg) {
   const uint32_t K = 100000;
 
   ThreadState* state = static_cast<ThreadState*>(arg);
@@ -300,7 +300,7 @@ static void ContentionNoDeadlock_thread(void* arg) NO_THREAD_SAFETY_ANALYSIS {
   }
 }
 
-static int ContentionNoDeadlock_Child() NO_THREAD_SAFETY_ANALYSIS {
+static int ContentionNoDeadlock_Child() {
   const size_t kMutexCount = 4;
 
   PRThread* threads[3];

xpcom/tests/gtest/TestDeadlockDetector.cpp

@@ -15,7 +15,7 @@ using mozilla::RecursiveMutexAutoLock;
 // well, actually recursively acquirable.
 
 TEST(RecursiveMutex, SmokeTest)
-NO_THREAD_SAFETY_ANALYSIS {
+{
   RecursiveMutex mutex("testing mutex");
 
   RecursiveMutexAutoLock lock1(mutex);

xpcom/tests/gtest/TestRecursiveMutex.cpp

@@ -21,7 +21,7 @@ static PRThread* spawn(void (*run)(void*), void* arg) {
 // Sanity check: tests that can be done on a single thread
 //
 TEST(Synchronization, Sanity)
-NO_THREAD_SAFETY_ANALYSIS {
+{
   Mutex lock("sanity::lock");
   lock.Lock();
   lock.AssertCurrentThreadOwns();
@@ -112,7 +112,7 @@ TEST(Synchronization, MonitorContention)
 
 static ReentrantMonitor* gMon2;
 
-static void MonitorContention2_thread(void* /*arg*/) NO_THREAD_SAFETY_ANALYSIS {
+static void MonitorContention2_thread(void* /*arg*/) {
   for (int i = 0; i < 100000; ++i) {
     gMon2->Enter();
     gMon2->AssertCurrentThreadIn();
@@ -144,7 +144,7 @@ TEST(Synchronization, MonitorContention2)
 static ReentrantMonitor* gMon3;
 static int32_t gMonFirst;
 
-static void MonitorSyncSanity_thread(void* /*arg*/) NO_THREAD_SAFETY_ANALYSIS {
+static void MonitorSyncSanity_thread(void* /*arg*/) {
   gMon3->Enter();
   gMon3->AssertCurrentThreadIn();
   if (gMonFirst) {
@@ -294,7 +294,7 @@ TEST(Synchronization, AutoUnlock)
 // AutoMonitor tests
 //
 TEST(Synchronization, AutoMonitor)
-NO_THREAD_SAFETY_ANALYSIS {
+{
   ReentrantMonitor m1("automonitor");
   ReentrantMonitor m2("automonitor2");
 

xpcom/tests/gtest/TestSynchronization.cpp

@@ -502,7 +502,7 @@ void RecursiveMutex::Unlock() {
   UnlockInternal();
 }
 
-void RecursiveMutex::AssertCurrentThreadIn() const {
+void RecursiveMutex::AssertCurrentThreadIn() {
   MOZ_ASSERT(IsAcquired() && mOwningThread == PR_GetCurrentThread());
 }