diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 
 # Nested build directory
 /build*
+**/cmake-build*
 
 #==============================================================================#
 # Explicit files to ignore (only matches one).
diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
@@ -16085,9 +16085,9 @@
 
     APInt SaturateC;
     if (VT == MVT::v8i8)
-      SaturateC = APInt(8, (1 << 8) - 1, true);
+      SaturateC = APInt(16, (1 << 8) - 1, true);
     else // if (VT == MVT::v4i16)
-      SaturateC = APInt(16, (1 << 16) - 1, true);
+      SaturateC = APInt(32, (1 << 16) - 1, true);
 
     APInt MinC;
     if (!ISD::isConstantSplatVector(Min->getOperand(1).getNode(), MinC) ||