self review of loops

Author: spall

clang/lib/CodeGen/CGExpr.cpp

@@ -6403,10 +6403,10 @@ void CodeGenFunction::FlattenAccessAndType(
       for (auto *FD : Record->fields())
         FieldTypes.push_back(FD->getType());
 
-      for (int64_t i = FieldTypes.size() - 1; i > -1; i--) {
+      for (int64_t I = FieldTypes.size() - 1; I > -1; I--) {
         llvm::SmallVector<llvm::Value *, 4> IdxListCopy = IdxList;
-        IdxListCopy.push_back(llvm::ConstantInt::get(IdxTy, i));
-        WorkList.insert(WorkList.end(), {FieldTypes[i], IdxListCopy});
+        IdxListCopy.push_back(llvm::ConstantInt::get(IdxTy, I));
+        WorkList.insert(WorkList.end(), {FieldTypes[I], IdxListCopy});
       }
     } else if (const auto *VT = dyn_cast<VectorType>(T)) {
       llvm::Type *LLVMT = ConvertTypeForMem(T);

clang/lib/CodeGen/CGExprAgg.cpp

@@ -545,22 +545,22 @@ static void EmitHLSLAggregateFlatCast(CodeGenFunction &CGF, Address DestVal,
           has less elements than flattened destination object.");
   // apply casts to what we load from LoadGEPList
   // and store result in Dest
-  for (unsigned i = 0; i < StoreGEPList.size(); i++) {
-    llvm::Value *Idx = LoadGEPList[i].second;
-    llvm::Value *Load = CGF.Builder.CreateLoad(LoadGEPList[i].first, "load");
+  for (unsigned I = 0, E = StoreGEPList.size(); I < E; I++) {
+    llvm::Value *Idx = LoadGEPList[I].second;
+    llvm::Value *Load = CGF.Builder.CreateLoad(LoadGEPList[I].first, "load");
     Load =
         Idx ? CGF.Builder.CreateExtractElement(Load, Idx, "vec.extract") : Load;
     llvm::Value *Cast =
-        CGF.EmitScalarConversion(Load, SrcTypes[i], DestTypes[i], Loc);
+        CGF.EmitScalarConversion(Load, SrcTypes[I], DestTypes[I], Loc);
 
     // store back
-    Idx = StoreGEPList[i].second;
+    Idx = StoreGEPList[I].second;
     if (Idx) {
       llvm::Value *V =
-          CGF.Builder.CreateLoad(StoreGEPList[i].first, "load.for.insert");
+          CGF.Builder.CreateLoad(StoreGEPList[I].first, "load.for.insert");
       Cast = CGF.Builder.CreateInsertElement(V, Cast, Idx);
     }
-    CGF.Builder.CreateStore(Cast, StoreGEPList[i].first);
+    CGF.Builder.CreateStore(Cast, StoreGEPList[I].first);
   }
 }
 

clang/lib/Sema/SemaHLSL.cpp

@@ -2500,8 +2500,10 @@ bool SemaHLSL::CanPerformAggregateCast(Expr *Src, QualType DestTy) {
   if (SrcTypes.size() < DestTypes.size())
     return false;
 
+  unsigned SrcSize = SrcTypes.size();
+  unsigned DstSize = DestTypes.size();
   unsigned I;
-  for (I = 0; I < DestTypes.size() && I < SrcTypes.size(); I++) {
+  for (I = 0; I < DstSize && I < SrcSize; I++) {
     if (SrcTypes[I]->isUnionType() || DestTypes[I]->isUnionType())
       return false;
     if (!CanPerformScalarCast(SrcTypes[I], DestTypes[I])) {
@@ -2510,7 +2512,7 @@ bool SemaHLSL::CanPerformAggregateCast(Expr *Src, QualType DestTy) {
   }
 
   // check the rest of the source type for unions.
-  for (; I < SrcTypes.size(); I++) {
+  for (; I < SrcSize; I++) {
     if (SrcTypes[I]->isUnionType())
       return false;
   }