diff options
| author | Alexander Potapenko <glider@google.com> | 2012-07-06 13:52:28 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2012-07-06 13:52:28 +0000 |
| commit | 740d166c3e3ccfba8d9ae5cefc4a9a8541c109f2 (patch) | |
| tree | 4ed72315ad369db8d29e33817bd7876d8aa52be8 /compiler-rt/lib | |
| parent | d1e6094f9ed22ab29b154bb7a331345a41edb4af (diff) | |
| download | bcm5719-llvm-740d166c3e3ccfba8d9ae5cefc4a9a8541c109f2.tar.gz bcm5719-llvm-740d166c3e3ccfba8d9ae5cefc4a9a8541c109f2.zip | |
Small fix: do not replace the default CFAllocator if it has been replaced already.
llvm-svn: 159824
Diffstat (limited to 'compiler-rt/lib')
| -rw-r--r-- | compiler-rt/lib/asan/asan_malloc_mac.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_malloc_mac.cc b/compiler-rt/lib/asan/asan_malloc_mac.cc index 16e92017ce9..1626ebebbcb 100644 --- a/compiler-rt/lib/asan/asan_malloc_mac.cc +++ b/compiler-rt/lib/asan/asan_malloc_mac.cc @@ -98,7 +98,7 @@ INTERCEPTOR(void, __CFInitialize) { CHECK(FLAG_replace_cfallocator); CHECK(asan_inited); REAL(__CFInitialize)(); - ReplaceCFAllocator(); + if (!cf_asan) ReplaceCFAllocator(); } namespace { |
