Commit f99e9de9 authored by thakis@chromium.org's avatar thakis@chromium.org

Attempt to fix the asan/win build.

BUG=none
TBR=ager,glider
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/blink/trunk@181658 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d96016d0
...@@ -187,19 +187,28 @@ ALWAYS_INLINE unsigned acquireLoad(volatile const unsigned* ptr) ...@@ -187,19 +187,28 @@ ALWAYS_INLINE unsigned acquireLoad(volatile const unsigned* ptr)
#if defined(ADDRESS_SANITIZER) #if defined(ADDRESS_SANITIZER)
__attribute__((no_sanitize_address)) ALWAYS_INLINE void asanUnsafeReleaseStore(volatile unsigned* ptr, unsigned value) // 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)
{ {
MEMORY_BARRIER(); MEMORY_BARRIER();
*ptr = value; *ptr = value;
} }
__attribute__((no_sanitize_address)) ALWAYS_INLINE unsigned asanUnsafeAcquireLoad(volatile const unsigned* ptr) NO_SANITIZE_ADDRESS_ATOMICS ALWAYS_INLINE unsigned asanUnsafeAcquireLoad(volatile const unsigned* ptr)
{ {
unsigned value = *ptr; unsigned value = *ptr;
MEMORY_BARRIER(); MEMORY_BARRIER();
return value; return value;
} }
#undef NO_SANITIZE_ADDRESS_ATOMICS
#endif // defined(ADDRESS_SANITIZER) #endif // defined(ADDRESS_SANITIZER)
#undef MEMORY_BARRIER #undef MEMORY_BARRIER
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment