[Sanitizer] Kill deprecated allocator interfaces in ASan, MSan and TSan in favor of

a unified interface in <sanitizer/allocator_interface.h>.


git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@215469 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 0 insertions, 103 deletions

diff --git a/include/sanitizer/asan_interface.h b/include/sanitizer/asan_interface.h
index e8163cfc3..db0d1f5d3 100644
--- a/include/sanitizer/asan_interface.h
+++ b/include/sanitizer/asan_interface.h
@@ -99,46 +99,6 @@ extern "C" {
   // the program crashes before ASan report is printed.
   void __asan_on_error();
 
-  // Returns the estimated number of bytes that will be reserved by allocator
-  // for request of "size" bytes. If ASan allocator can't allocate that much
-  // memory, returns the maximal possible allocation size, otherwise returns
-  // "size".
-  /* DEPRECATED: Use __sanitizer_get_estimated_allocated_size instead. */
-  size_t __asan_get_estimated_allocated_size(size_t size);
-
-  // Returns 1 if p was returned by the ASan allocator and is not yet freed.
-  // Otherwise returns 0.
-  /* DEPRECATED: Use __sanitizer_get_ownership instead. */
-  int __asan_get_ownership(const void *p);
-
-  // Returns the number of bytes reserved for the pointer p.
-  // Requires (get_ownership(p) == true) or (p == 0).
-  /* DEPRECATED: Use __sanitizer_get_allocated_size instead. */
-  size_t __asan_get_allocated_size(const void *p);
-
-  // Number of bytes, allocated and not yet freed by the application.
-  /* DEPRECATED: Use __sanitizer_get_current_allocated_bytes instead. */
-  size_t __asan_get_current_allocated_bytes();
-
-  // Number of bytes, mmaped by asan allocator to fulfill allocation requests.
-  // Generally, for request of X bytes, allocator can reserve and add to free
-  // lists a large number of chunks of size X to use them for future requests.
-  // All these chunks count toward the heap size. Currently, allocator never
-  // releases memory to OS (instead, it just puts freed chunks to free lists).
-  /* DEPRECATED: Use __sanitizer_get_heap_size instead. */
-  size_t __asan_get_heap_size();
-
-  // Number of bytes, mmaped by asan allocator, which can be used to fulfill
-  // allocation requests. When a user program frees memory chunk, it can first
-  // fall into quarantine and will count toward __asan_get_free_bytes() later.
-  /* DEPRECATED: Use __sanitizer_get_free_bytes instead. */
-  size_t __asan_get_free_bytes();
-
-  // Number of bytes in unmapped pages, that are released to OS. Currently,
-  // always returns 0.
-  /* DEPRECATED: Use __sanitizer_get_unmapped_bytes instead. */
-  size_t __asan_get_unmapped_bytes();
-
   // Prints accumulated stats to stderr. Used for debugging.
   void __asan_print_accumulated_stats();
 
@@ -146,15 +106,6 @@ extern "C" {
   // a string containing ASan runtime options. See asan_flags.h for details.
   const char* __asan_default_options();
 
-  // Malloc hooks that may be optionally provided by user.
-  // __asan_malloc_hook(ptr, size) is called immediately after
-  //   allocation of "size" bytes, which returned "ptr".
-  // __asan_free_hook(ptr) is called immediately before
-  //   deallocation of "ptr".
-  /* DEPRECATED: Use __sanitizer_malloc_hook / __sanitizer_free_hook instead. */
-  void __asan_malloc_hook(void *ptr, size_t size);
-  void __asan_free_hook(void *ptr);
-
   // The following 2 functions facilitate garbage collection in presence of
   // asan's fake stack.
 
diff --git a/include/sanitizer/msan_interface.h b/include/sanitizer/msan_interface.h
index f6a62be5c..5be586047 100644
--- a/include/sanitizer/msan_interface.h
+++ b/include/sanitizer/msan_interface.h
@@ -93,60 +93,6 @@ extern "C" {
      Passing 0 will unset the callback. */
   void __msan_set_death_callback(void (*callback)(void));
 
-  /***********************************/
-  /* Allocator statistics interface. */
-
-  /* Returns the estimated number of bytes that will be reserved by allocator
-     for request of "size" bytes. If Msan allocator can't allocate that much
-     memory, returns the maximal possible allocation size, otherwise returns
-     "size". */
-  /* DEPRECATED: Use __sanitizer_get_estimated_allocated_size instead. */
-  size_t __msan_get_estimated_allocated_size(size_t size);
-
-  /* Returns true if p was returned by the Msan allocator and
-     is not yet freed. */
-  /* DEPRECATED: Use __sanitizer_get_ownership instead. */
-  int __msan_get_ownership(const volatile void *p);
-
-  /* Returns the number of bytes reserved for the pointer p.
-     Requires (get_ownership(p) == true) or (p == 0). */
-  /* DEPRECATED: Use __sanitizer_get_allocated_size instead. */
-  size_t __msan_get_allocated_size(const volatile void *p);
-
-  /* Number of bytes, allocated and not yet freed by the application. */
-  /* DEPRECATED: Use __sanitizer_get_current_allocated_bytes instead. */
-  size_t __msan_get_current_allocated_bytes();
-
-  /* Number of bytes, mmaped by msan allocator to fulfill allocation requests.
-     Generally, for request of X bytes, allocator can reserve and add to free
-     lists a large number of chunks of size X to use them for future requests.
-     All these chunks count toward the heap size. Currently, allocator never
-     releases memory to OS (instead, it just puts freed chunks to free
-     lists). */
-  /* DEPRECATED: Use __sanitizer_get_heap_size instead. */
-  size_t __msan_get_heap_size();
-
-  /* Number of bytes, mmaped by msan allocator, which can be used to fulfill
-     allocation requests. When a user program frees memory chunk, it can first
-     fall into quarantine and will count toward __msan_get_free_bytes()
-     later. */
-  /* DEPRECATED: Use __sanitizer_get_free_bytes instead. */
-  size_t __msan_get_free_bytes();
-
-  /* Number of bytes in unmapped pages, that are released to OS. Currently,
-     always returns 0. */
-  /* DEPRECATED: Use __sanitizer_get_unmapped_bytes instead. */
-  size_t __msan_get_unmapped_bytes();
-
-  /* Malloc hooks that may be optionally provided by user.
-     __msan_malloc_hook(ptr, size) is called immediately after
-       allocation of "size" bytes, which returned "ptr".
-     __msan_free_hook(ptr) is called immediately before
-       deallocation of "ptr". */
-  /* DEPRECATED: Use __sanitizer_malloc_hook / __sanitizer_free_hook instead. */
-  void __msan_malloc_hook(const volatile void *ptr, size_t size);
-  void __msan_free_hook(const volatile void *ptr);
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif