commit faa7506f18a603ba97862c86c49ce946cdf2d0dd
author Teresa Johnson <tejohnson@google.com> Thu Aug 11 20:38:39 2016 +0000
committer Teresa Johnson <tejohnson@google.com> Thu Aug 11 20:38:39 2016 +0000
tree 6f3c9019c37c084de816687492547fcb6186ac5d
parent 21f475e1c4fe5120400afdf3aef7c0ef0311134c

Fix type truncation warnings

Avoid type truncation warnings from a 32-bit bot due to size_t not
being unsigned long long, by converting the variables and constants to
unsigned. This was introduced by r278338 and caused warnings here:
http://bb.pgr.jp/builders/i686-mingw32-RA-on-linux/builds/15527/steps/build_llvmclang/logs/warnings%20%287%29

llvm-svn: 278406

llvm/lib/LTO/LTO.cpp

diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index 282e127..c12a8ee 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp
@@ -185,7 +185,7 @@
 void LTO::addSymbolToGlobalRes(IRObjectFile *Obj,
                                SmallPtrSet<GlobalValue *, 8> &Used,
                                const InputFile::Symbol &Sym,
-                               SymbolResolution Res, size_t Partition) {
+                               SymbolResolution Res, unsigned Partition) {
   GlobalValue *GV = Obj->getSymbolGV(Sym.I->getRawDataRefImpl());
 
   auto &GlobalRes = GlobalResolutions[Sym.getName()];
@@ -345,7 +345,7 @@
   return Error();
 }
 
-size_t LTO::getMaxTasks() const {
+unsigned LTO::getMaxTasks() const {
   CalledGetMaxTasks = true;
   return RegularLTO.ParallelCodeGenParallelismLevel + ThinLTO.ModuleMap.size();
 }
@@ -408,7 +408,7 @@
         ModuleToDefinedGVSummaries(ModuleToDefinedGVSummaries) {}
 
   virtual ~ThinBackendProc() {}
-  virtual Error start(size_t Task, MemoryBufferRef MBRef,
+  virtual Error start(unsigned Task, MemoryBufferRef MBRef,
                       StringMap<FunctionImporter::ImportMapTy> &ImportLists,
                       MapVector<StringRef, MemoryBufferRef> &ModuleMap) = 0;
   virtual Error wait() = 0;
@@ -430,7 +430,7 @@
         BackendThreadPool(ThinLTOParallelismLevel) {}
 
   Error
-  runThinLTOBackendThread(AddStreamFn AddStream, size_t Task,
+  runThinLTOBackendThread(AddStreamFn AddStream, unsigned Task,
                           MemoryBufferRef MBRef,
                           ModuleSummaryIndex &CombinedIndex,
                           const FunctionImporter::ImportMapTy &ImportList,
@@ -446,7 +446,7 @@
                        ImportList, DefinedGlobals, ModuleMap);
   }
 
-  Error start(size_t Task, MemoryBufferRef MBRef,
+  Error start(unsigned Task, MemoryBufferRef MBRef,
               StringMap<FunctionImporter::ImportMapTy> &ImportLists,
               MapVector<StringRef, MemoryBufferRef> &ModuleMap) override {
     StringRef ModulePath = MBRef.getBufferIdentifier();
@@ -529,7 +529,7 @@
     return NewPath.str();
   }
 
-  Error start(size_t Task, MemoryBufferRef MBRef,
+  Error start(unsigned Task, MemoryBufferRef MBRef,
               StringMap<FunctionImporter::ImportMapTy> &ImportLists,
               MapVector<StringRef, MemoryBufferRef> &ModuleMap) override {
     StringRef ModulePath = MBRef.getBufferIdentifier();
@@ -629,8 +629,8 @@
   // ParallelCodeGenParallelismLevel, as tasks 0 through
   // ParallelCodeGenParallelismLevel-1 are reserved for parallel code generation
   // partitions.
-  size_t Task = RegularLTO.ParallelCodeGenParallelismLevel;
-  size_t Partition = 1;
+  unsigned Task = RegularLTO.ParallelCodeGenParallelismLevel;
+  unsigned Partition = 1;
 
   for (auto &Mod : ThinLTO.ModuleMap) {
     if (Error E = BackendProc->start(Task, Mod.second, ImportLists,