[llvm-commits] [compiler-rt] r145664 - /compiler-rt/trunk/lib/asan/asan_allocator.cc

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec  1 19:36:38 2011
New Revision: 145664

URL: http://llvm.org/viewvc/llvm-project?rev=145664&view=rev
Log:
lib/asan: Fix possible type mismatches.

Modified:
    compiler-rt/trunk/lib/asan/asan_allocator.cc

Modified: compiler-rt/trunk/lib/asan/asan_allocator.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.cc?rev=145664&r1=145663&r2=145664&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_allocator.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_allocator.cc Thu Dec  1 19:36:38 2011
@@ -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;