| Index: third_party/WebKit/Source/wtf/ContainerAnnotations.h
|
| diff --git a/third_party/WebKit/Source/wtf/ContainerAnnotations.h b/third_party/WebKit/Source/wtf/ContainerAnnotations.h
|
| index 1055154380fe975874bb37d66e6a86ae7d718a2e..401cc605435e88372a465472d4a9f5afe5528449 100644
|
| --- a/third_party/WebKit/Source/wtf/ContainerAnnotations.h
|
| +++ b/third_party/WebKit/Source/wtf/ContainerAnnotations.h
|
| @@ -12,27 +12,33 @@
|
| // the crashes there have been fixed: http://crbug.com/461406
|
| #if defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
|
| #define ANNOTATE_CONTIGUOUS_CONTAINER
|
| -#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
|
| - if (buffer) { \
|
| - __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), (buffer) + (capacity), (buffer) + (newSize)); \
|
| - }
|
| -#define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize) \
|
| - if (buffer) { \
|
| - __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), (buffer) + (oldSize), (buffer) + (capacity)); \
|
| - }
|
| -#define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize) \
|
| - if (buffer) { \
|
| - __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), (buffer) + (oldSize), (buffer) + (newSize)); \
|
| - }
|
| +#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
|
| + if (buffer) { \
|
| + __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
|
| + (buffer) + (capacity), \
|
| + (buffer) + (newSize)); \
|
| + }
|
| +#define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize) \
|
| + if (buffer) { \
|
| + __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
|
| + (buffer) + (oldSize), \
|
| + (buffer) + (capacity)); \
|
| + }
|
| +#define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize) \
|
| + if (buffer) { \
|
| + __sanitizer_annotate_contiguous_container(buffer, (buffer) + (capacity), \
|
| + (buffer) + (oldSize), \
|
| + (buffer) + (newSize)); \
|
| + }
|
| #define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity) \
|
| - ANNOTATE_DELETE_BUFFER(buffer, oldCapacity, bufferSize); \
|
| - ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize);
|
| + ANNOTATE_DELETE_BUFFER(buffer, oldCapacity, bufferSize); \
|
| + ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize);
|
| // Annotations require buffers to begin on an 8-byte boundary.
|
| -#else // defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
|
| +#else // defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
|
| #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize)
|
| #define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize)
|
| #define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize)
|
| #define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity)
|
| -#endif // defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
|
| +#endif // defined(ADDRESS_SANITIZER) && OS(LINUX) && CPU(X86_64)
|
|
|
| -#endif // WTF_ContainerAnnotations_h
|
| +#endif // WTF_ContainerAnnotations_h
|
|
|