resolve merge conflicts

Author: pdschubert

include/phasar/PhasarLLVM/Pointer/LLVMPointsToGraph.h

@@ -107,7 +107,9 @@ class LLVMPointsToGraph : public LLVMPointsToInfo {
   /// Keep track of what has already been merged into this points-to graph.
   std::unordered_set<const llvm::Function *> AnalyzedFunctions;
   LLVMBasedPointsToAnalysis PTA;
-  PointsToSetOwner<PointsToSetTy> Owner;
+
+  PointsToSetOwner<PointsToSetTy>::memory_resource_type MRes;
+  PointsToSetOwner<PointsToSetTy> Owner{&MRes};
   std::unordered_map<const llvm::Value *, DynamicPointsToSetPtr<PointsToSetTy>>
       Cache;
 

include/phasar/PhasarLLVM/Pointer/LLVMPointsToSet.h

@@ -7,16 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOSET_H_
-#define PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOSET_H_
-
-#include <iostream>
-#include <memory_resource>
-
-#include "nlohmann/json.hpp"
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseSet.h"
+#ifndef PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOSET_H
+#define PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOSET_H
 
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/DynamicPointsToSetPtr.h"
@@ -25,6 +17,14 @@
 #include "phasar/PhasarLLVM/Pointer/PointsToSetOwner.h"
 #include "phasar/Utils/StableVector.h"
 
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/DenseSet.h"
+
+#include "nlohmann/json.hpp"
+
+#include <iostream>
+#include <memory_resource>
+
 namespace llvm {
 class Value;
 class Module;
@@ -45,7 +45,7 @@ class LLVMPointsToSet : public LLVMPointsToInfo {
   LLVMBasedPointsToAnalysis PTA;
   llvm::DenseSet<const llvm::Function *> AnalyzedFunctions;
 
-  std::pmr::unsynchronized_pool_resource MRes;
+  PointsToSetOwner<PointsToSetTy>::memory_resource_type MRes;
   PointsToSetOwner<PointsToSetTy> Owner{&MRes};
 
   PointsToSetMap PointsToSets;

include/phasar/PhasarLLVM/Pointer/PointsToSetOwner.h

@@ -10,19 +10,30 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_POINTSTOSETOWNER_H
 #define PHASAR_PHASARLLVM_POINTER_POINTSTOSETOWNER_H
 
-#include <functional>
-#include <memory>
-#include <memory_resource>
-#include <type_traits>
+#include "phasar/PhasarLLVM/Pointer/DynamicPointsToSetPtr.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
+#include "phasar/Utils/StableVector.h"
 
 #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"
-#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
-#include "phasar/Utils/StableVector.h"
+#include <functional>
+#include <memory>
+#include <memory_resource>
+#include <type_traits>
+
+/// On some MAC systems, <memory_resource> is still not fully implemented, so do
+/// a workaround here
+
+#if !defined(__has_include) || __has_include(<memory_resource>)
+#define HAS_MEMORY_RESOURCE 1
+#include <memory_resource>
+#else
+#define HAS_MEMORY_RESOURCE 0
+#include "llvm/Support/RecyclingAllocator.h"
+#endif
 
 namespace llvm {
 class Value;
@@ -31,9 +42,27 @@ class Value;
 namespace psr {
 template <typename PointsToSetTy> class PointsToSetOwner {
 public:
-  PointsToSetOwner(std::pmr::polymorphic_allocator<PointsToSetTy> Alloc =
-                       std::pmr::get_default_resource()) noexcept
-      : Alloc(Alloc) {}
+  using allocator_type =
+#if HAS_MEMORY_RESOURCE
+      std::pmr::polymorphic_allocator<PointsToSetTy>
+#else
+      llvm::RecyclingAllocator<llvm::BumpPtrAllocator, PointsToSetTy> *
+#endif
+      ;
+
+  using memory_resource_type =
+#if HAS_MEMORY_RESOURCE
+      std::pmr::unsynchronized_pool_resource
+#else
+      llvm::RecyclingAllocator<llvm::BumpPtrAllocator, PointsToSetTy>
+#endif
+      ;
+
+  PointsToSetOwner(allocator_type Alloc) noexcept : Alloc(Alloc) {
+    if constexpr (std::is_pointer_v<allocator_type>) {
+      assert(Alloc != nullptr);
+    }
+  }
   PointsToSetOwner(PointsToSetOwner &&) noexcept = default;
 
   PointsToSetOwner(const PointsToSetOwner &) = delete;
@@ -43,13 +72,24 @@ template <typename PointsToSetTy> class PointsToSetOwner {
   ~PointsToSetOwner() {
     for (auto PTS : OwnedPTS) {
       std::destroy_at(PTS);
+#if HAS_MEMORY_RESOURCE
       Alloc.deallocate(PTS, 1);
+#else
+      Alloc->Deallocate(PTS);
+#endif
     }
     OwnedPTS.clear();
   }
 
   DynamicPointsToSetPtr<PointsToSetTy> acquire() {
-    auto Ptr = new (Alloc.allocate(1)) PointsToSetTy();
+    auto RawMem =
+#if HAS_MEMORY_RESOURCE
+        Alloc.allocate(1)
+#else
+        Alloc->Allocate()
+#endif
+        ;
+    auto Ptr = new (RawMem) PointsToSetTy();
     OwnedPTS.insert(Ptr);
     return &AllPTS.emplace_back(Ptr);
   }
@@ -61,7 +101,11 @@ template <typename PointsToSetTy> class PointsToSetOwner {
           "freed, or never allocated with this PointsToSetOwner!");
     }
     std::destroy_at(PTS);
+#if HAS_MEMORY_RESOURCE
     Alloc.deallocate(PTS, 1);
+#else
+    Alloc->Deallocate(PTS);
+#endif
     /// NOTE: Do not delete from AllPTS!
   }
 
@@ -72,7 +116,7 @@ template <typename PointsToSetTy> class PointsToSetOwner {
   }
 
 private:
-  std::pmr::polymorphic_allocator<PointsToSetTy> Alloc;
+  allocator_type Alloc{};
   llvm::DenseSet<PointsToSetTy *> OwnedPTS;
   StableVector<PointsToSetTy *> AllPTS;
 };