From: Kostya Serebryany <kcc@google.com>
Date: Tue, 14 Feb 2012 00:52:07 +0000 (+0000)
Subject: [tsan] fix compiler warnings
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3eccaa6625a8032bee6b84706cb46ed8eb915acf;p=oota-llvm.git

[tsan] fix compiler warnings

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150449 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Instrumentation/ThreadSanitizer.cpp b/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
index ab88d1c0b0b..d822535f637 100644
--- a/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/ThreadSanitizer.cpp
@@ -52,7 +52,7 @@ struct ThreadSanitizer : public FunctionPass {
   Value *TsanFuncEntry;
   Value *TsanFuncExit;
   // Accesses sizes are powers of two: 1, 2, 4, 8, 16.
-  static const int kNumberOfAccessSizes = 5;
+  static const size_t kNumberOfAccessSizes = 5;
   Value *TsanRead[kNumberOfAccessSizes];
   Value *TsanWrite[kNumberOfAccessSizes];
 };
@@ -87,7 +87,7 @@ bool ThreadSanitizer::doInitialization(Module &M) {
                                         IRB.getInt8PtrTy(), NULL);
   TsanFuncExit = M.getOrInsertFunction("__tsan_func_exit", IRB.getVoidTy(),
                                        NULL);
-  for (int i = 0; i < kNumberOfAccessSizes; ++i) {
+  for (size_t i = 0; i < kNumberOfAccessSizes; ++i) {
     SmallString<32> ReadName("__tsan_read");
     ReadName += itostr(1 << i);
     TsanRead[i] = M.getOrInsertFunction(ReadName, IRB.getVoidTy(),
@@ -161,7 +161,7 @@ bool ThreadSanitizer::instrumentLoadOrStore(Instruction *I) {
     // Ignore all unusual sizes.
     return false;
   }
-  uint32_t Idx = CountTrailingZeros_32(TypeSize / 8);
+  size_t Idx = CountTrailingZeros_32(TypeSize / 8);
   assert(Idx < kNumberOfAccessSizes);
   Value *OnAccessFunc = IsWrite ? TsanWrite[Idx] : TsanRead[Idx];
   IRB.CreateCall(OnAccessFunc, IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()));