[CLANG-TIDY] Fixed up clang-tidy errors

Colin Davidson · Colin Davidson · commit 857226786e55 · 2025-08-22T12:38:29.000+01:00
diff --git a/modules/cargo/test/small_vector.cpp b/modules/cargo/test/small_vector.cpp
@@ -711,8 +711,9 @@ TEST(small_vector, movable_pushes) {
     element() : movable_t(0), initialized(true) {}
     element(element &&rhs) : movable_t(std::move(rhs)), initialized(true) {}
     ~element() {
-      if (!initialized)
+      if (!initialized) {
         errored = true;
+      }
     }
     bool initialized;
   };
@@ -733,8 +734,9 @@ TEST(small_vector, copyable_pushes) {
   struct element : public copyable_t {
     element() : copyable_t(0), initialized(true) {}
     ~element() {
-      if (!initialized)
+      if (!initialized) {
         errored = true;
+      }
     }
     bool initialized;
   };
diff --git a/modules/compiler/compiler_pipeline/include/compiler/utils/pipeline_parse_helpers.h b/modules/compiler/compiler_pipeline/include/compiler/utils/pipeline_parse_helpers.h
@@ -75,11 +75,13 @@ static auto parsePassParameters(ParametersParseCallableT &&Parser,
 
 static bool checkParametrizedPassName(llvm::StringRef Name,
                                       llvm::StringRef PassName) {
-  if (!Name.consume_front(PassName))
+  if (!Name.consume_front(PassName)) {
     return false;
+  }
   // normal pass name w/o parameters == default parameters
-  if (Name.empty())
+  if (Name.empty()) {
     return true;
+  }
   return Name.starts_with("<") && Name.ends_with(">");
 }
 
diff --git a/modules/compiler/compiler_pipeline/source/barrier_regions.cpp b/modules/compiler/compiler_pipeline/source/barrier_regions.cpp
@@ -1416,14 +1416,16 @@ BasicBlock *compiler::utils::Barrier::CloneBasicBlock(
     BasicBlock *bb, ValueToValueMapTy &vmap, const Twine &name_suffix,
     live_variable_mem_t &live_defs_info, Function *F) {
   BasicBlock *new_bb = BasicBlock::Create(bb->getContext(), "", F);
-  if (bb->hasName())
+  if (bb->hasName()) {
     new_bb->setName(bb->getName() + name_suffix);
+  }
 
   // Loop over all instructions, and copy them over.
   for (Instruction &i : *bb) {
     Instruction *new_inst = i.clone();
-    if (i.hasName())
+    if (i.hasName()) {
       new_inst->setName(i.getName() + name_suffix);
+    }
     new_inst->insertInto(new_bb, new_bb->end());
 
     // Record live variables' defs which are in current kernel.
@@ -1438,8 +1440,9 @@ BasicBlock *compiler::utils::Barrier::CloneBasicBlock(
 
 /// @brief Seperate kernel function with barrier boundary.
 void compiler::utils::Barrier::SeperateKernelWithBarrier() {
-  if (barriers_.empty())
+  if (barriers_.empty()) {
     return;
+  }
 
   for (auto &[i, region] : barrier_region_id_map_) {
     kernel_id_map_[region.id] = GenerateNewKernel(region);
diff --git a/modules/compiler/compiler_pipeline/source/cl_builtin_info.cpp b/modules/compiler/compiler_pipeline/source/cl_builtin_info.cpp
@@ -3154,12 +3154,14 @@ CLBuiltinInfo::lowerGroupBuiltinToMuxBuiltin(CallInst &CI, BuiltinID ID,
     default:
       llvm_unreachable("unknown group operation for which to check the type");
     case eMuxBuiltinSubgroupReduceAdd:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinSubgroupReduceFAdd;
+      }
       break;
     case eMuxBuiltinSubgroupReduceMul:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinSubgroupReduceFMul;
+      }
       break;
     case eMuxBuiltinSubgroupReduceUMin:
       if (IsFP) {
@@ -3176,20 +3178,24 @@ CLBuiltinInfo::lowerGroupBuiltinToMuxBuiltin(CallInst &CI, BuiltinID ID,
       }
       break;
     case eMuxBuiltinSubgroupScanAddInclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinSubgroupScanFAddInclusive;
+      }
       break;
     case eMuxBuiltinSubgroupScanAddExclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinSubgroupScanFAddExclusive;
+      }
       break;
     case eMuxBuiltinSubgroupScanMulInclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinSubgroupScanFMulInclusive;
+      }
       break;
     case eMuxBuiltinSubgroupScanMulExclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinSubgroupScanFMulExclusive;
+      }
       break;
     case eMuxBuiltinSubgroupScanUMinInclusive:
       if (IsFP) {
@@ -3220,12 +3226,14 @@ CLBuiltinInfo::lowerGroupBuiltinToMuxBuiltin(CallInst &CI, BuiltinID ID,
       }
       break;
     case eMuxBuiltinWorkgroupReduceAdd:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinWorkgroupReduceFAdd;
+      }
       break;
     case eMuxBuiltinWorkgroupReduceMul:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinWorkgroupReduceFMul;
+      }
       break;
     case eMuxBuiltinWorkgroupReduceUMin:
       if (IsFP) {
@@ -3242,20 +3250,24 @@ CLBuiltinInfo::lowerGroupBuiltinToMuxBuiltin(CallInst &CI, BuiltinID ID,
       }
       break;
     case eMuxBuiltinWorkgroupScanAddInclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinWorkgroupScanFAddInclusive;
+      }
       break;
     case eMuxBuiltinWorkgroupScanAddExclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinWorkgroupScanFAddExclusive;
+      }
       break;
     case eMuxBuiltinWorkgroupScanMulInclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinWorkgroupScanFMulInclusive;
+      }
       break;
     case eMuxBuiltinWorkgroupScanMulExclusive:
