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

Unified Diff: Source/wtf/Atomics.h

Issue 1145073002: Move AddressSanitizer.h to wtf/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: fix non-Oilpan compilation Created 5 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 | « Source/wtf/AddressSanitizer.h ('k') | Source/wtf/LinkedHashSet.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/Atomics.h
diff --git a/Source/wtf/Atomics.h b/Source/wtf/Atomics.h
index 7ac57ed84a13adf051f4132b1596c907fea0e629..eecb34000c3736f05c27fb2d321472a97c16e909 100644
--- a/Source/wtf/Atomics.h
+++ b/Source/wtf/Atomics.h
@@ -30,6 +30,7 @@
#ifndef Atomics_h
#define Atomics_h
+#include "wtf/AddressSanitizer.h"
#include "wtf/Assertions.h"
#include "wtf/CPU.h"
@@ -263,28 +264,19 @@ ALWAYS_INLINE void* acquireLoad(void* volatile const* ptr)
#if defined(ADDRESS_SANITIZER)
-// FIXME: See comment on NO_SANITIZE_ADDRESS in platform/heap/AddressSanitizer.h
-#if !OS(WIN) || COMPILER(CLANG)
-#define NO_SANITIZE_ADDRESS_ATOMICS __attribute__((no_sanitize_address))
-#else
-#define NO_SANITIZE_ADDRESS_ATOMICS
-#endif
-
-NO_SANITIZE_ADDRESS_ATOMICS ALWAYS_INLINE void asanUnsafeReleaseStore(volatile unsigned* ptr, unsigned value)
+NO_SANITIZE_ADDRESS ALWAYS_INLINE void asanUnsafeReleaseStore(volatile unsigned* ptr, unsigned value)
{
MEMORY_BARRIER();
*ptr = value;
}
-NO_SANITIZE_ADDRESS_ATOMICS ALWAYS_INLINE unsigned asanUnsafeAcquireLoad(volatile const unsigned* ptr)
+NO_SANITIZE_ADDRESS ALWAYS_INLINE unsigned asanUnsafeAcquireLoad(volatile const unsigned* ptr)
{
unsigned value = *ptr;
MEMORY_BARRIER();
return value;
}
-#undef NO_SANITIZE_ADDRESS_ATOMICS
-
#endif // defined(ADDRESS_SANITIZER)
#undef MEMORY_BARRIER
« no previous file with comments | « Source/wtf/AddressSanitizer.h ('k') | Source/wtf/LinkedHashSet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698