diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-12-02 01:36:38 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-12-02 01:36:38 +0000 |
| commit | 4e3a11ba57b71f9a4356048708c8389020eb1afa (patch) | |
| tree | 41f20970dee6ae2835c850118aca88fa1b6934b9 | |
| parent | 9c665e36d4984e9b5513c9a8a9b2ddd4fc725c26 (diff) | |
| download | bcm5719-llvm-4e3a11ba57b71f9a4356048708c8389020eb1afa.tar.gz bcm5719-llvm-4e3a11ba57b71f9a4356048708c8389020eb1afa.zip | |
lib/asan: Fix possible type mismatches.
llvm-svn: 145664
| -rw-r--r-- | compiler-rt/lib/asan/asan_allocator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_allocator.cc b/compiler-rt/lib/asan/asan_allocator.cc index 70576ff7f67..0ba5ca5b2cb 100644 --- a/compiler-rt/lib/asan/asan_allocator.cc +++ b/compiler-rt/lib/asan/asan_allocator.cc @@ -437,7 +437,7 @@ class MallocInfo { left_chunk->chunk_state != CHUNK_AVAILABLE) return left_chunk; // Choose based on offset. - uintptr_t l_offset = 0, r_offset = 0; + size_t l_offset = 0, r_offset = 0; CHECK(left_chunk->AddrIsAtRight(addr, 1, &l_offset)); CHECK(right_chunk->AddrIsAtLeft(addr, 1, &r_offset)); if (l_offset < r_offset) @@ -457,7 +457,7 @@ class MallocInfo { CHECK(m->chunk_state == CHUNK_ALLOCATED || m->chunk_state == CHUNK_AVAILABLE || m->chunk_state == CHUNK_QUARANTINE); - uintptr_t offset = 0; + size_t offset = 0; if (m->AddrIsInside(addr, 1, &offset)) return m; |
