diff --git a/llvm/lib/CodeGen/GlobalISel/GISelValueTracking.cpp b/llvm/lib/CodeGen/GlobalISel/GISelValueTracking.cpp
index 2d276f05e24cf..135e1d2163e23 100644
--- a/llvm/lib/CodeGen/GlobalISel/GISelValueTracking.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/GISelValueTracking.cpp
@@ -222,11 +222,11 @@ void GISelValueTracking::computeKnownBitsImpl(Register R, KnownBits &Known,
     // Collect the known bits that are shared by every demanded vector element.
     Known.Zero.setAllBits();
     Known.One.setAllBits();
-    for (unsigned i = 0, e = MI.getNumOperands() - 1; i < e; ++i) {
-      if (!DemandedElts[i])
+    for (unsigned I = 0, E = MI.getNumOperands() - 1; I < E; ++I) {
+      if (!DemandedElts[I])
         continue;
 
-      computeKnownBitsImpl(MI.getOperand(i + 1).getReg(), Known2, APInt(1, 1),
+      computeKnownBitsImpl(MI.getOperand(I + 1).getReg(), Known2, APInt(1, 1),
                            Depth + 1);
 
       // Known bits are the values that are shared by every demanded element.
@@ -685,11 +685,11 @@ void GISelValueTracking::computeKnownBitsImpl(Register R, KnownBits &Known,
         MRI.getType(MI.getOperand(1).getReg()).getNumElements();
     unsigned NumSubVectors = MI.getNumOperands() - 1;
 
-    for (unsigned i = 0; i != NumSubVectors; ++i) {
+    for (unsigned I = 0; I != NumSubVectors; ++I) {
       APInt DemandedSub =
-          DemandedElts.extractBits(NumSubVectorElts, i * NumSubVectorElts);
+          DemandedElts.extractBits(NumSubVectorElts, I * NumSubVectorElts);
       if (!!DemandedSub) {
-        computeKnownBitsImpl(MI.getOperand(i + 1).getReg(), Known2, DemandedSub,
+        computeKnownBitsImpl(MI.getOperand(I + 1).getReg(), Known2, DemandedSub,
                              Depth + 1);
 
         Known = Known.intersectWith(Known2);
@@ -1944,11 +1944,11 @@ unsigned GISelValueTracking::computeNumSignBits(Register R,
     // Collect the known bits that are shared by every demanded vector element.
     FirstAnswer = TyBits;
     APInt SingleDemandedElt(1, 1);
-    for (unsigned i = 0, e = MI.getNumOperands() - 1; i < e; ++i) {
-      if (!DemandedElts[i])
+    for (unsigned I = 0, E = MI.getNumOperands() - 1; I < E; ++I) {
+      if (!DemandedElts[I])
         continue;
 
-      unsigned Tmp2 = computeNumSignBits(MI.getOperand(i + 1).getReg(),
+      unsigned Tmp2 = computeNumSignBits(MI.getOperand(I + 1).getReg(),
                                          SingleDemandedElt, Depth + 1);
       FirstAnswer = std::min(FirstAnswer, Tmp2);
 
@@ -1967,12 +1967,12 @@ unsigned GISelValueTracking::computeNumSignBits(Register R,
     unsigned NumSubVectorElts =
         MRI.getType(MI.getOperand(1).getReg()).getNumElements();
     unsigned NumSubVectors = MI.getNumOperands() - 1;
-    for (unsigned i = 0; i < NumSubVectors; ++i) {
+    for (unsigned I = 0; I < NumSubVectors; ++I) {
       APInt DemandedSub =
-          DemandedElts.extractBits(NumSubVectorElts, i * NumSubVectorElts);
+          DemandedElts.extractBits(NumSubVectorElts, I * NumSubVectorElts);
       if (!DemandedSub)
         continue;
-      unsigned Tmp2 = computeNumSignBits(MI.getOperand(i + 1).getReg(),
+      unsigned Tmp2 = computeNumSignBits(MI.getOperand(I + 1).getReg(),
                                          DemandedSub, Depth + 1);
 
       FirstAnswer = std::min(FirstAnswer, Tmp2);