Remove incomplete static thread safety annotations. (flutter#13151)

Fixes flutter/flutter#42704.
naguirre · Oct 17, 2019 · a925df1 · a925df1
1 parent ee1a140
commit a925df1
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 281 deletions.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -203,8 +203,6 @@ FILE: ../../../flutter/fml/synchronization/semaphore_unittest.cc
 FILE: ../../../flutter/fml/synchronization/shared_mutex.h
 FILE: ../../../flutter/fml/synchronization/shared_mutex_std.cc
 FILE: ../../../flutter/fml/synchronization/shared_mutex_std.h
-FILE: ../../../flutter/fml/synchronization/thread_annotations.h
-FILE: ../../../flutter/fml/synchronization/thread_annotations_unittest.cc
 FILE: ../../../flutter/fml/synchronization/waitable_event.cc
 FILE: ../../../flutter/fml/synchronization/waitable_event.h
 FILE: ../../../flutter/fml/synchronization/waitable_event_unittest.cc

diff --git a/fml/BUILD.gn b/fml/BUILD.gn
@@ -60,7 +60,6 @@ source_set("fml") {
     "synchronization/semaphore.cc",
     "synchronization/semaphore.h",
     "synchronization/shared_mutex.h",
-    "synchronization/thread_annotations.h",
     "synchronization/waitable_event.cc",
     "synchronization/waitable_event.h",
     "task_runner.cc",
@@ -212,7 +211,6 @@ executable("fml_unittests") {
     "platform/darwin/string_range_sanitization_unittests.mm",
     "synchronization/count_down_latch_unittests.cc",
     "synchronization/semaphore_unittest.cc",
-    "synchronization/thread_annotations_unittest.cc",
     "synchronization/waitable_event_unittest.cc",
     "thread_local_unittests.cc",
     "thread_unittests.cc",

diff --git a/fml/concurrent_message_loop.h b/fml/concurrent_message_loop.h
@@ -11,7 +11,6 @@
 
 #include "flutter/fml/closure.h"
 #include "flutter/fml/macros.h"
-#include "flutter/fml/synchronization/thread_annotations.h"
 
 namespace fml {
 

diff --git a/fml/message_loop_impl.h b/fml/message_loop_impl.h
@@ -18,7 +18,6 @@
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/message_loop_task_queues.h"
-#include "flutter/fml/synchronization/thread_annotations.h"
 #include "flutter/fml/time/time_point.h"
 #include "flutter/fml/wakeable.h"
 

diff --git a/fml/message_loop_task_queues.h b/fml/message_loop_task_queues.h
@@ -14,7 +14,6 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
 #include "flutter/fml/synchronization/shared_mutex.h"
-#include "flutter/fml/synchronization/thread_annotations.h"
 #include "flutter/fml/wakeable.h"
 
 namespace fml {
@@ -146,8 +145,7 @@ class MessageLoopTaskQueues
   fml::TimePoint GetNextWakeTimeUnlocked(TaskQueueId queue_id) const;
 
   static std::mutex creation_mutex_;
-  static fml::RefPtr<MessageLoopTaskQueues> instance_
-      FML_GUARDED_BY(creation_mutex_);
+  static fml::RefPtr<MessageLoopTaskQueues> instance_;
 
   std::unique_ptr<fml::SharedMutex> queue_meta_mutex_;
   std::map<TaskQueueId, std::unique_ptr<TaskQueueEntry>> queue_entries_;

diff --git a/fml/message_loop_unittests.cc b/fml/message_loop_unittests.cc
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <thread>
 
+#include "flutter/fml/build_config.h"
 #include "flutter/fml/concurrent_message_loop.h"
 #include "flutter/fml/message_loop.h"
 #include "flutter/fml/synchronization/count_down_latch.h"

diff --git a/fml/synchronization/thread_annotations.h b/fml/synchronization/thread_annotations.h
diff --git a/fml/synchronization/thread_annotations_unittest.cc b/fml/synchronization/thread_annotations_unittest.cc
diff --git a/fml/synchronization/waitable_event.cc b/fml/synchronization/waitable_event.cc
@@ -150,7 +150,7 @@ bool ManualResetWaitableEvent::WaitWithTimeout(TimeDelta timeout) {
   // holding |mutex_|.
   bool rv = WaitWithTimeoutImpl(
       &locker, &cv_,
-      [this, last_signal_id]() FML_NO_THREAD_SAFETY_ANALYSIS {
+      [this, last_signal_id]() {
         // Also check |signaled_| in case we're already signaled.
         return signaled_ || signal_id_ != last_signal_id;
       },

diff --git a/fml/synchronization/waitable_event.h b/fml/synchronization/waitable_event.h
@@ -14,7 +14,6 @@
 #include <mutex>
 
 #include "flutter/fml/macros.h"
-#include "flutter/fml/synchronization/thread_annotations.h"
 #include "flutter/fml/time/time_delta.h"
 
 namespace fml {

diff --git a/lib/ui/isolate_name_server/isolate_name_server.h b/lib/ui/isolate_name_server/isolate_name_server.h
@@ -10,7 +10,6 @@
 #include <string>
 
 #include "flutter/fml/macros.h"
-#include "flutter/fml/synchronization/thread_annotations.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 namespace flutter {
@@ -23,25 +22,21 @@ class IsolateNameServer {
 
   // Looks up the Dart_Port associated with a given name. Returns ILLEGAL_PORT
   // if the name does not exist.
-  Dart_Port LookupIsolatePortByName(const std::string& name)
-      FML_LOCKS_EXCLUDED(mutex_);
+  Dart_Port LookupIsolatePortByName(const std::string& name);
 
   // Registers a Dart_Port with a given name. Returns true if registration is
   // successful, false if the name entry already exists.
-  bool RegisterIsolatePortWithName(Dart_Port port, const std::string& name)
-      FML_LOCKS_EXCLUDED(mutex_);
+  bool RegisterIsolatePortWithName(Dart_Port port, const std::string& name);
 
   // Removes a name to Dart_Port mapping given a name. Returns true if the
   // mapping was successfully removed, false if the mapping does not exist.
-  bool RemoveIsolateNameMapping(const std::string& name)
-      FML_LOCKS_EXCLUDED(mutex_);
+  bool RemoveIsolateNameMapping(const std::string& name);
 
  private:
-  Dart_Port LookupIsolatePortByNameUnprotected(const std::string& name)
-      FML_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
+  Dart_Port LookupIsolatePortByNameUnprotected(const std::string& name);
 
   mutable std::mutex mutex_;
-  std::map<std::string, Dart_Port> port_mapping_ FML_GUARDED_BY(mutex_);
+  std::map<std::string, Dart_Port> port_mapping_;
 
   FML_DISALLOW_COPY_AND_ASSIGN(IsolateNameServer);
 };

diff --git a/lib/ui/plugins/callback_cache.h b/lib/ui/plugins/callback_cache.h
@@ -11,7 +11,6 @@
 #include <string>
 
 #include "flutter/fml/macros.h"
-#include "flutter/fml/synchronization/thread_annotations.h"
 #include "third_party/dart/runtime/include/dart_api.h"
 
 namespace flutter {
@@ -29,28 +28,26 @@ class DartCallbackCache {
 
   static int64_t GetCallbackHandle(const std::string& name,
                                    const std::string& class_name,
-                                   const std::string& library_path)
-      FML_LOCKS_EXCLUDED(mutex_);
+                                   const std::string& library_path);
 
-  static Dart_Handle GetCallback(int64_t handle) FML_LOCKS_EXCLUDED(mutex_);
+  static Dart_Handle GetCallback(int64_t handle);
 
   static std::unique_ptr<DartCallbackRepresentation> GetCallbackInformation(
-      int64_t handle) FML_LOCKS_EXCLUDED(mutex_);
+      int64_t handle);
 
-  static void LoadCacheFromDisk() FML_LOCKS_EXCLUDED(mutex_);
+  static void LoadCacheFromDisk();
 
  private:
   static Dart_Handle LookupDartClosure(const std::string& name,
                                        const std::string& class_name,
                                        const std::string& library_path);
 
-  static void SaveCacheToDisk() FML_EXCLUSIVE_LOCKS_REQUIRED(mutex_);
+  static void SaveCacheToDisk();
 
   static std::mutex mutex_;
   static std::string cache_path_;
 
-  static std::map<int64_t, DartCallbackRepresentation> cache_
-      FML_GUARDED_BY(mutex_);
+  static std::map<int64_t, DartCallbackRepresentation> cache_;
 
   FML_DISALLOW_IMPLICIT_CONSTRUCTORS(DartCallbackCache);
 };

diff --git a/runtime/dart_service_isolate.cc b/runtime/dart_service_isolate.cc
@@ -50,7 +50,6 @@ const uint8_t* GetSymbol(Dart_NativeFunction native_function) {
 
 std::mutex DartServiceIsolate::callbacks_mutex_;
 
-FML_GUARDED_BY(DartServiceIsolate::callbacks_mutex_)
 std::set<std::unique_ptr<DartServiceIsolate::ObservatoryServerStateCallback>>
     DartServiceIsolate::callbacks_;