summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2013-01-22 11:39:28 +0000
committerAlexander Potapenko <glider@google.com>2013-01-22 11:39:28 +0000
commit81f0b331dc977f78284cc98071c863565c04c472 (patch)
tree38dff9e4f8769ceeaf0c7b738d4e2abfa49eb87a
parent0ba8db45c63fc82279aefe0def2bc8d95429620b (diff)
downloadbcm5719-llvm-81f0b331dc977f78284cc98071c863565c04c472.tar.gz
bcm5719-llvm-81f0b331dc977f78284cc98071c863565c04c472.zip
[ASan] Disable the new/delete implementations for OSX
See https://code.google.com/p/address-sanitizer/issues/detail?id=131 llvm-svn: 173149
-rw-r--r--compiler-rt/lib/asan/asan_new_delete.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_new_delete.cc b/compiler-rt/lib/asan/asan_new_delete.cc
index 5d1f23c542e..7abc91a63f3 100644
--- a/compiler-rt/lib/asan/asan_new_delete.cc
+++ b/compiler-rt/lib/asan/asan_new_delete.cc
@@ -27,8 +27,9 @@ void ReplaceOperatorsNewAndDelete() { }
using namespace __asan; // NOLINT
-// On Android new() goes through malloc interceptors.
-#if !ASAN_ANDROID
+// On Mac and Android new() goes through malloc interceptors.
+// See also https://code.google.com/p/address-sanitizer/issues/detail?id=131.
+#if !ASAN_ANDROID && !ASAN_MAC
// Fake std::nothrow_t to avoid including <new>.
namespace std {
OpenPOWER on IntegriCloud