diff --git a/llvm/lib/VMCore/Constants.cpp b/llvm/lib/VMCore/Constants.cpp
index 64c2650ec1d8cddbab9c6ec94b7314036cc23f84..0c5079643310971fe8ce03b481f82816c9215ce2 100644
--- a/llvm/lib/VMCore/Constants.cpp
+++ b/llvm/lib/VMCore/Constants.cpp
@@ -118,7 +118,7 @@ ConstantInt *ConstantInt::getAllOnesValue(const Type *Ty) {
     if (ITy->getBitWidth() == 1)
       return ConstantInt::getTrue();
     else
-      return ConstantInt::get(Ty, int64_t(-1));
+      return ConstantInt::get(Ty, APInt::getAllOnesValue(ITy->getBitWidth()));
   return 0;
 }