summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-01-28 13:52:49 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-01-28 13:52:49 +0000
commit9f7e8c143302fe051a8c8fca45565cde1bee88a7 (patch)
tree60b2f0308b591438afd38e9a1519d3505f0b85ee /compiler-rt/lib
parent2538bd19016fffbb55d315dd32cae3cd27cf5f60 (diff)
downloadbcm5719-llvm-9f7e8c143302fe051a8c8fca45565cde1bee88a7.tar.gz
bcm5719-llvm-9f7e8c143302fe051a8c8fca45565cde1bee88a7.zip
[msan] A runtime call to support custom allocators.
llvm-svn: 173687
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/msan/msan_interceptors.cc13
1 files changed, 13 insertions, 0 deletions
diff --git a/compiler-rt/lib/msan/msan_interceptors.cc b/compiler-rt/lib/msan/msan_interceptors.cc
index 0672bcf78c9..635bff14dbc 100644
--- a/compiler-rt/lib/msan/msan_interceptors.cc
+++ b/compiler-rt/lib/msan/msan_interceptors.cc
@@ -20,6 +20,7 @@
#include "msan_platform_limits_posix.h"
#include "sanitizer_common/sanitizer_allocator.h"
#include "sanitizer_common/sanitizer_common.h"
+#include "sanitizer_common/sanitizer_stackdepot.h"
#include "sanitizer_common/sanitizer_libc.h"
#include <stdarg.h>
@@ -710,6 +711,18 @@ INTERCEPTOR(void *, malloc, SIZE_T size) {
return MsanReallocate(&stack, 0, size, sizeof(u64), false);
}
+void __msan_allocated_memory(void* data, uptr size) {
+ GET_MALLOC_STACK_TRACE;
+ if (flags()->poison_in_malloc)
+ __msan_poison(data, size);
+ if (__msan_get_track_origins()) {
+ u32 stack_id = StackDepotPut(stack.trace, stack.size);
+ CHECK(stack_id);
+ CHECK_EQ((stack_id >> 31), 0); // Higher bit is occupied by stack origins.
+ __msan_set_origin(data, size, stack_id);
+ }
+}
+
INTERCEPTOR(void *, mmap, void *addr, SIZE_T length, int prot, int flags,
int fd, OFF_T offset) {
ENSURE_MSAN_INITED();
OpenPOWER on IntegriCloud