| Index: Source/platform/heap/Heap.h
|
| diff --git a/Source/platform/heap/Heap.h b/Source/platform/heap/Heap.h
|
| index f9384ce98365ec54e5f4deec163a847bad2ad868..9053dd52b77dd2c84f89a483366469667d6db263 100644
|
| --- a/Source/platform/heap/Heap.h
|
| +++ b/Source/platform/heap/Heap.h
|
| @@ -32,11 +32,11 @@
|
| #define Heap_h
|
|
|
| #include "platform/PlatformExport.h"
|
| -#include "platform/heap/AddressSanitizer.h"
|
| #include "platform/heap/GCInfo.h"
|
| #include "platform/heap/ThreadState.h"
|
| #include "platform/heap/Visitor.h"
|
| #include "public/platform/WebThread.h"
|
| +#include "wtf/AddressSanitizer.h"
|
| #include "wtf/Assertions.h"
|
| #include "wtf/Atomics.h"
|
| #include "wtf/ContainerAnnotations.h"
|
| @@ -76,6 +76,12 @@ const uint8_t orphanedZapValue = 240;
|
| // used for dispatch.
|
| static const intptr_t zappedVTable = 0xd0d;
|
|
|
| +#if defined(ADDRESS_SANITIZER)
|
| +const size_t asanMagic = 0xabefeed0;
|
| +const size_t asanDeferMemoryReuseCount = 2;
|
| +const size_t asanDeferMemoryReuseMask = 0x3;
|
| +#endif
|
| +
|
| #if ENABLE(ASSERT) || defined(LEAK_SANITIZER) || defined(ADDRESS_SANITIZER)
|
| #define FILL_ZERO_IF_PRODUCTION(address, size) do { } while (false)
|
| #define FILL_ZERO_IF_NOT_PRODUCTION(address, size) memset((address), 0, (size))
|
|
|