[compiler-rt] r182465 - [ASan] Temporary remove leak checking from ASan, while we don't have makefile-based build for LSan

[Alexey Samsonov]

Author: samsonov
Date: Wed May 22 07:44:57 2013
New Revision: 182465

URL: http://llvm.org/viewvc/llvm-project?rev=182465&view=rev
Log:
[ASan] Temporary remove leak checking from ASan, while we don't have makefile-based build for LSan

Modified:
    compiler-rt/trunk/lib/asan/CMakeLists.txt
    compiler-rt/trunk/lib/asan/asan_allocator2.cc
    compiler-rt/trunk/lib/asan/asan_rtl.cc

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=182465&r1=182464&r2=182465&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Wed May 22 07:44:57 2013
@@ -85,7 +85,7 @@ else()
               $<TARGET_OBJECTS:RTInterception.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
-              $<TARGET_OBJECTS:RTLSanCommon.${arch}>
+              #$<TARGET_OBJECTS:RTLSanCommon.${arch}>
       CFLAGS ${ASAN_CFLAGS}
       DEFS ${ASAN_COMMON_DEFINITIONS}
       SYMS asan.syms)

Modified: compiler-rt/trunk/lib/asan/asan_allocator2.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator2.cc?rev=182465&r1=182464&r2=182465&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator2.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator2.cc Wed May 22 07:44:57 2013
@@ -768,7 +768,7 @@ u32 LsanMetadata::stack_trace_id() const
 template <typename Callable> void ForEachChunk(Callable const &callback) {
   __asan::allocator.ForEachChunk(callback);
 }
-#if CAN_SANITIZE_LEAKS
+#if 0
 template void ForEachChunk<ProcessPlatformSpecificAllocationsCb>(
     ProcessPlatformSpecificAllocationsCb const &callback);
 template void ForEachChunk<PrintLeakedCb>(PrintLeakedCb const &callback);
@@ -777,7 +777,7 @@ template void ForEachChunk<MarkIndirectl
     MarkIndirectlyLeakedCb const &callback);
 template void ForEachChunk<ReportLeakedCb>(ReportLeakedCb const &callback);
 template void ForEachChunk<ClearTagCb>(ClearTagCb const &callback);
-#endif  // SANITIZE_LEAKS
+#endif  // CAN_SANITIZE_LEAKS
 }  // namespace __lsan
 
 // ---------------------- Interface ---------------- {{{1

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=182465&r1=182464&r2=182465&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Wed May 22 07:44:57 2013
@@ -560,7 +560,7 @@ void __asan_init() {
 
   InitializeAllocator();
 
-#if CAN_SANITIZE_LEAKS
+#if 0
   __lsan::InitCommonLsan();
   if (flags()->detect_leaks) {
     Atexit(__lsan::DoLeakCheck);