Reviewers: jochen (slow), Sven Panne,

Message:
PTAL

Description:
Don't use -O3 with sanitizers.

BUG=chromium:430614
LOG=n

Please review this at https://codereview.chromium.org/798653006/

Base URL: https://chromium.googlesource.com/v8/v8.git@master

Affected files (+12, -4 lines):
  M build/standalone.gypi
  M build/toolchain.gypi


Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 5a29d99f7f7550503972f894deded9aad0218339..c0979a8f6e46a6823110e14e3ae2d3b85f5f8781 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,
Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 56b2e338eed352f3b2a95c408ad7fdfdb39653bf..bed1dc9f32f5bf9c0faf7bc18db135014cbd1a74 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'],
               }, {


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to