Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: src/ports/SkBarriers_x86.h

Issue 308073013: Update TSAN suppressions. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: undo SK_ANNOTATE_UNPROTECTED_READ Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkBarriers_x86.h
diff --git a/src/ports/SkBarriers_x86.h b/src/ports/SkBarriers_x86.h
index 4fbc444049fea7cbbd6645f101279155b0333e8d..fc57615e04852669c0c625dcd00ecfcdbd51be46 100644
--- 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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698