summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2014-08-28 20:24:05 +0000
committerKostya Serebryany <kcc@google.com>2014-08-28 20:24:05 +0000
commit1e3b338606d36eef6439680a5e2685c31beb8e7f (patch)
tree26a29501bea3ca22cba87ae9820f24d60e3a7e58
parent13ad07aca317dfb5c261bb67d3be36111857df42 (diff)
downloadbcm5719-llvm-1e3b338606d36eef6439680a5e2685c31beb8e7f.tar.gz
bcm5719-llvm-1e3b338606d36eef6439680a5e2685c31beb8e7f.zip
[asan] disable poison_array_cookie while I am investigating a false positive on chromium (I suspect that LLVM looses nosanitizer metadata; no test yet)
llvm-svn: 216684
-rw-r--r--compiler-rt/lib/asan/asan_rtl.cc2
-rw-r--r--compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc
index c3cc1d3f333..d9874016f57 100644
--- a/compiler-rt/lib/asan/asan_rtl.cc
+++ b/compiler-rt/lib/asan/asan_rtl.cc
@@ -269,7 +269,7 @@ void InitializeFlags(Flags *f, const char *env) {
f->allow_reexec = true;
f->print_full_thread_history = true;
f->poison_heap = true;
- f->poison_array_cookie = true;
+ f->poison_array_cookie = false;
f->poison_partial = true;
// Turn off alloc/dealloc mismatch checker on Mac and Windows for now.
// https://code.google.com/p/address-sanitizer/issues/detail?id=131
diff --git a/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc b/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc
index 339120ba2d2..49545f09355 100644
--- a/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc
+++ b/compiler-rt/test/asan/TestCases/Linux/new_array_cookie_test.cc
@@ -1,6 +1,6 @@
// REQUIRES: asan-64-bits
-// RUN: %clangxx_asan -O0 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_asan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_asan -O3 %s -o %t
+// RUN %run %t
// RUN: ASAN_OPTIONS=poison_array_cookie=1 not %run %t 2>&1 | FileCheck %s
// RUN: ASAN_OPTIONS=poison_array_cookie=0 %run %t
#include <stdio.h>
OpenPOWER on IntegriCloud