Commit 55e3a3b9 authored by Omer Katz's avatar Omer Katz Committed by Commit Bot

Revert "Enable asan on WTF::Vector for x86"

This reverts commit f4e68ca6.

Reason for revert: applying asan to WTF::Vector still causes failures
(e.g. https://crbug.com/993415)

Original change's description:
> Enable asan on WTF::Vector for x86
> 
> Bug: 461406
> Change-Id: I239725947a9fa39a9089af29a68a85c3b7c238df
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803147
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Commit-Queue: Omer Katz <omerkatz@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#696359}

TBR=haraken@chromium.org,omerkatz@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 461406
Change-Id: Ia14e4d0f1cc75127c15d6188bbc7ac9d11181990
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841555
Auto-Submit: Omer Katz <omerkatz@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702974}
parent 988a4f7d
......@@ -8,7 +8,9 @@
#include "build/build_config.h"
#include "third_party/blink/renderer/platform/wtf/sanitizers.h"
#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX)
// TODO(ochang): Remove the ARCH_CPU_X86_64 condition to enable this for X86
// once the crashes there have been fixed: http://crbug.com/461406
#if defined(ADDRESS_SANITIZER) && defined(OS_LINUX) && defined(ARCH_CPU_X86_64)
#define ANNOTATE_CONTIGUOUS_CONTAINER
#define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \
if (buffer) { \
......@@ -33,13 +35,13 @@
ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize);
// Annotations require buffers to begin on an 8-byte boundary.
#else // ADDRESS_SANITIZER && OS_LINUX
#else // ADDRESS_SANITIZER && OS_LINUX && ARCH_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 // ADDRESS_SANITIZER && OS_LINUX
#endif // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64
#endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_CONTAINER_ANNOTATIONS_H_
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