Merge branch 'f-ClangTidyFixIDETSA' into f-ClangTidyFixIDESolver

Author: Martin Mory

include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h

@@ -321,13 +321,13 @@ class LLVMBasedICFG
 
   template <typename Fn> void forEachGlobalCtor(Fn &&F) const {
     for (auto [Prio, Fun] : GlobalCtors) {
-      F(static_cast<const llvm::Function *>(Fun));
+      std::invoke(F, static_cast<const llvm::Function *>(Fun));
     }
   }
 
   template <typename Fn> void forEachGlobalDtor(Fn &&F) const {
     for (auto [Prio, Fun] : GlobalDtors) {
-      F(static_cast<const llvm::Function *>(Fun));
+      std::invoke(F, static_cast<const llvm::Function *>(Fun));
     }
   }
 

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions.h

@@ -185,7 +185,7 @@ class GenIf : public FlowFunction<D, Container> {
       : GenValues({GenValue}), Predicate(std::move(Predicate)) {}
 
   GenIf(container_type GenValues, std::function<bool(D)> Predicate)
-      : GenValues(std::move(GenValues)), Predicate(Predicate) {}
+      : GenValues(std::move(GenValues)), Predicate(std::move(Predicate)) {}
 
   ~GenIf() override = default;
 
@@ -274,7 +274,7 @@ class KillMultiple : public FlowFunction<D, Container> {
   KillMultiple(std::set<D> KillValues) : KillValues(std::move(KillValues)) {}
   ~KillMultiple() override = default;
   container_type computeTargets(D Source) override {
-    if (KillValues.find(Source) != KillValues.end()) {
+    if (KillValues.count(Source)) {
       return {};
     }
     return {Source};

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h

@@ -68,13 +68,8 @@ class LLVMZeroValue : public llvm::GlobalVariable {
     return LLVMZeroValueInternalName;
   }
 
-  bool isLLVMZeroValue(const llvm::Value *V) const {
-    if (V && V->hasName()) {
-      // checks if V's name start with "zero_value"
-      return V->getName().find(LLVMZeroValueInternalName) !=
-             llvm::StringRef::npos;
-    }
-    return false;
+  static bool isLLVMZeroValue(const llvm::Value *V) {
+    return V == getInstance();
   }
 
   // Do not specify a destructor (at all)!

lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp

@@ -444,15 +444,13 @@ const llvm::Function *LLVMBasedICFG::getFunction(const string &Fun) const {
 }
 
 const llvm::Function *LLVMBasedICFG::getFirstGlobalCtorOrNull() const {
-  auto It = GlobalCtors.begin();
-  if (It != GlobalCtors.end()) {
+  if (auto It = GlobalCtors.begin(); It != GlobalCtors.end()) {
     return It->second;
   }
   return nullptr;
 }
 const llvm::Function *LLVMBasedICFG::getLastGlobalDtorOrNull() const {
-  auto It = GlobalDtors.rbegin();
-  if (It != GlobalDtors.rend()) {
+  if (auto It = GlobalDtors.rbegin(); It != GlobalDtors.rend()) {
     return It->second;
   }
   return nullptr;
@@ -1273,8 +1271,8 @@ unsigned LLVMBasedICFG::getNumOfEdges() const {
 
 const llvm::Function *
 LLVMBasedICFG::getRegisteredDtorsCallerOrNull(const llvm::Module *Mod) {
-  auto It = GlobalRegisteredDtorsCaller.find(Mod);
-  if (It != GlobalRegisteredDtorsCaller.end()) {
+  if (auto It = GlobalRegisteredDtorsCaller.find(Mod);
+      It != GlobalRegisteredDtorsCaller.end()) {
     return It->second;
   }