Remove warnings when using -Wshorten-64-to-32.

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

diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h
index f2afd79e6ddd6b09db45a87bcac882c32c0146f1..b8f04c40b0d0acbbbf2f714880640fa8bb79c466 100644 (file)
--- a/include/llvm/Instructions.h
+++ b/include/llvm/Instructions.h
@@ -960,14 +960,14 @@ public:
                           InputIterator ArgBegin, InputIterator ArgEnd,
                           const std::string &Name = "",
                           Instruction *InsertBefore = 0) {
-    return new(ArgEnd - ArgBegin + 1)
+    return new((unsigned)(ArgEnd - ArgBegin + 1))
       CallInst(Func, ArgBegin, ArgEnd, Name, InsertBefore);
   }
   template<typename InputIterator>
   static CallInst *Create(Value *Func,
                           InputIterator ArgBegin, InputIterator ArgEnd,
                           const std::string &Name, BasicBlock *InsertAtEnd) {
-    return new(ArgEnd - ArgBegin + 1)
+    return new((unsigned)(ArgEnd - ArgBegin + 1))
       CallInst(Func, ArgBegin, ArgEnd, Name, InsertAtEnd);
   }
   static CallInst *Create(Value *F, Value *Actual, const std::string& Name = "",
@@ -1685,7 +1685,7 @@ public:
 
   ~BranchInst() {
     if (NumOperands == 1)
-      NumOperands = (unsigned)(uintptr_t)((Use*)this - OperandList);
+      NumOperands = (unsigned)((Use*)this - OperandList);
   }
 
   /// Transparently provide more efficient getOperand methods.