[llvm-commits] [compiler-rt] r158144 - /compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc

Alexey Samsonov samsonov at google.com
Thu Jun 7 02:26:13 PDT 2012


Author: samsonov
Date: Thu Jun  7 04:26:13 2012
New Revision: 158144

URL: http://llvm.org/viewvc/llvm-project?rev=158144&view=rev
Log:
[Sanitizer] include stdlib.h header to get malloc/free

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc?rev=158144&r1=158143&r2=158144&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_allocator.cc Thu Jun  7 04:26:13 2012
@@ -13,18 +13,16 @@
 //===----------------------------------------------------------------------===//
 #include "sanitizer_common.h"
 
-// Provisional implementation.
 // FIXME: We should probably use more low-level allocator that would
 // mmap some pages and split them into chunks to fulfill requests.
-extern "C" void *__libc_malloc(__sanitizer::uptr size);
-extern "C" void __libc_free(void *ptr);
+#include <stdlib.h>
 
 namespace __sanitizer {
 
 static const u64 kInternalAllocBlockMagic = 0x7A6CB03ABCEBC042ull;
 
 void *InternalAlloc(uptr size) {
-  void *p = __libc_malloc(size + sizeof(u64));
+  void *p = malloc(size + sizeof(u64));
   ((u64*)p)[0] = kInternalAllocBlockMagic;
   return (char*)p + sizeof(u64);
 }
@@ -34,7 +32,7 @@
   addr = (char*)addr - sizeof(u64);
   CHECK_EQ(((u64*)addr)[0], kInternalAllocBlockMagic);
   ((u64*)addr)[0] = 0;
-  __libc_free(addr);
+  free(addr);
 }
 
 }  // namespace __sanitizer





More information about the llvm-commits mailing list