Fix errors introduced by merging

Author: fabianbs96

include/phasar/PhasarLLVM/Pointer/PointsToSetOwner.h

@@ -16,6 +16,8 @@
 #include <type_traits>
 
 #include "llvm/ADT/DenseSet.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/iterator_range.h"
 #include "llvm/Support/ErrorHandling.h"
 
 #include "phasar/PhasarLLVM/Pointer/DynamicPointsToSetPtr.h"
@@ -51,6 +53,7 @@ template <typename PointsToSetTy> class PointsToSetOwner {
     OwnedPTS.insert(Ptr);
     return &AllPTS.emplace_back(Ptr);
   }
+
   void release(PointsToSetTy *PTS) noexcept {
     if (LLVM_UNLIKELY(!OwnedPTS.erase(PTS))) {
       llvm::report_fatal_error(
@@ -64,23 +67,8 @@ template <typename PointsToSetTy> class PointsToSetOwner {
 
   void reserve(size_t Capacity) { OwnedPTS.reserve(Capacity); }
 
-  template <typename CallBackTy,
-            typename = std::enable_if_t<
-                std::is_invocable_v<CallBackTy, PointsToSetTy *>>>
-  void forEachPointsToSet(CallBackTy &&CallBack) {
-    for (auto &[PTS, Unused] : OwnedPTS) {
-      std::invoke(std::forward<CallBackTy>(CallBack), PTS);
-    }
-  }
-
-  template <typename CallBackTy,
-            typename = std::enable_if_t<
-                std::is_invocable_v<CallBackTy, const PointsToSetTy *>>>
-  void forEachPointsToSet(CallBackTy &&CallBack) const {
-    for (auto &[PTS, Unused] : OwnedPTS) {
-      std::invoke(std::forward<CallBackTy>(CallBack),
-                  static_cast<const PointsToSetTy *>(PTS));
-    }
+  [[nodiscard]] auto getAllPointsToSets() const noexcept {
+    return llvm::make_range(OwnedPTS.begin(), OwnedPTS.end());
   }
 
 private:

lib/PhasarLLVM/Pointer/LLVMPointsToSet.cpp

@@ -105,7 +105,7 @@ LLVMPointsToSet::LLVMPointsToSet(ProjectIRDB &IRDB,
   Owner.reserve(Sets.size());
   for (const auto &PtsJson : Sets) {
     assert(PtsJson.is_array());
-    auto *PTS = Owner.acquire();
+    auto PTS = Owner.acquire();
     for (auto Alias : PtsJson) {
       const auto *Inst = fromMetaDataId(IRDB, Alias.get<std::string>());
       if (!Inst) {
@@ -696,7 +696,8 @@ nlohmann::json LLVMPointsToSet::getAsJson() const {
 
   /// Serialize the PointsToSets
   auto &Sets = J["PointsToSets"];
-  Owner.forEachPointsToSet([&Sets](const PointsToSetTy *PTS) {
+
+  for (const PointsToSetTy *PTS : Owner.getAllPointsToSets()) {
     auto PtsJson = nlohmann::json::array();
     for (const auto *Alias : *PTS) {
       auto Id = getMetaDataID(Alias);
@@ -707,7 +708,7 @@ nlohmann::json LLVMPointsToSet::getAsJson() const {
     if (!PtsJson.empty()) {
       Sets.push_back(std::move(PtsJson));
     }
-  });
+  }
 
   /// Serialize the AnalyzedFunctions
   auto &Fns = J["AnalyzedFunctions"];

tools/phasar-llvm/phasar-llvm.cpp

@@ -473,26 +473,28 @@ int main(int Argc, const char **Argv) {
   if (PhasarConfig::VariablesMap().count("persisted-summaries")) {
     SolverConfig.setComputePersistedSummaries(
         PhasarConfig::VariablesMap()["persisted-summaries"].as<bool>());
-    nlohmann::json PrecomputedPointsToSet;
-    if (auto PTAFile = PhasarConfig::VariablesMap().find("load-pta-from-json");
-        PTAFile != PhasarConfig::VariablesMap().end()) {
-      PrecomputedPointsToSet =
-          readJsonFile(llvm::StringRef(PTAFile->second.as<std::string>()));
-    }
-    // setup output directory
-    std::string OutDirectory;
-    if (PhasarConfig::VariablesMap().count("out")) {
-      OutDirectory = PhasarConfig::VariablesMap()["out"].as<std::string>();
-    }
-    // setup phasar project id
-    std::string ProjectID;
-    if (PhasarConfig::VariablesMap().count("project-id")) {
-      ProjectID = PhasarConfig::VariablesMap()["project-id"].as<std::string>();
-    }
-    AnalysisController Controller(
-        IRDB, DataFlowAnalyses, AnalysisConfigs, PTATy, CGTy, SoundnessLevel,
-        PhasarConfig::VariablesMap()["auto-globals"].as<bool>(), EntryPoints,
-        Strategy, EmitterOptions, ProjectID, OutDirectory,
-        PrecomputedPointsToSet);
-    return 0;
   }
+  nlohmann::json PrecomputedPointsToSet;
+  if (auto PTAFile = PhasarConfig::VariablesMap().find("load-pta-from-json");
+      PTAFile != PhasarConfig::VariablesMap().end()) {
+    PrecomputedPointsToSet =
+        readJsonFile(llvm::StringRef(PTAFile->second.as<std::string>()));
+  }
+  // setup output directory
+  std::string OutDirectory;
+  if (PhasarConfig::VariablesMap().count("out")) {
+    OutDirectory = PhasarConfig::VariablesMap()["out"].as<std::string>();
+  }
+  // setup phasar project id
+  std::string ProjectID;
+  if (PhasarConfig::VariablesMap().count("project-id")) {
+    ProjectID = PhasarConfig::VariablesMap()["project-id"].as<std::string>();
+  }
+  AnalysisController Controller(
+      IRDB, std::move(DataFlowAnalyses), std::move(AnalysisConfigs), PTATy,
+      CGTy, SoundnessLevel,
+      PhasarConfig::VariablesMap()["auto-globals"].as<bool>(), EntryPoints,
+      Strategy, EmitterOptions, SolverConfig, ProjectID, OutDirectory,
+      PrecomputedPointsToSet);
+  return 0;
+}