summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2013-02-21 17:12:21 +0000
committerAlexander Potapenko <glider@google.com>2013-02-21 17:12:21 +0000
commit97781c4dd0a0d426551a41f0d7249a4040af7bd9 (patch)
tree268a70234517a84024cfca67b9695bc26bdd708f
parent071890b5545f1909a2b73901fdb0ab6e3eb40b61 (diff)
downloadbcm5719-llvm-97781c4dd0a0d426551a41f0d7249a4040af7bd9.tar.gz
bcm5719-llvm-97781c4dd0a0d426551a41f0d7249a4040af7bd9.zip
[ASan] temporarily disable alloc_dealloc_mismatch on Mac, since the previous commit caused error reports in gTest.
llvm-svn: 175766
-rw-r--r--compiler-rt/lib/asan/asan_rtl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc
index d42c6746860..83aa1f46abf 100644
--- a/compiler-rt/lib/asan/asan_rtl.cc
+++ b/compiler-rt/lib/asan/asan_rtl.cc
@@ -164,7 +164,9 @@ void InitializeFlags(Flags *f, const char *env) {
f->fast_unwind_on_fatal = false;
f->fast_unwind_on_malloc = true;
f->poison_heap = true;
- f->alloc_dealloc_mismatch = true;
+ // Turn off alloc/dealloc mismatch checker on Mac for now.
+ // TODO(glider): Fix known issues and enable this back.
+ f->alloc_dealloc_mismatch = (ASAN_MAC == 0);;
f->use_stack_depot = true; // Only affects allocator2.
// Override from compile definition.
OpenPOWER on IntegriCloud