-      if (IsFP)
+      if (IsFP) {
         MuxBuiltinID = eMuxBuiltinWorkgroupScanFMulExclusive;
+      }
       break;
     case eMuxBuiltinWorkgroupScanUMinInclusive:
       if (IsFP) {
diff --git a/modules/compiler/compiler_pipeline/source/pass_functions.cpp b/modules/compiler/compiler_pipeline/source/pass_functions.cpp
@@ -502,8 +502,9 @@ llvm::BasicBlock *createLoop(llvm::BasicBlock *entry, llvm::BasicBlock *exit,
   // Set up all of our user PHIs
   for (unsigned i = 0, e = currIVs.size(); i != e; i++) {
     // For convenience to callers, permit nullptr and skip over it.
-    if (!currIVs[i])
+    if (!currIVs[i]) {
       continue;
+    }
 
     auto *const phi = loopIR.CreatePHI(currIVs[i]->getType(), 2);
     llvm::cast<llvm::PHINode>(phi)->addIncoming(currIVs[i],
@@ -528,8 +529,9 @@ llvm::BasicBlock *createLoop(llvm::BasicBlock *entry, llvm::BasicBlock *exit,
 
   // Update all of our PHIs
   for (unsigned i = 0, e = currIVs.size(); i != e; i++) {
-    if (!currIVs[i])
+    if (!currIVs[i]) {
       continue;
+    }
     llvm::cast<llvm::PHINode>(currIVs[i])->addIncoming(nextIVs[i], latch);
   }
 
diff --git a/modules/compiler/compiler_pipeline/source/replace_c11_atomic_funcs_pass.cpp b/modules/compiler/compiler_pipeline/source/replace_c11_atomic_funcs_pass.cpp
@@ -326,20 +326,24 @@ void replaceFlagClear(CallInst *C11FlagClear) {
 bool runOnInstruction(CallInst *Call) {
   if (auto *Callee = Call->getCalledFunction()) {
     auto Name{Callee->getName()};
-    if (!Name.starts_with("_Z"))
+    if (!Name.starts_with("_Z")) {
       return false;
+    }
     Name = Name.drop_front(2);
     unsigned KeyNameLength;
-    if (Name.consumeInteger(10, KeyNameLength))
+    if (Name.consumeInteger(10, KeyNameLength)) {
       return false;
+    }
     const StringRef MangledParams = Name.drop_front(KeyNameLength);
     Name = Name.take_front(KeyNameLength);
-    if (!Name.starts_with("atomic_"))
+    if (!Name.starts_with("atomic_")) {
       return false;
+    }
     Name = Name.drop_front(7);
     const bool Explicit = Name.ends_with("_explicit");
-    if (Explicit)
+    if (Explicit) {
       Name = Name.drop_back(9);
+    }
     if (Name == "init") {
       replaceInit(Call);
       return true;
diff --git a/modules/compiler/spirv-ll/source/builder_core.cpp b/modules/compiler/spirv-ll/source/builder_core.cpp
@@ -5939,10 +5939,12 @@ void Builder::generateReduction(const T *op, const std::string &opName,
   // wrapper. This is important for distinguishing between smin/smax, for
   // example.
   const char *prefix = "";
-  if (signInfo == MangleInfo::ForceSignInfo::ForceSigned)
+  if (signInfo == MangleInfo::ForceSignInfo::ForceSigned) {
     prefix = "s";
-  if (signInfo == MangleInfo::ForceSignInfo::ForceUnsigned)
+  }
+  if (signInfo == MangleInfo::ForceSignInfo::ForceUnsigned) {
     prefix = "u";
+  }
   const std::string cacheName = prefix + opName;
   auto *&reductionWrapper =
       module.reductionWrapperMap[operation][cacheName]
diff --git a/modules/compiler/targets/host/source/target.cpp b/modules/compiler/targets/host/source/target.cpp
@@ -272,8 +272,9 @@ HostTarget::initWithBuiltins(std::unique_ptr<llvm::Module> builtins_module) {
     if (!NewFeatures.empty()) {
       std::vector<std::string> NewFeatureVector;
       llvm::SubtargetFeatures::Split(NewFeatureVector, NewFeatures);
-      for (auto &NewFeature : NewFeatureVector)
+      for (auto &NewFeature : NewFeatureVector) {
         Features.AddFeature(NewFeature);
+      }
     }
   };
 
diff --git a/modules/compiler/test/group_ops.cpp b/modules/compiler/test/group_ops.cpp
@@ -78,10 +78,12 @@ class GroupOpsTest : public CompilerLLVMModuleTest {
   };
 
   static std::string getGroupBuiltinBaseName(GroupCollective::ScopeKind Scope) {
-    if (Scope == GroupCollective::ScopeKind::SubGroup)
+    if (Scope == GroupCollective::ScopeKind::SubGroup) {
       return "sub_group_";
-    if (Scope == GroupCollective::ScopeKind::VectorGroup)
+    }
+    if (Scope == GroupCollective::ScopeKind::VectorGroup) {
       return "vec_group_";
+    }
     return "work_group_";
   }
 
@@ -368,10 +370,12 @@ define void @test_wrapper(i32 %i, float %f, i32 %sg_lid, i64 %lid_x, i64 %lid_y,
       BuiltinDecls.push_back("declare " + Op.getLLVMFnString());
 
       const StringRef ParamName = [&]() -> StringRef {
-        if (Op.LLVMTy == "float")
+        if (Op.LLVMTy == "float") {
           return "%f";
-        if (Op.LLVMTy == "i32")
+        }
+        if (Op.LLVMTy == "i32") {
           return "%i";
+        }
         return "<err>";
       }();
       BuiltinCalls.push_back("%call" + std::to_string(Idx) + " = call " +
@@ -412,8 +416,9 @@ define void @test_wrapper(i32 %i, float %f, i32 %sg_lid, i64 %lid_x, i64 %lid_y,
       auto Builtin = BI.analyzeBuiltin(*CalledFn);
       std::string InfoStr = " for function " + CalledFn->getName().str();
       ASSERT_TRUE(Builtin) << InfoStr;
-      if (!Builtin)
+      if (!Builtin) {
         return;
+      }
       InfoStr += " identified as ID " + std::to_string(Builtin->ID);
       EXPECT_TRUE(BI.isMuxBuiltinID(Builtin->ID)) << InfoStr;
 
diff --git a/modules/compiler/utils/source/lld_linker.cpp b/modules/compiler/utils/source/lld_linker.cpp
@@ -86,19 +86,23 @@ lldLinkToBinary(const ArrayRef<uint8_t> rawBinary,
   };
 
   const TemporaryFile objFile("lld", "o");
-  if (objFile)
+  if (objFile) {
     return errorCodeToError(objFile.getErrorCode());
+  }
   const TemporaryFile elfFile("lld", "elf");
-  if (elfFile)
+  if (elfFile) {
     return errorCodeToError(elfFile.getErrorCode());
+  }
   const TemporaryFile linkerScript("lld", "ld");
-  if (linkerScript)
+  if (linkerScript) {
     return errorCodeToError(linkerScript.getErrorCode());
+  }
   TemporaryFile linkRTFile;
   if (linkerLib) {
     linkRTFile = TemporaryFile("lld_rt", "a");
-    if (linkRTFile)
+    if (linkRTFile) {
       return errorCodeToError(linkRTFile.getErrorCode());
+    }
     FILE *flinklib = fopen(linkRTFile.getFileName(), "wb+");
     if (nullptr != flinklib) {
       if (fwrite(linkerLib, 1, linkerLibBytes, flinklib) != linkerLibBytes) {
diff --git a/modules/compiler/vecz/source/analysis/divergence_analysis.cpp b/modules/compiler/vecz/source/analysis/divergence_analysis.cpp
@@ -427,11 +427,13 @@ void DivergenceResult::markByAll(BasicBlock &src) {
           // If we are not in a loop, or the loop we live in does not diverge
           // nor does the one englobing us if it exists, then mark by_all.
           if (DLoopTag) {
-            if (DLoopTag->isLoopDivergent())
+            if (DLoopTag->isLoopDivergent()) {
               continue;
+            }
             Loop *parentLoop = DLoopTag->loop->getParentLoop();
-            if (parentLoop && !isByAll(*parentLoop->getHeader()))
+            if (parentLoop && !isByAll(*parentLoop->getHeader())) {
               continue;
+            }
           }
           queue.push(DIndex);
         }
diff --git a/modules/compiler/vecz/source/vectorization_helpers.cpp b/modules/compiler/vecz/source/vectorization_helpers.cpp
@@ -261,8 +261,9 @@ Function *cloneFunctionToVector(const VectorizationUnit &VU) {
 static DILocation *getDILocation(unsigned Line, unsigned Column, MDNode *Scope,
                                  MDNode *InlinedAt = nullptr) {
   // If no scope is available, this is an unknown location.
-  if (!Scope)
+  if (!Scope) {
     return DebugLoc();
+  }
   return DILocation::get(Scope->getContext(), Line, Column, Scope, InlinedAt,
                          /*ImplicitCode*/ false);
 }
diff --git a/modules/kts/source/reference_functions_shared.cpp b/modules/kts/source/reference_functions_shared.cpp
@@ -77,8 +77,9 @@ uint32_t kts::Ref_Clz(size_t x) {
   uint32_t i = 0;
   while (((uint32_t)x & (1 << (31 - i))) == 0) {
     i++;
-    if (i == 32)
+    if (i == 32) {
       break;
+    }
   }
   return i;
 }
diff --git a/modules/mux/targets/host/source/device.cpp b/modules/mux/targets/host/source/device.cpp
@@ -115,8 +115,9 @@ static uint32_t os_cpu_frequency() {
       uint32_t i = wanted.size();
 
       while (i < size) {
-        if (buffer[i++] == ':')
+        if (buffer[i++] == ':') {
           break;
+        }
       }
 
       (void)fclose(file);
diff --git a/source/cl/test/UnitCL/include/ucl/file.h b/source/cl/test/UnitCL/include/ucl/file.h
@@ -43,8 +43,9 @@ struct File {
       const size_t objects =
           std::fread(buffer.data(), sizeof(value_type), buffer_size, file);
       content.insert(content.end(), buffer.data(), buffer.data() + objects);
-      if (objects < buffer_size)
+      if (objects < buffer_size) {
         break;
+      }
     }
     return content;
   }
diff --git a/source/cl/test/UnitCL/source/kts/arguments.cpp b/source/cl/test/UnitCL/source/kts/arguments.cpp
@@ -29,12 +29,15 @@ kts::ucl::ArgumentList::GetBufferDescForArg(unsigned index) const {
   if (index < GetCount()) {
     auto &arg = args_[index];
     const kts::BufferDesc &arg_desc = arg->GetBufferDesc();
-    if (arg_desc.size_ > 0)
+    if (arg_desc.size_ > 0) {
       desc.size_ = arg_desc.size_;
-    if (arg_desc.streamer_)
+    }
+    if (arg_desc.streamer_) {
       desc.streamer_ = arg_desc.streamer_;
-    if (arg_desc.streamer2_)
+    }
+    if (arg_desc.streamer2_) {
       desc.streamer2_ = arg_desc.streamer2_;
+    }
   }
   return desc;
 }
diff --git a/source/cl/test/UnitCL/source/ktst_regression_01.cpp b/source/cl/test/UnitCL/source/ktst_regression_01.cpp
diff --git a/source/cl/test/UnitCL/source/ktst_regression_03.cpp b/source/cl/test/UnitCL/source/ktst_regression_03.cpp
diff --git a/source/cl/test/UnitCL/source/ktst_vecz_tasks_task_04.cpp b/source/cl/test/UnitCL/source/ktst_vecz_tasks_task_04.cpp
diff --git a/source/cl/test/UnitCL/source/ktst_vecz_tasks_task_07.cpp b/source/cl/test/UnitCL/source/ktst_vecz_tasks_task_07.cpp
diff --git a/source/cl/tools/oclc/oclc.cpp b/source/cl/tools/oclc/oclc.cpp
