minor

Author: fabianbs96

include/phasar/PhasarLLVM/ControlFlow/CFGBase.h

@@ -41,7 +41,7 @@ template <typename Derived> class CFGBase {
     return self().getPredsOfImpl(Inst);
   }
   /// Returns an iterable range of all successor instructions of Inst in the
-  /// CFG. NOTE: This function is typically being caled in a hot part of the
+  /// CFG. NOTE: This function is typically being called in a hot part of the
   /// analysis and should therefore be highly optimized for performance
   [[nodiscard]] decltype(auto) getSuccsOf(ByConstRef<n_t> Inst) const {
     static_assert(
@@ -143,6 +143,7 @@ template <typename Derived> class CFGBase {
 };
 
 template <typename ICF, typename Domain>
+// NOLINTNEXTLINE(readability-identifier-naming)
 constexpr bool is_cfg_v = is_crtp_base_of_v<CFGBase, ICF>
     &&std::is_same_v<typename ICF::n_t, typename Domain::n_t>
         &&std::is_same_v<typename ICF::f_t, typename Domain::f_t>;

include/phasar/PhasarLLVM/ControlFlow/ICFGBase.h

@@ -66,7 +66,7 @@ template <typename Derived> class ICFGBase {
   }
   /// Returns an iterable range of all possible callee candidates at the given
   /// call-site induced by the used call-graph. NOTE: This function is typically
-  /// called in a hot part of the analysis any should therefore be very fast
+  /// called in a hot part of the analysis and should therefore be very fast
   [[nodiscard]] decltype(auto) getCalleesOfCallAt(ByConstRef<n_t> Inst) const {
     static_assert(
         is_iterable_over_v<decltype(self().getCalleesOfCallAtImpl(Inst)), f_t>);

include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h

@@ -86,7 +86,6 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   /// \param IncludeGlobals Properly include global constructors/destructors
   /// into the ICFG, if true. Requires to generate artificial functions into the
   /// IRDB. True by default
-
   explicit LLVMBasedICFG(ProjectIRDB *IRDB, CallGraphAnalysisType CGType,
                          llvm::ArrayRef<std::string> EntryPoints = {},
                          LLVMTypeHierarchy *TH = nullptr,

lib/PhasarLLVM/ControlFlow/LLVMBasedCFG.cpp

@@ -13,6 +13,7 @@
 #include "phasar/Utils/LLVMIRToSrc.h"
 #include "phasar/Utils/LLVMShorthands.h"
 
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Demangle/Demangle.h"
 #include "llvm/IR/IntrinsicInst.h"
@@ -136,9 +137,10 @@ auto detail::LLVMBasedCFGImpl<Derived>::getStartPointsOfImpl(f_t Fun) const
     }
     return {EntryInst};
   }
-  PHASAR_LOG_LEVEL(DEBUG, "Could not get starting points of '"
-                              << Fun->getName()
-                              << "' because it is a declaration");
+  PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedCFG",
+                       "Could not get starting points of '"
+                           << Fun->getName()
+                           << "' because it is a declaration");
   return {};
 }
 
@@ -153,8 +155,9 @@ auto detail::LLVMBasedCFGImpl<Derived>::getExitPointsOfImpl(f_t Fun) const
     // A function can have more than one exit point
     return psr::getAllExitPoints(Fun);
   }
-  PHASAR_LOG_LEVEL(DEBUG, "Could not get exit points of '"
-                              << Fun->getName() << "' which is declaration!");
+  PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedCFG",
+                       "Could not get exit points of '"
+                           << Fun->getName() << "' which is declaration!");
   return {};
 }
 

lib/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobalsImpl.cpp

@@ -146,17 +146,18 @@ static llvm::Function *createDtorCallerForModule(
 [[nodiscard]] static llvm::Function *collectRegisteredDtors(
     std::multimap<size_t, llvm::Function *, std::greater<>> &GlobalDtors,
     llvm::Module &Mod) {
-  PHASAR_LOG_LEVEL(DEBUG,
-                   "Collect Registered Dtors for Module " << Mod.getName());
+  PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG",
+                       "Collect Registered Dtors for Module " << Mod.getName());
 
   auto RegisteredDtors = collectRegisteredDtorsForModule(Mod);
 
   if (RegisteredDtors.empty()) {
     return nullptr;
   }
 
-  PHASAR_LOG_LEVEL(DEBUG,
-                   "> Found " << RegisteredDtors.size() << " Registered Dtors");
+  PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG",
+                       "> Found " << RegisteredDtors.size()
+                                  << " Registered Dtors");
 
   auto *RegisteredDtorCaller = createDtorCallerForModule(Mod, RegisteredDtors);
   // auto It =
@@ -281,10 +282,8 @@ llvm::Function *LLVMBasedICFG::buildCRuntimeGlobalCtorsDtorsModel(
     IRB.CreateRetVoid();
   } else {
 
-    auto *UEntrySelectorFn = llvm::cast<llvm::Function>(
-        M.getOrInsertFunction("__psrCRuntimeUserEntrySelector",
-                              llvm::Type::getInt32Ty(CTX))
-            .getCallee());
+    auto UEntrySelectorFn = M.getOrInsertFunction(
+        "__psrCRuntimeUserEntrySelector", llvm::Type::getInt32Ty(CTX));
 
     auto *UEntrySelector = IRB.CreateCall(UEntrySelectorFn, {});