summaryrefslogtreecommitdiff
path: root/lib/msan
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2014-10-26 06:23:07 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2014-10-26 06:23:07 +0000
commite675b842de5208f0ec182aede6cc7c62923739db (patch)
treecf573fbefd30b7813d9056d840c34c2ac542ac71 /lib/msan
parent160815f9e699693889646c6abeadb78c338277fc (diff)
Change StackDepot interface to use StackTrace more extensively
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220637 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan')
-rw-r--r--lib/msan/msan.cc2
-rw-r--r--lib/msan/msan_allocator.cc4
-rw-r--r--lib/msan/msan_interceptors.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index ffd4a7521..f58ac447b 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -280,7 +280,7 @@ u32 ChainOrigin(u32 id, StackTrace *stack) {
}
}
- StackDepotHandle h = StackDepotPut_WithHandle(stack->trace, stack->size);
+ StackDepotHandle h = StackDepotPut_WithHandle(*stack);
if (!h.valid()) return id;
if (flags()->origin_history_per_stack_limit > 0) {
diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc
index 69492970d..cabc94c02 100644
--- a/lib/msan/msan_allocator.cc
+++ b/lib/msan/msan_allocator.cc
@@ -102,7 +102,7 @@ static void *MsanAllocate(StackTrace *stack, uptr size, uptr alignment,
} else if (flags()->poison_in_malloc) {
__msan_poison(allocated, size);
if (__msan_get_track_origins()) {
- u32 stack_id = StackDepotPut(stack->trace, stack->size);
+ u32 stack_id = StackDepotPut(*stack);
CHECK(stack_id);
u32 id;
ChainedOriginDepotPut(stack_id, Origin::kHeapRoot, &id);
@@ -125,7 +125,7 @@ void MsanDeallocate(StackTrace *stack, void *p) {
if (flags()->poison_in_free) {
__msan_poison(p, size);
if (__msan_get_track_origins()) {
- u32 stack_id = StackDepotPut(stack->trace, stack->size);
+ u32 stack_id = StackDepotPut(*stack);
CHECK(stack_id);
u32 id;
ChainedOriginDepotPut(stack_id, Origin::kHeapRoot, &id);
diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc
index 18d8336af..86c12a48b 100644
--- a/lib/msan/msan_interceptors.cc
+++ b/lib/msan/msan_interceptors.cc
@@ -842,7 +842,7 @@ void __msan_allocated_memory(const void* data, uptr size) {
if (flags()->poison_in_malloc)
__msan_poison(data, size);
if (__msan_get_track_origins()) {
- u32 stack_id = StackDepotPut(stack.trace, stack.size);
+ u32 stack_id = StackDepotPut(stack);
u32 id;
ChainedOriginDepotPut(stack_id, Origin::kHeapRoot, &id);
__msan_set_origin(data, size, Origin(id, 1).raw_id());