Index: base/atomic_ref_count.h |
diff --git a/base/atomic_ref_count.h b/base/atomic_ref_count.h |
index 5130860ab0c28554a29b38cd25739af49f30738c..553fab6a8c65b65a3436edd2c80dfb68653bd172 100644 |
--- a/base/atomic_ref_count.h |
+++ b/base/atomic_ref_count.h |
@@ -12,7 +12,6 @@ |
#define BASE_ATOMIC_REF_COUNT_H_ |
#include "base/atomicops.h" |
-#include "base/third_party/dynamic_annotations/dynamic_annotations.h" |
namespace base { |
@@ -30,11 +29,7 @@ inline void AtomicRefCountIncN(volatile AtomicRefCount *ptr, |
// became zero will be visible to a thread that has just made the count zero. |
inline bool AtomicRefCountDecN(volatile AtomicRefCount *ptr, |
AtomicRefCount decrement) { |
- ANNOTATE_HAPPENS_BEFORE(ptr); |
bool res = (subtle::Barrier_AtomicIncrement(ptr, -decrement) != 0); |
- if (!res) { |
- ANNOTATE_HAPPENS_AFTER(ptr); |
- } |
return res; |
} |
@@ -58,9 +53,6 @@ inline bool AtomicRefCountDec(volatile AtomicRefCount *ptr) { |
// exclusive access to the object. |
inline bool AtomicRefCountIsOne(volatile AtomicRefCount *ptr) { |
bool res = (subtle::Acquire_Load(ptr) == 1); |
- if (res) { |
- ANNOTATE_HAPPENS_AFTER(ptr); |
- } |
return res; |
} |
@@ -69,9 +61,6 @@ inline bool AtomicRefCountIsOne(volatile AtomicRefCount *ptr) { |
// should never be zero. Hence this is generally used for a debug check. |
inline bool AtomicRefCountIsZero(volatile AtomicRefCount *ptr) { |
bool res = (subtle::Acquire_Load(ptr) == 0); |
- if (res) { |
- ANNOTATE_HAPPENS_AFTER(ptr); |
- } |
return res; |
} |