diff options
| author | glider <glider@chromium.org> | 2014-09-23 14:50:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-23 21:50:27 +0000 |
| commit | 3a065495f1e4edd6e8d9b510340a927a917a91e6 (patch) | |
| tree | fd7d597a058481375ef904a393728563558bfd21 /base/lazy_instance.cc | |
| parent | f37219757faac607fb53aa4afc925ac1324c0cb2 (diff) | |
| download | chromium_src-3a065495f1e4edd6e8d9b510340a927a917a91e6.zip chromium_src-3a065495f1e4edd6e8d9b510340a927a917a91e6.tar.gz chromium_src-3a065495f1e4edd6e8d9b510340a927a917a91e6.tar.bz2 | |
Remove TSan annotations from base/
, because ThreadSanitizer v2 doesn't need base::subtle to be annotated.
We can't drop the dependency on libdynamic_annotations yet, because some code calls RunningOnValgrind().
Also remove the unused dynamic_annotations.h headers from base/ and add one to content/test/, which uses RunningOnValgrind().
BUG=349861
R=ajwong@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/580813002
Cr-Commit-Position: refs/heads/master@{#296265}
Diffstat (limited to 'base/lazy_instance.cc')
| -rw-r--r-- | base/lazy_instance.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/base/lazy_instance.cc b/base/lazy_instance.cc index a81cb8c..594c1fe 100644 --- a/base/lazy_instance.cc +++ b/base/lazy_instance.cc @@ -8,7 +8,6 @@ #include "base/atomicops.h" #include "base/basictypes.h" #include "base/threading/platform_thread.h" -#include "base/third_party/dynamic_annotations/dynamic_annotations.h" namespace base { namespace internal { @@ -42,9 +41,6 @@ void CompleteLazyInstance(subtle::AtomicWord* state, subtle::AtomicWord new_instance, void* lazy_instance, void (*dtor)(void*)) { - // See the comment to the corresponding HAPPENS_AFTER in Pointer(). - ANNOTATE_HAPPENS_BEFORE(state); - // Instance is created, go from CREATING to CREATED. // Releases visibility over private_buf_ to readers. Pairing Acquire_Load's // are in NeedsInstance() and Pointer(). |