diff options
author | Kostya Serebryany <kcc@google.com> | 2012-12-03 11:57:01 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@google.com> | 2012-12-03 11:57:01 +0000 |
commit | dab61684ef23cbbe6c36950f1a14ae19bcdfe665 (patch) | |
tree | 3ff324db603951c698f646512c49259b5d6fc7ab | |
parent | e982a1d368eedcf23fb1c6c15eeefbf00b8be356 (diff) | |
download | bcm5719-llvm-dab61684ef23cbbe6c36950f1a14ae19bcdfe665.tar.gz bcm5719-llvm-dab61684ef23cbbe6c36950f1a14ae19bcdfe665.zip |
[tsan] remove unused InternalAllocBlock as part of larger refactoring
llvm-svn: 169123
3 files changed, 0 insertions, 22 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc index c43933061f1..b13a7c6c14c 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc @@ -49,13 +49,6 @@ void InternalFree(void *addr) { LIBC_FREE(addr); } -void *InternalAllocBlock(void *p) { - CHECK_NE(p, (void*)0); - u64 *pp = (u64*)((uptr)p & ~0x7); - for (; pp[0] != kBlockMagic; pp--) {} - return pp + 1; -} - // LowLevelAllocator static LowLevelAllocateCallback low_level_alloc_callback; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common.h b/compiler-rt/lib/sanitizer_common/sanitizer_common.h index dc53d885795..af0e43af613 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common.h @@ -51,9 +51,6 @@ bool MemoryRangeIsAvailable(uptr range_start, uptr range_end); // Internal allocator void *InternalAlloc(uptr size); void InternalFree(void *p); -// Given the pointer p into a valid allocated block, -// returns a pointer to the beginning of the block. -void *InternalAllocBlock(void *p); // InternalScopedBuffer can be used instead of large stack arrays to // keep frame size low. diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc index d3445b6c7c1..80139f0401c 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_allocator_test.cc @@ -22,14 +22,6 @@ TEST(Allocator, Basic) { char *p2 = (char*)InternalAlloc(20); EXPECT_NE(p2, (char*)0); EXPECT_NE(p2, p); - for (int i = 0; i < 10; i++) { - p[i] = 42; - EXPECT_EQ(p, InternalAllocBlock(p + i)); - } - for (int i = 0; i < 20; i++) { - ((char*)p2)[i] = 42; - EXPECT_EQ(p2, InternalAllocBlock(p2 + i)); - } InternalFree(p); InternalFree(p2); } @@ -42,10 +34,6 @@ TEST(Allocator, Stress) { uptr sz = rand_r(&rnd) % 1000; char *p = (char*)InternalAlloc(sz); EXPECT_NE(p, (char*)0); - for (uptr j = 0; j < sz; j++) { - p[j] = 42; - EXPECT_EQ(p, InternalAllocBlock(p + j)); - } ptrs[i] = p; } for (int i = 0; i < kCount; i++) { |