lib/asan: Fix possible type mismatches.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@145664 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_allocator.cc b/lib/asan/asan_allocator.cc
index 70576ff..0ba5ca5 100644
--- a/lib/asan/asan_allocator.cc
+++ b/lib/asan/asan_allocator.cc
@@ -437,7 +437,7 @@
         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 @@
     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;