summaryrefslogtreecommitdiffstats
path: root/base/debug
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 14:39:49 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-13 14:39:49 +0000
commit0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e (patch)
tree875280ba2122eb815705a9f504633e6ded42717f /base/debug
parenta9763e6a7e04f3a82f2c55365f537925677b89d7 (diff)
downloadchromium_src-0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e.zip
chromium_src-0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e.tar.gz
chromium_src-0fabac5aef4fc6db55c8ad2eeab7d696bdb0d66e.tar.bz2
Remove heapcheck support.
The bots are gone, no need to keep this around. The replacement that's maintained by the dynamic tools team is ASan / LSan. BUG=325380 Review URL: https://codereview.chromium.org/113193008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240643 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug')
-rw-r--r--base/debug/leak_annotations.h25
1 files changed, 5 insertions, 20 deletions
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h
index cac1eaf2..27fe663 100644
--- a/base/debug/leak_annotations.h
+++ b/base/debug/leak_annotations.h
@@ -9,32 +9,17 @@
#include "build/build_config.h"
// This file defines macros which can be used to annotate intentional memory
-// leaks. Support for annotations is implemented in HeapChecker and
-// LeakSanitizer. Annotated objects will be treated as a source of live
-// pointers, i.e. any heap objects reachable by following pointers from an
-// annotated object will not be reported as leaks.
+// leaks. Support for annotations is implemented in LeakSanitizer. Annotated
+// objects will be treated as a source of live pointers, i.e. any heap objects
+// reachable by following pointers from an annotated object will not be
+// reported as leaks.
//
// ANNOTATE_SCOPED_MEMORY_LEAK: all allocations made in the current scope
// will be annotated as leaks.
// ANNOTATE_LEAKING_OBJECT_PTR(X): the heap object referenced by pointer X will
// be annotated as a leak.
-//
-// Note that HeapChecker will report a fatal error if an object which has been
-// annotated with ANNOTATE_LEAKING_OBJECT_PTR is later deleted (but
-// LeakSanitizer won't).
-
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_NACL) && \
- defined(USE_HEAPCHECKER)
-
-#include "third_party/tcmalloc/chromium/src/gperftools/heap-checker.h"
-
-#define ANNOTATE_SCOPED_MEMORY_LEAK \
- HeapLeakChecker::Disabler heap_leak_checker_disabler; static_cast<void>(0)
-
-#define ANNOTATE_LEAKING_OBJECT_PTR(X) \
- HeapLeakChecker::IgnoreObject(X)
-#elif defined(LEAK_SANITIZER) && !defined(OS_NACL)
+#if defined(LEAK_SANITIZER) && !defined(OS_NACL)
// Public LSan API from <sanitizer/lsan_interface.h>.
extern "C" {