Merge branch 'development' into master_github

Author: pdschubert

.clang-tidy

@@ -16,6 +16,7 @@ Checks: '-*,
            -readability-convert-member-functions-to-static,
            -readability-isolate-declaration,
          cppcoreguidelines-*,
+           -cppcoreguidelines-avoid-non-const-global-variables,
            -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
            -cppcoreguidelines-owning-memory,
            -cppcoreguidelines-pro-type-reinterpret-cast,
@@ -53,6 +54,8 @@ CheckOptions:
     value:           (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|dPrime|fPrime)
   - key:             readability-identifier-naming.ParameterIgnoredRegexp
     value:           (d|d1|d2|d3|d4|d5|eP|f|n)
+  - key:             readability-identifier-naming.FunctionIgnoredRegexp
+    value:           (try_emplace|from_json|to_json)
   - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
     value:           1
   - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions

external/json

@@ -20,6 +20,7 @@
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMBasedPointsToAnalysis.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToSet.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -62,6 +63,7 @@ class AnalysisController {
   std::string ProjectID;
   std::string OutDirectory;
   boost::filesystem::path ResultDirectory;
+  IFDSIDESolverConfig SolverConfig;
   [[maybe_unused]] Soundness SoundnessLevel;
   [[maybe_unused]] bool AutoGlobalSupport;
 
@@ -122,6 +124,7 @@ class AnalysisController {
                      const std::set<std::string> &EntryPoints,
                      AnalysisStrategy Strategy,
                      AnalysisControllerEmitterOptions EmitterOptions,
+                     IFDSIDESolverConfig SolverConfig,
                      const std::string &ProjectID = "default-phasar-project",
                      const std::string &OutDirectory = "");
 

include/phasar/Controller/AnalysisController.h

@@ -19,6 +19,8 @@
 
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h"
+#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
+#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
 
 namespace psr {
 
@@ -51,7 +53,7 @@ class WholeProgramAnalysis {
   Solver DataFlowSolver;
 
 public:
-  WholeProgramAnalysis(ProjectIRDB &IRDB,
+  WholeProgramAnalysis(IFDSIDESolverConfig SolverConfig, ProjectIRDB &IRDB,
                        std::set<std::string> EntryPoints = {},
                        PointerAnalysisTy *PointerInfo = nullptr,
                        CallGraphAnalysisTy *CallGraph = nullptr,
@@ -70,12 +72,17 @@ class WholeProgramAnalysis {
                       : std::unique_ptr<CallGraphAnalysisTy>(CallGraph)),
         EntryPoints(EntryPoints),
         ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo, EntryPoints),
-        DataFlowSolver(ProblemDesc) {}
+        DataFlowSolver(ProblemDesc) {
+    if constexpr (has_setIFDSIDESolverConfig_v<ProblemDescription>) {
+      ProblemDesc.setIFDSIDESolverConfig(SolverConfig);
+    }
+  }
 
   template <typename T = ProblemDescription,
             typename = typename std::enable_if_t<!std::is_same_v<
                 typename T::ConfigurationTy, HasNoConfigurationType>>>
-  WholeProgramAnalysis(ProjectIRDB &IRDB, ConfigurationTy *Config,
+  WholeProgramAnalysis(IFDSIDESolverConfig SolverConfig, ProjectIRDB &IRDB,
+                       ConfigurationTy *Config,
                        std::set<std::string> EntryPoints = {},
                        PointerAnalysisTy *PointerInfo = nullptr,
                        CallGraphAnalysisTy *CallGraph = nullptr,
@@ -95,12 +102,17 @@ class WholeProgramAnalysis {
         EntryPoints(EntryPoints), Config(Config),
         ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo, *Config,
                     EntryPoints),
-        DataFlowSolver(ProblemDesc) {}
+        DataFlowSolver(ProblemDesc) {
+    if constexpr (has_setIFDSIDESolverConfig_v<ProblemDescription>) {
+      ProblemDesc.setIFDSIDESolverConfig(SolverConfig);
+    }
+  }
 
   template <typename T = ProblemDescription,
             typename = typename std::enable_if_t<!std::is_same_v<
                 typename T::ConfigurationTy, HasNoConfigurationType>>>
-  WholeProgramAnalysis(ProjectIRDB &IRDB, std::string ConfigPath,
+  WholeProgramAnalysis(IFDSIDESolverConfig SolverConfig, ProjectIRDB &IRDB,
+                       std::string ConfigPath,
                        std::set<std::string> EntryPoints = {},
                        PointerAnalysisTy *PointerInfo = nullptr,
                        CallGraphAnalysisTy *CallGraph = nullptr,
@@ -121,7 +133,11 @@ class WholeProgramAnalysis {
         OwnsConfig(true), ConfigPath(ConfigPath),
         ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo, *Config,
                     EntryPoints),
-        DataFlowSolver(ProblemDesc) {}
+        DataFlowSolver(ProblemDesc) {
+    if constexpr (has_setIFDSIDESolverConfig_v<ProblemDescription>) {
+      ProblemDesc.setIFDSIDESolverConfig(SolverConfig);
+    }
+  }
 
   WholeProgramAnalysis(const WholeProgramAnalysis &) = delete;
   WholeProgramAnalysis(WholeProgramAnalysis &&) = delete;

include/phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.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/ControlFlow/LLVMBasedICFG.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;
 

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

@@ -22,7 +22,6 @@
 #include "phasar/Config/Configuration.h"
 #include "phasar/Utils/EnumFlags.h"
 #include "phasar/Utils/Logger.h"
-#include "phasar/Utils/Utilities.h"
 
 namespace psr {
 
@@ -39,13 +38,14 @@ enum class SolverConfigOptions : uint32_t {
 };
 
 struct IFDSIDESolverConfig {
-  IFDSIDESolverConfig();
-  IFDSIDESolverConfig(SolverConfigOptions Options);
+  IFDSIDESolverConfig() noexcept = default;
+  IFDSIDESolverConfig(SolverConfigOptions Options) noexcept;
   ~IFDSIDESolverConfig() = default;
-  IFDSIDESolverConfig(const IFDSIDESolverConfig &) = default;
-  IFDSIDESolverConfig &operator=(const IFDSIDESolverConfig &) = default;
-  IFDSIDESolverConfig(IFDSIDESolverConfig &&) = default;
-  IFDSIDESolverConfig &operator=(IFDSIDESolverConfig &&) = default;
+  IFDSIDESolverConfig(const IFDSIDESolverConfig &) noexcept = default;
+  IFDSIDESolverConfig &
+  operator=(const IFDSIDESolverConfig &) noexcept = default;
+  IFDSIDESolverConfig(IFDSIDESolverConfig &&) noexcept = default;
+  IFDSIDESolverConfig &operator=(IFDSIDESolverConfig &&) noexcept = default;
 
   [[nodiscard]] bool followReturnsPastSeeds() const;
   [[nodiscard]] bool autoAddZero() const;
@@ -61,6 +61,8 @@ struct IFDSIDESolverConfig {
   void setEmitESG(bool Set = true);
   void setComputePersistedSummaries(bool Set = true);
 
+  void setConfig(SolverConfigOptions Opt);
+
   friend std::ostream &operator<<(std::ostream &OS,
                                   const IFDSIDESolverConfig &SC);
 

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.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)!