Update TSAN suppressions.

TSAN suppressions need to be on their own line, even free of comments.

Also, temporarily add SK_ANNOTATE_UNPROTECTED_READ to sk_acquire_load.
Will remove this when we're done iterating on SkBarriers_tsan.h: TSAN
has an atomic load that makes the annotation moot.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/be7de4fc4229b70b0954f3ea5e3b053dae4c1a9d

R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/308073013

diff --git a/src/ports/SkBarriers_x86.h b/src/ports/SkBarriers_x86.h
index 4fbc444..fc57615 100644 (file)
--- a/src/ports/SkBarriers_x86.h
+++ b/src/ports/SkBarriers_x86.h
@@ -8,8 +8,6 @@
 #ifndef SkBarriers_x86_DEFINED
 #define SkBarriers_x86_DEFINED
 
-#include "SkDynamicAnnotations.h"
-
 #ifdef SK_BUILD_FOR_WIN
 #  include <intrin.h>
 static inline void sk_compiler_barrier() { _ReadWriteBarrier(); }
@@ -19,7 +17,7 @@ static inline void sk_compiler_barrier() { asm volatile("" : : : "memory"); }
 
 template <typename T>
 T sk_acquire_load(T* ptr) {
-    T val = SK_ANNOTATE_UNPROTECTED_READ(*ptr);
+    T val = *ptr;
     // On x86, all loads are acquire loads, so we only need a compiler barrier.
     sk_compiler_barrier();
     return val;