Oilpan: Fix ASan instrumentation around heap object headers.

Source/wtf/Atomics.h

 /*
  * Copyright (C) 2007, 2008, 2010, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 25 matching lines @@
 #include <stdint.h>
 
 #if COMPILER(MSVC)
 #include <windows.h>
 #endif
 
 #if defined(THREAD_SANITIZER)
 #include <sanitizer/tsan_interface_atomic.h>
 #endif
 
+#if defined(ADDRESS_SANITIZER)
+#include <sanitizer/asan_interface.h>
+#endif
+
 namespace WTF {
 
 #if COMPILER(MSVC)
 
 // atomicAdd returns the result of the addition.
 ALWAYS_INLINE int atomicAdd(int volatile* addend, int increment)
 {
     return InterlockedExchangeAdd(reinterpret_cast<long volatile*>(addend), static_cast<long>(increment)) + increment;
 }
 
@@ skipping 43 matching lines @@
 }
 
 ALWAYS_INLINE void atomicSetOneToZero(int volatile* ptr)
 {
     ASSERT(*ptr == 1);
     __sync_lock_release(ptr);
 }
 #endif
 
 #if defined(THREAD_SANITIZER)
+

[Alexander Potapenko, 2014/09/09 09:57:30]

Did you mean adding these blank lines? (Here and below)

[Mads Ager (chromium), 2014/09/09 10:02:40]

Yeah, I did to make the formatting a bit more uniform.

 ALWAYS_INLINE void releaseStore(volatile int* ptr, int value)
 {
     __tsan_atomic32_store(ptr, value, __tsan_memory_order_release);
 }
 
 ALWAYS_INLINE int acquireLoad(volatile const int* ptr)
 {
     return __tsan_atomic32_load(ptr, __tsan_memory_order_acquire);
 }
 
 ALWAYS_INLINE void releaseStore(volatile unsigned* ptr, unsigned value)
 {
     __tsan_atomic32_store(reinterpret_cast<volatile int*>(ptr), static_cast<int>(value), __tsan_memory_order_release);
 }
 
 ALWAYS_INLINE unsigned acquireLoad(volatile const unsigned* ptr)
 {
     return static_cast<unsigned>(__tsan_atomic32_load(reinterpret_cast<volatile const int*>(ptr), __tsan_memory_order_acquire));
 }
+
 #else
 
 #if CPU(X86) || CPU(X86_64)
 // Only compiler barrier is needed.
 #if COMPILER(MSVC)
 // Starting from Visual Studio 2005 compiler guarantees acquire and release
 // semantics for operations on volatile variables. See MSDN entry for
 // MemoryBarrier macro.
 #define MEMORY_BARRIER()
 #else
@@ skipping 34 matching lines @@
     *ptr = value;
 }
 
 ALWAYS_INLINE unsigned acquireLoad(volatile const unsigned* ptr)
 {
     unsigned value = *ptr;
     MEMORY_BARRIER();
     return value;
 }
 
+#if defined(ADDRESS_SANITIZER)
+
+__attribute__((no_sanitize_address)) ALWAYS_INLINE void asanReleaseStore(volatile unsigned* ptr, unsigned value)
+{
+    MEMORY_BARRIER();
+    *ptr = value;
+}
+
+__attribute__((no_sanitize_address)) ALWAYS_INLINE unsigned asanAcquireLoad(volatile const unsigned* ptr)
+{
+    unsigned value = *ptr;
+    MEMORY_BARRIER();
+    return value;
+}
+
+#endif // defined(ADDRESS_SANITIZER)
+
 #undef MEMORY_BARRIER
 
 #endif
 
+#if !defined(ADDRESS_SANITIZER)
+
+ALWAYS_INLINE void asanReleaseStore(volatile unsigned* ptr, unsigned value)
+{
+    releaseStore(ptr, value);
+}
+
+ALWAYS_INLINE unsigned asanAcquireLoad(volatile const unsigned* ptr)
+{
+    return acquireLoad(ptr);
+}
+
+#endif
+
 } // namespace WTF
 
 using WTF::atomicAdd;
 using WTF::atomicSubtract;
 using WTF::atomicDecrement;
 using WTF::atomicIncrement;
 using WTF::atomicTestAndSetToOne;
 using WTF::atomicSetOneToZero;
 using WTF::acquireLoad;
 using WTF::releaseStore;
 
+// These methods allow loading from and storing to poisoned memory. Only
+// use these methods if you know what you are doing since they will
+// silence use-after-poison errors from ASan.
+using WTF::asanAcquireLoad;

[Alexander Potapenko, 2014/09/09 09:57:30]

How about 'asanUnsafe{AcquireLoad,ReleaseStore}'?

[Mads Ager (chromium), 2014/09/09 10:02:40]

Good idea, will do. I like the addition of unsafe here to make people think
twice before using these!

+using WTF::asanReleaseStore;
+
 #endif // Atomics_h