[ASan] minor fixes to silence cmake build warnings

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@160624 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_allocator.cc b/lib/asan/asan_allocator.cc
index 0e8530c..352cce0 100644
--- a/lib/asan/asan_allocator.cc
+++ b/lib/asan/asan_allocator.cc
@@ -42,7 +42,7 @@
 
 namespace __asan {
 
-#define  REDZONE (flags()->redzone)
+#define REDZONE ((uptr)(flags()->redzone))
 static const uptr kMinAllocSize = REDZONE * 2;
 static const u64 kMaxAvailableRam = 128ULL << 30;  // 128G
 static const uptr kMaxThreadLocalQuarantine = 1 << 20;  // 1M
@@ -344,7 +344,7 @@
     AsanChunkFifoList *q = &x->quarantine_;
     if (q->size() > 0) {
       quarantine_.PushList(q);
-      while (quarantine_.size() > flags()->quarantine_size) {
+      while (quarantine_.size() > (uptr)flags()->quarantine_size) {
         QuarantinePop();
       }
     }
@@ -704,7 +704,7 @@
     PoisonHeapPartialRightRedzone(addr + rounded_size - REDZONE,
                                   size & (REDZONE - 1));
   }
-  if (size <= flags()->max_malloc_fill_size) {
+  if (size <= (uptr)(flags()->max_malloc_fill_size)) {
     REAL(memset)((void*)addr, 0, rounded_size);
   }
   return (u8*)addr;