From e26627e8da54197fd6a4629e26db1ad9d75eff79 Mon Sep 17 00:00:00 2001
From: machenbach <machenbach@chromium.org>
Date: Tue, 20 Jan 2015 08:07:11 -0800
Subject: [PATCH] Don't use -O3 with sanitizers.

BUG=chromium:430614
LOG=n

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

Cr-Commit-Position: refs/heads/master@{#26169}
---
 build/standalone.gypi |  2 --
 build/toolchain.gypi  | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build/standalone.gypi b/build/standalone.gypi
index 5a29d99..c0979a8 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -35,8 +35,6 @@
     'component%': 'static_library',
     'make_clang_dir%': '../third_party/llvm-build/Release+Asserts',
     'clang_xcode%': 0,
-    'asan%': 0,
-    'tsan%': 0,
     'visibility%': 'hidden',
     'v8_enable_backtrace%': 0,
     'v8_enable_i18n_support%': 1,
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 56b2e33..bed1dc9 100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -31,6 +31,12 @@
   'variables': {
     'msvs_use_common_release': 0,
     'clang%': 0,
+    'asan%': 0,
+    'lsan%': 0,
+    'msan%': 0,
+    'tsan%': 0,
+    'ubsan%': 0,
+    'ubsan_vptr%': 0,
     'v8_target_arch%': '<(target_arch)',
     'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
     # Native Client builds currently use the V8 ARM JIT and
@@ -1020,7 +1026,9 @@
             ],
             'conditions': [
               # TODO(crbug.com/272548): Avoid -O3 in NaCl
-              ['nacl_target_arch=="none"', {
+              # Don't use -O3 with sanitizers.
+              ['nacl_target_arch=="none" and asan==0 and msan==0 and lsan==0 \
+                and tsan==0 and ubsan==0 and ubsan_vptr==0', {
                 'cflags': ['-O3'],
                 'cflags!': ['-O2'],
                 }, {
@@ -1105,7 +1113,9 @@
             ],
             'conditions': [
               # TODO(crbug.com/272548): Avoid -O3 in NaCl
-              ['nacl_target_arch=="none"', {
+              # Don't use -O3 with sanitizers.
+              ['nacl_target_arch=="none" and asan==0 and msan==0 and lsan==0 \
+                and tsan==0 and ubsan==0 and ubsan_vptr==0', {
                 'cflags': ['-O3'],
                 'cflags!': ['-O2'],
               }, {
-- 
2.7.4