diff --git a/llvm/unittests/ADT/APIntTest.cpp b/llvm/unittests/ADT/APIntTest.cpp
index 3eff0771ee6d5..ec3d5f82337f2 100644
--- a/llvm/unittests/ADT/APIntTest.cpp
+++ b/llvm/unittests/ADT/APIntTest.cpp
@@ -1749,14 +1749,14 @@ TEST(APIntTest, isShiftedMask) {
   unsigned MaskIdx, MaskLen;
   EXPECT_FALSE(APInt(32, 0x01010101).isShiftedMask(MaskIdx, MaskLen));
   EXPECT_TRUE(APInt(32, 0xf0000000).isShiftedMask(MaskIdx, MaskLen));
-  EXPECT_EQ(28, MaskIdx);
-  EXPECT_EQ(4, MaskLen);
+  EXPECT_EQ(28, (int)MaskIdx);
+  EXPECT_EQ(4, (int)MaskLen);
   EXPECT_TRUE(APInt(32, 0xffff0000).isShiftedMask(MaskIdx, MaskLen));
-  EXPECT_EQ(16, MaskIdx);
-  EXPECT_EQ(16, MaskLen);
+  EXPECT_EQ(16, (int)MaskIdx);
+  EXPECT_EQ(16, (int)MaskLen);
   EXPECT_TRUE(APInt(32, 0xff << 1).isShiftedMask(MaskIdx, MaskLen));
-  EXPECT_EQ(1, MaskIdx);
-  EXPECT_EQ(8, MaskLen);
+  EXPECT_EQ(1, (int)MaskIdx);
+  EXPECT_EQ(8, (int)MaskLen);
 
   for (int N : { 1, 2, 3, 4, 7, 8, 16, 32, 64, 127, 128, 129, 256 }) {
     EXPECT_FALSE(APInt(N, 0).isShiftedMask());
diff --git a/llvm/unittests/Support/MathExtrasTest.cpp b/llvm/unittests/Support/MathExtrasTest.cpp
index b9ed0dffcce20..23034d64028c6 100644
--- a/llvm/unittests/Support/MathExtrasTest.cpp
+++ b/llvm/unittests/Support/MathExtrasTest.cpp
@@ -184,14 +184,14 @@ TEST(MathExtras, isShiftedMask_32) {
   unsigned MaskIdx, MaskLen;
   EXPECT_FALSE(isShiftedMask_32(0x01010101, MaskIdx, MaskLen));
   EXPECT_TRUE(isShiftedMask_32(0xf0000000, MaskIdx, MaskLen));
-  EXPECT_EQ(28, MaskIdx);
-  EXPECT_EQ(4, MaskLen);
+  EXPECT_EQ(28, (int)MaskIdx);
+  EXPECT_EQ(4, (int)MaskLen);
   EXPECT_TRUE(isShiftedMask_32(0xffff0000, MaskIdx, MaskLen));
-  EXPECT_EQ(16, MaskIdx);
-  EXPECT_EQ(16, MaskLen);
+  EXPECT_EQ(16, (int)MaskIdx);
+  EXPECT_EQ(16, (int)MaskLen);
   EXPECT_TRUE(isShiftedMask_32(0xff << 1, MaskIdx, MaskLen));
-  EXPECT_EQ(1, MaskIdx);
-  EXPECT_EQ(8, MaskLen);
+  EXPECT_EQ(1, (int)MaskIdx);
+  EXPECT_EQ(8, (int)MaskLen);
 }
 
 TEST(MathExtras, isShiftedMask_64) {
@@ -203,14 +203,14 @@ TEST(MathExtras, isShiftedMask_64) {
   unsigned MaskIdx, MaskLen;
   EXPECT_FALSE(isShiftedMask_64(0x0101010101010101ull, MaskIdx, MaskLen));
   EXPECT_TRUE(isShiftedMask_64(0xf000000000000000ull, MaskIdx, MaskLen));
-  EXPECT_EQ(60, MaskIdx);
-  EXPECT_EQ(4, MaskLen);
+  EXPECT_EQ(60, (int)MaskIdx);
+  EXPECT_EQ(4, (int)MaskLen);
   EXPECT_TRUE(isShiftedMask_64(0xffff000000000000ull, MaskIdx, MaskLen));
-  EXPECT_EQ(48, MaskIdx);
-  EXPECT_EQ(16, MaskLen);
+  EXPECT_EQ(48, (int)MaskIdx);
+  EXPECT_EQ(16, (int)MaskLen);
   EXPECT_TRUE(isShiftedMask_64(0xffull << 55, MaskIdx, MaskLen));
-  EXPECT_EQ(55, MaskIdx);
-  EXPECT_EQ(8, MaskLen);
+  EXPECT_EQ(55, (int)MaskIdx);
+  EXPECT_EQ(8, (int)MaskLen);
 }
 
 TEST(MathExtras, isPowerOf2_32) {