From 392579d587b6bb08658dadd0ea900dada7e55c13 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 24 Mar 2025 18:32:17 +0100
Subject: [PATCH 01/24] Fix v2503 bugs (#763)

* Remove googletest from gitmodules.

Recommended way of using gtest is through FetchContent

* Add <sstream> to DOTGraph.cpp, which is missing on FreeBSD
---
 .gitmodules            | 4 ----
 lib/Utils/DOTGraph.cpp | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 70653bf9e2..350885ac54 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,6 @@
 	path = external/json
 	url = https://github.com/nlohmann/json.git
 	ignore = dirty
-[submodule "lib/googletest"]
-	path = external/googletest
-	url = https://github.com/google/googletest.git
-	branch = master
 [submodule "external/json-schema-validator"]
 	path = external/json-schema-validator
 	url = https://github.com/pboettch/json-schema-validator.git
diff --git a/lib/Utils/DOTGraph.cpp b/lib/Utils/DOTGraph.cpp
index f745336c22..1bd7dc7d30 100644
--- a/lib/Utils/DOTGraph.cpp
+++ b/lib/Utils/DOTGraph.cpp
@@ -18,11 +18,11 @@
 
 #include "nlohmann/json.hpp"
 
-#include <algorithm>
 #include <filesystem>
 #include <fstream>
 #include <iterator>
 #include <ostream>
+#include <sstream>
 #include <utility>
 
 namespace psr {

From 9915caed0513c3f512aa8d5655795ff894ae7f5b Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 24 Mar 2025 18:55:49 +0100
Subject: [PATCH 02/24] Mark Hexastore as deprecated (#764)

* Mark Hexastore as deprecated

* minor
---
 include/phasar/DB/Hexastore.h |  3 ++-
 unittests/DB/CMakeLists.txt   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/phasar/DB/Hexastore.h b/include/phasar/DB/Hexastore.h
index d6960c903c..64ade62375 100644
--- a/include/phasar/DB/Hexastore.h
+++ b/include/phasar/DB/Hexastore.h
@@ -73,7 +73,8 @@ struct HSResult {
  *
  * @brief Efficient data structure for holding graphs in databases.
  */
-class Hexastore {
+class [[deprecated("This ancient API is not maintained for long and should not "
+                   "be used anymore!")]] Hexastore {
 private:
   sqlite3 *HSInternalDB{};
   static int callback(void * /*NotUsed*/, int Argc, char **Argv,
diff --git a/unittests/DB/CMakeLists.txt b/unittests/DB/CMakeLists.txt
index 87e1de139e..6f6c3606b6 100644
--- a/unittests/DB/CMakeLists.txt
+++ b/unittests/DB/CMakeLists.txt
@@ -1,9 +1,9 @@
-if(SQLite3_FOUND)
-	set(DBSources
-		HexastoreTest.cpp
-	)
+# if(SQLite3_FOUND)
+# 	set(DBSources
+# 		HexastoreTest.cpp
+# 	)
 
-	foreach(TEST_SRC ${DBSources})
-		add_phasar_unittest(${TEST_SRC})
-	endforeach(TEST_SRC)
-endif()
+# 	foreach(TEST_SRC ${DBSources})
+# 		add_phasar_unittest(${TEST_SRC})
+# 	endforeach(TEST_SRC)
+# endif()

From d294b68d12f2a0e0852f9f8efd7c63fa73102d38 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 24 Mar 2025 19:20:36 +0100
Subject: [PATCH 03/24] Fix init-submodules-release.sh (#765)

* Fix init-submodules-release.sh

* default to submodule update in the helper shell script

* Fix pre-commit

---------

Co-authored-by: Sriteja Kummita <sriteja.ku@gmail.com>
---
 utils/init-submodules-release.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/utils/init-submodules-release.sh b/utils/init-submodules-release.sh
index 159e2f6201..31e4c9f3fd 100755
--- a/utils/init-submodules-release.sh
+++ b/utils/init-submodules-release.sh
@@ -3,13 +3,18 @@
 source ./safeCommandsSet.sh
 
 if git submodule status 2>&1 | grep -iq "fatal: Not a git repository (or any of the parent directories): .git"; then
+
 safe_cd "$(dirname "$0")"/../external/
-git clone git@github.com:google/googletest.git
-safe_cd googletest/
-git checkout release-1.8.0
+
+git clone --no-checkout https://github.com/nlohmann/json.git
+safe_cd json/
+git checkout v3.11.3
 safe_cd -
-git clone git@github.com:nlohmann/json.git
+
+git clone --no-checkout https://github.com/pboettch/json-schema-validator.git
 safe_cd json/
-git checkout v3.4.0
+git checkout 2.3.0
 safe_cd -
+
+else git submodule update --init;
 fi

From 9e0f2ca46a60b1a86e1f39169e01b8f7c7c4de48 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Wed, 2 Apr 2025 18:14:04 +0200
Subject: [PATCH 04/24] Remove deprecated APIs and mark some others as
 deprecated (#766)

---
 CMakeLists.txt                                |   6 -
 Config.cmake.in                               |  14 -
 examples/use-phasar-as-library/CMakeLists.txt |   5 +-
 .../phasar/AnalysisStrategy/AnalysisSetup.h   |   4 +-
 include/phasar/Config/Configuration.h         |  23 -
 include/phasar/Config/Version.h               |  12 -
 include/phasar/ControlFlow/CFGBase.h          |   6 -
 include/phasar/ControlFlow/CallGraph.h        |  24 -
 .../ControlFlow/CallGraphAnalysisType.def     |   1 -
 include/phasar/ControlFlow/ICFGBase.h         |   9 -
 .../phasar/DataFlow/IfdsIde/FlowFunctions.h   | 365 --------------
 .../DataFlow/IfdsIde/SpecialSummaries.h       |  24 +-
 .../ControlFlow/LLVMBasedBackwardICFG.h       |   4 -
 .../PhasarLLVM/ControlFlow/LLVMBasedICFG.h    |   4 -
 .../ControlFlow/Resolver/DTAResolver.h        |  78 ---
 .../ControlFlow/SparseLLVMBasedICFGView.h     |   1 -
 .../TypeStateDescription.h                    |   2 +-
 .../Passes/GeneralStatisticsAnalysis.h        | 107 ----
 include/phasar/PhasarLLVM/Pointer.h           |   5 +-
 .../PhasarLLVM/Pointer/LLVMAliasGraph.h       | 275 ----------
 .../phasar/PhasarLLVM/Pointer/LLVMAliasSet.h  |   9 -
 .../Pointer/TypeGraphs/CachedTypeGraph.h      | 109 ----
 .../Pointer/TypeGraphs/LazyTypeGraph.h        |  92 ----
 .../PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h |  50 --
 .../TypeHierarchy/DIBasedTypeHierarchy.h      |   6 -
 .../TypeHierarchy/LLVMTypeHierarchy.h         |  40 +-
 .../PhasarLLVM/TypeHierarchy/LLVMVFTable.h    |   6 -
 include/phasar/Pointer/AliasInfo.h            |  16 -
 include/phasar/TypeHierarchy/TypeHierarchy.h  |   6 -
 include/phasar/TypeHierarchy/VFTable.h        |   6 -
 include/phasar/Utils/Logger.h                 |   6 -
 include/phasar/Utils/Utilities.h              |  10 -
 lib/Config/Configuration.cpp                  |   4 -
 .../ControlFlow/LLVMBasedBackwardICFG.cpp     |   4 -
 lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp  |   6 -
 .../ControlFlow/LLVMVFTableProvider.cpp       |   1 +
 .../ControlFlow/Resolver/DTAResolver.cpp      | 239 ---------
 .../ControlFlow/Resolver/Resolver.cpp         |   7 -
 .../ControlFlow/SparseLLVMBasedICFGView.cpp   |   4 -
 .../Passes/GeneralStatisticsAnalysis.cpp      |  46 --
 lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp     | 469 ------------------
 lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp       |  27 -
 .../Pointer/TypeGraphs/CachedTypeGraph.cpp    | 159 ------
 .../Pointer/TypeGraphs/LazyTypeGraph.cpp      | 104 ----
 .../TypeHierarchy/DIBasedTypeHierarchy.cpp    |   6 -
 .../TypeHierarchy/LLVMTypeHierarchy.cpp       |  71 +--
 lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp  |   5 -
 lib/Utils/Logger.cpp                          |  13 -
 lib/Utils/Utilities.cpp                       |  13 -
 unittests/DB/HexastoreTest.cpp                |   8 +-
 .../PhasarLLVM/ControlFlow/CMakeLists.txt     |   1 -
 .../ControlFlow/LLVMBasedICFG_DTATest.cpp     |  67 ---
 .../PhasarLLVM/TypeHierarchy/CMakeLists.txt   |   1 -
 .../LLVMTypeHierarchySerializationTest.cpp    |   5 +
 .../TypeHierarchy/LLVMTypeHierarchyTest.cpp   |   5 +
 .../TypeHierarchy/TypeGraphTest.cpp           | 417 ----------------
 56 files changed, 52 insertions(+), 2955 deletions(-)
 delete mode 100644 include/phasar/Config/Version.h
 delete mode 100644 include/phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h
 delete mode 100644 include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
 delete mode 100644 include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
 delete mode 100644 include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h
 delete mode 100644 include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h
 delete mode 100644 lib/PhasarLLVM/ControlFlow/Resolver/DTAResolver.cpp
 delete mode 100644 lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp
 delete mode 100644 lib/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.cpp
 delete mode 100644 lib/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.cpp
 delete mode 100644 unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp
 delete mode 100644 unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b8d993810..72e0a73b99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,12 +38,6 @@ else()
   set(PHASAR_BUILD_OPTIONAL_TARGETS_DEFAULT OFF)
 endif()
 
-option(PHASAR_EXPERIMENTAL_CXX20 "Build phasar in C++20 mode. This is an experimental feature" OFF)
-if(PHASAR_EXPERIMENTAL_CXX20)
-  message(DEPRECATION "The option PHASAR_EXPERIMENTAL_CXX20 is deprecated and will be removed in a future version of PhASAR. Use CMAKE_CXX_STANDARD=20 instead.")
-  set(CMAKE_CXX_STANDARD 20)
-endif()
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
diff --git a/Config.cmake.in b/Config.cmake.in
index e531879c5d..fce796ba73 100644
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -61,23 +61,9 @@ foreach(component ${phasar_FIND_COMPONENTS})
 endforeach()
 
 if (NOT DEFINED phasar_FOUND OR phasar_FOUND EQUAL TRUE)
-  foreach(component ${phasar_FIND_COMPONENTS})
-    # For backwards compatibility -- will be removed with next release
-    add_library(phasar::phasar_${component} ALIAS phasar::${component})
-  endforeach()
-
   if (NOT phasar_FIND_COMPONENTS)
     list(APPEND PHASAR_NEEDED_LIBS phasar::phasar)
     # Default target
     add_library(phasar ALIAS phasar::phasar)
   endif()
-
-  function(phasar_config executable)
-    message(DEPRECATION "The function  'phasar_config' is deprecated. Use target_link_libraries(${executable} PUBLIC phasar::phasar) instead!")
-
-    target_link_libraries(${executable}
-      PUBLIC
-        ${PHASAR_NEEDED_LIBS}
-    )
-  endfunction()
 endif()
diff --git a/examples/use-phasar-as-library/CMakeLists.txt b/examples/use-phasar-as-library/CMakeLists.txt
index 5246e3b823..bacf370078 100644
--- a/examples/use-phasar-as-library/CMakeLists.txt
+++ b/examples/use-phasar-as-library/CMakeLists.txt
@@ -17,10 +17,7 @@ add_executable(myphasartool
   myphasartool.cpp
 )
 
-# Old way using phasar_config (deprecated):
-#   phasar_config(myphasartool)
-
-# New way using target_link_libraries:
+# Link your tool against phasar:
 target_link_libraries(myphasartool phasar::llvm_ifdside)
 
 # If find_package did not specify components:
diff --git a/include/phasar/AnalysisStrategy/AnalysisSetup.h b/include/phasar/AnalysisStrategy/AnalysisSetup.h
index dcdfb6ee2e..975ed1c292 100644
--- a/include/phasar/AnalysisStrategy/AnalysisSetup.h
+++ b/include/phasar/AnalysisStrategy/AnalysisSetup.h
@@ -12,7 +12,7 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 
 namespace psr {
 
@@ -29,7 +29,7 @@ struct AnalysisSetup {
 struct DefaultAnalysisSetup : AnalysisSetup {
   using PointerAnalysisTy = LLVMAliasSet;
   using CallGraphAnalysisTy = LLVMBasedICFG;
-  using TypeHierarchyTy = LLVMTypeHierarchy;
+  using TypeHierarchyTy = DIBasedTypeHierarchy;
 };
 
 } // namespace psr
diff --git a/include/phasar/Config/Configuration.h b/include/phasar/Config/Configuration.h
index 1d0f91b789..975e18aa58 100644
--- a/include/phasar/Config/Configuration.h
+++ b/include/phasar/Config/Configuration.h
@@ -68,29 +68,6 @@ class PhasarConfig {
   // NOLINTNEXTLINE(readability-identifier-naming)
   [[nodiscard]] static llvm::StringRef PhasarDirectory() noexcept;
 
-  /// Name of the file storing all standard header search paths used for
-  /// compilation.
-  [[nodiscard, deprecated("This ancient API is broken and should not be used "
-                          "anymore")]] static constexpr llvm::StringRef
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  HeaderSearchPathsFileName() noexcept {
-    return "standard_header_paths.conf";
-  }
-
-  /// Name of the compile_commands.json file (in case we wish to rename)
-  [[nodiscard, deprecated("This ancient API is broken and should not be used "
-                          "anymore")]] static constexpr llvm::StringRef
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  CompileCommandsJson() noexcept {
-    return "compile_commands.json";
-  }
-
-  /// Default Source- and Sink-Functions path
-  [[nodiscard, deprecated("This ancient API is broken and should not be used "
-                          "anymore")]] static llvm::StringRef
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  DefaultSourceSinkFunctionsPath() noexcept;
-
   // Variables to be used in JSON export format
   /// Identifier for call graph export
   // NOLINTNEXTLINE(readability-identifier-naming)
diff --git a/include/phasar/Config/Version.h b/include/phasar/Config/Version.h
deleted file mode 100644
index c5017b860b..0000000000
--- a/include/phasar/Config/Version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef PHASAR_CONFIG_VERSION_H
-#define PHASAR_CONFIG_VERSION_H
-
-/// Note: This header is only left for backward compatibility and may be removed
-/// in the future
-
-#pragma GCC warning(                                                           \
-    "The header Version.h is deprecated. Use 'phasar/Config/phasar-config.h' instead")
-
-#include "phasar/Config/phasar-config.h"
-
-#endif
diff --git a/include/phasar/ControlFlow/CFGBase.h b/include/phasar/ControlFlow/CFGBase.h
index 0ec38d5dcb..6f0f1d610d 100644
--- a/include/phasar/ControlFlow/CFGBase.h
+++ b/include/phasar/ControlFlow/CFGBase.h
@@ -13,8 +13,6 @@
 #include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/TypeTraits.h"
 
-#include "nlohmann/json.hpp"
-
 namespace psr {
 
 enum class SpecialMemberFunctionType;
@@ -131,10 +129,6 @@ template <typename Derived> class CFGBase {
   void print(ByConstRef<f_t> Fun, llvm::raw_ostream &OS) const {
     self().printImpl(Fun, OS);
   }
-  [[nodiscard, deprecated("Please use printAsJson() instead")]] nlohmann::json
-  getAsJson(ByConstRef<f_t> Fun) const {
-    return self().getAsJsonImpl(Fun);
-  }
 
 protected:
   Derived &self() noexcept { return static_cast<Derived &>(*this); }
diff --git a/include/phasar/ControlFlow/CallGraph.h b/include/phasar/ControlFlow/CallGraph.h
index d73a1b5783..e2a03fec25 100644
--- a/include/phasar/ControlFlow/CallGraph.h
+++ b/include/phasar/ControlFlow/CallGraph.h
@@ -19,10 +19,7 @@
 
 #include "llvm/IR/Function.h"
 
-#include "nlohmann/json.hpp"
-
 #include <functional>
-#include <string>
 #include <utility>
 #include <vector>
 
@@ -105,27 +102,6 @@ class CallGraph : public CallGraphBase<CallGraph<N, F>> {
     CGData.printAsJson(OS);
   }
 
-  /// Creates a JSON representation of this call-graph suitable for presistent
-  /// storage.
-  /// Use the ctor taking a json object for deserialization
-  template <typename FunctionIdGetter, typename InstIdGetter>
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson(FunctionIdGetter GetFunctionId,
-            InstIdGetter GetInstructionId) const {
-    nlohmann::json J;
-
-    for (const auto &[Fun, Callers] : CallersOf) {
-      auto &JCallers = J[std::invoke(GetFunctionId, Fun)];
-
-      for (const auto &CS : *Callers) {
-        JCallers.push_back(std::invoke(GetInstructionId, CS));
-      }
-    }
-
-    return J;
-  }
-
   template <typename FunctionLabelGetter, typename InstParentGetter,
             typename InstLabelGetter>
   void printAsDot(llvm::raw_ostream &OS, FunctionLabelGetter GetFunctionLabel,
diff --git a/include/phasar/ControlFlow/CallGraphAnalysisType.def b/include/phasar/ControlFlow/CallGraphAnalysisType.def
index 3430b21c07..6576b08318 100644
--- a/include/phasar/ControlFlow/CallGraphAnalysisType.def
+++ b/include/phasar/ControlFlow/CallGraphAnalysisType.def
@@ -14,7 +14,6 @@
 CALL_GRAPH_ANALYSIS_TYPE(NORESOLVE, "nores", "Don't resolve indirect- and virtual calls")
 CALL_GRAPH_ANALYSIS_TYPE(CHA, "cha", "Class hierarchy analysis")
 CALL_GRAPH_ANALYSIS_TYPE(RTA, "rta", "Rapid type analysis")
-CALL_GRAPH_ANALYSIS_TYPE(DTA, "dta", "Declared type analysis")
 CALL_GRAPH_ANALYSIS_TYPE(VTA, "vta", "Variable type analysis")
 CALL_GRAPH_ANALYSIS_TYPE(OTF, "otf", "On-the-fly analysis based on points-to info (default)")
 
diff --git a/include/phasar/ControlFlow/ICFGBase.h b/include/phasar/ControlFlow/ICFGBase.h
index bbdd5b75f2..4ef63126d1 100644
--- a/include/phasar/ControlFlow/ICFGBase.h
+++ b/include/phasar/ControlFlow/ICFGBase.h
@@ -17,8 +17,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "nlohmann/json.hpp"
-
 #include <type_traits>
 
 namespace psr {
@@ -112,13 +110,6 @@ template <typename Derived> class ICFGBase {
     self().printAsJsonImpl(OS);
   }
 
-  /// Returns the underlying call-graph as JSON
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson() const {
-    return self().getAsJsonImpl();
-  }
-
   [[nodiscard]] size_t getNumCallSites() const noexcept {
     return self().getNumCallSitesImpl();
   }
diff --git a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
index c416571c2f..2f3fa53f5c 100644
--- a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
+++ b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
@@ -29,7 +29,6 @@
 #include <set>
 #include <type_traits>
 #include <utility>
-#include <vector>
 
 namespace psr {
 
@@ -872,370 +871,6 @@ class FlowFunctions
   }
 };
 
-////////////////////////////////////////////////////////////////////////////////
-//                          Legacy Flow Functions
-////////////////////////////////////////////////////////////////////////////////
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use identityFlow() instead")]] Identity
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::FlowFunctionType;
-  using typename FlowFunction<D, Container>::FlowFunctionPtrType;
-
-  using typename FlowFunction<D, Container>::container_type;
-
-  ~Identity() override = default;
-  Identity(const Identity &I) = delete;
-  Identity &operator=(const Identity &I) = delete;
-  // simply return what the user provides
-  container_type computeTargets(D Source) override { return {Source}; }
-  static std::shared_ptr<Identity> getInstance() {
-    static std::shared_ptr<Identity> Instance =
-        std::shared_ptr<Identity>(new Identity);
-    return Instance;
-  }
-
-private:
-  Identity() = default;
-};
-
-template <typename D, typename Fn, typename Container = std::set<D>>
-class [[deprecated("Use lambdaFlow() instead")]] LambdaFlow
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  LambdaFlow(Fn && F) : Flow(std::move(F)) {}
-  LambdaFlow(const Fn &F) : Flow(F) {}
-  ~LambdaFlow() override = default;
-  container_type computeTargets(D Source) override { return Flow(Source); }
-
-private:
-  // std::function<container_type(D)> flow;
-  Fn Flow;
-};
-
-template <typename D, typename Fn, typename Container = std::set<D>>
-typename FlowFunction<D>::FlowFunctionPtrType makeLambdaFlow(Fn &&F) {
-  return std::make_shared<LambdaFlow<D, std::decay_t<Fn>, Container>>(
-      std::forward<Fn>(F));
-}
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated]] Compose : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::FlowFunctionType;
-  using typename FlowFunction<D, Container>::FlowFunctionPtrType;
-
-  using typename FlowFunction<D, Container>::container_type;
-
-  Compose(const std::vector<FlowFunctionPtrType> &Funcs) : Funcs(Funcs) {}
-
-  ~Compose() override = default;
-
-  container_type computeTargets(D Source) override {
-    container_type Current{Source};
-    for (const FlowFunctionPtrType &Func : Funcs) {
-      container_type Next;
-      for (const D &Fact : Current) {
-        container_type Target = Func->computeTargets(Fact);
-        Next.insert(Target.begin(), Target.end());
-      }
-      Current = Next;
-    }
-    return Current;
-  }
-
-  static FlowFunctionPtrType
-  compose(const std::vector<FlowFunctionPtrType> &Funcs) {
-    std::vector<FlowFunctionPtrType> Vec;
-    for (const FlowFunctionPtrType &Func : Funcs) {
-      if (Func != Identity<D, Container>::getInstance()) {
-        Vec.push_back(Func);
-      }
-    }
-    if (Vec.size() == 1) { // NOLINT(readability-container-size-empty)
-      return Vec[0];
-    }
-    if (Vec.empty()) {
-      return Identity<D, Container>::getInstance();
-    }
-    return std::make_shared<Compose>(Vec);
-  }
-
-protected:
-  const std::vector<FlowFunctionPtrType> Funcs;
-};
-
-//===----------------------------------------------------------------------===//
-// Gen flow functions
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use generateFlow() instead")]] Gen
-    : public FlowFunction<D, Container> {
-  using typename FlowFunction<D, Container>::container_type;
-
-protected:
-  D GenValue;
-  D ZeroValue;
-
-public:
-  Gen(D GenValue, D ZeroValue) : GenValue(GenValue), ZeroValue(ZeroValue) {}
-  ~Gen() override = default;
-
-  container_type computeTargets(D Source) override {
-    if (Source == ZeroValue) {
-      return {Source, GenValue};
-    }
-    return {Source};
-  }
-};
-
-/**
- * @brief Generates the given value if the given predicate evaluates to true.
- * @tparam D The type of data-flow facts to be generated.
- */
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use generateFlowIf() instead")]] GenIf
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  GenIf(D GenValue, std::function<bool(D)> Predicate)
-      : GenValues({GenValue}), Predicate(std::move(Predicate)) {}
-
-  GenIf(container_type GenValues, std::function<bool(D)> Predicate)
-      : GenValues(std::move(GenValues)), Predicate(std::move(Predicate)) {}
-
-  ~GenIf() override = default;
-
-  container_type computeTargets(D Source) override {
-    if (Predicate(Source)) {
-      container_type ToGenerate;
-      ToGenerate.insert(Source);
-      ToGenerate.insert(GenValues.begin(), GenValues.end());
-      return ToGenerate;
-    }
-    return {Source};
-  }
-
-protected:
-  container_type GenValues;
-  std::function<bool(D)> Predicate;
-};
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use generateManyFlows() instead")]] GenAll
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  GenAll(container_type GenValues, D ZeroValue)
-      : GenValues(std::move(GenValues)), ZeroValue(ZeroValue) {}
-  ~GenAll() override = default;
-  container_type computeTargets(D Source) override {
-    if (Source == ZeroValue) {
-      GenValues.insert(Source);
-      return GenValues;
-    }
-    return {Source};
-  }
-
-protected:
-  container_type GenValues;
-  D ZeroValue;
-};
-
-//===----------------------------------------------------------------------===//
-// Kill flow functions
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use killFlow() instead")]] Kill
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  Kill(D KillValue) : KillValue(KillValue) {}
-  ~Kill() override = default;
-  container_type computeTargets(D Source) override {
-    if (Source == KillValue) {
-      return {};
-    }
-    return {Source};
-  }
-
-protected:
-  D KillValue;
-};
-
-/// \brief Kills all facts for which the given predicate evaluates to true.
-/// \tparam D The type of data-flow facts to be killed.
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use killFlowIf instead")]] KillIf
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  KillIf(std::function<bool(D)> Predicate) : Predicate(std::move(Predicate)) {}
-  ~KillIf() override = default;
-  container_type computeTargets(D Source) override {
-    if (Predicate(Source)) {
-      return {};
-    }
-    return {Source};
-  }
-
-protected:
-  std::function<bool(D)> Predicate;
-};
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use killManyFlows() instead")]] KillMultiple
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  KillMultiple(std::set<D> KillValues) : KillValues(std::move(KillValues)) {}
-  ~KillMultiple() override = default;
-  container_type computeTargets(D Source) override {
-    if (KillValues.find(Source) != KillValues.end()) {
-      return {};
-    }
-    return {Source};
-  }
-
-protected:
-  container_type KillValues;
-};
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use killAllFlows() instead")]] KillAll
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  ~KillAll() override = default;
-  KillAll(const KillAll &K) = delete;
-  KillAll &operator=(const KillAll &K) = delete;
-  container_type computeTargets(D /*Source*/) override {
-    return container_type();
-  }
-
-  static std::shared_ptr<KillAll<D>> getInstance() {
-    static std::shared_ptr<KillAll> Instance =
-        std::shared_ptr<KillAll>(new KillAll);
-    return Instance;
-  }
-
-private:
-  KillAll() = default;
-};
-
-//===----------------------------------------------------------------------===//
-// Gen-and-kill flow functions
-template <typename D, typename Container = std::set<D>>
-class [[deprecated(
-    "Use generateFlowAndKillAllOthers() instead")]] GenAndKillAllOthers
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  GenAndKillAllOthers(D GenValue, D ZeroValue)
-      : GenValue(GenValue), ZeroValue(ZeroValue) {}
-  ~GenAndKillAllOthers() override = default;
-  container_type computeTargets(D Source) override {
-    if (Source == ZeroValue) {
-      return {ZeroValue, GenValue};
-    }
-    return {};
-  }
-
-private:
-  D GenValue;
-  D ZeroValue;
-};
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated(
-    "Use generateManyFlowsAndKillAllOthers() instead")]] GenAllAndKillAllOthers
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  GenAllAndKillAllOthers(const container_type &GenValues, D ZeroValue)
-      : GenValues(GenValues), ZeroValue(ZeroValue) {}
-  ~GenAllAndKillAllOthers() override = default;
-  container_type computeTargets(D Source) override {
-    if (Source == ZeroValue) {
-      GenValues.insert(Source);
-      return GenValues;
-    }
-    return {};
-  }
-
-protected:
-  container_type GenValues;
-  D ZeroValue;
-};
-
-//===----------------------------------------------------------------------===//
-// Miscellaneous flow functions
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use transferFlow() instead")]] Transfer
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-
-  Transfer(D ToValue, D FromValue) : ToValue(ToValue), FromValue(FromValue) {}
-  ~Transfer() override = default;
-  container_type computeTargets(D Source) override {
-    if (Source == FromValue) {
-      return {Source, ToValue};
-    }
-    if (Source == ToValue) {
-      return {};
-    }
-    return {Source};
-  }
-
-protected:
-  D ToValue;
-  D FromValue;
-};
-
-template <typename D, typename Container = std::set<D>>
-class [[deprecated("Use unionFlows() instead")]] Union
-    : public FlowFunction<D, Container> {
-public:
-  using typename FlowFunction<D, Container>::container_type;
-  using typename FlowFunction<D, Container>::FlowFunctionType;
-  using typename FlowFunction<D, Container>::FlowFunctionPtrType;
-
-  Union(const std::vector<FlowFunctionPtrType> &FlowFuncs)
-      : FlowFuncs([&FlowFuncs]() {
-          if (FlowFuncs.empty()) {
-            return std::vector<FlowFunctionPtrType>(
-                {Identity<D, Container>::getInstance()});
-          }
-          return FlowFuncs;
-        }()) {}
-
-  ~Union() override = default;
-  container_type computeTargets(D Source) override {
-    container_type Result;
-    for (const auto &FlowFunc : FlowFuncs) {
-      container_type Target = FlowFunc->computeTargets(Source);
-      Result.insert(Target.begin(), Target.end());
-    }
-    return Result;
-  }
-
-protected:
-  const std::vector<FlowFunctionPtrType> FlowFuncs;
-};
-
 } // namespace  psr
 
 #endif
diff --git a/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h b/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
index 3154c52b33..41cb4d58e1 100644
--- a/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
+++ b/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
@@ -34,7 +34,9 @@
 
 namespace psr {
 
-template <typename D, typename V = BinaryDomain> class SpecialSummaries {
+template <typename D, typename V = BinaryDomain>
+class [[deprecated("This ancient API is not maintained and should not be used "
+                   "anymore")]] SpecialSummaries {
   using FlowFunctionType = FlowFunction<D>;
   using FlowFunctionPtrType = std::shared_ptr<FlowFunction<D>>;
 
@@ -50,8 +52,8 @@ template <typename D, typename V = BinaryDomain> class SpecialSummaries {
     // insert default flow and edge functions
     for (const auto &FunctionName :
          PhasarConfig::getPhasarConfig().specialFunctionNames()) {
-      SpecialFlowFunctions.insert(
-          std::make_pair(FunctionName, Identity<D>::getInstance()));
+      // SpecialFlowFunctions.insert(
+      //     std::make_pair(FunctionName, Identity<D>::getInstance()));
       SpecialEdgeFunctions.insert(
           std::make_pair(FunctionName, EdgeIdentity<V>{}));
     }
@@ -95,8 +97,8 @@ template <typename D, typename V = BinaryDomain> class SpecialSummaries {
     return SpecialFlowFunctions.count(Name);
   }
 
-  FlowFunctionPtrType
-  getSpecialFlowFunctionSummary(const llvm::Function *Func) {
+  FlowFunctionPtrType getSpecialFlowFunctionSummary(
+      const llvm::Function *Func) {
     return getSpecialFlowFunctionSummary(Func->getName());
   }
 
@@ -104,18 +106,18 @@ template <typename D, typename V = BinaryDomain> class SpecialSummaries {
     return SpecialFlowFunctions[Name];
   }
 
-  std::shared_ptr<EdgeFunction<V>>
-  getSpecialEdgeFunctionSummary(const llvm::Function *Func) {
+  std::shared_ptr<EdgeFunction<V>> getSpecialEdgeFunctionSummary(
+      const llvm::Function *Func) {
     return getSpecialEdgeFunctionSummary(Func->getName());
   }
 
-  std::shared_ptr<EdgeFunction<V>>
-  getSpecialEdgeFunctionSummary(const std::string &Name) {
+  std::shared_ptr<EdgeFunction<V>> getSpecialEdgeFunctionSummary(
+      const std::string &Name) {
     return SpecialEdgeFunctions[Name];
   }
 
-  friend llvm::raw_ostream &
-  operator<<(llvm::raw_ostream &OS, const SpecialSummaries<D> &SpecialSumms) {
+  friend llvm::raw_ostream &operator<<(
+      llvm::raw_ostream &OS, const SpecialSummaries<D> &SpecialSumms) {
     OS << "SpecialSummaries:\n";
     for (auto &Entry : SpecialSumms.SpecialFunctionNames) {
       OS << Entry.first << " ";
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
index c3ac4191b6..d9bbb1786a 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
@@ -46,9 +46,6 @@ class LLVMBasedBackwardICFG : public LLVMBasedBackwardCFG,
 
   using ICFGBase::printAsJson;
 
-  using CFGBase::getAsJson;
-  using ICFGBase::getAsJson;
-
 public:
   LLVMBasedBackwardICFG(LLVMBasedICFG *ForwardICFG);
 
@@ -67,7 +64,6 @@ class LLVMBasedBackwardICFG : public LLVMBasedBackwardCFG,
   getReturnSitesOfCallAtImpl(n_t Inst) const;
   void printImpl(llvm::raw_ostream &OS) const;
   void printAsJsonImpl(llvm::raw_ostream &OS) const;
-  [[nodiscard, deprecated]] nlohmann::json getAsJsonImpl() const;
   [[nodiscard]] const CallGraph<n_t, f_t> &getCallGraphImpl() const noexcept;
   [[nodiscard]] size_t getNumCallSitesImpl() const noexcept;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
index 4b9e35dd9e..9ed1799e0b 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
@@ -135,9 +135,6 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
 
   using ICFGBase::printAsJson;
 
-  using CFGBase::getAsJson;
-  using ICFGBase::getAsJson;
-
 private:
   [[nodiscard]] FunctionRange getAllFunctionsImpl() const;
   [[nodiscard]] f_t getFunctionImpl(llvm::StringRef Fun) const;
@@ -150,7 +147,6 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   getReturnSitesOfCallAtImpl(n_t Inst) const;
   void printImpl(llvm::raw_ostream &OS) const;
   void printAsJsonImpl(llvm::raw_ostream &OS) const;
-  [[nodiscard, deprecated]] nlohmann::json getAsJsonImpl() const;
   [[nodiscard]] const LLVMBasedCallGraph &getCallGraphImpl() const noexcept {
     return CG;
   }
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h
deleted file mode 100644
index 3a34ea4f24..0000000000
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * DTAResolver.h
- *
- *  Created on: 20.07.2018
- *      Author: nicolas bellec
- */
-
-#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_RESOLVER_DTARESOLVER_H_
-#define PHASAR_PHASARLLVM_CONTROLFLOW_RESOLVER_DTARESOLVER_H_
-
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
-// To switch the TypeGraph
-// #include "phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h"
-
-#include <string>
-
-namespace llvm {
-class Instruction;
-class CallBase;
-class Function;
-class BitCastInst;
-} // namespace llvm
-
-namespace psr {
-
-class [[deprecated("Does not work with opaque pointers anymore")]] DTAResolver
-    : public CHAResolver {
-public:
-  using TypeGraph_t = CachedTypeGraph;
-
-  DTAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
-              const DIBasedTypeHierarchy *TH);
-
-  ~DTAResolver() override = default;
-
-  FunctionSetTy resolveVirtualCall(const llvm::CallBase *CallSite) override;
-
-  void otherInst(const llvm::Instruction *Inst) override;
-
-  [[nodiscard]] std::string str() const override;
-
-  [[nodiscard]] bool mutatesHelperAnalysisInformation()
-      const noexcept override {
-    return false;
-  }
-
-protected:
-  TypeGraph_t TypeGraph;
-
-  /**
-   * An heuristic that return true if the bitcast instruction is interesting to
-   * take into the DTA relational graph
-   */
-  static bool heuristicAntiConstructorThisType(
-      const llvm::BitCastInst *BitCast);
-
-  /**
-   * Another heuristic that return true if the bitcast instruction is
-   * interesting to take into the DTA relational graph (use the presence or not
-   * of vtable)
-
-   */
-  bool heuristicAntiConstructorVtablePos(const llvm::BitCastInst *BitCast);
-};
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
index 927840d252..8c0aaa9dac 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
@@ -59,7 +59,6 @@ class SparseLLVMBasedICFGView
   [[nodiscard]] llvm::SmallVector<n_t, 2>
   getReturnSitesOfCallAtImpl(n_t Inst) const;
   void printImpl(llvm::raw_ostream &OS) const;
-  [[nodiscard, deprecated]] nlohmann::json getAsJsonImpl() const;
   [[nodiscard]] const CallGraph<n_t, f_t> &getCallGraphImpl() const noexcept;
 
   [[nodiscard]] const SparseLLVMBasedCFG &
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
index a7e14e8fc0..0e6865686b 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
@@ -78,7 +78,7 @@ struct TypeStateDescription : public TypeStateDescriptionBase {
    * Represents the start/initial state of an object after creation, e.g. state
    * of a file handle after fopen()
    */
-  [[nodiscard]] virtual State start() const = 0;
+  [[nodiscard, deprecated]] virtual State start() const = 0;
 
   /**
    * Represents the error state of an object
diff --git a/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h b/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
index 4f0e943b78..fddf1e98d5 100644
--- a/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
+++ b/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
@@ -19,8 +19,6 @@
 
 #include "llvm/IR/PassManager.h"
 
-#include "nlohmann/json.hpp"
-
 #include <set>
 
 namespace llvm {
@@ -74,111 +72,6 @@ struct GeneralStatistics {
   std::set<const llvm::Instruction *> RetResInstructions;
   std::string ModuleName{};
 
-  /**
-   * @brief Returns the number of Allocation sites.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use AllocationSites instead")]] size_t
-  getAllocationsites() const;
-
-  /**
-   * @brief Returns the number of Function calls.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use CallSites instead")]] size_t
-  getFunctioncalls() const;
-
-  /**
-   * @brief Returns the number of Instructions.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use Instructions instead")]] size_t
-  getInstructions() const;
-
-  /**
-   * @brief Returns the number of global pointers.
-   */
-  [[nodiscard]] [[deprecated(
-      "All globals are pointers. Use Globals instead")]] size_t
-  getGlobalPointers() const;
-
-  /**
-   * @brief Returns the number of basic blocks.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use BasicBlocks instead")]] size_t
-  getBasicBlocks() const;
-
-  /**
-   * @brief Returns the number of functions.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use Functions instead")]] size_t
-  getFunctions() const;
-
-  /**
-   * @brief Returns the number of globals.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use Globals instead")]] size_t
-  getGlobals() const;
-
-  /**
-   * @brief Returns the number of constant globals.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use GlobalConsts instead")]] size_t
-  getGlobalConsts() const;
-
-  /**
-   * @brief Returns the number of memory intrinsics.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use MemIntrinsics instead")]] size_t
-  getMemoryIntrinsics() const;
-
-  /**
-   * @brief Returns the number of store instructions.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use StoreInstructions instead")]] size_t
-  getStoreInstructions() const;
-
-  /**
-   * @brief Returns the number of load instructions.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use LoadInstructions instead; this "
-      "function seems to be broken anyway")]] size_t
-  getLoadInstructions();
-
-  /**
-   * @brief Returns all possible Types.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use AllocatedTypes instead")]] const std::
-      set<const llvm::Type *> &
-      getAllocatedTypes() const;
-
-  /**
-   * @brief Returns all stack and heap allocating instructions.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use AllocaInstructions "
-      "instead")]] const std::set<const llvm::Instruction *> &
-  getAllocaInstructions() const;
-
-  /**
-   * @brief Returns all Return and Resume Instructions.
-   */
-  [[nodiscard]] [[deprecated(
-      "Getters are no longer needed. Use RetResInstructions "
-      "instead")]] const std::set<const llvm::Instruction *> &
-  getRetResInstructions() const;
-
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson() const;
   void printAsJson(llvm::raw_ostream &OS = llvm::outs()) const;
 };
 
diff --git a/include/phasar/PhasarLLVM/Pointer.h b/include/phasar/PhasarLLVM/Pointer.h
index 220567251a..a2a67fd202 100644
--- a/include/phasar/PhasarLLVM/Pointer.h
+++ b/include/phasar/PhasarLLVM/Pointer.h
@@ -10,13 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_H
 #define PHASAR_PHASARLLVM_POINTER_H
 
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h"
+#include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h"
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h"
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h"
 
 #endif // PHASAR_PHASARLLVM_POINTER_H
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
deleted file mode 100644
index 83c22dbef4..0000000000
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#ifndef PHASAR_PHASARLLVM_POINTER_LLVMALIASGRAPH_H_
-#define PHASAR_PHASARLLVM_POINTER_LLVMALIASGRAPH_H_
-
-#include "phasar/Config/Configuration.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
-#include "phasar/Pointer/AliasInfoBase.h"
-#include "phasar/Pointer/AliasInfoTraits.h"
-#include "phasar/Pointer/AliasSetOwner.h"
-#include "phasar/Utils/AnalysisProperties.h"
-
-#include "llvm/IR/AbstractCallSite.h"
-
-#include "boost/graph/adjacency_list.hpp"
-#include "nlohmann/json.hpp"
-
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-namespace llvm {
-class Value;
-class Module;
-class Instruction;
-class AAResults;
-class Function;
-class Type;
-} // namespace llvm
-
-namespace psr {
-extern template class BoxedPtr<LLVMAliasInfo::AliasSetTy>;
-extern template class BoxedConstPtr<LLVMAliasInfo::AliasSetTy>;
-extern template class AliasSetOwner<LLVMAliasInfo::AliasSetTy>;
-
-class LLVMAliasGraph;
-template <>
-struct AliasInfoTraits<LLVMAliasGraph>
-    : DefaultAATraits<const llvm::Value *, const llvm::Instruction *> {};
-
-/**
- *  TODO: Is this impl legacy code? Can it be removed?
- *
- * 	This class is a representation of a points-to graph. It is possible to
- * 	construct a points-to graph for a single function using the results of
- *  the llvm alias analysis or merge several points-to graphs into a single
- *	points-to graph, e.g. to construct a whole program points-to graph.
- *
- *	The graph itself is undirectional and can have labeled edges.
- *
- *	@brief Represents the points-to graph of a function.
- */
-class [[deprecated("Use LLVMAliasSet Instead")]] LLVMAliasGraph
-    : public AnalysisPropertiesMixin<LLVMAliasGraph>,
-      AliasInfoBaseUtils {
-  using traits_t = AliasInfoTraits<LLVMAliasGraph>;
-
-public:
-  using n_t = traits_t::n_t;
-  using v_t = traits_t::v_t;
-  using AliasSetTy = traits_t::AliasSetTy;
-  using AliasSetPtrTy = traits_t::AliasSetPtrTy;
-  using AllocationSiteSetPtrTy = traits_t::AllocationSiteSetPtrTy;
-
-  // Call-graph friends
-  friend class LLVMBasedICFG;
-  /**
-   * 	@brief Holds the information of a vertex in the points-to graph.
-   */
-  struct VertexProperties {
-    /**
-     * This might be an Instruction, an Operand of an Instruction, Global
-     * Variable or a formal Argument.
-     */
-    const llvm::Value *V = nullptr;
-    VertexProperties() = default;
-    VertexProperties(const llvm::Value *V);
-    std::string getValueAsString() const;
-
-    // Fetching the users for V is expensive, so we cache the result.
-    mutable std::vector<const llvm::User *> Users;
-    std::vector<const llvm::User *> getUsers() const;
-  };
-
-  /**
-   * 	@brief Holds the information of an edge in the points-to graph.
-   */
-  struct EdgeProperties {
-    /// This may contain a call or invoke instruction.
-    const llvm::Value *V = nullptr;
-    EdgeProperties() = default;
-    EdgeProperties(const llvm::Value *V);
-    [[nodiscard]] std::string getValueAsString() const;
-  };
-
-  /// Data structure for holding the points-to graph.
-  using graph_t =
-      boost::adjacency_list<boost::vecS, boost::vecS, boost::undirectedS,
-                            VertexProperties, EdgeProperties>;
-
-  /// The type for vertex representative objects.
-  using vertex_t = boost::graph_traits<graph_t>::vertex_descriptor;
-
-  /// The type for edge representative objects.
-  using edge_t = boost::graph_traits<graph_t>::edge_descriptor;
-
-  /// The type for a vertex iterator.
-  using vertex_iterator = boost::graph_traits<graph_t>::vertex_iterator;
-  using out_edge_iterator = boost::graph_traits<graph_t>::out_edge_iterator;
-  using in_edge_iterator = boost::graph_traits<graph_t>::in_edge_iterator;
-
-  /**
-   * Creates a points-to graph based on the computed Alias results.
-   *
-   * @brief Creates a points-to graph for a given function.
-   * @param AA Contains the computed Alias Results.
-   * @param F Points-to graph is created for this particular function.
-   * @param onlyConsiderMustAlias True, if only Must Aliases should be
-   * considered. False, if May and Must Aliases should be
-   * considered.
-   */
-  explicit LLVMAliasGraph(LLVMProjectIRDB & IRDB, bool UseLazyEvaluation = true,
-                          AliasAnalysisType PATy =
-                              AliasAnalysisType::CFLAnders);
-
-  /**
-   * @brief Returns true if graph contains 0 nodes.
-   */
-  bool empty() const;
-
-  /**
-   * @brief Returns the number of graph nodes.
-   */
-  size_t size() const;
-
-  /**
-   * @brief Returns a std::vector containing pointers which are escaping through
-   *        function parameters.
-   * @return Vector holding function argument pointers and the function argument
-   * number.
-   */
-  std::vector<std::pair<unsigned, const llvm::Value *>>
-  getPointersEscapingThroughParams();
-
-  /**
-   * @brief Returns a std::vector containing pointers which are escaping through
-   *        function return statements.
-   * @return Vector with pointers.
-   */
-  std::vector<const llvm::Value *> getPointersEscapingThroughReturns() const;
-
-  /**
-   * @brief Returns a std::vector containing pointers which are escaping through
-   *        function return statements for a specific function.
-   * @param F Function pointer
-   * @return Vector with pointers.
-   */
-  std::vector<const llvm::Value *> getPointersEscapingThroughReturnsForFunction(
-      const llvm::Function *Fd) const;
-
-  /**
-   * @brief Checks if a given value is represented by a vertex in the points-to
-   * graph.
-   * @return True, the points-to graph contains the given value.
-   */
-  bool containsValue(llvm::Value * V);
-
-  /**
-   * The value-vertex-map maps each Value of the points-to graph to
-   * its corresponding Vertex in the points-to graph.
-   *
-   * @brief Prints the value-vertex-map to the command-line.
-   */
-  void printValueVertexMap();
-
-  class PointerVertexOrEdgePrinter {
-  public:
-    PointerVertexOrEdgePrinter(const graph_t &PAG) : PAG(PAG) {}
-    template <class VertexOrEdge>
-    void operator()(std::ostream &Out, const VertexOrEdge &V) const {
-      Out << "[label=\"" << PAG[V].getValueAsString() << "\"]";
-    }
-
-  private:
-    const graph_t &PAG;
-  };
-
-  static inline PointerVertexOrEdgePrinter makePointerVertexOrEdgePrinter(
-      const graph_t &PAG) {
-    return {PAG};
-  }
-
-  /**
-   * @brief Prints the points-to graph in .dot format to the given output
-   * stream.
-   * @param outputstream.
-   */
-  void printAsDot(llvm::raw_ostream &OS = llvm::outs()) const;
-
-  size_t getNumVertices() const;
-
-  size_t getNumEdges() const;
-
-  // --- IsAliasInfo impl
-
-  [[nodiscard]] bool isInterProcedural() const noexcept;
-
-  [[nodiscard]] AliasAnalysisType getAliasAnalysisType() const noexcept;
-
-  AliasResult alias(const llvm::Value *V1, const llvm::Value *V2,
-                    const llvm::Instruction *I = nullptr);
-
-  AliasSetPtrTy getAliasSet(const llvm::Value *V,
-                            const llvm::Instruction *I = nullptr);
-
-  AllocationSiteSetPtrTy getReachableAllocationSites(
-      const llvm::Value *V, bool IntraProcOnly = false,
-      const llvm::Instruction *I = nullptr);
-
-  [[nodiscard]] bool isInReachableAllocationSites(
-      const llvm::Value *V, const llvm::Value *PotentialValue,
-      bool IntraProcOnly = false, const llvm::Instruction *I = nullptr);
-
-  void mergeWith(const LLVMAliasGraph &OtherPTI);
-
-  void introduceAlias(const llvm::Value *V1, const llvm::Value *V2,
-                      const llvm::Instruction *I = nullptr,
-                      AliasResult Kind = AliasResult::MustAlias);
-
-  void print(llvm::raw_ostream &OS = llvm::outs()) const;
-
-  [[nodiscard]] nlohmann::json getAsJson() const;
-
-  void printAsJson(llvm::raw_ostream &OS = llvm::outs()) const;
-
-  [[nodiscard]] AnalysisProperties getAnalysisProperties() const noexcept {
-    return AnalysisProperties::None;
-  }
-
-private:
-  // ---
-
-  // void mergeGraph(const LLVMAliasGraph &Other);
-
-  void computeAliasGraph(const llvm::Value *V);
-
-  void computeAliasGraph(llvm::Function * F);
-
-  struct AllocationSiteDFSVisitor;
-  struct ReachabilityDFSVisitor;
-
-  /// The points to graph.
-  graph_t PAG;
-  using ValueVertexMapT = std::unordered_map<const llvm::Value *, vertex_t>;
-  ValueVertexMapT ValueVertexMap;
-  /// Keep track of what has already been merged into this points-to graph.
-  std::unordered_set<const llvm::Function *> AnalyzedFunctions;
-  LLVMBasedAliasAnalysis PTA;
-
-  AliasSetOwner<AliasSetTy>::memory_resource_type MRes;
-  AliasSetOwner<AliasSetTy> Owner{&MRes};
-  std::unordered_map<const llvm::Value *, BoxedPtr<AliasSetTy>> Cache;
-};
-
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
index 7a9c2dbd71..ff4ccbe5dc 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
@@ -17,15 +17,10 @@
 #include "phasar/Pointer/AliasResult.h"
 #include "phasar/Pointer/AliasSetOwner.h"
 #include "phasar/Utils/AnalysisProperties.h"
-#include "phasar/Utils/StableVector.h"
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
 
-#include "nlohmann/json.hpp"
-
-#include <utility>
-
 namespace llvm {
 class Value;
 class Instruction;
@@ -100,10 +95,6 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
 
   void print(llvm::raw_ostream &OS = llvm::outs()) const;
 
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson() const;
-
   [[nodiscard]] LLVMAliasSetData getLLVMAliasSetData() const;
 
   void printAsJson(llvm::raw_ostream &OS = llvm::outs()) const;
diff --git a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
deleted file mode 100644
index 17efc1abbf..0000000000
--- a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * CachedTypeGraph.h
- *
- *  Created on: 28.06.2018
- *      Author: nicolas bellec
- */
-
-#ifndef PHASAR_PHASARLLVM_POINTER_TYPEGRAPHS_CACHEDTYPEGRAPH_H_
-#define PHASAR_PHASARLLVM_POINTER_TYPEGRAPHS_CACHEDTYPEGRAPH_H_
-
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h"
-
-#include "boost/graph/adjacency_list.hpp"
-#include "boost/graph/graph_traits.hpp"
-#include "boost/graph/reverse_graph.hpp"
-
-#include <set>
-#include <string>
-#include <unordered_map>
-
-#ifndef PSR_FRIEND_TEST
-#define PSR_FRIEND_TEST(TEST, CLASS)
-#endif
-
-namespace llvm {
-class StructType;
-} // namespace llvm
-
-namespace psr {
-class CachedTypeGraph : public TypeGraph<CachedTypeGraph> {
-protected:
-  struct VertexProperties {
-    std::string Name;
-    std::set<const llvm::StructType *> Types;
-    const llvm::StructType *BaseType = nullptr;
-  };
-
-  struct EdgeProperties {
-    EdgeProperties() = default;
-  };
-
-  using graph_t =
-      boost::adjacency_list<boost::setS, boost::vecS, boost::bidirectionalS,
-                            VertexProperties, EdgeProperties>;
-
-  using vertex_t = boost::graph_traits<graph_t>::vertex_descriptor;
-  using vertex_iterator = boost::graph_traits<graph_t>::vertex_iterator;
-  using edge_t = boost::graph_traits<graph_t>::edge_descriptor;
-  using out_edge_iterator = boost::graph_traits<graph_t>::out_edge_iterator;
-  using in_edge_iterator = boost::graph_traits<graph_t>::in_edge_iterator;
-
-  using rev_graph_t = boost::reverse_graph<graph_t, graph_t &>;
-
-  using rev_vertex_t = boost::graph_traits<rev_graph_t>::vertex_descriptor;
-  using rev_vertex_iterator = boost::graph_traits<rev_graph_t>::vertex_iterator;
-  using rev_edge_t = boost::graph_traits<rev_graph_t>::edge_descriptor;
-  using rev_out_edge_iterator =
-      boost::graph_traits<rev_graph_t>::out_edge_iterator;
-  using rev_in_edge_iterator =
-      boost::graph_traits<rev_graph_t>::in_edge_iterator;
-
-  struct dfs_visitor;
-  struct reverse_type_propagation_dfs_visitor;
-
-  std::unordered_map<std::string, vertex_t> TypeVertexMap;
-  graph_t G;
-  bool AlreadyVisited = false;
-
-  PSR_FRIEND_TEST(TypeGraphTest, AddType)
-  PSR_FRIEND_TEST(TypeGraphTest, AddLinkSimple)
-  PSR_FRIEND_TEST(TypeGraphTest, AddLinkWithSubs)
-  PSR_FRIEND_TEST(TypeGraphTest, AddLinkWithRecursion)
-  PSR_FRIEND_TEST(TypeGraphTest, ReverseTypePropagation)
-  PSR_FRIEND_TEST(TypeGraphTest, TypeAggregation)
-  PSR_FRIEND_TEST(TypeGraphTest, Merging)
-
-  vertex_t addType(const llvm::StructType *NewType);
-  void reverseTypePropagation(const llvm::StructType *BaseStruct);
-  void aggregateTypes();
-  bool addLinkWithoutReversePropagation(const llvm::StructType *From,
-                                        const llvm::StructType *To);
-
-public:
-  CachedTypeGraph() = default;
-
-  ~CachedTypeGraph() override = default;
-  // CachedTypeGraph(const CachedTypeGraph &copy) = delete;
-  // CachedTypeGraph& operator=(const CachedTypeGraph &copy) = delete;
-  // CachedTypeGraph(CachedTypeGraph &&move) = delete;
-  // CachedTypeGraph& operator=(CachedTypeGraph &&move) = delete;
-
-  bool addLink(const llvm::StructType *From,
-               const llvm::StructType *To) override;
-  void printAsDot(const std::string &Path = "typegraph.dot") const override;
-  std::set<const llvm::StructType *>
-  getTypes(const llvm::StructType *StructType) override;
-};
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h
deleted file mode 100644
index a29e6a45ea..0000000000
--- a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * LazyTypeGraph.h
- *
- *  Created on: 28.06.2018
- *      Author: nicolas bellec
- */
-
-#ifndef PHASAR_PHASARLLVM_POINTER_TYPEGRAPHS_LAZYTYPEGRAPH_H
-#define PHASAR_PHASARLLVM_POINTER_TYPEGRAPHS_LAZYTYPEGRAPH_H
-
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h"
-
-#include "boost/graph/adjacency_list.hpp"
-#include "boost/graph/graph_traits.hpp"
-#include "boost/graph/reverse_graph.hpp"
-
-#include <set>
-#include <string>
-#include <unordered_map>
-
-namespace llvm {
-class StructType;
-} // namespace llvm
-
-namespace psr {
-class LazyTypeGraph : public TypeGraph<LazyTypeGraph> {
-protected:
-  struct VertexProperties {
-    std::string Name;
-    const llvm::StructType *SType = nullptr;
-  };
-
-  struct EdgeProperties {
-    EdgeProperties() = default;
-  };
-
-  using graph_t =
-      boost::adjacency_list<boost::setS, boost::vecS, boost::bidirectionalS,
-                            VertexProperties, EdgeProperties>;
-
-  using vertex_t = boost::graph_traits<graph_t>::vertex_descriptor;
-  using vertex_iterator = boost::graph_traits<graph_t>::vertex_iterator;
-  using edge_t = boost::graph_traits<graph_t>::edge_descriptor;
-  using out_edge_iterator = boost::graph_traits<graph_t>::out_edge_iterator;
-  using in_edge_iterator = boost::graph_traits<graph_t>::in_edge_iterator;
-
-  using rev_graph_t = boost::reverse_graph<graph_t, graph_t &>;
-
-  using rev_vertex_t = boost::graph_traits<rev_graph_t>::vertex_descriptor;
-  using rev_vertex_iterator = boost::graph_traits<rev_graph_t>::vertex_iterator;
-  using rev_edge_t = boost::graph_traits<rev_graph_t>::edge_descriptor;
-  using rev_out_edge_iterator =
-      boost::graph_traits<rev_graph_t>::out_edge_iterator;
-  using rev_in_edge_iterator =
-      boost::graph_traits<rev_graph_t>::in_edge_iterator;
-
-  struct dfs_visitor;
-
-  std::unordered_map<std::string, vertex_t> TypeToVertexMap;
-  graph_t Graph;
-  bool AlreadyVisited = false;
-
-  vertex_t addType(const llvm::StructType *NewType);
-  void aggregateTypes();
-
-public:
-  LazyTypeGraph() = default;
-
-  ~LazyTypeGraph() override = default;
-  // LazyTypeGraph(const LazyTypeGraph &copy) = delete;
-  // LazyTypeGraph& operator=(const LazyTypeGraph &copy) = delete;
-  // LazyTypeGraph(LazyTypeGraph &&move) = delete;
-  // LazyTypeGraph& operator=(LazyTypeGraph &&move) = delete;
-
-  [[nodiscard]] bool addLink(const llvm::StructType *From,
-                             const llvm::StructType *To) override;
-  void printAsDot(const std::string &Path = "typegraph.dot") const override;
-  [[nodiscard]] std::set<const llvm::StructType *>
-  getTypes(const llvm::StructType *StructType) override;
-};
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h b/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h
deleted file mode 100644
index b7a4ac9090..0000000000
--- a/include/phasar/PhasarLLVM/Pointer/TypeGraphs/TypeGraph.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * TypeGraph.h
- *
- *  Created on: 28.06.2018
- *      Author: nicolas bellec
- */
-
-#ifndef PHASAR_PHASARLLVM_POINTER_TYPEGRAPHS_TYPEGRAPH_H_
-#define PHASAR_PHASARLLVM_POINTER_TYPEGRAPHS_TYPEGRAPH_H_
-
-#include <map>
-#include <set>
-#include <string>
-
-namespace llvm {
-class StructType;
-} // namespace llvm
-
-namespace psr {
-template <class ConcreteTypeGraph> class TypeGraph {
-public:
-  TypeGraph() = default;
-
-  virtual ~TypeGraph() = default;
-  // TypeGraph(const TypeGraph &copy) = delete;
-  // TypeGraph& operator=(const TypeGraph &copy) = delete;
-  // TypeGraph(TypeGraph &&move) = delete;
-  // TypeGraph& operator=(TypeGraph &&move) = delete;
-
-  /* Add a link if not already in the graph
-   * Return true if the node has been added, false otherwise
-   */
-  virtual bool addLink(const llvm::StructType *From,
-                       const llvm::StructType *To) = 0;
-  virtual void printAsDot(const std::string &Path = "typegraph.dot") const = 0;
-  virtual std::set<const llvm::StructType *>
-  getTypes(const llvm::StructType *ST) = 0;
-};
-} // namespace psr
-
-#endif
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
index 53b93d9f1a..1b5694c6d4 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
@@ -14,11 +14,9 @@
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
 #include "phasar/TypeHierarchy/TypeHierarchy.h"
 
-#include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/Support/Casting.h"
 
@@ -101,10 +99,6 @@ class DIBasedTypeHierarchy
    */
   void printAsDot(llvm::raw_ostream &OS = llvm::outs()) const;
 
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson() const override;
-
   /**
    * @brief Prints the class hierarchy to an ostream in json format.
    * @param an outputstream
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
index 3678dfa44c..1e1a79cfe6 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h
@@ -51,7 +51,7 @@ class LLVMProjectIRDB;
  * 	hierarchy graph based on the data from the %ProjectIRCompiledDB
  * 	and reconstructing the virtual method tables.
  */
-class LLVMTypeHierarchy
+class [[deprecated("Use DIBasedTypeHierarchy instead")]] LLVMTypeHierarchy
     : public TypeHierarchy<const llvm::StructType *, const llvm::Function *> {
 public:
   struct VertexProperties {
@@ -110,11 +110,11 @@ class LLVMTypeHierarchy
   // map from clearname to vtable variable
   std::unordered_map<std::string, const llvm::GlobalVariable *> ClearNameTVMap;
 
-  std::vector<const llvm::StructType *>
-  getSubTypes(const llvm::Module &M, const llvm::StructType &Type) const;
+  std::vector<const llvm::StructType *> getSubTypes(
+      const llvm::Module &M, const llvm::StructType &Type) const;
 
-  std::vector<const llvm::Function *>
-  getVirtualFunctions(const llvm::Module &M, const llvm::StructType &Type);
+  std::vector<const llvm::Function *> getVirtualFunctions(
+      const llvm::Module &M, const llvm::StructType &Type);
 
 protected:
   void buildLLVMTypeHierarchy(const llvm::Module &M);
@@ -157,29 +157,29 @@ class LLVMTypeHierarchy
    */
   void constructHierarchy(const llvm::Module &M);
 
-  [[nodiscard]] inline bool
-  hasType(const llvm::StructType *Type) const override {
+  [[nodiscard]] inline bool hasType(const llvm::StructType *Type)
+      const override {
     return TypeVertexMap.count(Type);
   }
 
-  [[nodiscard]] inline bool
-  isSubType(const llvm::StructType *Type,
-            const llvm::StructType *SubType) const override {
+  [[nodiscard]] inline bool isSubType(const llvm::StructType *Type,
+                                      const llvm::StructType *SubType)
+      const override {
     auto ReachableTypes = getSubTypes(Type);
     return ReachableTypes.count(SubType);
   }
 
-  std::set<const llvm::StructType *>
-  getSubTypes(const llvm::StructType *Type) const override;
+  std::set<const llvm::StructType *> getSubTypes(const llvm::StructType *Type)
+      const override;
 
-  [[nodiscard]] const llvm::StructType *
-  getType(llvm::StringRef TypeName) const override;
+  [[nodiscard]] const llvm::StructType *getType(llvm::StringRef TypeName)
+      const override;
 
-  [[nodiscard]] std::vector<const llvm::StructType *>
-  getAllTypes() const override;
+  [[nodiscard]] std::vector<const llvm::StructType *> getAllTypes()
+      const override;
 
-  [[nodiscard]] llvm::StringRef
-  getTypeName(const llvm::StructType *Type) const override;
+  [[nodiscard]] llvm::StringRef getTypeName(const llvm::StructType *Type)
+      const override;
 
   [[nodiscard]] size_t size() const noexcept override {
     return boost::num_vertices(TypeGraph);
@@ -191,10 +191,6 @@ class LLVMTypeHierarchy
 
   void print(llvm::raw_ostream &OS = llvm::outs()) const override;
 
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson() const override;
-
   // void mergeWith(LLVMTypeHierarchy &Other);
 
   /**
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
index cd2e226920..a68c1b341a 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
@@ -13,8 +13,6 @@
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTableData.h"
 #include "phasar/TypeHierarchy/VFTable.h"
 
-#include "nlohmann/json.hpp"
-
 #include <vector>
 
 namespace llvm {
@@ -71,10 +69,6 @@ class LLVMVFTable : public VFTable<const llvm::Function *> {
 
   void print(llvm::raw_ostream &OS) const override;
 
-  [[nodiscard]] [[deprecated(
-      "Please use printAsJson() instead")]] nlohmann::json
-  getAsJson() const override;
-
   [[nodiscard]] LLVMVFTableData getVFTableData() const;
 
   void printAsJson(llvm::raw_ostream &OS) const override;
diff --git a/include/phasar/Pointer/AliasInfo.h b/include/phasar/Pointer/AliasInfo.h
index 056969fe5e..db861acdca 100644
--- a/include/phasar/Pointer/AliasInfo.h
+++ b/include/phasar/Pointer/AliasInfo.h
@@ -139,12 +139,6 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
     VT->Print(AA, OS);
   }
 
-  [[nodiscard, deprecated("Use printAsJson() instead")]] nlohmann::json
-  getAsJson() const {
-    assert(VT != nullptr);
-    return VT->GetAsJson(AA);
-  }
-
   void printAsJson(llvm::raw_ostream &OS) const {
     assert(VT != nullptr);
     VT->PrintAsJson(AA, OS);
@@ -200,7 +194,6 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
                                          ByConstRef<v_t>, bool,
                                          ByConstRef<n_t>);
     void (*Print)(const void *, llvm::raw_ostream &);
-    nlohmann::json (*GetAsJson)(const void *);
     void (*PrintAsJson)(const void *, llvm::raw_ostream &);
     void (*MergeWith)(void *, void *);
     void (*IntroduceAlias)(void *, ByConstRef<v_t>, ByConstRef<v_t>,
@@ -240,15 +233,6 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
       [](const void *AA, llvm::raw_ostream &OS) {
         static_cast<const ConcreteAA *>(AA)->print(OS);
       },
-      [](const void *AA) noexcept {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated"
-        if constexpr (has_getAsJson<ConcreteAA>::value) {
-          return static_cast<const ConcreteAA *>(AA)->getAsJson();
-        }
-        return nlohmann::json();
-#pragma GCC diagnostic pop
-      },
       [](const void *AA, llvm::raw_ostream &OS) {
         static_cast<const ConcreteAA *>(AA)->printAsJson(OS);
       },
diff --git a/include/phasar/TypeHierarchy/TypeHierarchy.h b/include/phasar/TypeHierarchy/TypeHierarchy.h
index d753652cf9..5d06705d1b 100644
--- a/include/phasar/TypeHierarchy/TypeHierarchy.h
+++ b/include/phasar/TypeHierarchy/TypeHierarchy.h
@@ -14,8 +14,6 @@
 
 #include "llvm/Support/raw_ostream.h"
 
-#include "nlohmann/json_fwd.hpp"
-
 #include <set>
 
 namespace psr {
@@ -40,10 +38,6 @@ template <typename T, typename F> class TypeHierarchy {
 
   virtual void print(llvm::raw_ostream &OS = llvm::outs()) const = 0;
 
-  [[nodiscard,
-    deprecated("Please use printAsJson() instead")]] virtual nlohmann::json
-  getAsJson() const = 0;
-
   virtual void printAsJson(llvm::raw_ostream &OS) const = 0;
 };
 
diff --git a/include/phasar/TypeHierarchy/VFTable.h b/include/phasar/TypeHierarchy/VFTable.h
index 83c544dbcd..a236f2e345 100644
--- a/include/phasar/TypeHierarchy/VFTable.h
+++ b/include/phasar/TypeHierarchy/VFTable.h
@@ -12,8 +12,6 @@
 
 #include "llvm/Support/raw_ostream.h"
 
-#include "nlohmann/json.hpp"
-
 #include <vector>
 
 namespace llvm {
@@ -38,10 +36,6 @@ template <typename F> class VFTable {
 
   virtual void print(llvm::raw_ostream &OS) const = 0;
 
-  [[nodiscard,
-    deprecated("Please use printAsJson() instead")]] virtual nlohmann::json
-  getAsJson() const = 0;
-
   virtual void printAsJson(llvm::raw_ostream &OS) const = 0;
 };
 
diff --git a/include/phasar/Utils/Logger.h b/include/phasar/Utils/Logger.h
index 6b3ea5e186..abf1fd65e6 100644
--- a/include/phasar/Utils/Logger.h
+++ b/include/phasar/Utils/Logger.h
@@ -155,12 +155,6 @@ class Logger final {
 #define PHASAR_LOG_LEVEL(level, message) (void)0
 #endif
 
-/**
- * Initializes the logger.
- */
-[[deprecated("Please use the new initialize*Logger() family instead")]] void
-initializeLogger(bool UseLogger, const std::string &LogFile = "");
-
 } // namespace psr
 
 #endif
diff --git a/include/phasar/Utils/Utilities.h b/include/phasar/Utils/Utilities.h
index de2698c00e..f2c7504c74 100644
--- a/include/phasar/Utils/Utilities.h
+++ b/include/phasar/Utils/Utilities.h
@@ -33,16 +33,6 @@ std::string createTimeStamp();
 
 bool isConstructor(llvm::StringRef MangledName);
 
-namespace legacy {
-// May need to call this function from a safe environment where we have already
-// checked that it does not take any harm. Surround it with the legacy namespace
-// as a marker that this function will be removed soon.
-
-/// [[deprecated("Requires non-opaque pointers, which will no longer be "
-///              "supported by LLVM in the next version!")]]
-const llvm::Type *stripPointer(const llvm::Type *Pointer);
-} // namespace legacy
-
 bool isMangled(llvm::StringRef Name);
 
 template <typename T>
diff --git a/lib/Config/Configuration.cpp b/lib/Config/Configuration.cpp
index 11a36279e3..8378bacaab 100644
--- a/lib/Config/Configuration.cpp
+++ b/lib/Config/Configuration.cpp
@@ -55,10 +55,6 @@ llvm::StringRef PhasarConfig::PhasarDirectory() noexcept {
   return PHASAR_SRC_DIR;
 }
 
-llvm::StringRef PhasarConfig::DefaultSourceSinkFunctionsPath() noexcept {
-  return PHASAR_SRC_DIR "/config/phasar-source-sink-function.json";
-}
-
 static bool loadConfigFileInto(PhasarConfig &PC, llvm::StringRef FileName,
                                std::set<std::string> &Lines) {
   auto ConfigFile = PC.readConfigFileAsTextOrErr(FileName);
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.cpp
index 53a3a3adb2..1d9e41cf29 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.cpp
@@ -68,10 +68,6 @@ void LLVMBasedBackwardICFG::printAsJsonImpl(llvm::raw_ostream &OS) const {
   ForwardICFG->printAsJson(OS);
 }
 
-nlohmann::json LLVMBasedBackwardICFG::getAsJsonImpl() const {
-  return ForwardICFG->getAsJson();
-}
-
 auto LLVMBasedBackwardICFG::getCallGraphImpl() const noexcept
     -> const CallGraph<n_t, f_t> & {
   return ForwardICFG->getCallGraph();
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
index ce87316f5d..addd88c957 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
@@ -158,12 +158,6 @@ void LLVMBasedICFG::printAsJsonImpl(llvm::raw_ostream &OS) const {
       [this](n_t Inst) { return IRDB->getInstructionId(Inst); });
 }
 
-nlohmann::json LLVMBasedICFG::getAsJsonImpl() const {
-  return CG.getAsJson(
-      [](f_t F) { return F->getName().str(); },
-      [this](n_t Inst) { return IRDB->getInstructionId(Inst); });
-}
-
 template class ICFGBase<LLVMBasedICFG>;
 
 } // namespace psr
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp b/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
index 43c6dab56d..45820e2793 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
@@ -10,6 +10,7 @@
 #include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/Demangle/Demangle.h"
 #include "llvm/IR/Constants.h"
+#include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Casting.h"
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/DTAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/DTAResolver.cpp
deleted file mode 100644
index 7863c024a4..0000000000
--- a/lib/PhasarLLVM/ControlFlow/Resolver/DTAResolver.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- *  DTAResolver.cpp
- *
- *  Created on: 20.07.2018
- *      Author: nicolas bellec
- */
-
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h"
-
-#include "phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h"
-#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-#include "phasar/Utils/Logger.h"
-#include "phasar/Utils/Utilities.h"
-
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Operator.h"
-#include "llvm/IR/Value.h"
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/ErrorHandling.h"
-
-#include <memory>
-
-using namespace psr;
-
-DTAResolver::DTAResolver(const LLVMProjectIRDB *IRDB,
-                         const LLVMVFTableProvider *VTP,
-                         const DIBasedTypeHierarchy *TH)
-    : CHAResolver(IRDB, VTP, TH) {}
-
-bool DTAResolver::heuristicAntiConstructorThisType(
-    const llvm::BitCastInst *BitCast) {
-  llvm::report_fatal_error("Does not work with opaque pointers anymore");
-#if 0
-  // We check if the caller is a constructor, and if the this argument has the
-  // same type as the source type of the bitcast. If it is the case, it returns
-  // false, true otherwise.
-
-  if (const auto *Caller = BitCast->getFunction()) {
-    if (isConstructor(Caller->getName().str())) {
-      if (auto *FuncTy = Caller->getFunctionType()) {
-        if (auto *ThisTy = FuncTy->getParamType(0)) {
-          if (ThisTy == BitCast->getSrcTy()) {
-            return false;
-          }
-        }
-      }
-    }
-  }
-
-  return true;
-#endif
-}
-
-bool DTAResolver::heuristicAntiConstructorVtablePos(
-    const llvm::BitCastInst *BitCast) {
-  llvm::report_fatal_error("Does not work with opaque pointers anymore");
-#if 0
-
-  // Better heuristic than the previous one, can handle the CRTP. Based on the
-  // previous one.
-
-
-  if (heuristicAntiConstructorThisType(BitCast)) {
-    return true;
-  }
-
-  // We know that we are in a constructor and the source type of the bitcast is
-  // the same as the this argument. We then check where the bitcast is against
-  // the store instruction of the vtable.
-  if (!BitCast->getSrcTy()->isOpaquePointerTy()) {
-    const auto *StructTy = psr::legacy::stripPointer(BitCast->getSrcTy());
-    if (StructTy == nullptr) {
-      throw std::runtime_error(
-          "StructTy == nullptr in the heuristic_anti_contructor");
-    }
-
-    // If it doesn't contain vtable, there is no reason to call this class in
-    // the DTA graph, so no need to add it
-    if (StructTy->isStructTy()) {
-      if (VTP->hasVFTable(llvm::dyn_cast<llvm::StructType>(StructTy))) {
-        return false;
-      }
-    }
-  }
-  // So there is a vtable, the question is, where is it compared to the bitcast
-  // instruction Carefull, there can be multiple vtable storage, we want to get
-  // the last one vtable storage typically are : store i32 (...)** bitcast (i8**
-  // getelementptr inbounds ({ [3 x i8*], [3 x i8*] }, { [3 x i8*], [3 x i8*] }*
-  // @_ZTV2AA, i32 0, inrange i32 1, i32 3) to i32 (...)**), i32 (...)*** %17,
-  // align 8
-  // WARNING: May break when changing llvm version or using clang with version
-  // > 5.0.1
-
-  const auto *Caller = BitCast->getFunction();
-  if (Caller == nullptr) {
-    throw std::runtime_error(
-        "A bitcast instruction has no associated function");
-  }
-
-  int Idx = 0;
-
-  int VtableNum = 0;
-
-  int BitcastNum = 0;
-
-  for (auto I = llvm::inst_begin(Caller), E = llvm::inst_end(Caller); I != E;
-       ++I, ++Idx) {
-    const auto &Inst = *I;
-
-    if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(&Inst)) {
-      // We got a store instruction, now we are checking if it is a vtable
-      // storage
-      if (const auto *BitcastExpr =
-              llvm::dyn_cast<llvm::ConstantExpr>(Store->getValueOperand())) {
-        if (BitcastExpr->isCast()) {
-          if (auto *ConstGep = llvm::dyn_cast<llvm::ConstantExpr>(
-                  BitcastExpr->getOperand(0))) {
-            if (auto *Gep = llvm::dyn_cast<llvm::GEPOperator>(ConstGep)) {
-              if (auto *Vtable = llvm::dyn_cast<llvm::Constant>(
-                      Gep->getPointerOperand())) {
-                // We can here assume that we found a vtable
-                VtableNum = Idx;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    if (&Inst == BitCast) {
-      BitcastNum = Idx;
-    }
-  }
-
-  return (BitcastNum > VtableNum);
-#endif
-}
-
-void DTAResolver::otherInst(const llvm::Instruction *Inst) {
-  llvm::report_fatal_error("Does not work with opaque pointers anymore");
-#if 0
-  if (Inst->getType()->isOpaquePointerTy()) {
-    /// XXX: We may want to get these information on a different way, e.g. by
-    /// analyzing the debug info
-    return;
-  }
-  if (const auto *BitCast = llvm::dyn_cast<llvm::BitCastInst>(Inst)) {
-    // We add the connection between the two types in the DTA graph
-    auto *Src = BitCast->getSrcTy();
-    auto *Dest = BitCast->getDestTy();
-
-    const auto *SrcStructType = llvm::dyn_cast<llvm::StructType>(
-        psr::legacy::stripPointer(Src)); // NOLINT
-    const auto *DestStructType = llvm::dyn_cast<llvm::StructType>(
-        psr::legacy::stripPointer(Dest)); // NOLINT
-
-    if (SrcStructType && DestStructType &&
-        heuristicAntiConstructorVtablePos(BitCast)) {
-      TypeGraph.addLink(DestStructType, SrcStructType);
-    }
-  }
-#endif
-}
-auto DTAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
-    -> FunctionSetTy {
-  llvm::report_fatal_error("Does not work with opaque pointers anymore");
-#if 0
-  FunctionSetTy PossibleCallTargets;
-
-  PHASAR_LOG_LEVEL(DEBUG,
-                   "Call virtual function: " << llvmIRToString(CallSite));
-
-  auto RetrievedVtableIndex = getVFTIndex(CallSite);
-  if (!RetrievedVtableIndex.has_value()) {
-    // An error occured
-    PHASAR_LOG_LEVEL(DEBUG,
-                     "Error with resolveVirtualCall : impossible to retrieve "
-                     "the vtable index\n"
-                         << llvmIRToString(CallSite) << "\n");
-    return {};
-  }
-
-  auto VtableIndex = RetrievedVtableIndex.value();
-
-  PHASAR_LOG_LEVEL(DEBUG, "Virtual function table entry is: " << VtableIndex);
-
-  const auto *ReceiverType = getReceiverStructType(CallSite);
-
-  auto PossibleTypes = TypeGraph.getTypes(ReceiverType);
-
-  // WARNING We deactivated the check on allocated because it is
-  // unabled to get the types allocated in the used libraries
-  // auto allocated_types = IRDB.getAllocatedTypes();
-  // auto end_it = allocated_types.end();
-  for (const auto *PossibleType : PossibleTypes) {
-    if (const auto *PossibleTypeStruct =
-            llvm::dyn_cast<llvm::StructType>(PossibleType)) {
-      // if ( allocated_types.find(possible_type_struct) != end_it ) {
-      const auto *Target =
-          getNonPureVirtualVFTEntry(PossibleTypeStruct, VtableIndex, CallSite);
-      if (Target) {
-        PossibleCallTargets.insert(Target);
-      }
-    }
-  }
-
-  if (PossibleCallTargets.empty()) {
-    PossibleCallTargets = CHAResolver::resolveVirtualCall(CallSite);
-  }
-
-  PHASAR_LOG_LEVEL(DEBUG, "Possible targets are:");
-#ifdef DYNAMIC_LOG
-  for (const auto *Entry : PossibleCallTargets) {
-    PHASAR_LOG_LEVEL(DEBUG, Entry);
-  }
-#endif
-
-  return PossibleCallTargets;
-#endif
-}
-
-std::string DTAResolver::str() const { return "DTA"; }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
index 27c91bcd4a..9065a43415 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
@@ -19,7 +19,6 @@
 #include "phasar/ControlFlow/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/DTAResolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h"
@@ -205,12 +204,6 @@ std::unique_ptr<Resolver> Resolver::create(CallGraphAnalysisType Ty,
   case CallGraphAnalysisType::RTA:
     assert(TH != nullptr);
     return std::make_unique<RTAResolver>(IRDB, VTP, TH);
-  case CallGraphAnalysisType::DTA:
-    assert(TH != nullptr);
-    PHASAR_LOG_LEVEL(ERROR, "Do not use the DTA resolver anymore. It relies on "
-                            "the removed 'typed-pointers' feature of LLVM.");
-    std::exit(1);
-    // return std::make_unique<DTAResolver>(IRDB, VTP, TH);
   case CallGraphAnalysisType::VTA:
     llvm::report_fatal_error(
         "The VTA callgraph algorithm is not implemented yet");
diff --git a/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.cpp b/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.cpp
index a61b147cc7..ac17cfbfe1 100644
--- a/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.cpp
+++ b/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.cpp
@@ -49,10 +49,6 @@ void SparseLLVMBasedICFGView::printImpl(llvm::raw_ostream &OS) const {
   ICF->print(OS);
 }
 
-nlohmann::json SparseLLVMBasedICFGView::getAsJsonImpl() const {
-  return ICF->getAsJson();
-}
-
 auto SparseLLVMBasedICFGView::getCallGraphImpl() const noexcept
     -> const CallGraph<n_t, f_t> & {
   return ICF->getCallGraph();
diff --git a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
index ed64e47840..4575fa59ea 100644
--- a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
+++ b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
@@ -23,7 +23,6 @@
 #include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/Casting.h"
-#include "llvm/Support/Format.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -252,43 +251,6 @@ GeneralStatistics GeneralStatisticsAnalysis::runOnModule(llvm::Module &M) {
   return Stats;
 }
 
-size_t GeneralStatistics::getAllocationsites() const { return AllocationSites; }
-
-size_t GeneralStatistics::getFunctioncalls() const { return CallSites; }
-
-size_t GeneralStatistics::getInstructions() const { return Instructions; }
-
-size_t GeneralStatistics::getGlobalPointers() const { return Globals; }
-
-size_t GeneralStatistics::getBasicBlocks() const { return BasicBlocks; }
-
-size_t GeneralStatistics::getFunctions() const { return Functions; }
-
-size_t GeneralStatistics::getGlobals() const { return Globals; }
-
-size_t GeneralStatistics::getGlobalConsts() const { return GlobalConsts; }
-
-size_t GeneralStatistics::getMemoryIntrinsics() const { return MemIntrinsics; }
-
-size_t GeneralStatistics::getStoreInstructions() const {
-  return StoreInstructions;
-}
-
-const std::set<const llvm::Type *> &
-GeneralStatistics::getAllocatedTypes() const {
-  return AllocatedTypes;
-}
-
-const std::set<const llvm::Instruction *> &
-GeneralStatistics::getAllocaInstructions() const {
-  return AllocaInstructions;
-}
-
-const std::set<const llvm::Instruction *> &
-GeneralStatistics::getRetResInstructions() const {
-  return RetResInstructions;
-}
-
 void GeneralStatistics::printAsJson(llvm::raw_ostream &OS) const {
   nlohmann::json Json;
 
@@ -333,14 +295,6 @@ void GeneralStatistics::printAsJson(llvm::raw_ostream &OS) const {
   OS << Json << '\n';
 }
 
-nlohmann::json GeneralStatistics::getAsJson() const {
-  std::string GeneralStatisticsAsString;
-  llvm::raw_string_ostream Stream(GeneralStatisticsAsString);
-  printAsJson(Stream);
-
-  return nlohmann::json::parse(GeneralStatisticsAsString);
-}
-
 } // namespace psr
 
 namespace {
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp
deleted file mode 100644
index 26a0acac8f..0000000000
--- a/lib/PhasarLLVM/Pointer/LLVMAliasGraph.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasGraph.h"
-
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-#include "phasar/Utils/Logger.h"
-#include "phasar/Utils/NlohmannLogging.h"
-#include "phasar/Utils/PAMMMacros.h"
-#include "phasar/Utils/Utilities.h"
-
-#include "llvm/ADT/SetVector.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Value.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "boost/graph/copy.hpp"
-#include "boost/graph/depth_first_search.hpp"
-#include "boost/graph/graph_utility.hpp"
-#include "boost/graph/graphviz.hpp"
-
-using namespace std;
-
-namespace psr {
-struct LLVMAliasGraph::AllocationSiteDFSVisitor : boost::default_dfs_visitor {
-  // collect the allocation sites that are found
-  AliasSetTy &AllocationSites;
-  // keeps track of the current path
-  std::vector<vertex_t> VisitorStack;
-  // the call stack that can be matched against the visitor stack
-  const std::vector<const llvm::Instruction *> &CallStack;
-
-  AllocationSiteDFSVisitor(AliasSetTy &AllocationSizes,
-                           const vector<const llvm::Instruction *> &CallStack)
-      : AllocationSites(AllocationSizes), CallStack(CallStack) {}
-
-  template <typename Vertex, typename Graph>
-  void discover_vertex(Vertex U, const Graph & /*G*/) {
-    VisitorStack.push_back(U);
-  }
-
-  template <typename Vertex, typename Graph>
-  void finish_vertex(Vertex U, const Graph &G) {
-    // check for stack allocation
-    if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(G[U].V)) {
-      // If the call stack is empty, we completely ignore the calling context
-      if (matchesStack(G) || CallStack.empty()) {
-        PHASAR_LOG_LEVEL(DEBUG,
-                         "Found stack allocation: " << llvmIRToString(Alloc));
-        AllocationSites.insert(G[U].V);
-      }
-    }
-    // check for heap allocation
-    if (llvm::isa<llvm::CallInst>(G[U].V) ||
-        llvm::isa<llvm::InvokeInst>(G[U].V)) {
-      const auto *CallSite = llvm::cast<llvm::CallBase>(G[U].V);
-      if (CallSite->getCalledFunction() != nullptr &&
-          isHeapAllocatingFunction(CallSite->getCalledFunction())) {
-        // If the call stack is empty, we completely ignore the calling
-        // context
-        if (matchesStack(G) || CallStack.empty()) {
-          PHASAR_LOG_LEVEL(
-              DEBUG, "Found heap allocation: " << llvmIRToString(CallSite));
-          AllocationSites.insert(G[U].V);
-        }
-      }
-    }
-    VisitorStack.pop_back();
-  }
-
-  template <typename Graph> bool matchesStack(const Graph &G) {
-    size_t CallStackIdx = 0;
-    for (size_t I = 0, J = 1;
-         I < VisitorStack.size() && J < VisitorStack.size(); ++I, ++J) {
-      auto E = boost::edge(VisitorStack[I], VisitorStack[J], G);
-      if (G[E.first].V == nullptr) {
-        continue;
-      }
-      if (G[E.first].V != CallStack[CallStack.size() - CallStackIdx - 1]) {
-        return false;
-      }
-      CallStackIdx++;
-    }
-    return true;
-  }
-};
-
-struct LLVMAliasGraph::ReachabilityDFSVisitor : boost::default_dfs_visitor {
-  std::set<vertex_t> &AliasSet;
-  ReachabilityDFSVisitor(set<vertex_t> &Result) : AliasSet(Result) {}
-  template <typename Vertex, typename Graph>
-  void finish_vertex(Vertex U, const Graph & /*Graph*/) {
-    AliasSet.insert(U);
-  }
-};
-
-// points-to graph internal stuff
-
-LLVMAliasGraph::VertexProperties::VertexProperties(const llvm::Value *V)
-    : V(V) {}
-
-std::string LLVMAliasGraph::VertexProperties::getValueAsString() const {
-  return llvmIRToString(V);
-}
-
-std::vector<const llvm::User *>
-LLVMAliasGraph::VertexProperties::getUsers() const {
-  if (!Users.empty() || V == nullptr) {
-    return Users;
-  }
-  auto AllUsers = V->users();
-  Users.insert(Users.end(), AllUsers.begin(), AllUsers.end());
-  return Users;
-}
-
-LLVMAliasGraph::EdgeProperties::EdgeProperties(const llvm::Value *V) : V(V) {}
-
-std::string LLVMAliasGraph::EdgeProperties::getValueAsString() const {
-  return llvmIRToString(V);
-}
-
-// points-to graph stuff
-
-LLVMAliasGraph::LLVMAliasGraph(LLVMProjectIRDB &IRDB, bool UseLazyEvaluation,
-                               AliasAnalysisType /*PATy*/)
-    : PTA(IRDB, UseLazyEvaluation) {}
-
-void LLVMAliasGraph::computeAliasGraph(const llvm::Value *V) {
-  // FIXME when fixed in LLVM
-  auto *VF = const_cast<llvm::Function *>(retrieveFunction(V)); // NOLINT
-  computeAliasGraph(VF);
-}
-
-void LLVMAliasGraph::computeAliasGraph(llvm::Function *F) {
-  // check if we already analyzed the function
-  if (AnalyzedFunctions.find(F) != AnalyzedFunctions.end()) {
-    return;
-  }
-  PAMM_GET_INSTANCE;
-  PHASAR_LOG_LEVEL(DEBUG, "Analyzing function: " << F->getName());
-  AnalyzedFunctions.insert(F);
-  llvm::AAResults &AA = *PTA.getAAResults(F);
-  bool EvalAAMD = true;
-
-  // taken from llvm/Analysis/AliasAnalysisEvaluator.cpp
-  const llvm::DataLayout &DL = F->getParent()->getDataLayout();
-
-  llvm::SetVector<llvm::Value *> Pointers;
-  llvm::SmallSetVector<llvm::CallBase *, 16> Calls;
-  llvm::SetVector<llvm::Value *> Loads;
-  llvm::SetVector<llvm::Value *> Stores;
-
-  for (auto &I : F->args()) {
-    if (I.getType()->isPointerTy()) { // Add all pointer arguments.
-      Pointers.insert(&I);
-    }
-  }
-
-  for (llvm::inst_iterator I = inst_begin(*F), E = inst_end(*F); I != E; ++I) {
-    if (I->getType()->isPointerTy()) { // Add all pointer instructions.
-      Pointers.insert(&*I);
-    }
-    if (EvalAAMD && llvm::isa<llvm::LoadInst>(&*I)) {
-      Loads.insert(&*I);
-    }
-    if (EvalAAMD && llvm::isa<llvm::StoreInst>(&*I)) {
-      Stores.insert(&*I);
-    }
-    llvm::Instruction &Inst = *I;
-    if (auto *Call = llvm::dyn_cast<llvm::CallBase>(&Inst)) {
-      llvm::Value *Callee = Call->getCalledOperand();
-      // Skip actual functions for direct function calls.
-      if (!llvm::isa<llvm::Function>(Callee) && isInterestingPointer(Callee)) {
-        Pointers.insert(Callee);
-      }
-      // Consider formals.
-      for (llvm::Use &DataOp : Call->data_ops()) {
-        if (isInterestingPointer(DataOp)) {
-          Pointers.insert(DataOp);
-        }
-      }
-      Calls.insert(Call);
-    } else {
-      // Consider all operands.
-      for (llvm::Instruction::op_iterator OI = Inst.op_begin(),
-                                          OE = Inst.op_end();
-           OI != OE; ++OI) {
-        if (isInterestingPointer(*OI)) {
-          Pointers.insert(*OI);
-        }
-      }
-    }
-  }
-
-  INC_COUNTER("GS Pointer", Pointers.size(), Core);
-
-  // make vertices for all pointers
-  for (auto *P : Pointers) {
-    ValueVertexMap[P] = boost::add_vertex(VertexProperties(P), PAG);
-  }
-  // iterate over the worklist, and run the full (n^2)/2 disambiguations
-  const auto MapEnd = ValueVertexMap.end();
-  for (auto I1 = ValueVertexMap.begin(); I1 != MapEnd; ++I1) {
-    llvm::Type *I1ElTy =
-        !I1->first->getType()->isOpaquePointerTy()
-            ? I1->first->getType()->getNonOpaquePointerElementType()
-            : nullptr;
-    const uint64_t I1Size = I1ElTy && I1ElTy->isSized()
-                                ? DL.getTypeStoreSize(I1ElTy)
-                                : llvm::MemoryLocation::UnknownSize;
-    for (auto I2 = std::next(I1); I2 != MapEnd; ++I2) {
-      llvm::Type *I2ElTy =
-          !I2->first->getType()->isOpaquePointerTy()
-              ? I2->first->getType()->getNonOpaquePointerElementType()
-              : nullptr;
-      const uint64_t I2Size = I2ElTy && I2ElTy->isSized()
-                                  ? DL.getTypeStoreSize(I2ElTy)
-                                  : llvm::MemoryLocation::UnknownSize;
-      switch (AA.alias(I1->first, I1Size, I2->first, I2Size)) {
-      case llvm::AliasResult::NoAlias:
-        break;
-      case llvm::AliasResult::MayAlias: // no break
-        [[fallthrough]];
-      case llvm::AliasResult::PartialAlias: // no break
-        [[fallthrough]];
-      case llvm::AliasResult::MustAlias:
-        boost::add_edge(I1->second, I2->second, PAG);
-        break;
-      default:
-        break;
-      }
-    }
-  }
-}
-
-bool LLVMAliasGraph::isInterProcedural() const noexcept { return false; }
-
-AliasAnalysisType LLVMAliasGraph::getAliasAnalysisType() const noexcept {
-  return AliasAnalysisType::Invalid;
-}
-
-AliasResult LLVMAliasGraph::alias(const llvm::Value *V1, const llvm::Value *V2,
-                                  const llvm::Instruction * /*I*/) {
-  computeAliasGraph(V1);
-  computeAliasGraph(V2);
-  auto PTS = getAliasSet(V1);
-  if (PTS->contains(V2)) {
-    return AliasResult::MustAlias;
-  }
-  return AliasResult::NoAlias;
-}
-
-auto LLVMAliasGraph::getReachableAllocationSites(
-    const llvm::Value *V, bool /*IntraProcOnly*/,
-    const llvm::Instruction * /*I*/) -> AllocationSiteSetPtrTy {
-  computeAliasGraph(V);
-  auto AllocSites = std::make_unique<AliasSetTy>();
-  AllocationSiteDFSVisitor AllocVis(*AllocSites, {});
-  vector<boost::default_color_type> ColorMap(boost::num_vertices(PAG));
-  boost::depth_first_visit(
-      PAG, ValueVertexMap[V], AllocVis,
-      boost::make_iterator_property_map(
-          ColorMap.begin(), boost::get(boost::vertex_index, PAG), ColorMap[0]));
-  return AllocSites;
-}
-
-[[nodiscard]] bool LLVMAliasGraph::isInReachableAllocationSites(
-    const llvm::Value *V, const llvm::Value *PotentialValue, bool IntraProcOnly,
-    const llvm::Instruction *I) {
-  return getReachableAllocationSites(V, IntraProcOnly, I)
-      ->count(PotentialValue);
-}
-
-void LLVMAliasGraph::mergeWith(const LLVMAliasGraph &OtherPTI) {
-  AnalyzedFunctions.insert(OtherPTI.AnalyzedFunctions.begin(),
-                           OtherPTI.AnalyzedFunctions.end());
-  using vertex_t = graph_t::vertex_descriptor;
-  using vertex_map_t = std::map<vertex_t, vertex_t>;
-  vertex_map_t OldToNewVertexMapping;
-  boost::associative_property_map<vertex_map_t> VertexMapWrapper(
-      OldToNewVertexMapping);
-  boost::copy_graph(OtherPTI.PAG, PAG, boost::orig_to_copy(VertexMapWrapper));
-  for (const auto &OtherValues : OtherPTI.ValueVertexMap) {
-    auto Search = OldToNewVertexMapping.find(OtherValues.second);
-    if (Search != OldToNewVertexMapping.end()) {
-      ValueVertexMap.insert(make_pair(OtherValues.first, Search->second));
-    }
-  }
-}
-
-void LLVMAliasGraph::introduceAlias(const llvm::Value *V1,
-                                    const llvm::Value *V2,
-                                    const llvm::Instruction *I,
-                                    AliasResult /*Kind*/) {
-  computeAliasGraph(V1);
-  computeAliasGraph(V2);
-  auto Vert1 = ValueVertexMap[V1];
-  auto Vert2 = ValueVertexMap[V2];
-  boost::add_edge(Vert1, Vert2, I, PAG);
-}
-
-vector<pair<unsigned, const llvm::Value *>>
-LLVMAliasGraph::getPointersEscapingThroughParams() {
-  vector<pair<unsigned, const llvm::Value *>> EscapingPointers;
-  for (auto VertexIter : boost::make_iterator_range(boost::vertices(PAG))) {
-    if (const auto *Arg = llvm::dyn_cast<llvm::Argument>(PAG[VertexIter].V)) {
-      EscapingPointers.emplace_back(Arg->getArgNo(), Arg);
-    }
-  }
-  return EscapingPointers;
-}
-
-vector<const llvm::Value *>
-LLVMAliasGraph::getPointersEscapingThroughReturns() const {
-  vector<const llvm::Value *> EscapingPointers;
-  for (auto VertexIter : boost::make_iterator_range(boost::vertices(PAG))) {
-    const auto &Vertex = PAG[VertexIter];
-    for (const auto *const User : Vertex.getUsers()) {
-      if (llvm::isa<llvm::ReturnInst>(User)) {
-        EscapingPointers.push_back(Vertex.V);
-      }
-    }
-  }
-  return EscapingPointers;
-}
-
-vector<const llvm::Value *>
-LLVMAliasGraph::getPointersEscapingThroughReturnsForFunction(
-    const llvm::Function *F) const {
-  vector<const llvm::Value *> EscapingPointers;
-  for (auto VertexIter : boost::make_iterator_range(boost::vertices(PAG))) {
-    const auto &Vertex = PAG[VertexIter];
-    for (const auto *const User : Vertex.getUsers()) {
-      if (const auto *R = llvm::dyn_cast<llvm::ReturnInst>(User)) {
-        if (R->getFunction() == F) {
-          EscapingPointers.push_back(Vertex.V);
-        }
-      }
-    }
-  }
-  return EscapingPointers;
-}
-
-bool LLVMAliasGraph::containsValue(llvm::Value *V) {
-  for (auto VertexIter : boost::make_iterator_range(boost::vertices(PAG))) {
-    if (PAG[VertexIter].V == V) {
-      return true;
-    }
-  }
-  return false;
-}
-
-auto LLVMAliasGraph::getAliasSet(const llvm::Value *V,
-                                 const llvm::Instruction * /*I*/)
-    -> AliasSetPtrTy {
-  PAMM_GET_INSTANCE;
-  INC_COUNTER("[Calls] getAliasSet", 1, Full);
-  START_TIMER("Alias-Set Computation", Full);
-  const auto *VF = retrieveFunction(V);
-  computeAliasGraph(VF);
-  // check if the graph contains a corresponding vertex
-  set<vertex_t> ReachableVertices;
-  ReachabilityDFSVisitor Vis(ReachableVertices);
-  vector<boost::default_color_type> ColorMap(boost::num_vertices(PAG));
-  boost::depth_first_visit(
-      PAG, ValueVertexMap.at(V), Vis,
-      boost::make_iterator_property_map(
-          ColorMap.begin(), boost::get(boost::vertex_index, PAG), ColorMap[0]));
-  auto ResultSet = [this, V] {
-    auto &Ret = Cache[V];
-
-    if (!Ret) {
-      Ret = Owner.acquire();
-    }
-
-    return Ret;
-  }();
-
-  for (auto Vertex : ReachableVertices) {
-    ResultSet->insert(PAG[Vertex].V);
-  }
-  PAUSE_TIMER("Alias-Set Computation", Full);
-  ADD_TO_HISTOGRAM("Points-to", ResultSet->size(), 1, Full);
-  return ResultSet;
-}
-
-void LLVMAliasGraph::print(llvm::raw_ostream &OS) const {
-  for (const auto &Fn : AnalyzedFunctions) {
-    llvm::outs() << "LLVMAliasGraph for " << Fn->getName() << ":\n";
-    vertex_iterator UI;
-
-    vertex_iterator UIEnd;
-    for (boost::tie(UI, UIEnd) = boost::vertices(PAG); UI != UIEnd; ++UI) {
-      OS << PAG[*UI].getValueAsString() << " <--> ";
-      out_edge_iterator EI;
-
-      out_edge_iterator EIEnd;
-      for (boost::tie(EI, EIEnd) = boost::out_edges(*UI, PAG); EI != EIEnd;
-           ++EI) {
-        OS << PAG[target(*EI, PAG)].getValueAsString() << " ";
-      }
-      OS << '\n';
-    }
-  }
-}
-
-void LLVMAliasGraph::printAsDot(llvm::raw_ostream &OS) const {
-  std::stringstream S;
-  boost::write_graphviz(S, PAG, makePointerVertexOrEdgePrinter(PAG),
-                        makePointerVertexOrEdgePrinter(PAG));
-  OS << S.str();
-}
-
-nlohmann::json LLVMAliasGraph::getAsJson() const {
-  nlohmann::json J;
-  vertex_iterator VIv;
-
-  vertex_iterator VIvEnd;
-  out_edge_iterator EI;
-
-  out_edge_iterator EIEnd;
-  // iterate all graph vertices
-  for (boost::tie(VIv, VIvEnd) = boost::vertices(PAG); VIv != VIvEnd; ++VIv) {
-    J[PhasarConfig::JsonAliasGraphID().str()][PAG[*VIv].getValueAsString()];
-    // iterate all out edges of vertex vi_v
-    for (boost::tie(EI, EIEnd) = boost::out_edges(*VIv, PAG); EI != EIEnd;
-         ++EI) {
-      J[PhasarConfig::JsonAliasGraphID().str()][PAG[*VIv].getValueAsString()] +=
-          PAG[boost::target(*EI, PAG)].getValueAsString();
-    }
-  }
-  return J;
-}
-
-void LLVMAliasGraph::printValueVertexMap() {
-  for (const auto &Entry : ValueVertexMap) {
-    llvm::outs() << Entry.first << " <---> " << Entry.second << '\n';
-  }
-}
-
-bool LLVMAliasGraph::empty() const { return size() == 0; }
-
-size_t LLVMAliasGraph::size() const { return getNumVertices(); }
-
-size_t LLVMAliasGraph::getNumVertices() const {
-  return boost::num_vertices(PAG);
-}
-
-size_t LLVMAliasGraph::getNumEdges() const { return boost::num_edges(PAG); }
-
-void LLVMAliasGraph::printAsJson(llvm::raw_ostream &OS) const {
-  nlohmann::json J = getAsJson();
-  OS << J;
-}
-
-} // namespace psr
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
index ecc2eb532d..6beca389fb 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
@@ -716,33 +716,6 @@ void LLVMAliasSet::introduceAlias(const llvm::Value *V1, const llvm::Value *V2,
   mergeAliasSets(V1, V2);
 }
 
-nlohmann::json LLVMAliasSet::getAsJson() const {
-  nlohmann::json J;
-
-  /// Serialize the AliasSets
-  auto &Sets = J["AliasSets"];
-
-  for (const AliasSetTy *PTS : Owner.getAllAliasSets()) {
-    auto PtsJson = nlohmann::json::array();
-    for (const auto *Alias : *PTS) {
-      auto Id = getMetaDataID(Alias);
-      if (Id != "-1") {
-        PtsJson.push_back(std::move(Id));
-      }
-    }
-    if (!PtsJson.empty()) {
-      Sets.push_back(std::move(PtsJson));
-    }
-  }
-
-  /// Serialize the AnalyzedFunctions
-  auto &Fns = J["AnalyzedFunctions"];
-  for (const auto *F : AnalyzedFunctions) {
-    Fns.push_back(F->getName());
-  }
-  return J;
-}
-
 LLVMAliasSetData LLVMAliasSet::getLLVMAliasSetData() const {
   LLVMAliasSetData Data;
 
diff --git a/lib/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.cpp b/lib/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.cpp
deleted file mode 100644
index 77c7ab8698..0000000000
--- a/lib/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * TypeGraph.cpp
- *
- *  Created on: 28.06.2018
- *      Author: nicolas bellec
- */
-
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h"
-
-#include "phasar/Utils/Logger.h"
-#include "phasar/Utils/Utilities.h"
-
-#include "llvm/IR/DerivedTypes.h"
-
-#include "boost/graph/depth_first_search.hpp"
-#include "boost/graph/graph_utility.hpp"
-#include "boost/graph/graphviz.hpp"
-#include "boost/property_map/dynamic_property_map.hpp"
-
-using namespace std;
-using namespace psr;
-
-namespace psr {
-
-struct CachedTypeGraph::dfs_visitor : public boost::default_dfs_visitor {
-  dfs_visitor(graph_t *G) : G(G) {}
-
-  void finish_edge(edge_t E, graph_t const &U) { // NOLINT
-    CachedTypeGraph::vertex_t Src = boost::source(E, U);
-    CachedTypeGraph::vertex_t Target = boost::target(E, U);
-
-    for (const auto *TargetType : U[Target].Types) {
-      (*G)[Src].Types.insert(TargetType);
-    }
-  }
-
-  graph_t *G;
-};
-
-struct CachedTypeGraph::reverse_type_propagation_dfs_visitor
-    : public boost::default_dfs_visitor {
-  reverse_type_propagation_dfs_visitor(rev_graph_t *G) : G(G) {}
-
-  void examine_edge(rev_edge_t E, rev_graph_t const &U) { // NOLINT
-    auto Src = boost::source(E, U);
-    auto Target = boost::target(E, U);
-
-    for (const auto *SrcType : U[Src].Types) {
-      (*G)[Target].Types.insert(SrcType);
-    }
-  }
-
-  rev_graph_t *G;
-};
-
-CachedTypeGraph::vertex_t
-CachedTypeGraph::addType(const llvm::StructType *NewType) {
-  std::string Name;
-  if (!NewType->isLiteral()) {
-    Name = NewType->getName();
-  } else {
-    std::stringstream StrS;
-    StrS << "literal_" << NewType;
-    Name = StrS.str();
-  }
-
-  if (TypeVertexMap.find(Name) == TypeVertexMap.end()) {
-    auto Vertex = boost::add_vertex(G);
-    TypeVertexMap[Name] = Vertex;
-    G[Vertex].Name = Name;
-    G[Vertex].BaseType = NewType;
-    G[Vertex].Types.insert(NewType);
-  }
-
-  return TypeVertexMap[Name];
-}
-
-bool CachedTypeGraph::addLink(const llvm::StructType *From,
-                              const llvm::StructType *To) {
-  if (AlreadyVisited) {
-    return false;
-  }
-
-  AlreadyVisited = true;
-
-  auto FromVertex = addType(From);
-  auto ToVertex = addType(To);
-
-  auto ResultEdge = boost::add_edge(FromVertex, ToVertex, G);
-
-  if (ResultEdge.second) {
-    reverseTypePropagation(To);
-  }
-
-  AlreadyVisited = false;
-  return ResultEdge.second;
-}
-
-bool CachedTypeGraph::addLinkWithoutReversePropagation(
-    const llvm::StructType *From, const llvm::StructType *To) {
-  if (AlreadyVisited) {
-    return false;
-  }
-
-  AlreadyVisited = true;
-
-  auto FromVertex = addType(From);
-  auto ToVertex = addType(To);
-
-  auto ResultEdge = boost::add_edge(FromVertex, ToVertex, G);
-
-  AlreadyVisited = false;
-  return ResultEdge.second;
-}
-
-void CachedTypeGraph::printAsDot(const std::string &Path) const {
-  std::ofstream Ofs(Path);
-  boost::write_graphviz(
-      Ofs, G, boost::make_label_writer(boost::get(&VertexProperties::Name, G)));
-}
-
-void CachedTypeGraph::aggregateTypes() {
-  dfs_visitor Vis(&G);
-  boost::depth_first_search(G, boost::visitor(Vis));
-}
-
-void CachedTypeGraph::reverseTypePropagation(
-    const llvm::StructType *BaseStruct) {
-  auto Name = BaseStruct->getName().str();
-
-  std::vector<boost::default_color_type> ColorMap(boost::num_vertices(G));
-
-  auto Reversed = boost::reverse_graph<CachedTypeGraph::graph_t,
-                                       CachedTypeGraph::graph_t &>(G);
-  reverse_type_propagation_dfs_visitor Vis(&Reversed);
-
-  boost::depth_first_visit(Reversed, TypeVertexMap[Name], Vis,
-                           boost::make_iterator_property_map(
-                               ColorMap.begin(),
-                               boost::get(boost::vertex_index, Reversed),
-                               ColorMap[0]));
-}
-
-std::set<const llvm::StructType *>
-CachedTypeGraph::getTypes(const llvm::StructType *StructType) {
-  auto StructTyVertex = addType(StructType);
-  return G[StructTyVertex].Types;
-}
-
-} // namespace psr
diff --git a/lib/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.cpp b/lib/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.cpp
deleted file mode 100644
index ee33541287..0000000000
--- a/lib/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2017 Philipp Schubert.
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of LICENSE.txt.
- *
- * Contributors:
- *     Philipp Schubert and others
- *****************************************************************************/
-
-/*
- * LazyLazyTypeGraph.cpp
- *
- *  Created on: 28.06.2018
- *      Author: nicolas bellec
- */
-
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h"
-
-#include "phasar/Utils/Logger.h"
-#include "phasar/Utils/Utilities.h"
-
-#include "llvm/IR/DerivedTypes.h"
-
-#include "boost/graph/depth_first_search.hpp"
-#include "boost/graph/graph_utility.hpp"
-#include "boost/graph/graphviz.hpp"
-#include "boost/property_map/dynamic_property_map.hpp"
-
-using namespace std;
-using namespace psr;
-
-namespace psr {
-
-struct LazyTypeGraph::dfs_visitor : public boost::default_dfs_visitor {
-  dfs_visitor(std::set<const llvm::StructType *> &Result) : Result(Result) {}
-
-  void finish_edge(edge_t E, graph_t const &U) {
-    LazyTypeGraph::vertex_t Target = boost::target(E, U);
-
-    Result.insert(U[Target].SType);
-  }
-
-  std::set<const llvm::StructType *> &Result;
-};
-
-LazyTypeGraph::vertex_t
-LazyTypeGraph::addType(const llvm::StructType *NewType) {
-  auto Name = NewType->getName().str();
-
-  if (TypeToVertexMap.find(Name) == TypeToVertexMap.end()) {
-    auto Vertex = boost::add_vertex(Graph);
-    TypeToVertexMap[Name] = Vertex;
-    Graph[Vertex].Name = Name;
-    Graph[Vertex].SType = NewType;
-  }
-
-  return TypeToVertexMap[Name];
-}
-
-bool LazyTypeGraph::addLink(const llvm::StructType *From,
-                            const llvm::StructType *To) {
-  if (AlreadyVisited) {
-    return false;
-  }
-
-  AlreadyVisited = true;
-
-  auto FromVertex = addType(From);
-  auto ToVertex = addType(To);
-
-  auto ResultEdge = boost::add_edge(FromVertex, ToVertex, Graph);
-
-  AlreadyVisited = false;
-  return ResultEdge.second;
-}
-
-void LazyTypeGraph::printAsDot(const std::string &Path) const {
-  std::ofstream Ofs(Path);
-  boost::write_graphviz(Ofs, Graph,
-                        boost::make_label_writer(boost::get(
-                            &LazyTypeGraph::VertexProperties::Name, Graph)));
-}
-
-std::set<const llvm::StructType *>
-LazyTypeGraph::getTypes(const llvm::StructType *StructType) {
-  auto StructTyVertex = addType(StructType);
-
-  std::vector<boost::default_color_type> ColorMap(boost::num_vertices(Graph));
-
-  std::set<const llvm::StructType *> Results;
-  Results.insert(StructType);
-
-  dfs_visitor Vis(Results);
-
-  boost::depth_first_visit(
-      Graph, StructTyVertex, Vis,
-      boost::make_iterator_property_map(ColorMap.begin(),
-                                        boost::get(boost::vertex_index, Graph),
-                                        ColorMap[0]));
-
-  return Results;
-}
-
-} // namespace psr
diff --git a/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
index d6188b1b53..36319dc05a 100644
--- a/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
@@ -361,12 +361,6 @@ void DIBasedTypeHierarchy::print(llvm::raw_ostream &OS) const {
   }
 }
 
-[[nodiscard]] [[deprecated("Please use printAsJson() instead")]] nlohmann::json
-DIBasedTypeHierarchy::getAsJson() const {
-  /// TODO: implement
-  llvm::report_fatal_error("Not implemented");
-}
-
 DIBasedTypeHierarchyData DIBasedTypeHierarchy::getTypeHierarchyData() const {
   DIBasedTypeHierarchyData Data;
 
diff --git a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
index 2e0707f9f4..028abe8659 100644
--- a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
@@ -49,7 +49,7 @@ using namespace std;
 namespace psr {
 
 // provide a VertexPropertyWrite to tell boost how to write a vertex
-class TypeHierarchyVertexWriter {
+class [[deprecated]] TypeHierarchyVertexWriter {
 public:
   TypeHierarchyVertexWriter(const LLVMTypeHierarchy::bidigraph_t &TyGraph)
       : TyGraph(TyGraph) {}
@@ -389,75 +389,6 @@ void LLVMTypeHierarchy::print(llvm::raw_ostream &OS) const {
   }
 }
 
-nlohmann::json LLVMTypeHierarchy::getAsJson() const {
-  nlohmann::json J;
-  vertex_iterator VIv;
-
-  vertex_iterator VIvEnd;
-  out_edge_iterator EI;
-
-  out_edge_iterator EIEnd;
-  // iterate all graph vertices
-  for (boost::tie(VIv, VIvEnd) = boost::vertices(TypeGraph); VIv != VIvEnd;
-       ++VIv) {
-    J[PhasarConfig::JsonTypeHierarchyID().str()][TypeGraph[*VIv].getTypeName()];
-    // iterate all out edges of vertex vi_v
-    for (boost::tie(EI, EIEnd) = boost::out_edges(*VIv, TypeGraph); EI != EIEnd;
-         ++EI) {
-      J[PhasarConfig::JsonTypeHierarchyID().str()]
-       [TypeGraph[*VIv].getTypeName()] +=
-          TypeGraph[boost::target(*EI, TypeGraph)].getTypeName();
-    }
-  }
-  return J;
-}
-
-// void LLVMTypeHierarchy::mergeWith(LLVMTypeHierarchy &Other) {
-//   cout << "LLVMTypeHierarchy::mergeWith()" << endl;
-//   boost::copy_graph(Other.TypeGraph, TypeGraph); // G += H;
-//   // build the contractions
-//   vector<pair<vertex_t, vertex_t>> contractions;
-//   map<string, vertex_t> observed;
-//   for (auto V : boost::make_iterator_range(boost::vertices(TypeGraph))) {
-//     if (observed.find(TypeGraph[V].name) != observed.end()) {
-//       // check which one has the valid pointer and the knowledge of the
-//       vtables if (TypeGraph[V].llvmtype) {
-//         contractions.push_back(make_pair(observed[TypeGraph[V].name], V));
-//       } else {
-//         contractions.push_back(make_pair(V, observed[TypeGraph[V].name]));
-//       }
-//     } else {
-//       observed[TypeGraph[V].name] = V;
-//     }
-//   }
-//   cout << "contractions.size(): " << contractions.size() << '\n';
-//   for (auto contraction : contractions) {
-//     contract_vertices<bidigraph_t, vertex_t, EdgeProperties>(
-//         contraction.first, contraction.second, TypeGraph);
-//   }
-//   // merge the vtables
-//   TypeVFTMap.insert(Other.TypeVFTMap.begin(),
-//   Other.TypeVFTMap.end());
-//   // merge the modules analyzed
-//   contained_modules.insert(Other.contained_modules.begin(),
-//                            Other.contained_modules.end());
-//   // reset the vertex mapping
-//   TypeVertexMap.clear();
-//   for (auto V : boost::make_iterator_range(boost::vertices(TypeGraph))) {
-//     TypeVertexMap[TypeGraph[V].name] = V;
-//   }
-//   // cache the reachable types
-//   bidigraph_t tc;
-//   boost::transitive_closure(TypeGraph, tc);
-//   for (auto V : boost::make_iterator_range(boost::vertices(TypeGraph))) {
-//     for (auto OE : boost::make_iterator_range(boost::out_edges(V, tc))) {
-//       auto Source = boost::source(OE, tc);
-//       auto Target = boost::target(OE, tc);
-//       TypeGraph[V].reachableTypes.insert(TypeGraph[Target].name);
-//     }
-//   }
-// }
-
 void LLVMTypeHierarchy::printAsDot(llvm::raw_ostream &OS) const {
   std::stringstream S;
   boost::write_graphviz(S, TypeGraph, TypeHierarchyVertexWriter(TypeGraph));
diff --git a/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp b/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
index b25822da84..f2a5a849bd 100644
--- a/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
@@ -48,11 +48,6 @@ void LLVMVFTable::print(llvm::raw_ostream &OS) const {
   }
 }
 
-nlohmann::json LLVMVFTable::getAsJson() const {
-  nlohmann::json J = "{}"_json;
-  return J;
-}
-
 [[nodiscard]] LLVMVFTableData LLVMVFTable::getVFTableData() const {
   LLVMVFTableData Data;
 
diff --git a/lib/Utils/Logger.cpp b/lib/Utils/Logger.cpp
index 35cd18a29f..b166bf67b6 100644
--- a/lib/Utils/Logger.cpp
+++ b/lib/Utils/Logger.cpp
@@ -225,16 +225,3 @@ void Logger::addLinePrefix(llvm::raw_ostream &OS,
 }
 
 } // namespace psr
-
-void psr::initializeLogger(bool UseLogger, const std::string &LogFile) {
-  if (!UseLogger) {
-    Logger::disable();
-    return;
-  }
-  if (LogFile.empty()) {
-    Logger::initializeStderrLogger(Logger::getLoggerFilterLevel());
-  } else {
-    std::ignore =
-        Logger::initializeFileLogger(LogFile, Logger::getLoggerFilterLevel());
-  }
-}
diff --git a/lib/Utils/Utilities.cpp b/lib/Utils/Utilities.cpp
index 28e8d378ec..0c2aeedaca 100644
--- a/lib/Utils/Utilities.cpp
+++ b/lib/Utils/Utilities.cpp
@@ -64,19 +64,6 @@ bool isConstructor(llvm::StringRef MangledName) {
   return false;
 }
 
-const llvm::Type *legacy::stripPointer(const llvm::Type *Pointer) {
-  const auto *Next = llvm::dyn_cast<llvm::PointerType>(Pointer);
-  while (Next) {
-    assert(!Next->isOpaquePointerTy() &&
-           "Don't call stripPointer, when analyzing IR that uses opaque "
-           "pointers!");
-    Pointer = Next->getNonOpaquePointerElementType();
-    Next = llvm::dyn_cast<llvm::PointerType>(Pointer);
-  }
-
-  return Pointer;
-}
-
 bool isMangled(llvm::StringRef Name) {
   // See llvm/Demangle/Demangle.cpp
   if (Name.startswith("_Z") || Name.startswith("___Z")) {
diff --git a/unittests/DB/HexastoreTest.cpp b/unittests/DB/HexastoreTest.cpp
index 06bc7ff83a..6ce20b23a7 100644
--- a/unittests/DB/HexastoreTest.cpp
+++ b/unittests/DB/HexastoreTest.cpp
@@ -100,12 +100,12 @@ TEST(HexastoreTest, StoreGraphNoEdgeLabels) {
   struct Vertex {
     string Name;
     Vertex() = default;
-    Vertex(string Name) : Name(move(Name)) {}
+    Vertex(string Name) : Name(std::move(Name)) {}
   };
   struct Edge {
     string EdgeName;
     Edge() = default;
-    Edge(string Label) : EdgeName(move(Label)) {}
+    Edge(string Label) : EdgeName(std::move(Label)) {}
   };
 
   using graph_t = boost::adjacency_list<boost::setS, boost::vecS,
@@ -181,12 +181,12 @@ TEST(HexastoreTest, StoreGraphWithEdgeLabels) {
   struct Vertex {
     string Name;
     Vertex() = default;
-    Vertex(string Name) : Name(move(Name)) {}
+    Vertex(string Name) : Name(std::move(Name)) {}
   };
   struct Edge {
     string EdgeName;
     Edge() = default;
-    Edge(string Label) : EdgeName(move(Label)) {}
+    Edge(string Label) : EdgeName(std::move(Label)) {}
   };
 
   using graph_t = boost::adjacency_list<boost::setS, boost::vecS,
diff --git a/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt b/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt
index 77c0d24438..11a79b8389 100644
--- a/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt
+++ b/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt
@@ -2,7 +2,6 @@ set(ControlFlowSources
 	LLVMBasedCFGTest.cpp
 	LLVMBasedICFGTest.cpp
 	LLVMBasedICFG_CHATest.cpp
-	LLVMBasedICFG_DTATest.cpp
 	LLVMBasedICFG_OTFTest.cpp
 	LLVMBasedICFG_RTATest.cpp
 	LLVMBasedBackwardCFGTest.cpp
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp
deleted file mode 100644
index f66e024303..0000000000
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "phasar/Config/Configuration.h"
-#include "phasar/ControlFlow/CallGraphAnalysisType.h"
-#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-
-#include "TestConfig.h"
-#include "gtest/gtest.h"
-
-using namespace psr;
-
-TEST(LLVMBasedICFG_DTATest, VirtualCallSite_5) {
-  GTEST_SKIP() << "Requires typed pointers!";
-  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
-                       "call_graphs/virtual_call_5_cpp.ll");
-  DIBasedTypeHierarchy TH(IRDB);
-  LLVMAliasSet PT(&IRDB);
-  LLVMBasedICFG ICFG(&IRDB, CallGraphAnalysisType::DTA, {"main"}, &TH, &PT);
-  const llvm::Function *F = IRDB.getFunctionDefinition("main");
-  const llvm::Function *FuncA = IRDB.getFunctionDefinition("_ZN1A4funcEv");
-  const llvm::Function *VFuncA = IRDB.getFunctionDefinition("_ZN1A5VfuncEv");
-  const llvm::Function *VFuncB = IRDB.getFunctionDefinition("_ZN1B5VfuncEv");
-  ASSERT_TRUE(F);
-  ASSERT_TRUE(FuncA);
-  ASSERT_TRUE(VFuncA);
-  ASSERT_TRUE(VFuncB);
-
-  const llvm::Instruction *I = getNthInstruction(F, 16);
-  if (llvm::isa<llvm::CallInst>(I) || llvm::isa<llvm::InvokeInst>(I)) {
-    const auto &Callees = ICFG.getCalleesOfCallAt(I);
-
-    ASSERT_TRUE(ICFG.isVirtualFunctionCall(I));
-    ASSERT_EQ(Callees.size(), 2U);
-    ASSERT_TRUE(llvm::is_contained(Callees, VFuncB));
-    ASSERT_TRUE(llvm::is_contained(Callees, VFuncA));
-    ASSERT_TRUE(llvm::is_contained(ICFG.getCallersOf(VFuncA), I));
-    ASSERT_TRUE(llvm::is_contained(ICFG.getCallersOf(VFuncB), I));
-  }
-}
-
-TEST(LLVMBasedICFG_DTATest, VirtualCallSite_6) {
-  GTEST_SKIP() << "Requires typed pointers!";
-  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
-                       "call_graphs/virtual_call_6_cpp.ll");
-  DIBasedTypeHierarchy TH(IRDB);
-  LLVMAliasSet PT(&IRDB);
-  LLVMBasedICFG ICFG(&IRDB, CallGraphAnalysisType::DTA, {"main"}, &TH, &PT);
-  const llvm::Function *F = IRDB.getFunctionDefinition("main");
-  const llvm::Function *VFuncA = IRDB.getFunctionDefinition("_ZN1A5VfuncEv");
-  const llvm::Function *VFuncB = IRDB.getFunctionDefinition("_ZN1B5VfuncEv");
-  ASSERT_TRUE(F);
-  ASSERT_TRUE(VFuncA);
-  ASSERT_TRUE(VFuncB);
-
-  const llvm::Instruction *I = getNthInstruction(F, 6);
-  const auto &Callers = ICFG.getCallersOf(VFuncA);
-  ASSERT_EQ(Callers.size(), 1U);
-  ASSERT_TRUE(llvm::is_contained(Callers, I));
-}
-
-int main(int Argc, char **Argv) {
-  ::testing::InitGoogleTest(&Argc, Argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt b/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt
index d4407ecef7..fc190151ac 100644
--- a/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt
+++ b/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt
@@ -3,7 +3,6 @@ set(PointerSources
 	DIBasedTypeHierarchyTest.cpp
 	LLVMTypeHierarchySerializationTest.cpp
 	LLVMTypeHierarchyTest.cpp
-	TypeGraphTest.cpp
 )
 
 foreach(TEST_SRC ${PointerSources})
diff --git a/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchySerializationTest.cpp b/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchySerializationTest.cpp
index 8ce287caf4..9042b52547 100644
--- a/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchySerializationTest.cpp
+++ b/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchySerializationTest.cpp
@@ -15,6 +15,9 @@
 
 using namespace psr;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+
 /* ============== TEST FIXTURE ============== */
 class LLVMTypeHierarchySerialization
     : public ::testing::TestWithParam<std::string_view> {
@@ -65,6 +68,8 @@ TEST_P(LLVMTypeHierarchySerialization, OrigAndDeserEqual) {
   compareResults(TypeHierarchy, DeserializedTypeHierarchy);
 }
 
+#pragma GCC diagnostic pop
+
 static constexpr std::string_view TypeHierarchyTestFiles[] = {
     "type_hierarchy_1_cpp_dbg.ll",    "type_hierarchy_2_cpp_dbg.ll",
     "type_hierarchy_3_cpp_dbg.ll",    "type_hierarchy_4_cpp_dbg.ll",
diff --git a/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp b/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
index 0d302c9124..c9404f6070 100644
--- a/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
+++ b/unittests/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyTest.cpp
@@ -20,6 +20,9 @@ using namespace psr;
 
 using llvm::demangle;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated"
+
 namespace psr {
 
 // Check basic type hierarchy construction
@@ -408,6 +411,8 @@ PHASAR_SKIP_TEST(TEST(LTHTest, HandleSTLString) {
 
 } // namespace psr
 
+#pragma GCC diagnostic pop
+
 int main(int Argc, char **Argv) {
   ::testing::InitGoogleTest(&Argc, Argv);
   auto Res = RUN_ALL_TESTS();
diff --git a/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp b/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp
deleted file mode 100644
index 22a5252239..0000000000
--- a/unittests/PhasarLLVM/TypeHierarchy/TypeGraphTest.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-#include "gtest/gtest.h"
-// -- Need gtest for the FRIEND_TEST macro
-#define PSR_FRIEND_TEST(TEST, CLASS) FRIEND_TEST(TEST, CLASS);
-
-#include "phasar/Config/Configuration.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/CachedTypeGraph.h"
-#include "phasar/PhasarLLVM/Pointer/TypeGraphs/LazyTypeGraph.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-#include "phasar/Utils/Utilities.h"
-
-#include "llvm/Support/ManagedStatic.h"
-
-#include "TestConfig.h"
-#include "boost/graph/isomorphism.hpp"
-
-using namespace std;
-using namespace psr;
-
-namespace psr {
-
-TEST(TypeGraphTest, AddType) {
-  LLVMProjectIRDB IRDB(
-      {unittest::PathToLLTestFiles + "basic/two_structs_cpp.ll"});
-  llvm::Module *M = IRDB.getModule();
-
-  unsigned int NbStruct = 0;
-
-  CachedTypeGraph Tg;
-  CachedTypeGraph::graph_t G;
-
-  for (auto *StructType : M->getIdentifiedStructTypes()) {
-    ASSERT_TRUE(StructType != nullptr);
-
-    auto Node = Tg.addType(StructType);
-
-    ASSERT_TRUE(Tg.G[Node].Name == StructType->getName().str());
-    ASSERT_TRUE(Tg.G[Node].BaseType == StructType);
-    ASSERT_TRUE(Tg.G[Node].Types.size() == 1);
-    ASSERT_TRUE(Tg.G[Node].Types.count(StructType));
-
-    boost::add_vertex(G);
-
-    ASSERT_TRUE(boost::isomorphism(G, Tg.G));
-
-    ++NbStruct;
-  }
-
-  ASSERT_TRUE(NbStruct >= 2);
-}
-
-TEST(TypeGraphTest, ReverseTypePropagation) {
-  LLVMProjectIRDB IRDB(
-      {unittest::PathToLLTestFiles + "basic/seven_structs_cpp.ll"});
-  llvm::Module *M = IRDB.getModule();
-
-  unsigned int NbStruct = 0;
-  llvm::StructType *StructA = nullptr;
-
-  llvm::StructType *StructB = nullptr;
-
-  llvm::StructType *StructC = nullptr;
-
-  llvm::StructType *StructD = nullptr;
-
-  llvm::StructType *StructE = nullptr;
-
-  CachedTypeGraph Tg;
-
-  // Isomorphism to assure that the TypeGraph have the wanted structure
-  CachedTypeGraph::graph_t G;
-
-  for (auto *StructType : M->getIdentifiedStructTypes()) {
-    if (StructType) {
-      switch (NbStruct) {
-      case 0:
-        StructA = StructType;
-        break;
-      case 1:
-        StructB = StructType;
-        break;
-      case 2:
-        StructC = StructType;
-        break;
-      case 3:
-        StructD = StructType;
-        break;
-      case 4:
-        StructE = StructType;
-        break;
-      case 5:
-        [[fallthrough]];
-      case 6:
-        break;
-      default:
-        // NB: Will always fail but serve to understand where the error come
-        // from
-        ASSERT_TRUE(NbStruct < 7);
-        break;
-      }
-
-      ++NbStruct;
-    }
-  }
-
-  ASSERT_TRUE(NbStruct == 7);
-  ASSERT_TRUE(StructA != nullptr);
-  ASSERT_TRUE(StructB != nullptr);
-  ASSERT_TRUE(StructC != nullptr);
-  ASSERT_TRUE(StructD != nullptr);
-  ASSERT_TRUE(StructE != nullptr);
-
-  auto VertexA = boost::add_vertex(G);
-  auto VertexB = boost::add_vertex(G);
-  auto VertexC = boost::add_vertex(G);
-  auto VertexD = boost::add_vertex(G);
-  auto VertexE = boost::add_vertex(G);
-
-  auto NodeA = Tg.addType(StructA);
-  auto NodeB = Tg.addType(StructB);
-  auto NodeC = Tg.addType(StructC);
-  auto NodeD = Tg.addType(StructD);
-  auto NodeE = Tg.addType(StructE);
-
-  Tg.addLinkWithoutReversePropagation(StructA, StructB);
-  Tg.addLinkWithoutReversePropagation(StructB, StructC);
-  Tg.addLinkWithoutReversePropagation(StructC, StructD);
-  Tg.addLinkWithoutReversePropagation(StructE, StructB);
-
-  boost::add_edge(VertexA, VertexB, G);
-  boost::add_edge(VertexB, VertexC, G);
-  boost::add_edge(VertexC, VertexD, G);
-  boost::add_edge(VertexE, VertexB, G);
-
-  ASSERT_TRUE(boost::isomorphism(G, Tg.G));
-
-  auto TgEdges = boost::edges(Tg.G);
-
-  int NumberEdge = 0;
-
-  TgEdges = boost::edges(Tg.G);
-  for (auto It = TgEdges.first; It != TgEdges.second; ++It) {
-    ++NumberEdge;
-
-    auto Src = boost::source(*It, Tg.G);
-    auto Target = boost::target(*It, Tg.G);
-
-    ASSERT_TRUE(NumberEdge <= 4);
-
-    ASSERT_TRUE(Src == NodeA || Src == NodeB || Src == NodeC || Src == NodeE);
-    if (Src == NodeA) {
-      ASSERT_TRUE(Target == NodeB);
-    } else if (Src == NodeB) {
-      ASSERT_TRUE(Target == NodeC);
-    } else if (Src == NodeC) {
-      ASSERT_TRUE(Target == NodeD);
-    } else if (Src == NodeE) {
-      ASSERT_TRUE(Target == NodeB);
-    }
-  }
-
-  ASSERT_TRUE(NumberEdge == 4);
-  NumberEdge = 0; // NOLINT Avoid stupid mistakes
-
-  // Check that the type are coherent in the graph
-  ASSERT_TRUE(Tg.G[VertexA].Types.count(StructA));
-  ASSERT_TRUE(Tg.G[VertexA].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexB].Types.count(StructB));
-  ASSERT_TRUE(Tg.G[VertexB].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexC].Types.count(StructC));
-  ASSERT_TRUE(Tg.G[VertexC].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexD].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexD].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexE].Types.count(StructE));
-  ASSERT_TRUE(Tg.G[VertexE].Types.size() == 1);
-
-  Tg.reverseTypePropagation(StructC);
-
-  // Check that the type are coherent in the graph
-  ASSERT_TRUE(Tg.G[VertexA].Types.count(StructA) &&
-              Tg.G[VertexA].Types.count(StructB) &&
-              Tg.G[VertexA].Types.count(StructC));
-  ASSERT_TRUE(Tg.G[VertexA].Types.size() == 3);
-  ASSERT_TRUE(Tg.G[VertexB].Types.count(StructB) &&
-              Tg.G[VertexB].Types.count(StructC));
-  ASSERT_TRUE(Tg.G[VertexB].Types.size() == 2);
-  ASSERT_TRUE(Tg.G[VertexC].Types.count(StructC));
-  ASSERT_TRUE(Tg.G[VertexC].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexD].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexD].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexE].Types.count(StructE) &&
-              Tg.G[VertexE].Types.count(StructB) &&
-              Tg.G[VertexE].Types.count(StructC));
-  ASSERT_TRUE(Tg.G[VertexE].Types.size() == 3);
-}
-
-TEST(TypeGraphTest, AddLinkSimple) {
-  LLVMProjectIRDB IRDB(
-      {unittest::PathToLLTestFiles + "basic/two_structs_cpp.ll"});
-  llvm::Module *M = IRDB.getModule();
-
-  unsigned int NbStruct = 0;
-  llvm::StructType *StructA = nullptr;
-
-  llvm::StructType *StructB = nullptr;
-
-  CachedTypeGraph Tg;
-  CachedTypeGraph::graph_t G;
-
-  for (auto *StructType : M->getIdentifiedStructTypes()) {
-    if (StructType) {
-      switch (NbStruct) {
-      case 0:
-        StructA = StructType;
-        break;
-      case 1:
-        StructB = StructType;
-        break;
-      default:
-        // NB: Will always fail but serve to understand where the error come
-        // from
-        ASSERT_TRUE(NbStruct < 2);
-        break;
-      }
-
-      ++NbStruct;
-    }
-  }
-
-  ASSERT_TRUE(NbStruct == 2);
-  ASSERT_TRUE(StructA != nullptr);
-  ASSERT_TRUE(StructB != nullptr);
-
-  auto NodeA = Tg.addType(StructA);
-  auto NodeB = Tg.addType(StructB);
-  Tg.addLink(StructA, StructB);
-
-  auto VertexA = boost::add_vertex(G);
-  auto VertexB = boost::add_vertex(G);
-
-  boost::add_edge(VertexA, VertexB, G);
-
-  ASSERT_TRUE(boost::isomorphism(G, Tg.G));
-
-  auto P = edges(Tg.G);
-
-  auto Begin = P.first;
-  auto End = P.second;
-
-  int NumberEdge = 0;
-
-  for (auto It = Begin; It != End; ++It) {
-    ++NumberEdge;
-
-    auto Src = boost::source(*It, Tg.G);
-    auto Target = boost::target(*It, Tg.G);
-
-    ASSERT_TRUE(NumberEdge == 1);
-    ASSERT_TRUE(Src == NodeA);
-    ASSERT_TRUE(Target == NodeB);
-  }
-
-  ASSERT_TRUE(NumberEdge == 1);
-}
-
-TEST(TypeGraphTest, TypeAggregation) {
-  LLVMProjectIRDB IRDB(
-      {unittest::PathToLLTestFiles + "basic/seven_structs_cpp.ll"});
-  llvm::Module *M = IRDB.getModule();
-
-  unsigned int NbStruct = 0;
-  llvm::StructType *StructA = nullptr;
-  llvm::StructType *StructB = nullptr;
-  llvm::StructType *StructC = nullptr;
-  llvm::StructType *StructD = nullptr;
-  llvm::StructType *StructE = nullptr;
-
-  CachedTypeGraph Tg;
-
-  // Isomorphism to assure that the TypeGraph have the wanted structure
-  CachedTypeGraph::graph_t G;
-
-  for (auto *StructType : M->getIdentifiedStructTypes()) {
-    if (StructType) {
-      switch (NbStruct) {
-      case 0:
-        StructA = StructType;
-        break;
-      case 1:
-        StructB = StructType;
-        break;
-      case 2:
-        StructC = StructType;
-        break;
-      case 3:
-        StructD = StructType;
-        break;
-      case 4:
-        StructE = StructType;
-        break;
-      case 5:
-        [[fallthrough]];
-      case 6:
-        break;
-      default:
-        // NB: Will always fail but serve to understand where the error come
-        // from
-        ASSERT_TRUE(NbStruct < 7);
-        break;
-      }
-
-      ++NbStruct;
-    }
-  }
-
-  ASSERT_TRUE(NbStruct == 7);
-  ASSERT_TRUE(StructA != nullptr);
-  ASSERT_TRUE(StructB != nullptr);
-  ASSERT_TRUE(StructC != nullptr);
-  ASSERT_TRUE(StructD != nullptr);
-  ASSERT_TRUE(StructE != nullptr);
-
-  auto VertexA = boost::add_vertex(G);
-  auto VertexB = boost::add_vertex(G);
-  auto VertexC = boost::add_vertex(G);
-  auto VertexD = boost::add_vertex(G);
-  auto VertexE = boost::add_vertex(G);
-
-  auto NodeA = Tg.addType(StructA);
-  auto NodeB = Tg.addType(StructB);
-  auto NodeC = Tg.addType(StructC);
-  auto NodeD = Tg.addType(StructD);
-  auto NodeE = Tg.addType(StructE);
-
-  Tg.addLinkWithoutReversePropagation(StructA, StructB);
-  Tg.addLinkWithoutReversePropagation(StructB, StructC);
-  Tg.addLinkWithoutReversePropagation(StructC, StructD);
-  Tg.addLinkWithoutReversePropagation(StructE, StructB);
-
-  boost::add_edge(VertexA, VertexB, G);
-  boost::add_edge(VertexB, VertexC, G);
-  boost::add_edge(VertexC, VertexD, G);
-  boost::add_edge(VertexE, VertexB, G);
-
-  ASSERT_TRUE(boost::isomorphism(G, Tg.G));
-
-  auto TgEdges = boost::edges(Tg.G);
-
-  int NumberEdge = 0;
-
-  TgEdges = boost::edges(Tg.G);
-  for (auto It = TgEdges.first; It != TgEdges.second; ++It) {
-    ++NumberEdge;
-
-    auto Src = boost::source(*It, Tg.G);
-    auto Target = boost::target(*It, Tg.G);
-
-    ASSERT_TRUE(NumberEdge <= 4);
-
-    ASSERT_TRUE(Src == NodeA || Src == NodeB || Src == NodeC || Src == NodeE);
-    if (Src == NodeA) {
-      ASSERT_TRUE(Target == NodeB);
-    } else if (Src == NodeB) {
-      ASSERT_TRUE(Target == NodeC);
-    } else if (Src == NodeC) {
-      ASSERT_TRUE(Target == NodeD);
-    } else if (Src == NodeE) {
-      ASSERT_TRUE(Target == NodeB);
-    }
-  }
-
-  ASSERT_TRUE(NumberEdge == 4);
-  NumberEdge = 0; // NOLINT Avoid stupid mistakes
-
-  // Check that the type are coherent in the graph
-  ASSERT_TRUE(Tg.G[VertexA].Types.count(StructA));
-  ASSERT_TRUE(Tg.G[VertexA].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexB].Types.count(StructB));
-  ASSERT_TRUE(Tg.G[VertexB].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexC].Types.count(StructC));
-  ASSERT_TRUE(Tg.G[VertexC].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexD].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexD].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexE].Types.count(StructE));
-  ASSERT_TRUE(Tg.G[VertexE].Types.size() == 1);
-
-  Tg.aggregateTypes();
-
-  // Check that the type are coherent in the graph
-  ASSERT_TRUE(Tg.G[VertexA].Types.count(StructA) &&
-              Tg.G[VertexA].Types.count(StructB) &&
-              Tg.G[VertexA].Types.count(StructC) &&
-              Tg.G[VertexA].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexA].Types.size() == 4);
-  ASSERT_TRUE(Tg.G[VertexB].Types.count(StructB) &&
-              Tg.G[VertexB].Types.count(StructC) &&
-              Tg.G[VertexB].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexB].Types.size() == 3);
-  ASSERT_TRUE(Tg.G[VertexC].Types.count(StructC) &&
-              Tg.G[VertexC].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexC].Types.size() == 2);
-  ASSERT_TRUE(Tg.G[VertexD].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexD].Types.size() == 1);
-  ASSERT_TRUE(Tg.G[VertexE].Types.count(StructE) &&
-              Tg.G[VertexE].Types.count(StructB) &&
-              Tg.G[VertexE].Types.count(StructC) &&
-              Tg.G[VertexE].Types.count(StructD));
-  ASSERT_TRUE(Tg.G[VertexE].Types.size() == 4);
-}
-} // namespace psr
-
-int main(int Argc, char **Argv) {
-  ::testing::InitGoogleTest(&Argc, Argv);
-  auto Res = RUN_ALL_TESTS();
-  llvm::llvm_shutdown();
-  return Res;
-}

From 6e258917a52b2324dae66616cc0256e7e5bacaf4 Mon Sep 17 00:00:00 2001
From: Maximilian Leo Huber <huber.maximilian.leo@gmail.com>
Date: Thu, 3 Apr 2025 19:49:02 +0200
Subject: [PATCH 05/24] Default Flow Functions (#768)

* IDETabulationProblem child classes

* get call, ret, calltoret flowfunc impls

* default flow functions

* call, ret, calltoret with AliasInfo

* Lambda funcs for retflow

* PureFlow tests

* backup before merge

* More Test Files

* normal and call flow tests

* LLVMAliasSet fix NoAliasImpl

* fix + commented out bad code

* fixed some NoAliasInfoTabProb code

* temp removed broken  tests

* specific value sets fix

* first retflow test

* cleanup

* fixed NormalFlow01 + ground truth

* last tests, seqfaults

* good progress, few tests fail

* Fix compilation issue after merge

* Remove unused-variable warning in release mode for CallGraph.h

* tests pass, rebased failed

* mionr after rebase

* fixed all tests after rebase

* Some cleanup

* Rename the default problems + add IFDS versions

* minor

* Some cleanup in ll file generation

---------

Co-authored-by: Fabian Schiebel <fabian.schiebel@iem.fraunhofer.de>
Co-authored-by: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
---
 include/phasar/ControlFlow/CallGraph.h        |   3 +-
 .../IfdsIde/DefaultAliasAwareIDEProblem.h     | 158 ++++
 .../IfdsIde/DefaultNoAliasIDEProblem.h        | 124 +++
 .../PhasarLLVM/Pointer/FilteredLLVMAliasSet.h |   3 +-
 .../DefaultAliasAwareIDEFlowFunctions.cpp     | 102 +++
 .../DefaultNoaliasIDEFlowFunctions.cpp        |  87 ++
 test/llvm_test_code/pure_flow/CMakeLists.txt  |  18 +
 .../pure_flow/all_flow_functions_01.cpp       |  15 +
 .../pure_flow/call_flow/CMakeLists.txt        |   8 +
 .../pure_flow/call_flow/call_flow_01.cpp      |  12 +
 .../pure_flow/call_flow/call_flow_02.cpp      |  23 +
 .../pure_flow/call_to_ret_flow/CMakeLists.txt |   8 +
 .../call_to_ret_flow/call_to_ret_flow_01.cpp  |  12 +
 .../call_to_ret_flow/call_to_ret_flow_02.cpp  |  19 +
 .../pure_flow/int_call_no_params_01.cpp       |  12 +
 .../pure_flow/int_call_one_param_01.cpp       |  12 +
 .../pure_flow/int_call_pointer_param_01.cpp   |  13 +
 .../pure_flow/normal_flow/CMakeLists.txt      |  10 +
 .../pure_flow/normal_flow/normal_flow_01.cpp  |   9 +
 .../pure_flow/normal_flow/normal_flow_02.cpp  |  14 +
 .../pure_flow/normal_flow/normal_flow_03.cpp  |  16 +
 .../pure_flow/normal_flow/normal_flow_04.cpp  |  15 +
 .../pure_flow/ret_flow/CMakeLists.txt         |   9 +
 .../pure_flow/ret_flow/ret_flow_01.cpp        |  18 +
 .../pure_flow/ret_flow/ret_flow_02.cpp        |  27 +
 .../pure_flow/ret_flow/ret_flow_03.cpp        |  32 +
 .../pure_flow/void_call_no_params_01.cpp      |   8 +
 .../pure_flow/void_call_one_param_01.cpp      |   8 +
 .../pure_flow/void_call_pointer_param_01.cpp  |   9 +
 .../DataFlow/IfdsIde/CMakeLists.txt           |   1 +
 .../IfdsIde/DefaultFlowFunctionTest.cpp       | 852 ++++++++++++++++++
 31 files changed, 1654 insertions(+), 3 deletions(-)
 create mode 100644 include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
 create mode 100644 include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
 create mode 100644 lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
 create mode 100644 lib/PhasarLLVM/DataFlow/IfdsIde/DefaultNoaliasIDEFlowFunctions.cpp
 create mode 100644 test/llvm_test_code/pure_flow/CMakeLists.txt
 create mode 100644 test/llvm_test_code/pure_flow/all_flow_functions_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/call_flow/CMakeLists.txt
 create mode 100644 test/llvm_test_code/pure_flow/call_flow/call_flow_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/call_flow/call_flow_02.cpp
 create mode 100644 test/llvm_test_code/pure_flow/call_to_ret_flow/CMakeLists.txt
 create mode 100644 test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_02.cpp
 create mode 100644 test/llvm_test_code/pure_flow/int_call_no_params_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/int_call_one_param_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/int_call_pointer_param_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/normal_flow/CMakeLists.txt
 create mode 100644 test/llvm_test_code/pure_flow/normal_flow/normal_flow_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/normal_flow/normal_flow_02.cpp
 create mode 100644 test/llvm_test_code/pure_flow/normal_flow/normal_flow_03.cpp
 create mode 100644 test/llvm_test_code/pure_flow/normal_flow/normal_flow_04.cpp
 create mode 100644 test/llvm_test_code/pure_flow/ret_flow/CMakeLists.txt
 create mode 100644 test/llvm_test_code/pure_flow/ret_flow/ret_flow_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/ret_flow/ret_flow_02.cpp
 create mode 100644 test/llvm_test_code/pure_flow/ret_flow/ret_flow_03.cpp
 create mode 100644 test/llvm_test_code/pure_flow/void_call_no_params_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/void_call_one_param_01.cpp
 create mode 100644 test/llvm_test_code/pure_flow/void_call_pointer_param_01.cpp
 create mode 100644 unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp

diff --git a/include/phasar/ControlFlow/CallGraph.h b/include/phasar/ControlFlow/CallGraph.h
index e2a03fec25..79350de642 100644
--- a/include/phasar/ControlFlow/CallGraph.h
+++ b/include/phasar/ControlFlow/CallGraph.h
@@ -177,8 +177,7 @@ template <typename N, typename F> class CallGraphBuilder {
   [[nodiscard]] FunctionVertexTy *addFunctionVertex(f_t Fun) {
     auto [It, Inserted] = CG.CallersOf.try_emplace(std::move(Fun), nullptr);
     if (Inserted) {
-      auto Cap = CG.FunVertexOwner.capacity();
-      assert(CG.FunVertexOwner.size() < Cap &&
+      assert(CG.FunVertexOwner.size() < CG.FunVertexOwner.capacity() &&
              "Trying to add more than MaxNumFunctions Function Vertices");
       It->second = &CG.FunVertexOwner.emplace_back();
     }
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
new file mode 100644
index 0000000000..9a73977f97
--- /dev/null
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
@@ -0,0 +1,158 @@
+#ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDEALIASINFOTABULATIONPROBLEM_H
+#define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDEALIASINFOTABULATIONPROBLEM_H
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+
+#include <cassert>
+
+// Forward declaration of types for which we only use its pointer or ref type
+namespace llvm {
+class Instruction;
+class Function;
+class Value;
+} // namespace llvm
+
+namespace psr {
+
+namespace detail {
+class IDEAliasAwareDefaultFlowFunctionsImpl
+    : private IDENoAliasDefaultFlowFunctionsImpl {
+public:
+  using typename IDENoAliasDefaultFlowFunctionsImpl::d_t;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::f_t;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::FlowFunctionPtrType;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::FlowFunctionType;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::n_t;
+
+  using IDENoAliasDefaultFlowFunctionsImpl::isFunctionModeled;
+
+  [[nodiscard]] constexpr LLVMAliasInfoRef getAliasInfo() const noexcept {
+    return AS;
+  }
+
+  constexpr IDEAliasAwareDefaultFlowFunctionsImpl(LLVMAliasInfoRef AS) noexcept
+      : AS(AS) {
+    assert(AS && "You must provide an alias information handle!");
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunctionImpl(n_t Curr,
+                                                              n_t /*Succ*/);
+  [[nodiscard]] FlowFunctionPtrType getCallFlowFunctionImpl(n_t CallInst,
+                                                            f_t CalleeFun);
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunctionImpl(n_t CallSite,
+                                                           f_t /*CalleeFun*/,
+                                                           n_t ExitInst,
+                                                           n_t /*RetSite*/);
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunctionImpl(n_t CallSite, n_t /*RetSite*/,
+                               llvm::ArrayRef<f_t> /*Callees*/);
+
+private:
+  LLVMAliasInfoRef AS;
+};
+} // namespace detail
+
+template <typename AnalysisDomainTy>
+class DefaultAliasAwareIDEProblem
+    : public IDETabulationProblem<AnalysisDomainTy>,
+      protected detail::IDEAliasAwareDefaultFlowFunctionsImpl {
+public:
+  using ProblemAnalysisDomain = AnalysisDomainTy;
+  using d_t = typename AnalysisDomainTy::d_t;
+  using n_t = typename AnalysisDomainTy::n_t;
+  using f_t = typename AnalysisDomainTy::f_t;
+  using t_t = typename AnalysisDomainTy::t_t;
+  using v_t = typename AnalysisDomainTy::v_t;
+  using l_t = typename AnalysisDomainTy::l_t;
+  using i_t = typename AnalysisDomainTy::i_t;
+  using db_t = typename AnalysisDomainTy::db_t;
+
+  using ConfigurationTy = HasNoConfigurationType;
+
+  using FlowFunctionType = FlowFunction<d_t>;
+  using FlowFunctionPtrType = typename FlowFunctionType::FlowFunctionPtrType;
+
+  using container_type = typename FlowFunctionType::container_type;
+
+  /// Constructs an IDETabulationProblem with the usual arguments + alias
+  /// information.
+  ///
+  /// \note It is useful to use an instance of FilteredAliasSet for the alias
+  /// information to lower suprious aliases
+  explicit DefaultAliasAwareIDEProblem(
+      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      std::vector<std::string> EntryPoints,
+      std::optional<d_t>
+          ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
+      : IDETabulationProblem<AnalysisDomainTy>(IRDB, std::move(EntryPoints),
+                                               std::move(ZeroValue)),
+        detail::IDEAliasAwareDefaultFlowFunctionsImpl(AS) {}
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
+                                                          n_t Succ) override {
+    return getNormalFlowFunctionImpl(Curr, Succ);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallFlowFunction(n_t CallInst, f_t CalleeFun) override {
+    return getCallFlowFunctionImpl(CallInst, CalleeFun);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunction(n_t CallSite,
+                                                       f_t CalleeFun,
+                                                       n_t ExitInst,
+                                                       n_t RetSite) override {
+    return getRetFlowFunctionImpl(CallSite, CalleeFun, ExitInst, RetSite);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
+                           llvm::ArrayRef<f_t> Callees) override {
+    return getCallToRetFlowFunctionImpl(CallSite, RetSite, Callees);
+  }
+};
+
+class DefaultAliasAwareIFDSProblem
+    : public IFDSTabulationProblem<LLVMAnalysisDomainDefault>,
+      protected detail::IDEAliasAwareDefaultFlowFunctionsImpl {
+public:
+  /// Constructs an IFDSTabulationProblem with the usual arguments + alias
+  /// information.
+  ///
+  /// \note It is useful to use an instance of FilteredAliasSet for the alias
+  /// information to lower suprious aliases
+  explicit DefaultAliasAwareIFDSProblem(
+      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      std::vector<std::string> EntryPoints,
+      d_t ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
+      : IFDSTabulationProblem(IRDB, std::move(EntryPoints), ZeroValue),
+        detail::IDEAliasAwareDefaultFlowFunctionsImpl(AS) {}
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
+                                                          n_t Succ) override {
+    return getNormalFlowFunctionImpl(Curr, Succ);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallFlowFunction(n_t CallInst, f_t CalleeFun) override {
+    return getCallFlowFunctionImpl(CallInst, CalleeFun);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunction(n_t CallSite,
+                                                       f_t CalleeFun,
+                                                       n_t ExitInst,
+                                                       n_t RetSite) override {
+    return getRetFlowFunctionImpl(CallSite, CalleeFun, ExitInst, RetSite);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
+                           llvm::ArrayRef<f_t> Callees) override {
+    return getCallToRetFlowFunctionImpl(CallSite, RetSite, Callees);
+  }
+};
+
+} // namespace psr
+
+#endif
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
new file mode 100644
index 0000000000..1865f749f2
--- /dev/null
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
@@ -0,0 +1,124 @@
+#ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDENOALIASINFOTABULATIONPROBLEM_H
+#define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDENOALIASINFOTABULATIONPROBLEM_H
+
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
+
+namespace llvm {
+class Value;
+class Instruction;
+class Function;
+} // namespace llvm
+
+namespace psr {
+
+namespace detail {
+class IDENoAliasDefaultFlowFunctionsImpl {
+public:
+  using d_t = const llvm::Value *;
+  using n_t = const llvm::Instruction *;
+  using f_t = const llvm::Function *;
+  using FlowFunctionType = FlowFunction<d_t>;
+  using FlowFunctionPtrType = typename FlowFunctionType::FlowFunctionPtrType;
+
+  virtual ~IDENoAliasDefaultFlowFunctionsImpl() = default;
+
+  /// True, if the analysis knows this function, either because it is analyzed,
+  /// or because we have external information about it.
+  [[nodiscard]] virtual bool isFunctionModeled(f_t Fun) const;
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunctionImpl(n_t Curr,
+                                                              n_t /*Succ*/);
+  [[nodiscard]] FlowFunctionPtrType getCallFlowFunctionImpl(n_t CallInst,
+                                                            f_t CalleeFun);
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunctionImpl(n_t CallSite,
+                                                           f_t /*CalleeFun*/,
+                                                           n_t ExitInst,
+                                                           n_t /*RetSite*/);
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunctionImpl(n_t CallSite, n_t /*RetSite*/,
+                               llvm::ArrayRef<f_t> /*Callees*/);
+};
+} // namespace detail
+
+template <typename AnalysisDomainTy>
+class DefaultNoAliasIDEProblem
+    : public IDETabulationProblem<AnalysisDomainTy>,
+      protected detail::IDENoAliasDefaultFlowFunctionsImpl {
+public:
+  using ProblemAnalysisDomain = AnalysisDomainTy;
+  using d_t = typename AnalysisDomainTy::d_t;
+  using n_t = typename AnalysisDomainTy::n_t;
+  using f_t = typename AnalysisDomainTy::f_t;
+  using t_t = typename AnalysisDomainTy::t_t;
+  using v_t = typename AnalysisDomainTy::v_t;
+  using l_t = typename AnalysisDomainTy::l_t;
+  using i_t = typename AnalysisDomainTy::i_t;
+  using db_t = typename AnalysisDomainTy::db_t;
+
+  using ConfigurationTy = HasNoConfigurationType;
+
+  using FlowFunctionType = FlowFunction<d_t>;
+  using FlowFunctionPtrType = typename FlowFunctionType::FlowFunctionPtrType;
+
+  using IDETabulationProblem<AnalysisDomainTy>::IDETabulationProblem;
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
+                                                          n_t Succ) override {
+    return getNormalFlowFunctionImpl(Curr, Succ);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallFlowFunction(n_t CallInst, f_t CalleeFun) override {
+    return getCallFlowFunctionImpl(CallInst, CalleeFun);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunction(n_t CallSite,
+                                                       f_t CalleeFun,
+                                                       n_t ExitInst,
+                                                       n_t RetSite) override {
+    return getRetFlowFunctionImpl(CallSite, CalleeFun, ExitInst, RetSite);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
+                           llvm::ArrayRef<f_t> Callees) override {
+    return getCallToRetFlowFunctionImpl(CallSite, RetSite, Callees);
+  }
+};
+
+class DefaultNoAliasIFDSProblem
+    : public IFDSTabulationProblem<LLVMIFDSAnalysisDomainDefault>,
+      protected detail::IDENoAliasDefaultFlowFunctionsImpl {
+public:
+  using IFDSTabulationProblem::IFDSTabulationProblem;
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
+                                                          n_t Succ) override {
+    return getNormalFlowFunctionImpl(Curr, Succ);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallFlowFunction(n_t CallInst, f_t CalleeFun) override {
+    return getCallFlowFunctionImpl(CallInst, CalleeFun);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunction(n_t CallSite,
+                                                       f_t CalleeFun,
+                                                       n_t ExitInst,
+                                                       n_t RetSite) override {
+    return getRetFlowFunctionImpl(CallSite, CalleeFun, ExitInst, RetSite);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
+                           llvm::ArrayRef<f_t> Callees) override {
+    return getCallToRetFlowFunctionImpl(CallSite, RetSite, Callees);
+  }
+};
+
+} // namespace psr
+
+#endif
diff --git a/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
index 91599637c9..b18cadbecb 100644
--- a/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
@@ -66,7 +66,8 @@ class FilteredLLVMAliasSet {
             typename = std::enable_if_t<
                 std::is_constructible_v<LLVMAliasSet, ArgsT...>>>
   explicit FilteredLLVMAliasSet(ArgsT &&...Args)
-      : FilteredLLVMAliasSet(std::forward<ArgsT>(Args)...) {}
+      : FilteredLLVMAliasSet(
+            std::make_unique<LLVMAliasSet>(std::forward<ArgsT>(Args)...)) {}
 
   // --- API Functions:
 
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
new file mode 100644
index 0000000000..ed18352cee
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
@@ -0,0 +1,102 @@
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+
+#include "llvm/IR/Instructions.h"
+
+using namespace psr;
+
+using FFTemplates =
+    FlowFunctionTemplates<detail::IDEAliasAwareDefaultFlowFunctionsImpl::d_t,
+                          detail::IDEAliasAwareDefaultFlowFunctionsImpl::
+                              FlowFunctionType::container_type>;
+using container_type = FFTemplates::container_type;
+
+auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
+    n_t Curr, n_t Succ) -> FlowFunctionPtrType {
+
+  if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
+    container_type Gen;
+
+    auto AliasSet = AS.getAliasSet(Store->getPointerOperand(), Store);
+    Gen.insert(AliasSet->begin(), AliasSet->end());
+    Gen.insert(Store->getValueOperand());
+
+    return FFTemplates::lambdaFlow(
+        [Store, Gen{std::move(Gen)}](d_t Source) -> container_type {
+          if (Store->getPointerOperand() == Source) {
+            return {};
+          }
+          if (Store->getValueOperand() == Source) {
+            return Gen;
+          }
+
+          return {Source};
+        });
+  }
+
+  return this->IDENoAliasDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
+      Curr, Succ);
+}
+
+auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getCallFlowFunctionImpl(
+    n_t CallInst, f_t CalleeFun) -> FlowFunctionPtrType {
+  return this->IDENoAliasDefaultFlowFunctionsImpl::getCallFlowFunctionImpl(
+      CallInst, CalleeFun);
+}
+
+static void populateWithMayAliases(LLVMAliasInfoRef AS, container_type &Facts,
+                                   const llvm::Instruction *Context) {
+  container_type Tmp = Facts;
+  for (const auto *Fact : Facts) {
+    auto Aliases = AS.getAliasSet(Fact, Context);
+    for (const auto *Alias : *Aliases) {
+      if (const auto *Inst = llvm::dyn_cast<llvm::Instruction>(Alias)) {
+        if (Inst->getParent() == Context->getParent() &&
+            Context->comesBefore(Inst)) {
+          // We will see that inst later
+          continue;
+        }
+      }
+
+      if (const auto *Load = llvm::dyn_cast<llvm::LoadInst>(Alias)) {
+        // Handle at least one level of indirection...
+        const auto *PointerOp = Load->getPointerOperand()->stripPointerCasts();
+        Tmp.insert(PointerOp);
+      }
+
+      Tmp.insert(Alias);
+    }
+  }
+
+  Facts = std::move(Tmp);
+}
+
+auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getRetFlowFunctionImpl(
+    n_t CallSite, f_t /*CalleeFun*/, n_t ExitInst, n_t /*RetSite*/)
+    -> FlowFunctionPtrType {
+  container_type Gen;
+
+  if (const auto *Call = llvm::dyn_cast<llvm::CallBase>(CallSite)) {
+    const auto PostProcessFacts = [AS = AS, Call](container_type &Facts) {
+      populateWithMayAliases(AS, Facts, Call);
+    };
+
+    return mapFactsToCaller(
+        Call, ExitInst,
+        [](d_t Param, d_t Source) {
+          return Param == Source && Param->getType()->isPointerTy();
+        },
+        {}, {}, true, true, PostProcessFacts);
+  }
+
+  return FFTemplates::killAllFlows();
+}
+
+auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::
+    getCallToRetFlowFunctionImpl(n_t CallSite, n_t RetSite,
+                                 llvm::ArrayRef<f_t> Callees)
+        -> FlowFunctionPtrType {
+  return this->IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl(
+      CallSite, RetSite, Callees);
+}
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultNoaliasIDEFlowFunctions.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultNoaliasIDEFlowFunctions.cpp
new file mode 100644
index 0000000000..538fb22924
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultNoaliasIDEFlowFunctions.cpp
@@ -0,0 +1,87 @@
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Operator.h"
+
+using namespace psr;
+
+using FFTemplates =
+    FlowFunctionTemplates<detail::IDENoAliasDefaultFlowFunctionsImpl::d_t,
+                          detail::IDENoAliasDefaultFlowFunctionsImpl::
+                              FlowFunctionType::container_type>;
+
+bool detail::IDENoAliasDefaultFlowFunctionsImpl::isFunctionModeled(
+    f_t Fun) const {
+  return !Fun->isDeclaration();
+}
+
+auto detail::IDENoAliasDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
+    n_t Curr, n_t /*Succ*/) -> FlowFunctionPtrType {
+
+  if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
+    return strongUpdateStore(Store);
+  }
+  if (const auto *Load = llvm::dyn_cast<llvm::LoadInst>(Curr)) {
+    return FFTemplates::generateFlowIf(Load, [Load](d_t Source) {
+      return Source == Load->getPointerOperand();
+    });
+  }
+  if (const auto *UnaryOp = llvm::dyn_cast<llvm::UnaryOperator>(Curr)) {
+    return FFTemplates::generateFlow(UnaryOp, UnaryOp->getOperand(0));
+  }
+  if (const auto *BinaryOp = llvm::dyn_cast<llvm::BinaryOperator>(Curr)) {
+    return FFTemplates::generateFlowIf(BinaryOp, [BinaryOp](d_t Source) {
+      return Source == BinaryOp->getOperand(0) ||
+             Source == BinaryOp->getOperand(1);
+    });
+  }
+  if (const auto *GetElementPtr = llvm::dyn_cast<llvm::GEPOperator>(Curr)) {
+    return FFTemplates::generateFlow(GetElementPtr,
+                                     GetElementPtr->getPointerOperand());
+  }
+
+  return FFTemplates::identityFlow();
+}
+
+auto detail::IDENoAliasDefaultFlowFunctionsImpl::getCallFlowFunctionImpl(
+    n_t CallInst, f_t CalleeFun) -> FlowFunctionPtrType {
+  if (const auto *CallSite = llvm::dyn_cast<llvm::CallBase>(CallInst)) {
+    return mapFactsToCallee(CallSite, CalleeFun);
+  }
+
+  return FFTemplates::killAllFlows();
+}
+
+auto detail::IDENoAliasDefaultFlowFunctionsImpl::getRetFlowFunctionImpl(
+    n_t CallSite, f_t /*CalleeFun*/, n_t ExitInst, n_t /*RetSite*/)
+    -> FlowFunctionPtrType {
+
+  if (const auto *Call = llvm::dyn_cast<llvm::CallBase>(CallSite)) {
+    return mapFactsToCaller(Call, ExitInst, [](d_t Param, d_t Source) {
+      return Param == Source && Param->getType()->isPointerTy();
+    });
+  }
+
+  return FFTemplates::killAllFlows();
+}
+
+auto detail::IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl(
+    n_t CallSite, n_t /*RetSite*/, llvm::ArrayRef<f_t> Callees)
+    -> FlowFunctionPtrType {
+
+  if (llvm::any_of(Callees,
+                   [this](f_t Callee) { return !isFunctionModeled(Callee); })) {
+    // Cannot strongly update, if we don't know the callee
+    return FFTemplates::identityFlow();
+  }
+
+  if (const auto *Call = llvm::dyn_cast<llvm::CallBase>(CallSite)) {
+    return mapFactsAlongsideCallSite(
+        Call, [](d_t Arg) { return !Arg->getType()->isPointerTy(); }, false);
+  }
+
+  return FFTemplates::identityFlow();
+}
diff --git a/test/llvm_test_code/pure_flow/CMakeLists.txt b/test/llvm_test_code/pure_flow/CMakeLists.txt
new file mode 100644
index 0000000000..60b08c0034
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/CMakeLists.txt
@@ -0,0 +1,18 @@
+set(NoMem2regSources
+  all_flow_functions_01.cpp
+  int_call_no_params_01.cpp
+  int_call_one_param_01.cpp
+  int_call_pointer_param_01.cpp
+  void_call_no_params_01.cpp
+  void_call_one_param_01.cpp
+  void_call_pointer_param_01.cpp
+)
+
+foreach(TEST_SRC ${NoMem2regSources})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
+endforeach(TEST_SRC)
+
+subdirlist(subdirs ${CMAKE_CURRENT_SOURCE_DIR})
+foreach(subdir ${subdirs})
+  add_subdirectory(${subdir})
+endforeach(subdir)
diff --git a/test/llvm_test_code/pure_flow/all_flow_functions_01.cpp b/test/llvm_test_code/pure_flow/all_flow_functions_01.cpp
new file mode 100644
index 0000000000..0cf43f662d
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/all_flow_functions_01.cpp
@@ -0,0 +1,15 @@
+#include <cstdio>
+
+int call(const int *One, const int Second) {
+  int ToReturn = 1;
+  printf("call(%d, %d)\nreturn %d", *One, Second, ToReturn);
+  return ToReturn;
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  int Two = 2;
+  int ReturnInt = call(&One, Two);
+  printf("ReturnInt: %d\n", ReturnInt);
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/call_flow/CMakeLists.txt b/test/llvm_test_code/pure_flow/call_flow/CMakeLists.txt
new file mode 100644
index 0000000000..5798e97fbf
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/call_flow/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(NoMem2regSources
+  call_flow_01.cpp
+  call_flow_02.cpp
+)
+
+foreach(TEST_SRC ${NoMem2regSources})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
+endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/pure_flow/call_flow/call_flow_01.cpp b/test/llvm_test_code/pure_flow/call_flow/call_flow_01.cpp
new file mode 100644
index 0000000000..e21f965083
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/call_flow/call_flow_01.cpp
@@ -0,0 +1,12 @@
+#include <cstdio>
+
+void call(int ZeroArg, int OneArg) {}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int Zero = 0;
+  int One = 1;
+  int Two = 2;
+
+  call(Zero, One);
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/call_flow/call_flow_02.cpp b/test/llvm_test_code/pure_flow/call_flow/call_flow_02.cpp
new file mode 100644
index 0000000000..90c5f6304f
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/call_flow/call_flow_02.cpp
@@ -0,0 +1,23 @@
+#include <cstdio>
+
+void call(int *One) {}
+void secondCall(int *One, int **Two, int ***Three) {}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+
+  int One = 1;
+  int Two = 2;
+  int Three = 3;
+
+  int *PtrToOne = &One;
+  int *PtrToTwo = &Two;
+  int **PtrPtrToTwo = &PtrToTwo;
+  int *PtrToThree = &Three;
+  int **PtrPtrToThree = &PtrToThree;
+  int ***PtrPtrPtrToThree = &PtrPtrToThree;
+
+  call(PtrToOne);
+  secondCall(PtrToOne, PtrPtrToTwo, PtrPtrPtrToThree);
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/call_to_ret_flow/CMakeLists.txt b/test/llvm_test_code/pure_flow/call_to_ret_flow/CMakeLists.txt
new file mode 100644
index 0000000000..36d041b6ed
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/call_to_ret_flow/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(NoMem2regSources
+  call_to_ret_flow_01.cpp
+  call_to_ret_flow_02.cpp
+)
+
+foreach(TEST_SRC ${NoMem2regSources})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
+endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_01.cpp b/test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_01.cpp
new file mode 100644
index 0000000000..1797a073c7
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_01.cpp
@@ -0,0 +1,12 @@
+#include <cstdio>
+
+int call(int Zero, int One) { return Zero + One; }
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int Zero = 0;
+  int One = 1;
+
+  int CallReturn = call(Zero, One);
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_02.cpp b/test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_02.cpp
new file mode 100644
index 0000000000..4d014bcfa3
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/call_to_ret_flow/call_to_ret_flow_02.cpp
@@ -0,0 +1,19 @@
+#include <cstdio>
+
+void callTwo() {}
+void callOne() {}
+void call() {
+  int Three = 3;
+  callOne();
+  int Four = 4;
+  callTwo();
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  call();
+  int Two = 2;
+  callOne();
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/int_call_no_params_01.cpp b/test/llvm_test_code/pure_flow/int_call_no_params_01.cpp
new file mode 100644
index 0000000000..d2b3277a75
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/int_call_no_params_01.cpp
@@ -0,0 +1,12 @@
+#include <cstdio>
+
+int call() {
+  printf("call()\n");
+  return 1;
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int ReturnInt = call();
+  printf("ReturnInt: %d\n", ReturnInt);
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/int_call_one_param_01.cpp b/test/llvm_test_code/pure_flow/int_call_one_param_01.cpp
new file mode 100644
index 0000000000..97912f62fe
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/int_call_one_param_01.cpp
@@ -0,0 +1,12 @@
+#include <cstdio>
+
+int call(int Integer) {
+  printf("call(%d)\n", Integer);
+  return 1;
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int ReturnInt = call(1);
+  printf("ReturnInt: %d\n", ReturnInt);
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/int_call_pointer_param_01.cpp b/test/llvm_test_code/pure_flow/int_call_pointer_param_01.cpp
new file mode 100644
index 0000000000..0d7a114460
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/int_call_pointer_param_01.cpp
@@ -0,0 +1,13 @@
+#include <cstdio>
+
+int call(const int *Integer) {
+  printf("call(%d)\n", *Integer);
+  return 1;
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  int ReturnInt = call(&One);
+  printf("ReturnInt: %d\n", ReturnInt);
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/normal_flow/CMakeLists.txt b/test/llvm_test_code/pure_flow/normal_flow/CMakeLists.txt
new file mode 100644
index 0000000000..225ec21a61
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/normal_flow/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(NoMem2regSources
+  normal_flow_01.cpp
+  normal_flow_02.cpp
+  normal_flow_03.cpp
+  normal_flow_04.cpp
+)
+
+foreach(TEST_SRC ${NoMem2regSources})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
+endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/pure_flow/normal_flow/normal_flow_01.cpp b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_01.cpp
new file mode 100644
index 0000000000..a788a4187c
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_01.cpp
@@ -0,0 +1,9 @@
+#include <cstdio>
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  int Two = 2;
+  int *OnePtr = &One;
+  int &TwoAddr = Two;
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/normal_flow/normal_flow_02.cpp b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_02.cpp
new file mode 100644
index 0000000000..965f099801
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_02.cpp
@@ -0,0 +1,14 @@
+#include <cstdio>
+
+void call() {}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  int Two = 2;
+
+  call();
+
+  int Three = 3;
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/normal_flow/normal_flow_03.cpp b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_03.cpp
new file mode 100644
index 0000000000..2bcbe573ba
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_03.cpp
@@ -0,0 +1,16 @@
+#include <cstdio>
+
+struct StructOne {
+  int One = 1;
+};
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  int OtherOne = One;
+  int MinusOne = !One;
+  int Two = One + One;
+  int *PtrToOne = &One;
+  StructOne ForGEP = StructOne();
+  int GEP = ForGEP.One;
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/normal_flow/normal_flow_04.cpp b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_04.cpp
new file mode 100644
index 0000000000..9012516ff0
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/normal_flow/normal_flow_04.cpp
@@ -0,0 +1,15 @@
+#include <cstdio>
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+
+  int *PtrToOne = &One;
+  int **PtrPtrToOne = &PtrToOne;
+  int ***PtrPtrPtrToOne = &PtrPtrToOne;
+
+  int Deref1 = *PtrToOne;
+  int Deref2 = **PtrPtrToOne;
+  int Deref3 = ***PtrPtrPtrToOne;
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/ret_flow/CMakeLists.txt b/test/llvm_test_code/pure_flow/ret_flow/CMakeLists.txt
new file mode 100644
index 0000000000..018af3009b
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/ret_flow/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(NoMem2regSources
+  ret_flow_01.cpp
+  ret_flow_02.cpp
+  ret_flow_03.cpp
+)
+
+foreach(TEST_SRC ${NoMem2regSources})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
+endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/pure_flow/ret_flow/ret_flow_01.cpp b/test/llvm_test_code/pure_flow/ret_flow/ret_flow_01.cpp
new file mode 100644
index 0000000000..a3e3d0a6a0
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/ret_flow/ret_flow_01.cpp
@@ -0,0 +1,18 @@
+#include <cstdio>
+
+int getTwo() { return 2; }
+
+int call(int ZeroArg, int OneArg) {
+  int TwoInCall = getTwo();
+  return ZeroArg + OneArg;
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int Zero = 0;
+  int One = 1;
+  int Two = 2;
+
+  int CallReturn = call(Zero, One);
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/ret_flow/ret_flow_02.cpp b/test/llvm_test_code/pure_flow/ret_flow/ret_flow_02.cpp
new file mode 100644
index 0000000000..06dc62def8
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/ret_flow/ret_flow_02.cpp
@@ -0,0 +1,27 @@
+#include <cstdio>
+
+int getTwo() { return 2; }
+
+int newThree() {
+  int FourInFunc = 4;
+  return 3;
+}
+
+int call(int ZeroArg, int OneArg) {
+  int TwoInCall = getTwo();
+  int ThreeInCall = 3;
+
+  ThreeInCall = newThree();
+
+  return ZeroArg + OneArg;
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int Zero = 0;
+  int One = 1;
+  int Two = 2;
+
+  int CallReturn = call(Zero, One);
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/ret_flow/ret_flow_03.cpp b/test/llvm_test_code/pure_flow/ret_flow/ret_flow_03.cpp
new file mode 100644
index 0000000000..d540ffc27b
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/ret_flow/ret_flow_03.cpp
@@ -0,0 +1,32 @@
+#include <cstdio>
+
+int GlobalFour = 4;
+
+const int *newThree(const int *ThreeArg) {
+  const int *NewThreePtrInFunc = &(*ThreeArg);
+  return NewThreePtrInFunc;
+}
+
+int *getFourPtr() { return &GlobalFour; }
+
+int &getFourAddr() { return GlobalFour; }
+
+int call(int &ZeroArg, const int *OneArg) {
+  int TwoInCall = 2;
+  int ThreeInCall = 3;
+  int *ThreePtrInCall = &ThreeInCall;
+  const int *NewThreeInCall = newThree(ThreePtrInCall);
+
+  return ZeroArg + *OneArg + TwoInCall + *NewThreeInCall + *getFourPtr() +
+         getFourAddr();
+}
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int Zero = 0;
+  int One = 1;
+  int Two = 2;
+
+  int CallReturn = call(Zero, &One);
+
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/void_call_no_params_01.cpp b/test/llvm_test_code/pure_flow/void_call_no_params_01.cpp
new file mode 100644
index 0000000000..3c3111e249
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/void_call_no_params_01.cpp
@@ -0,0 +1,8 @@
+#include <cstdio>
+
+void call() { printf("call()"); }
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  call();
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/void_call_one_param_01.cpp b/test/llvm_test_code/pure_flow/void_call_one_param_01.cpp
new file mode 100644
index 0000000000..71589e5f83
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/void_call_one_param_01.cpp
@@ -0,0 +1,8 @@
+#include <cstdio>
+
+void call(int Integer) { printf("call(%d)\n", Integer); }
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  call(1);
+  return 0;
+}
diff --git a/test/llvm_test_code/pure_flow/void_call_pointer_param_01.cpp b/test/llvm_test_code/pure_flow/void_call_pointer_param_01.cpp
new file mode 100644
index 0000000000..0b181aee9d
--- /dev/null
+++ b/test/llvm_test_code/pure_flow/void_call_pointer_param_01.cpp
@@ -0,0 +1,9 @@
+#include <cstdio>
+
+void call(const int *Integer) { printf("call(%d)\n", *Integer); }
+
+int main(int /*argc*/, char * /*argv*/[]) {
+  int One = 1;
+  call(&One);
+  return 0;
+}
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt b/unittests/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
index 5c191d3856..dcda34ffdd 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory(Problems)
 
 set(IfdsIdeSources
+  DefaultFlowFunctionTest.cpp
   EdgeFunctionComposerTest.cpp
   EdgeFunctionSingletonCacheTest.cpp
   InteractiveIDESolverTest.cpp
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
new file mode 100644
index 0000000000..71d12e3129
--- /dev/null
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
@@ -0,0 +1,852 @@
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
+#include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/InstrTypes.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Support/raw_ostream.h"
+
+#include "TestConfig.h"
+#include "gtest/gtest.h"
+
+#include <set>
+
+using namespace psr;
+
+namespace {
+
+class IDEAliasImpl : public DefaultAliasAwareIFDSProblem {
+public:
+  IDEAliasImpl(LLVMProjectIRDB *IRDB)
+      : DefaultAliasAwareIFDSProblem(IRDB, &PT, {}, {}), PT(IRDB){};
+
+  [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
+    return {};
+  };
+
+private:
+  FilteredLLVMAliasSet PT;
+};
+
+class IDENoAliasImpl : public DefaultNoAliasIFDSProblem {
+public:
+  IDENoAliasImpl(LLVMProjectIRDB *IRDB)
+      : DefaultNoAliasIFDSProblem(IRDB, {}, {}){};
+
+  [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
+    return {};
+  };
+};
+
+std::set<const llvm::Value *>
+getNormalFlowValueSet(const llvm::Instruction *Instr, IDEAliasImpl &AliasImpl,
+                      const llvm::Value *Arg) {
+  const auto AliasNormalFlowFunc =
+      AliasImpl.getNormalFlowFunction(Instr, nullptr);
+  const auto AliasLLVMValueSet = AliasNormalFlowFunc->computeTargets(Arg);
+  return AliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getNormalFlowValueSet(const llvm::Instruction *Instr,
+                      IDENoAliasImpl &NoAliasImpl, const llvm::Value *Arg) {
+  const auto NoAliasNormalFlowFunc =
+      NoAliasImpl.getNormalFlowFunction(Instr, nullptr);
+  const auto NoAliasLLVMValueSet = NoAliasNormalFlowFunc->computeTargets(Arg);
+  return NoAliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getCallFlowValueSet(const llvm::Instruction *Instr, IDEAliasImpl &AliasImpl,
+                    const llvm::Value *Arg, const llvm::Function *CalleeFunc) {
+  const auto AliasCallFlowFunc =
+      AliasImpl.getCallFlowFunction(Instr, CalleeFunc);
+  std::set<const llvm::Value *> AliasLLVMValueSet =
+      AliasCallFlowFunc->computeTargets(Arg);
+  return AliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getCallFlowValueSet(const llvm::Instruction *Instr, IDENoAliasImpl &NoAliasImpl,
+                    const llvm::Value *Arg, const llvm::Function *CalleeFunc) {
+  const auto NoAliasCallFlowFunc =
+      NoAliasImpl.getCallFlowFunction(Instr, CalleeFunc);
+  std::set<const llvm::Value *> NoAliasLLVMValueSet =
+      NoAliasCallFlowFunc->computeTargets(Arg);
+  return NoAliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getRetFlowValueSet(const llvm::Instruction *Instr, IDEAliasImpl &AliasImpl,
+                   const llvm::Value *Arg, const llvm::Instruction *ExitInst) {
+  const auto AliasRetFlowFunc =
+      AliasImpl.getRetFlowFunction(Instr, nullptr, ExitInst, nullptr);
+  std::set<const llvm::Value *> AliasLLVMValueSet =
+      AliasRetFlowFunc->computeTargets(Arg);
+  return AliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getRetFlowValueSet(const llvm::Instruction *Instr, IDENoAliasImpl &NoAliasImpl,
+                   const llvm::Value *Arg, const llvm::Instruction *ExitInst) {
+  const auto NoAliasRetFlowFunc =
+      NoAliasImpl.getRetFlowFunction(Instr, nullptr, ExitInst, nullptr);
+  std::set<const llvm::Value *> NoAliasLLVMValueSet =
+      NoAliasRetFlowFunc->computeTargets(Arg);
+  return NoAliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getCallToRetFlowValueSet(const llvm::Instruction *Instr,
+                         IDEAliasImpl &AliasImpl, const llvm::Value *Arg) {
+  const auto AliasCallToRetFlowFunc =
+      AliasImpl.getCallToRetFlowFunction(Instr, nullptr, {});
+  const auto AliasLLVMValueSet = AliasCallToRetFlowFunc->computeTargets(Arg);
+  return AliasLLVMValueSet;
+}
+
+std::set<const llvm::Value *>
+getCallToRetFlowValueSet(const llvm::Instruction *Instr,
+                         IDENoAliasImpl &NoAliasImpl, const llvm::Value *Arg) {
+  const auto NoAliasCallToRetFlowFunc =
+      NoAliasImpl.getCallToRetFlowFunction(Instr, nullptr, {});
+  const auto NoAliasLLVMValueSet =
+      NoAliasCallToRetFlowFunc->computeTargets(Arg);
+  return NoAliasLLVMValueSet;
+}
+
+std::string stringifyValueSet(const std::set<const llvm::Value *> &Vals) {
+  std::string Ret;
+  llvm::raw_string_ostream ROS(Ret);
+
+  ROS << "{ ";
+
+  llvm::interleaveComma(
+      Vals, ROS, [&ROS](const auto *Val) { ROS << llvmIRToString(Val); });
+
+  ROS << " }";
+
+  return Ret;
+}
+
+TEST(PureFlow, NormalFlow01) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/normal_flow/normal_flow_01_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  const auto *MainFunc = IRDB.getFunction("main");
+  // %0
+  const auto *PercentZero = MainFunc->getArg(0);
+  // %1
+  const auto *PercentOne = MainFunc->getArg(1);
+  // %.addr = alloca i32, align 4, !psr.id !216; | ID: 1
+  const auto *Instr1 = IRDB.getInstruction(1);
+  // %.addr1 = alloca ptr, align 8, !psr.id !217; | ID: 2
+  const auto *Instr2 = IRDB.getInstruction(2);
+  //%One = alloca i32, align 4, !psr.id !218; | ID: 3
+  const auto *Instr3 = IRDB.getInstruction(3);
+  // %Two = alloca i32, align 4, !psr.id !219; | ID: 4
+  const auto *Instr4 = IRDB.getInstruction(4);
+  // %OnePtr = alloca ptr, align 8, !psr.id !220; | ID: 5
+  const auto *Instr5 = IRDB.getInstruction(5);
+  // %TwoAddr = alloca ptr, align 8, !psr.id !221; | ID: 6
+  const auto *Instr6 = IRDB.getInstruction(6);
+
+  // store i32 %0, ptr %.addr, align 4
+  const auto *Instr8 = IRDB.getInstruction(8);
+  ASSERT_TRUE(Instr8);
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr1}),
+            getNormalFlowValueSet(Instr8, AliasImpl, PercentZero));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr1}),
+            getNormalFlowValueSet(Instr8, NoAliasImpl, PercentZero));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr8, AliasImpl, Instr1));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr8, NoAliasImpl, Instr1));
+
+  // store ptr %1, ptr %.addr1, align 8
+  const auto *Instr10 = IRDB.getInstruction(10);
+  ASSERT_TRUE(Instr10);
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr2}),
+            getNormalFlowValueSet(Instr10, AliasImpl, PercentOne));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr2}),
+            getNormalFlowValueSet(Instr10, NoAliasImpl, PercentOne));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr10, AliasImpl, Instr2));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr10, NoAliasImpl, Instr2));
+
+  // store ptr %One, ptr %OnePtr, align 8, !dbg !225
+  const auto *Instr17 = IRDB.getInstruction(17);
+  ASSERT_TRUE(Instr17);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr5}),
+            getNormalFlowValueSet(Instr17, AliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr5}),
+            getNormalFlowValueSet(Instr17, NoAliasImpl, Instr3));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr17, AliasImpl, Instr5));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr17, NoAliasImpl, Instr5));
+
+  // store ptr %Two, ptr %TwoAddr, align 8, !dbg !228
+  const auto *Instr19 = IRDB.getInstruction(19);
+  ASSERT_TRUE(Instr19);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr4, Instr6}),
+            getNormalFlowValueSet(Instr19, AliasImpl, Instr4));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr4, Instr6}),
+            getNormalFlowValueSet(Instr19, NoAliasImpl, Instr4));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr19, AliasImpl, Instr6));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr19, NoAliasImpl, Instr6));
+
+  // Other arg
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr19},
+            getNormalFlowValueSet(Instr19, AliasImpl, Instr19));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr19},
+            getNormalFlowValueSet(Instr19, NoAliasImpl, Instr19));
+}
+
+TEST(PureFlow, NormalFlow02) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/normal_flow/normal_flow_02_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  const auto *MainFunc = IRDB.getFunction("main");
+  ASSERT_TRUE(MainFunc);
+  // %0
+  const auto *PercentZero = MainFunc->getArg(0);
+  ASSERT_TRUE(PercentZero);
+  // %1
+  const auto *PercentOne = MainFunc->getArg(1);
+  ASSERT_TRUE(PercentOne);
+  // %.addr = alloca i32, align 4, !psr.id !221; | ID: 2
+  const auto *Instr2 = IRDB.getInstruction(2);
+  ASSERT_TRUE(Instr2);
+  // %.addr1 = alloca ptr, align 8, !psr.id !222; | ID: 3
+  const auto *Instr3 = IRDB.getInstruction(3);
+  ASSERT_TRUE(Instr3);
+
+  // store i32 %0, ptr %.addr, align 4, !psr.id !227; | ID: 8
+  const auto *Instr8 = IRDB.getInstruction(8);
+  ASSERT_TRUE(Instr8);
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr2}),
+            getNormalFlowValueSet(Instr8, AliasImpl, PercentZero));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr2}),
+            getNormalFlowValueSet(Instr8, NoAliasImpl, PercentZero));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr8, AliasImpl, Instr2));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr8, NoAliasImpl, Instr2));
+
+  // store ptr %1, ptr %.addr1, align 8, !psr.id !231; | ID: 10
+  const auto *Instr10 = IRDB.getInstruction(10);
+  ASSERT_TRUE(Instr10);
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr3}),
+            getNormalFlowValueSet(Instr10, AliasImpl, PercentOne));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr3}),
+            getNormalFlowValueSet(Instr10, NoAliasImpl, PercentOne));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr10, AliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr10, NoAliasImpl, Instr3));
+
+  // Other arg
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr10},
+            getNormalFlowValueSet(Instr10, AliasImpl, Instr10));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr10},
+            getNormalFlowValueSet(Instr10, NoAliasImpl, Instr10));
+}
+
+TEST(PureFlow, NormalFlow03) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/normal_flow/normal_flow_03_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // %One = alloca i32, align 4, !psr.id !222; | ID: 3
+  const auto *Instr3 = IRDB.getInstruction(3);
+  ASSERT_TRUE(Instr3);
+  // %ForGEP = alloca %struct.StructOne, align 4, !psr.id !227; | ID: 8
+  const auto *Instr8 = IRDB.getInstruction(8);
+  ASSERT_TRUE(Instr8);
+  // %2 = load i32, ptr %One, align 4, !dbg !245, !psr.id !246; | ID: 18
+  const auto *Instr18 = IRDB.getInstruction(18);
+  ASSERT_TRUE(Instr18);
+
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr18}),
+            getNormalFlowValueSet(Instr18, AliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr18}),
+            getNormalFlowValueSet(Instr18, NoAliasImpl, Instr3));
+  // %3 = load i32, ptr %One, align 4, !dbg !251, !psr.id !252; | ID: 21
+  const auto *Instr21 = IRDB.getInstruction(21);
+  ASSERT_TRUE(Instr21);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr21}),
+            getNormalFlowValueSet(Instr21, AliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr21}),
+            getNormalFlowValueSet(Instr21, NoAliasImpl, Instr3));
+
+  // %tobool = icmp ne i32 %3, 0, !dbg !251, !psr.id !253; | ID: 22
+  const auto *Instr22 = IRDB.getInstruction(22);
+  ASSERT_TRUE(Instr22);
+  // %lnot = xor i1 %tobool, true, !dbg !254, !psr.id !255; | ID: 23
+  const auto *Instr23 = IRDB.getInstruction(23);
+  ASSERT_TRUE(Instr23);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr22, Instr23}),
+            getNormalFlowValueSet(Instr23, AliasImpl, Instr22));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr22, Instr23}),
+            getNormalFlowValueSet(Instr23, NoAliasImpl, Instr22));
+
+  // %4 = load i32, ptr %One, align 4, !dbg !261, !psr.id !262; | ID: 27
+  const auto *Instr27 = IRDB.getInstruction(27);
+  ASSERT_TRUE(Instr27);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr27}),
+            getNormalFlowValueSet(Instr27, AliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr27}),
+            getNormalFlowValueSet(Instr27, NoAliasImpl, Instr3));
+
+  // %5 = load i32, ptr %One, align 4, !dbg !263, !psr.id !264; | ID: 28
+  const auto *Instr28 = IRDB.getInstruction(28);
+  ASSERT_TRUE(Instr28);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr28}),
+            getNormalFlowValueSet(Instr28, AliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr28}),
+            getNormalFlowValueSet(Instr28, NoAliasImpl, Instr3));
+
+  // %add = add nsw i32 %4, %5, !dbg !265, !psr.id !266; | ID: 29
+  const auto *Instr29 = IRDB.getInstruction(29);
+  ASSERT_TRUE(Instr29);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr27, Instr29}),
+            getNormalFlowValueSet(Instr29, AliasImpl, Instr27));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr27, Instr29}),
+            getNormalFlowValueSet(Instr29, NoAliasImpl, Instr27));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr28, Instr29}),
+            getNormalFlowValueSet(Instr29, AliasImpl, Instr28));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr28, Instr29}),
+            getNormalFlowValueSet(Instr29, NoAliasImpl, Instr28));
+
+  // %One2 = getelementptr inbounds %struct.StructOne, ptr %ForGEP, i32 0, i32
+  // 0, !dbg !282, !psr.id !283; | ID: 37
+  const auto *Instr37 = IRDB.getInstruction(37);
+  ASSERT_TRUE(Instr37);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr37}),
+            getNormalFlowValueSet(Instr37, AliasImpl, Instr8));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr37}),
+            getNormalFlowValueSet(Instr37, NoAliasImpl, Instr8));
+
+  // %6 = load i32, ptr %One2, align 4, !dbg !282, !psr.id !284; | ID: 38
+  const auto *Instr38 = IRDB.getInstruction(38);
+  ASSERT_TRUE(Instr38);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr37, Instr38}),
+            getNormalFlowValueSet(Instr38, AliasImpl, Instr37));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr37, Instr38}),
+            getNormalFlowValueSet(Instr38, NoAliasImpl, Instr37));
+}
+
+TEST(PureFlow, NormalFlow04) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/normal_flow/normal_flow_04_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // %Deref1 = alloca i32, align 4, !psr.id !222; | ID: 7
+  const auto *Instr7 = IRDB.getInstruction(7);
+  ASSERT_TRUE(Instr7);
+  // %Deref2 = alloca i32, align 4, !psr.id !223; | ID: 8
+  const auto *Instr8 = IRDB.getInstruction(8);
+  ASSERT_TRUE(Instr8);
+  // %Deref3 = alloca i32, align 4, !psr.id !224; | ID: 9
+  const auto *Instr9 = IRDB.getInstruction(9);
+  ASSERT_TRUE(Instr9);
+  // %3 = load i32, ptr %2, align 4, !dbg !258, !psr.id !259; | ID: 25
+  const auto *Instr25 = IRDB.getInstruction(25);
+  ASSERT_TRUE(Instr25);
+  // %6 = load i32, ptr %5, align 4, !dbg !268, !psr.id !269; | ID: 30
+  const auto *Instr30 = IRDB.getInstruction(30);
+  ASSERT_TRUE(Instr30);
+  // %10 = load i32, ptr %9, align 4, !dbg !280, !psr.id !281; | ID: 36
+  const auto *Instr36 = IRDB.getInstruction(36);
+  ASSERT_TRUE(Instr36);
+
+  // store i32 %3, ptr %Deref1, align 4, !dbg !254, !psr.id !260; | ID: 26
+  const auto *Instr26 = IRDB.getInstruction(26);
+  ASSERT_TRUE(Instr26);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr25, Instr7}),
+            getNormalFlowValueSet(Instr26, AliasImpl, Instr25));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr25, Instr7}),
+            getNormalFlowValueSet(Instr26, NoAliasImpl, Instr25));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr26, AliasImpl, Instr7));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr26, NoAliasImpl, Instr7));
+
+  // store i32 %6, ptr %Deref2, align 4, !dbg !262, !psr.id !270; | ID: 31
+  const auto *Instr31 = IRDB.getInstruction(31);
+  ASSERT_TRUE(Instr31);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr30}),
+            getNormalFlowValueSet(Instr31, AliasImpl, Instr30));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr30}),
+            getNormalFlowValueSet(Instr31, NoAliasImpl, Instr30));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr31, AliasImpl, Instr8));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr31, NoAliasImpl, Instr8));
+
+  // store i32 %10, ptr %Deref3, align 4, !dbg !272, !psr.id !282; | ID: 37
+  const auto *Instr37 = IRDB.getInstruction(37);
+  ASSERT_TRUE(Instr37);
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr9, Instr36}),
+            getNormalFlowValueSet(Instr37, AliasImpl, Instr36));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr9, Instr36}),
+            getNormalFlowValueSet(Instr37, NoAliasImpl, Instr36));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr37, AliasImpl, Instr9));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr37, NoAliasImpl, Instr9));
+}
+
+/*
+  CallFlow
+*/
+
+TEST(PureFlow, CallFlow01) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/call_flow/call_flow_01_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // call void @_Z4callii(i32 noundef %2, i32 noundef %3), !dbg !261, !psr.id
+  // !262; | ID: 26
+  const auto *Instr26 = IRDB.getInstruction(26);
+  ASSERT_TRUE(Instr26);
+  const auto *FuncForInstr26 = IRDB.getFunction("_Z4callii");
+  ASSERT_TRUE(FuncForInstr26);
+  ASSERT_EQ(FuncForInstr26->arg_size(), 2);
+  const auto *Param0 = FuncForInstr26->getArg(0);
+  const auto *Param1 = FuncForInstr26->getArg(1);
+
+  if (const auto *CallSite = llvm::dyn_cast<llvm::CallBase>(Instr26)) {
+    EXPECT_EQ(std::set<const llvm::Value *>{Param0},
+              getCallFlowValueSet(Instr26, AliasImpl,
+                                  CallSite->getArgOperand(0), FuncForInstr26));
+    EXPECT_EQ(std::set<const llvm::Value *>{Param1},
+              getCallFlowValueSet(Instr26, AliasImpl,
+                                  CallSite->getArgOperand(1), FuncForInstr26));
+    EXPECT_EQ(std::set<const llvm::Value *>{Param0},
+              getCallFlowValueSet(Instr26, NoAliasImpl,
+                                  CallSite->getArgOperand(0), FuncForInstr26));
+    EXPECT_EQ(std::set<const llvm::Value *>{Param1},
+              getCallFlowValueSet(Instr26, NoAliasImpl,
+                                  CallSite->getArgOperand(1), FuncForInstr26));
+  } else {
+    FAIL();
+  }
+}
+
+TEST(PureFlow, CallFlow02) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/call_flow/call_flow_02_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // %One = alloca i32, align 4, !psr.id !251; | ID: 17
+  const auto *Instr17 = IRDB.getInstruction(17);
+  ASSERT_TRUE(Instr17);
+  // %Two = alloca i32, align 4, !psr.id !252; | ID: 18
+  const auto *Instr18 = IRDB.getInstruction(18);
+  ASSERT_TRUE(Instr18);
+  // %Three = alloca i32, align 4, !psr.id !253; | ID: 19
+  const auto *Instr19 = IRDB.getInstruction(19);
+  ASSERT_TRUE(Instr19);
+  // %PtrToOne = alloca ptr, align 8, !psr.id !254; | ID: 20
+  const auto *Instr20 = IRDB.getInstruction(20);
+  ASSERT_TRUE(Instr20);
+  // %PtrToTwo = alloca ptr, align 8, !psr.id !255; | ID: 21
+  const auto *Instr21 = IRDB.getInstruction(21);
+  ASSERT_TRUE(Instr21);
+  // %PtrPtrToTwo = alloca ptr, align 8, !psr.id !256; | ID: 22
+  const auto *Instr22 = IRDB.getInstruction(22);
+  ASSERT_TRUE(Instr22);
+  // %PtrToThree = alloca ptr, align 8, !psr.id !257; | ID: 23
+  const auto *Instr23 = IRDB.getInstruction(23);
+  ASSERT_TRUE(Instr23);
+  // %PtrPtrToThree = alloca ptr, align 8, !psr.id !258; | ID: 24
+  const auto *Instr24 = IRDB.getInstruction(24);
+  ASSERT_TRUE(Instr24);
+  // %PtrPtrPtrToThree = alloca ptr, align 8, !psr.id !259; | ID: 25
+  const auto *Instr25 = IRDB.getInstruction(25);
+  ASSERT_TRUE(Instr25);
+  // call void @_Z4callPi(ptr noundef %2), !dbg !307, !psr.id !308; | ID: 50
+  const auto *Instr50 = IRDB.getInstruction(50);
+  ASSERT_TRUE(Instr50);
+  // call void @_Z10secondCallPiPS_PS0_(ptr noundef %3, ptr noundef %4, ptr
+  // noundef %5), !dbg !315, !psr.id !316; | ID: 54
+  const auto *Instr54 = IRDB.getInstruction(54);
+  ASSERT_TRUE(Instr54);
+
+  // call function
+  const auto *CallFunc = IRDB.getFunction("_Z4callPi");
+  ASSERT_TRUE(CallFunc);
+  // second call function
+  const auto *SecondCallFunc = IRDB.getFunction("_Z10secondCallPiPS_PS0_");
+  ASSERT_TRUE(SecondCallFunc);
+
+  const auto *CSCallFunc = llvm::cast<llvm::CallBase>(Instr50);
+  const auto *CSSecondCallFunc = llvm::cast<llvm::CallBase>(Instr54);
+
+  EXPECT_EQ((std::set<const llvm::Value *>{CallFunc->getArg(0)}),
+            getCallFlowValueSet(Instr50, AliasImpl,
+                                CSCallFunc->getArgOperand(0), CallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{CallFunc->getArg(0)}),
+            getCallFlowValueSet(Instr50, NoAliasImpl,
+                                CSCallFunc->getArgOperand(0), CallFunc));
+
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(0)}),
+            getCallFlowValueSet(Instr54, AliasImpl,
+                                CSSecondCallFunc->getArgOperand(0),
+                                SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(0)}),
+            getCallFlowValueSet(Instr54, NoAliasImpl,
+                                CSSecondCallFunc->getArgOperand(0),
+                                SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(1)}),
+            getCallFlowValueSet(Instr54, AliasImpl,
+                                CSSecondCallFunc->getArgOperand(1),
+                                SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(1)}),
+            getCallFlowValueSet(Instr54, NoAliasImpl,
+                                CSSecondCallFunc->getArgOperand(1),
+                                SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(2)}),
+            getCallFlowValueSet(Instr54, AliasImpl,
+                                CSSecondCallFunc->getArgOperand(2),
+                                SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(2)}),
+            getCallFlowValueSet(Instr54, NoAliasImpl,
+                                CSSecondCallFunc->getArgOperand(2),
+                                SecondCallFunc));
+}
+
+/*
+  RetFlow
+*/
+
+TEST(PureFlow, RetFlow01) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/ret_flow/ret_flow_01_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // %Two = alloca i32, align 4, !psr.id !251; | ID: 20
+  const auto *UnusedValue = IRDB.getValueFromId(20);
+
+  // %call = call noundef i32 @_Z6getTwov(), !dbg !231, !psr.id !232; | ID: 9
+  const auto *Instr9 = IRDB.getInstruction(9);
+  ASSERT_TRUE(Instr9);
+  // ret i32 2, !dbg !212, !psr.id !213; | ID: 0
+  const auto *Instr0 = IRDB.getInstruction(0);
+  ASSERT_TRUE(Instr0);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr9, AliasImpl, UnusedValue, Instr0));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr9, NoAliasImpl, UnusedValue, Instr0));
+
+  // %call = call noundef i32 @_Z4callii(i32 noundef %2, i32 noundef %3), !dbg
+  // !281, !psr.id !282; | ID: 36
+  const auto *Instr36 = IRDB.getInstruction(36);
+  ASSERT_TRUE(Instr36);
+  // ret i32 %add, !dbg !240, !psr.id !241; | ID: 14
+  const auto *Instr14 = IRDB.getInstruction(14);
+  ASSERT_TRUE(Instr14);
+  const auto *FuncZ4callii = IRDB.getFunction("_Z4callii");
+
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr36, AliasImpl, FuncZ4callii->getArg(0), Instr14));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr36, AliasImpl, FuncZ4callii->getArg(1), Instr14));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr36, NoAliasImpl, FuncZ4callii->getArg(0),
+                               Instr14));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr36, NoAliasImpl, FuncZ4callii->getArg(1),
+                               Instr14));
+
+  // negative tests
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr9, AliasImpl, FuncZ4callii->getArg(1), Instr0));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr9, NoAliasImpl, FuncZ4callii->getArg(1), Instr0));
+}
+
+TEST(PureFlow, RetFlow02) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/ret_flow/ret_flow_02_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // %Two = alloca i32, align 4, !psr.id !268; | ID: 29
+  const auto *UnusedValue = IRDB.getValueFromId(29);
+
+  // %call = call noundef i32 @_Z6getTwov(), !dbg !240, !psr.id !241; | ID: 14
+  const auto *Instr14 = IRDB.getInstruction(14);
+  ASSERT_TRUE(Instr14);
+  // ret i32 2, !dbg !212, !psr.id !213; | ID: 0
+  const auto *Instr0 = IRDB.getInstruction(0);
+  ASSERT_TRUE(Instr0);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr14, AliasImpl, UnusedValue, Instr0));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr14, NoAliasImpl, UnusedValue, Instr0));
+
+  // %call1 = call noundef i32 @_Z8newThreev(), !dbg !247, !psr.id !248; | ID:
+  // 18
+  const auto *Instr18 = IRDB.getInstruction(18);
+  ASSERT_TRUE(Instr18);
+  // ret i32 3, !dbg !220, !psr.id !221; | ID: 4
+  const auto *Instr4 = IRDB.getInstruction(4);
+  ASSERT_TRUE(Instr4);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr18, AliasImpl, UnusedValue, Instr4));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr18, NoAliasImpl, UnusedValue, Instr4));
+
+  //  %call = call noundef i32 @_Z4callii(i32 noundef %2, i32 noundef %3), !dbg
+  //  !298, !psr.id !299; | ID: 45
+  const auto *Instr45 = IRDB.getInstruction(45);
+  ASSERT_TRUE(Instr45);
+  // ret i32 %add, !dbg !257, !psr.id !258; | ID: 23
+  const auto *Instr23 = IRDB.getInstruction(23);
+  ASSERT_TRUE(Instr23);
+  const auto *FuncZ4callii = IRDB.getFunction("_Z4callii");
+
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr45, AliasImpl, FuncZ4callii->getArg(0), Instr23));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr45, AliasImpl, FuncZ4callii->getArg(1), Instr23));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr45, NoAliasImpl, FuncZ4callii->getArg(0),
+                               Instr23));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr45, NoAliasImpl, FuncZ4callii->getArg(1),
+                               Instr23));
+
+  // negative tests
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr14, AliasImpl, FuncZ4callii->getArg(1), Instr0));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr14, NoAliasImpl, FuncZ4callii->getArg(1),
+                               Instr0));
+}
+
+TEST(PureFlow, RetFlow03) {
+  LLVMProjectIRDB IRDB({unittest::PathToLLTestFiles +
+                        "pure_flow/ret_flow/ret_flow_03_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // %ThreeInCall = alloca i32, align 4, !psr.id !254; | ID: 15
+  const auto *Instr15 = IRDB.getValueFromId(15);
+  ASSERT_TRUE(Instr15);
+
+  // %ThreePtrInCall = alloca ptr, align 8, !psr.id !255; | ID: 16
+  const auto *Instr16 = IRDB.getValueFromId(16);
+  ASSERT_TRUE(Instr16);
+
+  // %0 = load ptr, ptr %ThreePtrInCall, align 8, !dbg !280, !psr.id !281; | ID:
+  // 29
+  const auto *Instr29 = IRDB.getValueFromId(29);
+  ASSERT_TRUE(Instr29);
+
+  // %call = call noundef ptr @_Z8newThreePKi(ptr noundef %0), !dbg !282,
+  // !psr.id !283; | ID: 30
+  const auto *Instr30 = IRDB.getValueFromId(30);
+  ASSERT_TRUE(Instr30);
+
+  // ret ptr %1, !dbg !234, !psr.id !235; | ID: 9
+  const auto *Instruction9 = IRDB.getInstruction(9);
+  ASSERT_TRUE(Instruction9);
+  // %call = call noundef ptr @_Z8newThreePKi(ptr noundef %0), !dbg !282,
+  // !psr.id !283; | ID: 30
+  const auto *Instruction30 = IRDB.getInstruction(30);
+  ASSERT_TRUE(Instruction30);
+  const auto *FunctionZ8newThreePKi = IRDB.getFunction("_Z8newThreePKi");
+
+  const auto &Got = getRetFlowValueSet(
+      Instruction30, AliasImpl, FunctionZ8newThreePKi->getArg(0), Instruction9);
+
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr15, Instr16, Instr29, Instr30}),
+            Got)
+      << stringifyValueSet(Got);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr29},
+            getRetFlowValueSet(Instruction30, NoAliasImpl,
+                               FunctionZ8newThreePKi->getArg(0), Instruction9));
+
+  // ret ptr @GlobalFour, !dbg !240, !psr.id !241; | ID: 10
+  const auto *Instruction10 = IRDB.getInstruction(10);
+  ASSERT_TRUE(Instruction10);
+  // %call3 = call noundef ptr @_Z10getFourPtrv(), !dbg !304, !psr.id !305; |
+  // ID: 42
+  const auto *Instruction42 = IRDB.getInstruction(42);
+  ASSERT_TRUE(Instruction42);
+
+  // ret ptr @GlobalFour, !dbg !246, !psr.id !247; | ID: 11
+  const auto *Instruction11 = IRDB.getInstruction(11);
+  ASSERT_TRUE(Instruction11);
+  //  %call5 = call noundef nonnull align 4 dereferenceable(4) ptr
+  //  @_Z11getFourAddrv(), !dbg !310, !psr.id !311; | ID: 45
+  const auto *Instruction45 = IRDB.getInstruction(45);
+  ASSERT_TRUE(Instruction45);
+
+  // ret i32 %add6, !dbg !315, !psr.id !316; | ID: 48
+  const auto *Instruction48 = IRDB.getInstruction(48);
+  ASSERT_TRUE(Instruction48);
+  // %call = call noundef i32 @_Z4callRiPKi(ptr noundef nonnull align 4
+  // dereferenceable(4) %Zero, ptr noundef %One), !dbg !352, !psr.id !353; | ID:
+  // 68
+  const auto *Instruction68 = IRDB.getInstruction(68);
+  ASSERT_TRUE(Instruction68);
+  const auto *FuncZ4callRiPKi = IRDB.getFunction("_Z4callRiPKi");
+  // %Zero = alloca i32, align 4, !psr.id !324; | ID: 52
+  const auto *Instr52 = IRDB.getInstruction(52);
+  ASSERT_TRUE(Instr52);
+
+  // %One = alloca i32, align 4, !psr.id !325; | ID: 53
+  const auto *Instr53 = IRDB.getInstruction(53);
+  ASSERT_TRUE(Instr53);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr52},
+            getRetFlowValueSet(Instruction68, AliasImpl,
+                               FuncZ4callRiPKi->getArg(0), Instruction48));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr52},
+            getRetFlowValueSet(Instruction68, NoAliasImpl,
+                               FuncZ4callRiPKi->getArg(0), Instruction48));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr53},
+            getRetFlowValueSet(Instruction68, AliasImpl,
+                               FuncZ4callRiPKi->getArg(1), Instruction48));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr53},
+            getRetFlowValueSet(Instruction68, NoAliasImpl,
+                               FuncZ4callRiPKi->getArg(1), Instruction48));
+}
+
+/*
+  CallToRetFlow
+*/
+
+TEST(PureFlow, CallToRetFlow01) {
+  LLVMProjectIRDB IRDB(
+      {unittest::PathToLLTestFiles +
+       "pure_flow/call_to_ret_flow/call_to_ret_flow_01_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // store i32 0, ptr %Zero, align 4, !dbg !252, !psr.id !254; | ID: 22
+  const auto *Instr22 = IRDB.getInstruction(22);
+  ASSERT_TRUE(Instr22);
+
+  // store i32 1, ptr %One, align 4, !dbg !256, !psr.id !258; | ID: 24
+  const auto *Instr24 = IRDB.getInstruction(24);
+  ASSERT_TRUE(Instr24);
+
+  // ret i32 0, !dbg !269, !psr.id !270; | ID: 30
+  const auto *Instr30 = IRDB.getInstruction(30);
+  ASSERT_TRUE(Instr30);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
+            getCallToRetFlowValueSet(Instr30, AliasImpl, Instr22));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
+            getCallToRetFlowValueSet(Instr30, NoAliasImpl, Instr22));
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr24},
+            getCallToRetFlowValueSet(Instr30, AliasImpl, Instr24));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr24},
+            getCallToRetFlowValueSet(Instr30, NoAliasImpl, Instr24));
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr30},
+            getCallToRetFlowValueSet(Instr30, AliasImpl, Instr30));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr30},
+            getCallToRetFlowValueSet(Instr30, NoAliasImpl, Instr30));
+}
+
+TEST(PureFlow, CallToRetFlow02) {
+  LLVMProjectIRDB IRDB(
+      {unittest::PathToLLTestFiles +
+       "pure_flow/call_to_ret_flow/call_to_ret_flow_02_cpp_dbg.ll"});
+  IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
+  IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+
+  // store i32 3, ptr %Three, align 4, !dbg !223, !psr.id !225; | ID: 5
+  const auto *Instr5 = IRDB.getInstruction(5);
+  ASSERT_TRUE(Instr5);
+
+  // store i32 4, ptr %Four, align 4, !dbg !229, !psr.id !231; | ID: 8
+  const auto *Instr8 = IRDB.getInstruction(8);
+  ASSERT_TRUE(Instr8);
+
+  // ret void, !dbg !234, !psr.id !235; | ID: 10
+  const auto *Instr10 = IRDB.getInstruction(10);
+  ASSERT_TRUE(Instr10);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr5},
+            getCallToRetFlowValueSet(Instr10, AliasImpl, Instr5));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr5},
+            getCallToRetFlowValueSet(Instr10, NoAliasImpl, Instr5));
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr8},
+            getCallToRetFlowValueSet(Instr10, AliasImpl, Instr8));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr8},
+            getCallToRetFlowValueSet(Instr10, NoAliasImpl, Instr8));
+
+  // store i32 1, ptr %One, align 4, !dbg !255, !psr.id !257; | ID: 22
+  const auto *Instr22 = IRDB.getInstruction(22);
+  ASSERT_TRUE(Instr22);
+
+  // store i32 2, ptr %Two, align 4, !dbg !261, !psr.id !263; | ID: 25
+  const auto *Instr25 = IRDB.getInstruction(25);
+  ASSERT_TRUE(Instr25);
+
+  // ret i32 0, !dbg !266, !psr.id !267; | ID: 27
+  const auto *Instr27 = IRDB.getInstruction(27);
+  ASSERT_TRUE(Instr27);
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
+            getCallToRetFlowValueSet(Instr27, AliasImpl, Instr22));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
+            getCallToRetFlowValueSet(Instr27, NoAliasImpl, Instr22));
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr25},
+            getCallToRetFlowValueSet(Instr27, AliasImpl, Instr25));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr25},
+            getCallToRetFlowValueSet(Instr27, NoAliasImpl, Instr25));
+
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr27},
+            getCallToRetFlowValueSet(Instr27, AliasImpl, Instr27));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr27},
+            getCallToRetFlowValueSet(Instr27, NoAliasImpl, Instr27));
+}
+
+}; // namespace
+
+// main function for the test case
+int main(int Argc, char **Argv) {
+  ::testing::InitGoogleTest(&Argc, Argv);
+  return RUN_ALL_TESTS();
+}

From 28a25b712d0118ed57fae7c82905879fb23d85dc Mon Sep 17 00:00:00 2001
From: jusito <17811819+jusito@users.noreply.github.com>
Date: Fri, 4 Apr 2025 18:48:04 +0200
Subject: [PATCH 06/24] ci/update runner (#769)

* ci: Prepare runner brownout

Swift tests are disabled due to dependency on outdated Swift version.

* fix: tests on ubuntu 24.04

* fix: update clang-format in pre-commit hook to match clang-format version in CI

* pre-commit

---------

Co-authored-by: Lucas Briese <lucas.briese@iem.fraunhofer.de>
Co-authored-by: Fabian Schiebel <fabian.schiebel@iem.fraunhofer.de>
---
 .github/workflows/ci.yml                      | 23 +------------------
 .github/workflows/pre-commit.yml              |  8 +++----
 .github/workflows/reviewdog-clang-format.yml  | 10 ++++----
 .pre-commit-config.yaml                       |  2 +-
 .../ControlFlow/LLVMBasedCFGTest.cpp          |  7 +-----
 .../Problems/IDEExtendedTaintAnalysisTest.cpp |  2 +-
 .../Problems/IDEFeatureTaintAnalysisTest.cpp  | 23 +++++++++----------
 .../Problems/IDEGeneralizedLCATest.cpp        |  2 +-
 .../IDEInstInteractionAnalysisTest.cpp        | 12 +++++-----
 9 files changed, 30 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30b1cd00c2..a68d15bcdc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-20.04, ubuntu-24.04-arm]
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
         compiler: [ [clang++-19, clang-19, "clang-19 libclang-rt-19-dev"] ]
         build: [ Debug, Release, DebugLibdeps ]
         include:
@@ -46,28 +46,7 @@ jobs:
         run: |
           ./utils/InstallAptDependencies.sh --noninteractive tzdata ${{ matrix.compiler[2] }}
 
-      - uses: swift-actions/setup-swift@v2
-        if: matrix.os == 'ubuntu-20.04'
-        with:
-          swift-version: "5.8.1"
-      - name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }} including swift
-        if: matrix.os == 'ubuntu-20.04'
-        env:
-          CXX: ${{ matrix.compiler[0] }}
-          CC: ${{ matrix.compiler[1] }}
-        shell: bash
-        run: |
-          cmake -S . -B build \
-            -DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
-            -DBUILD_PHASAR_CLANG=OFF \
-            -DBUILD_SWIFT_TESTS=ON \
-            -DPHASAR_USE_Z3=ON \
-            ${{ matrix.flags }} \
-            -G Ninja
-          ninja -C build
-
       - name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }}
-        if: matrix.os != 'ubuntu-20.04'
         env:
           CXX: ${{ matrix.compiler[0] }}
           CC: ${{ matrix.compiler[1] }}
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 86df3a0ad8..bce9eb49b1 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -5,14 +5,14 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
 
-    - uses: pre-commit/action@v2.0.0
+    - uses: pre-commit/action@v3.0.1
       with:
         extra_args: --from-ref origin/development --to-ref HEAD
diff --git a/.github/workflows/reviewdog-clang-format.yml b/.github/workflows/reviewdog-clang-format.yml
index d3eed65d9a..b6b5bacb91 100644
--- a/.github/workflows/reviewdog-clang-format.yml
+++ b/.github/workflows/reviewdog-clang-format.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -14,17 +14,15 @@ jobs:
         include:
           - tool: clang-format
             install: |
-              sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
-              sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main'
               sudo apt-get update
-              sudo apt-get -y install --no-install-recommends clang-format-14
+              sudo apt-get -y install --no-install-recommends clang-format-19
             regex: \.(h|c|hpp|cpp)$
-            command: clang-format-14 --style=file -i
+            command: clang-format-19 --style=file -i
 
     continue-on-error: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 786e0aba36..5543f809cf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,6 @@ repos:
     -   id: check-added-large-files
     -   id: requirements-txt-fixer
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 'v14.0.6'
+    rev: 'v19.1.7'
     hooks:
     -   id: clang-format
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp
index 3753a403a2..546306de0e 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest.cpp
@@ -245,13 +245,8 @@ PHASAR_SKIP_TEST(TEST(LLVMBasedCFGTest, HandlesCppStandardType) {
       {unittest::PathToLLTestFiles + "name_mangling/special_members_2_cpp.ll"});
 
   auto *M = IRDB.getModule();
-  auto *F = M->getFunction("_ZNSt8ios_base4InitC1Ev");
+
   LLVMBasedCFG CFG;
-  ASSERT_EQ(CFG.getSpecialMemberFunctionType(F),
-            SpecialMemberFunctionType::Constructor);
-  auto *N = M->getFunction("_ZNSt8ios_base4InitD1Ev");
-  ASSERT_EQ(CFG.getSpecialMemberFunctionType(N),
-            SpecialMemberFunctionType::Destructor);
   auto *O = M->getFunction(
       "_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED1Ev");
   ASSERT_EQ(CFG.getSpecialMemberFunctionType(O),
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
index 5c3395b6d2..51af9f3058 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
@@ -208,7 +208,7 @@ TEST_F(IDETaintAnalysisTest, XTaint09_1) {
 TEST_F(IDETaintAnalysisTest, XTaint09) {
   map<int, set<string>> Gt;
 
-  Gt[33] = {"32"};
+  Gt[24] = {"23"};
 
   doAnalysis({PathToLLFiles + "xtaint09_cpp.ll"}, Gt, std::monostate{});
 }
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
index cf0d4ac181..243cb2d6a7 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
@@ -152,8 +152,7 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
   [[nodiscard]] inline std::set<std::string>
   taintsForInst(const llvm::Instruction *Inst,
                 SolverResults<const llvm::Instruction *, const llvm::Value *,
-                              IDEFeatureTaintEdgeFact>
-                    SR) {
+                              IDEFeatureTaintEdgeFact> SR) {
 
     if (const auto *Ret = llvm::dyn_cast<llvm::ReturnInst>(Inst)) {
       if (Ret->getNumOperands() == 0) {
@@ -243,15 +242,15 @@ PHASAR_SKIP_TEST(TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_04) {
   LIBCPP_GTEST_SKIP;
 
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 23, "retval", std::set<std::string>{"13"});
-  GroundTruth.emplace("main", 23, "argc.addr", std::set<std::string>{"14"});
-  GroundTruth.emplace("main", 23, "argv.addr", std::set<std::string>{"15"});
-  GroundTruth.emplace("main", 23, "i", std::set<std::string>{"16"});
+  GroundTruth.emplace("main", 23, "retval", std::set<std::string>{"7"});
+  GroundTruth.emplace("main", 23, "argc.addr", std::set<std::string>{"8"});
+  GroundTruth.emplace("main", 23, "argv.addr", std::set<std::string>{"9"});
+  GroundTruth.emplace("main", 23, "i", std::set<std::string>{"10"});
   GroundTruth.emplace("main", 23, "j",
-                      std::set<std::string>{"16", "17", "19", "18"});
+                      std::set<std::string>{"10", "11", "12", "13"});
   GroundTruth.emplace(
       "main", 23, "k",
-      std::set<std::string>{"16", "17", "18", "19", "20", "24", "25"});
+      std::set<std::string>{"10", "11", "12", "13", "14", "18", "19"});
   doAnalysisAndCompareResults("basic_04_cpp.ll", {"main"}, GroundTruth, false);
 })
 
@@ -444,11 +443,11 @@ TEST_F(IDEFeatureTaintAnalysisTest, HandleGlobalTest_05) {
   // NOTE: Facts at init() should be empty, except for its own ID;
   //       g should be strongly updated
 
-  GroundTruth.emplace("main", 1, "g", std::set<std::string>{"2"});
-  GroundTruth.emplace("main", 2, "g", std::set<std::string>{"8"});
+  GroundTruth.emplace("main", 1, "g", std::set<std::string>{"0"});
+  GroundTruth.emplace("main", 2, "g", std::set<std::string>{"2"});
   GroundTruth.emplace("main", 4, "call",
-                      std::set<std::string>{"10", "13", "14", "8"});
-  GroundTruth.emplace("main", 4, "g", std::set<std::string>{"8"});
+                      std::set<std::string>{"2", "4", "7", "8"});
+  GroundTruth.emplace("main", 4, "g", std::set<std::string>{"2"});
 
   doAnalysisAndCompareResults("global_05_cpp.ll", {"main"}, GroundTruth, true);
 }
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
index 03165a8abb..d81885c43f 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
@@ -130,7 +130,7 @@ TEST_F(IDEGeneralizedLCATest, StringTestCpp) {
   const auto *LastMainInstruction =
       getLastInstructionOf(HA->getProjectIRDB().getFunction("main"));
   GroundTruth.push_back({{EdgeValue("Hello, World")},
-                         3,
+                         7,
                          static_cast<unsigned int>(
                              std::stoi(getMetaDataID(LastMainInstruction)))});
   compareResults(GroundTruth);
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
index a1368dc258..59a474013b 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
@@ -482,22 +482,22 @@ PHASAR_SKIP_TEST(TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_04) {
   std::set<IIACompactResult_t> GroundTruth;
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "retval", {"13"}));
+          "main", 23, "retval", {"7"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "argc.addr", {"14"}));
+          "main", 23, "argc.addr", {"8"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "argv.addr", {"15"}));
+          "main", 23, "argv.addr", {"9"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "i", {"16"}));
+          "main", 23, "i", {"10"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "j", {"16", "17", "19", "18"}));
+          "main", 23, "j", {"10", "11", "12", "13"}));
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "k", {"16", "17", "18", "19", "20", "24", "25"}));
+          "main", 23, "k", {"10", "11", "12", "13", "14", "18", "19"}));
   doAnalysisAndCompareResults("basic_04_cpp.ll", {"main"}, GroundTruth, false);
 })
 

From 64412c57ec328fb360c37e56a14b022052d6c0be Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 19 May 2025 18:37:28 +0200
Subject: [PATCH 07/24] SVF Pointer Analyses (#767)

* Add SVF dependency + make the LLVMBasedAliasAnalysis polymorphic to allow injecting the SVF analysis

* Add public interface for SVFPointsToSet

* Add SVFPointsToInfo + Fix PointsToInfoBase

* Fixes in PointsToInfo + add minimal tests

* Add CRTPBase utility

* New test + some cleanup

* Fix build due to merge

* minor

* Simplify the SVF alias analyses + make FunctionAliasView more type-safe

* minor

* Regain precision

* Get rid of UB + aim to resolve memory leaks with SVF

* Fix SVF memory leak

* pre-commit with new clang-format version

* Apply review comments

* Getting rid of the PSR_BIND_ALIASVIEW macro

* fix compilation
---
 .clang-tidy                                   |   2 +
 .gitignore                                    |   5 +-
 CMakeLists.txt                                |  12 ++
 config.h.in                                   |   2 +
 include/phasar/ControlFlow/CFGBase.h          |  21 +--
 include/phasar/ControlFlow/CallGraphBase.h    |  11 +-
 include/phasar/ControlFlow/ICFGBase.h         |  23 ++-
 .../PhasarLLVM/ControlFlow/LLVMBasedCFG.h     |   1 -
 include/phasar/PhasarLLVM/Pointer.h           |   2 +-
 .../PhasarLLVM/Pointer/AliasAnalysisView.h    |  99 ++++++++++++
 .../phasar/PhasarLLVM/Pointer/LLVMAliasSet.h  |   8 +-
 .../PhasarLLVM/Pointer/SVF/SVFPointsToSet.h   |  55 +++++++
 include/phasar/Pointer/AliasAnalysisType.def  |   2 +
 include/phasar/Pointer/PointsToInfo.h         |  33 ++--
 include/phasar/Pointer/PointsToInfoBase.h     |  44 ++---
 include/phasar/Utils/CRTPUtils.h              |  32 ++++
 include/phasar/Utils/Fn.h                     |  43 +++++
 include/phasar/Utils/PointerUtils.h           |  27 ++++
 lib/CMakeLists.txt                            |   3 +
 lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp  |  34 ++++
 lib/PhasarLLVM/Pointer/CMakeLists.txt         |   9 +-
 .../Pointer/FilteredLLVMAliasSet.cpp          |   2 +
 lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp       |  61 ++-----
 .../Pointer/LLVMBasedAliasAnalysis.cpp        |  91 +++++++++--
 .../Pointer/LLVMBasedAliasAnalysis.h          |  45 +++---
 lib/PhasarLLVM/Pointer/SVF/CMakeLists.txt     |  24 +++
 lib/PhasarLLVM/Pointer/SVF/InitSVF.cpp        |  46 ++++++
 lib/PhasarLLVM/Pointer/SVF/InitSVF.h          |  15 ++
 .../Pointer/SVF/SVFBasedAliasAnalysis.cpp     | 123 ++++++++++++++
 .../Pointer/SVF/SVFBasedAliasAnalysis.h       |  25 +++
 lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp | 153 ++++++++++++++++++
 .../Pointer/external/CMakeLists.txt           |   2 +
 lib/Pointer/PointsToInfo.cpp                  |  19 +--
 unittests/PhasarLLVM/Pointer/CMakeLists.txt   |  12 +-
 .../PhasarLLVM/Pointer/SVFAliasSetTest.cpp    |  92 +++++++++++
 35 files changed, 978 insertions(+), 200 deletions(-)
 create mode 100644 include/phasar/PhasarLLVM/Pointer/AliasAnalysisView.h
 create mode 100644 include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h
 create mode 100644 include/phasar/Utils/CRTPUtils.h
 create mode 100644 include/phasar/Utils/Fn.h
 create mode 100644 lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp
 rename {include/phasar => lib}/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h (55%)
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/CMakeLists.txt
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/InitSVF.cpp
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/InitSVF.h
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.h
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp
 create mode 100644 lib/PhasarLLVM/Pointer/external/CMakeLists.txt
 create mode 100644 unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp

diff --git a/.clang-tidy b/.clang-tidy
index 94ed69701b..3e95f2eaea 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -29,10 +29,12 @@ Checks: '-*,
            -cppcoreguidelines-init-variables,
            -cppcoreguidelines-macro-usage,
            -cppcoreguidelines-avoid-do-while,
+           -cppcoreguidelines-avoid-c-arrays,
          bugprone-*,
            -bugprone-easily-swappable-parameters,
          modernize-*,
            -modernize-use-trailing-return-type,
+           -modernize-avoid-c-arrays,
          performance-*,
          clang-analyzer-*
         '
diff --git a/.gitignore b/.gitignore
index f86934e8b1..2aaf8ce5f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,11 +30,8 @@ doc/*
 log/*
 **/*/logs/
 
-# CMake build dir
-build/*
-
 # MS VS Code
-.vscode/*
+.vscode/
 
 # Eclipse
 .cproject
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72e0a73b99..5370c88ee3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,6 +308,18 @@ endif()
 include(add_llvm)
 add_llvm()
 
+# SVF
+option(PHASAR_USE_SVF "Use SVF for more options in alias analysis (default is OFF)" OFF)
+if(PHASAR_USE_SVF)
+  find_package(SVF REQUIRED CONFIG)
+  message(STATUS "Found SVF ${SVF_VERSION}")
+
+  if (NOT PHASAR_USE_Z3)
+    message(WARNING "SVF requires Z3. Set PHASAR_USE_Z3=ON")
+    set(PHASAR_USE_Z3 ON)
+  endif()
+endif()
+
 # Z3 Solver
 if(PHASAR_IN_TREE)
   set (PHASAR_USE_Z3 OFF)
diff --git a/config.h.in b/config.h.in
index 97b0e8a9f6..926d69b0bf 100644
--- a/config.h.in
+++ b/config.h.in
@@ -13,4 +13,6 @@
 
 #cmakedefine PHASAR_HAS_SQLITE
 
+#cmakedefine PHASAR_USE_SVF
+
 #endif /* PHASAR_CONFIG_CONFIG_H  */
diff --git a/include/phasar/ControlFlow/CFGBase.h b/include/phasar/ControlFlow/CFGBase.h
index 6f0f1d610d..5b932f2b5a 100644
--- a/include/phasar/ControlFlow/CFGBase.h
+++ b/include/phasar/ControlFlow/CFGBase.h
@@ -11,6 +11,7 @@
 #define PHASAR_CONTROLFLOW_CFGBASE_H
 
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/CRTPUtils.h"
 #include "phasar/Utils/TypeTraits.h"
 
 namespace psr {
@@ -22,7 +23,12 @@ template <typename T> struct CFGTraits {
   // using f_t
 };
 
-template <typename Derived> class CFGBase {
+template <typename Derived> class CFGBase : public CRTPBase<Derived> {
+  friend Derived;
+
+protected:
+  using CRTPBase<Derived>::self;
+
 public:
   using n_t = typename CFGTraits<Derived>::n_t;
   using f_t = typename CFGTraits<Derived>::f_t;
@@ -129,19 +135,14 @@ template <typename Derived> class CFGBase {
   void print(ByConstRef<f_t> Fun, llvm::raw_ostream &OS) const {
     self().printImpl(Fun, OS);
   }
-
-protected:
-  Derived &self() noexcept { return static_cast<Derived &>(*this); }
-  const Derived &self() const noexcept {
-    return static_cast<const Derived &>(*this);
-  }
 };
 
 template <typename ICF, typename Domain>
 // NOLINTNEXTLINE(readability-identifier-naming)
-PSR_CONCEPT 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>;
+PSR_CONCEPT 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>;
 
 } // namespace psr
 
diff --git a/include/phasar/ControlFlow/CallGraphBase.h b/include/phasar/ControlFlow/CallGraphBase.h
index 2f2371618b..67bfb0cc94 100644
--- a/include/phasar/ControlFlow/CallGraphBase.h
+++ b/include/phasar/ControlFlow/CallGraphBase.h
@@ -11,6 +11,7 @@
 #define PHASAR_CONTROLFLOW_CALLGRAPHBASE_H
 
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/CRTPUtils.h"
 #include "phasar/Utils/TypeTraits.h"
 
 namespace psr {
@@ -22,7 +23,10 @@ template <typename T> struct CGTraits {
 /// Base class of all CallGraph implementations within phasar (currently only
 /// CallGraph<N, F>).
 /// Only represents the data, not how to create it.
-template <typename Derived> class CallGraphBase {
+template <typename Derived> class CallGraphBase : public CRTPBase<Derived> {
+  friend Derived;
+  using CRTPBase<Derived>::self;
+
 public:
   using n_t = typename CGTraits<Derived>::n_t;
   using f_t = typename CGTraits<Derived>::f_t;
@@ -46,11 +50,6 @@ template <typename Derived> class CallGraphBase {
         is_iterable_over_v<decltype(self().getCallersOfImpl(Fun)), n_t>);
     return self().getCallersOfImpl(Fun);
   }
-
-private:
-  const Derived &self() const noexcept {
-    return static_cast<const Derived &>(*this);
-  }
 };
 } // namespace psr
 
diff --git a/include/phasar/ControlFlow/ICFGBase.h b/include/phasar/ControlFlow/ICFGBase.h
index 4ef63126d1..71f340462c 100644
--- a/include/phasar/ControlFlow/ICFGBase.h
+++ b/include/phasar/ControlFlow/ICFGBase.h
@@ -12,6 +12,7 @@
 
 #include "phasar/ControlFlow/CFGBase.h"
 #include "phasar/ControlFlow/CallGraphBase.h"
+#include "phasar/Utils/CRTPUtils.h"
 #include "phasar/Utils/TypeTraits.h"
 
 #include "llvm/ADT/StringRef.h"
@@ -20,16 +21,14 @@
 #include <type_traits>
 
 namespace psr {
-template <typename Derived> class ICFGBase {
+template <typename Derived> class ICFGBase : public CRTPBase<Derived> {
+  friend Derived;
+  using CRTPBase<Derived>::self;
+
 public:
   using n_t = typename CFGTraits<Derived>::n_t;
   using f_t = typename CFGTraits<Derived>::f_t;
 
-  ICFGBase() noexcept {
-    static_assert(is_crtp_base_of_v<CFGBase, Derived>,
-                  "An ICFG must also be a CFG");
-  }
-
   /// Returns an iterable range of all function definitions or declarations in
   /// the ICFG
   [[nodiscard]] decltype(auto) getAllFunctions() const {
@@ -113,20 +112,16 @@ template <typename Derived> class ICFGBase {
   [[nodiscard]] size_t getNumCallSites() const noexcept {
     return self().getNumCallSitesImpl();
   }
-
-private:
-  const Derived &self() const noexcept {
-    return static_cast<const Derived &>(*this);
-  }
 };
 
 /// True, iff ICF is a proper instantiation of ICFGBase with n_t and f_t taken
 /// from the given analysis-Domain
 template <typename ICF, typename Domain>
 // NOLINTNEXTLINE(readability-identifier-naming)
-PSR_CONCEPT is_icfg_v = is_crtp_base_of_v<ICFGBase, 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>;
+PSR_CONCEPT is_icfg_v =
+    is_crtp_base_of_v<ICFGBase, 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>;
 
 } // namespace psr
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
index a3134c7131..9eee1395d6 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
@@ -38,7 +38,6 @@ template <> struct CFGTraits<LLVMBasedBackwardCFG> : CFGTraits<LLVMBasedCFG> {};
 
 namespace detail {
 template <typename Derived> class LLVMBasedCFGImpl : public CFGBase<Derived> {
-  friend CFGBase<Derived>;
   friend class LLVMBasedBackwardCFG;
 
 public:
diff --git a/include/phasar/PhasarLLVM/Pointer.h b/include/phasar/PhasarLLVM/Pointer.h
index a2a67fd202..8025df0f4d 100644
--- a/include/phasar/PhasarLLVM/Pointer.h
+++ b/include/phasar/PhasarLLVM/Pointer.h
@@ -10,10 +10,10 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_H
 #define PHASAR_PHASARLLVM_POINTER_H
 
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 #include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 
 #endif // PHASAR_PHASARLLVM_POINTER_H
diff --git a/include/phasar/PhasarLLVM/Pointer/AliasAnalysisView.h b/include/phasar/PhasarLLVM/Pointer/AliasAnalysisView.h
new file mode 100644
index 0000000000..afdedb5de6
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Pointer/AliasAnalysisView.h
@@ -0,0 +1,99 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_POINTER_ALIASANALYSISVIEW_H
+#define PHASAR_PHASARLLVM_POINTER_ALIASANALYSISVIEW_H
+
+#include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasResult.h"
+
+#include <memory>
+#include <type_traits>
+
+namespace llvm {
+class Value;
+class DataLayout;
+class Function;
+} // namespace llvm
+
+namespace psr {
+class LLVMProjectIRDB;
+
+class FunctionAliasView {
+public:
+  template <typename T>
+  using AliasCallbackTy = AliasResult (*)(T *, const llvm::Value *,
+                                          const llvm::Value *,
+                                          const llvm::DataLayout &);
+
+  [[nodiscard]] AliasResult alias(const llvm::Value *V, const llvm::Value *Rep,
+                                  const llvm::DataLayout &DL) {
+    return Alias(Context, V, Rep, DL);
+  }
+
+  template <
+      typename T, typename AliasFn,
+      typename = std::enable_if_t<std::is_empty_v<AliasFn> &&
+                                  std::is_default_constructible_v<AliasFn>>>
+  constexpr FunctionAliasView(T *Context, AliasFn /*Alias*/) noexcept
+      : Context(Context), Alias(&callAlias<T, AliasFn>) {}
+
+private:
+  template <typename T, typename AliasFn>
+  static AliasResult callAlias(void *Context, const llvm::Value *V1,
+                               const llvm::Value *V2,
+                               const llvm::DataLayout &DL) {
+    return AliasFn{}(static_cast<T *>(Context), V1, V2, DL);
+  }
+
+  void *Context{};
+  AliasCallbackTy<void> Alias{};
+};
+
+class AliasAnalysisView {
+public:
+  constexpr AliasAnalysisView(AliasAnalysisType PATy) noexcept : PATy(PATy) {}
+
+  virtual ~AliasAnalysisView() = default;
+
+  [[nodiscard]] FunctionAliasView getAAResults(const llvm::Function *F) {
+    assert(F != nullptr);
+    return doGetAAResults(F);
+  }
+
+  void erase(llvm::Function *F) noexcept {
+    assert(F != nullptr);
+    doErase(F);
+  }
+
+  void clear() noexcept { doClear(); }
+
+  [[nodiscard]] constexpr AliasAnalysisType
+  getPointerAnalysisType() const noexcept {
+    return PATy;
+  };
+
+  [[nodiscard]] static std::unique_ptr<AliasAnalysisView>
+  create(LLVMProjectIRDB &IRDB, bool UseLazyEvaluation, AliasAnalysisType PATy);
+
+private:
+  static std::unique_ptr<AliasAnalysisView>
+  createLLVMBasedAnalysis(LLVMProjectIRDB &IRDB, bool UseLazyEvaluation,
+                          AliasAnalysisType PATy);
+
+  virtual FunctionAliasView doGetAAResults(const llvm::Function *F) = 0;
+  virtual void doErase(llvm::Function *F) noexcept = 0;
+  virtual void doClear() noexcept = 0;
+
+  AliasAnalysisType PATy{};
+};
+
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_ALIASANALYSISVIEW_H
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
index ff4ccbe5dc..1c77b6f0cd 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
@@ -10,8 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_LLVMALIASSET_H
 #define PHASAR_PHASARLLVM_POINTER_LLVMALIASSET_H
 
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
 #include "phasar/Pointer/AliasInfoBase.h"
 #include "phasar/Pointer/AliasInfoTraits.h"
 #include "phasar/Pointer/AliasResult.h"
@@ -69,7 +69,7 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
   };
 
   [[nodiscard]] inline AliasAnalysisType getAliasAnalysisType() const noexcept {
-    return PTA.getPointerAnalysisType();
+    return PTA->getPointerAnalysisType();
   };
 
   [[nodiscard]] AliasResult alias(const llvm::Value *V1, const llvm::Value *V2,
@@ -143,12 +143,12 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
                                         const llvm::GlobalObject *VG) const;
 
   /// Utility function used by computeFunctionsAliasSet(...)
-  void addPointer(llvm::AAResults &AA, const llvm::DataLayout &DL,
+  void addPointer(FunctionAliasView AA, const llvm::DataLayout &DL,
                   const llvm::Value *V, std::vector<const llvm::Value *> &Reps);
 
   [[nodiscard]] static BoxedPtr<AliasSetTy> getEmptyAliasSet();
 
-  LLVMBasedAliasAnalysis PTA;
+  std::unique_ptr<AliasAnalysisView> PTA;
   llvm::DenseSet<const llvm::Function *> AnalyzedFunctions;
 
   AliasSetOwner<AliasSetTy>::memory_resource_type MRes;
diff --git a/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h b/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h
new file mode 100644
index 0000000000..55c753222b
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+#ifndef PHASAR_PHASARLLVM_POINTER_SVF_SVFPOINTSTOSET_H
+#define PHASAR_PHASARLLVM_POINTER_SVF_SVFPOINTSTOSET_H
+
+#include "phasar/Config/phasar-config.h"
+#include "phasar/Pointer/PointsToInfo.h"
+
+#include "llvm/ADT/DenseSet.h"
+#include "llvm/IR/Value.h"
+
+#ifndef PHASAR_USE_SVF
+#error                                                                         \
+    "Don't include SVFPointsToSet.h when PhASAR is not configured to include SVF. Set the cmake variable PHASAR_USE_SVF and retry."
+#endif
+
+namespace psr {
+class LLVMProjectIRDB;
+class SVFPointsToInfo;
+
+struct SVFPointsToInfoTraits {
+  using v_t = const llvm::Value *;
+  using n_t = const llvm::Instruction *;
+  using o_t = uint32_t;
+
+  // TODO: Use a more efficient representation; maybe even one that does not
+  // require an expensive transformation from SVF::PointsTo
+  using PointsToSetTy = llvm::SmallDenseSet<o_t>;
+
+  // No special pointer type
+  using PointsToSetPtrTy = PointsToSetTy;
+};
+
+using SVFBasedPointsToInfo = PointsToInfo<SVFPointsToInfoTraits>;
+using SVFBasedPointsToInfoRef = PointsToInfoRef<SVFPointsToInfoTraits>;
+
+/// Use SVF to perform a VersionedFlowSensitive pointer analysis and return the
+/// results compatible to psr::PointsToInfo and psr::PointsToInfoRef
+[[nodiscard]] SVFBasedPointsToInfo
+createSVFVFSPointsToInfo(LLVMProjectIRDB &IRDB);
+
+/// Use SVF to perform a ContextDDA pointer analysis and return the
+/// results compatible to psr::PointsToInfo and psr::PointsToInfoRef
+[[nodiscard]] SVFBasedPointsToInfo
+createSVFDDAPointsToInfo(LLVMProjectIRDB &IRDB);
+
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_SVF_SVFPOINTSTOSET_H
diff --git a/include/phasar/Pointer/AliasAnalysisType.def b/include/phasar/Pointer/AliasAnalysisType.def
index 93c3599d77..dda81808ca 100644
--- a/include/phasar/Pointer/AliasAnalysisType.def
+++ b/include/phasar/Pointer/AliasAnalysisType.def
@@ -15,5 +15,7 @@ ALIAS_ANALYSIS_TYPE(Basic, "basic", "Basic LLVM alias resolving based on simple,
 ALIAS_ANALYSIS_TYPE(CFLSteens, "cflsteens", "Steensgaard-style alias analysis (equality-based)")
 ALIAS_ANALYSIS_TYPE(CFLAnders, "cflanders", "Andersen-style alias analysis (subset-based) (default)")
 ALIAS_ANALYSIS_TYPE(PointsTo, "points-to", "Alias-information based on (external) points-to information")
+ALIAS_ANALYSIS_TYPE(SVFDDA, "svf-dda", "Alias-information based on SVF's ContextDDA analysis. Requires SVF.")
+ALIAS_ANALYSIS_TYPE(SVFVFS, "svf-vfs", "Alias-information based on SVF's VersionedFlowSensitive analysis. Requires SVF.")
 
 #undef ALIAS_ANALYSIS_TYPE
diff --git a/include/phasar/Pointer/PointsToInfo.h b/include/phasar/Pointer/PointsToInfo.h
index 2eaf0f4387..af2f54d587 100644
--- a/include/phasar/Pointer/PointsToInfo.h
+++ b/include/phasar/Pointer/PointsToInfo.h
@@ -14,10 +14,10 @@
 #include "phasar/Utils/ByRef.h"
 
 #include <cassert>
+#include <memory>
 #include <optional>
 #include <type_traits>
 #include <utility>
-#include <vector>
 
 namespace psr {
 
@@ -29,7 +29,7 @@ struct PointsToTraits<PointsToInfoRef<PTATraits>> : PTATraits {};
 template <typename PTATraits>
 struct PointsToTraits<PointsToInfo<PTATraits>> : PTATraits {};
 
-/// A type-erased reference to any object implementing th PointsToInfoBase
+/// A type-erased reference to any object implementing the PointsToInfoBase
 /// interface. Use this, if your analysis is not tied to a specific points-to
 /// info implementation.
 ///
@@ -87,7 +87,6 @@ class PointsToInfoRef<PTATraits,
     PointsToSetPtrTy (*GetPointsToSet)(const void *, ByConstRef<o_t>,
                                        ByConstRef<n_t>);
 
-    std::vector<v_t> (*GetInterestingPointersAt)(const void *, ByConstRef<n_t>);
     void (*Destroy)(const void *) noexcept; // Useful for the owning variant
   };
 
@@ -120,15 +119,6 @@ class PointsToInfoRef<PTATraits,
           return static_cast<const ConcretePTA *>(PT)->getPointsToSet(
               Pointer, AtInstruction);
         },
-        [](const void *PT, ByConstRef<n_t> AtInstruction) {
-          std::vector<v_t> Ret;
-          for (ByConstRef<v_t> Ptr :
-               static_cast<const ConcretePTA *>(PT)->getInterestingPointersAt(
-                   AtInstruction)) {
-            Ret.push_back(Ptr);
-          }
-          return Ret;
-        },
         [](const void *PT) noexcept {
           delete static_cast<const ConcretePTA *>(PT);
         },
@@ -164,7 +154,7 @@ class PointsToInfoRef<PTATraits,
   }
 
   [[nodiscard]] std::optional<v_t>
-  asPointerOrNull(ByConstRef<o_t> Obj) const noexcept {
+  asPointerOrNullImpl(ByConstRef<o_t> Obj) const noexcept {
     assert(VT);
     return VT->AsPointerOrNull(PT, Obj);
   }
@@ -201,18 +191,12 @@ class PointsToInfoRef<PTATraits,
     return VT->GetPointsToSetV(PT, Pointer, AtInstruction);
   }
 
-  std::vector<v_t>
-  getInterestingPointersAtImpl(ByConstRef<n_t> AtInstruction) const {
-    assert(VT);
-    return VT->GetInterestingPointersAt(PT, AtInstruction);
-  }
-
   // ---
   const void *PT{};
   const VTable<> *VT{};
 };
 
-/// Similar to PointsToInfoRef, but owns the held reference. Us this, if you
+/// Similar to PointsToInfoRef, but owns the held reference. Use this, if you
 /// need to decide dynamically, which points-to info implementation to use.
 ///
 /// Implicitly convertible to PointsToInfoRef.
@@ -232,12 +216,13 @@ class [[clang::trivial_abi]] PointsToInfo<
 
   PointsToInfo() noexcept = default;
   PointsToInfo(std::nullptr_t) noexcept {};
+
   PointsToInfo(const PointsToInfo &) = delete;
   PointsToInfo &operator=(const PointsToInfo &) = delete;
+
   PointsToInfo(PointsToInfo &&Other) noexcept { swap(Other); }
   PointsToInfo &operator=(PointsToInfo &&Other) noexcept {
-    auto Cpy{std::move(Other)};
-    swap(Cpy);
+    PointsToInfo(std::move(Other)).swap(*this);
     return *this;
   }
 
@@ -255,6 +240,10 @@ class [[clang::trivial_abi]] PointsToInfo<
       : PointsToInfoRef<PTATraits>(
             new ConcretePTA(std::forward<ArgTys>(Args)...)) {}
 
+  template <typename ConcretePTA>
+  PointsToInfo(std::unique_ptr<ConcretePTA> PTA)
+      : PointsToInfoRef<PTATraits>(PTA.release()) {}
+
   ~PointsToInfo() noexcept {
     if (*this) {
       this->VT->Destroy(this->PT);
diff --git a/include/phasar/Pointer/PointsToInfoBase.h b/include/phasar/Pointer/PointsToInfoBase.h
index 9eef7cf3ad..0bb22091fb 100644
--- a/include/phasar/Pointer/PointsToInfoBase.h
+++ b/include/phasar/Pointer/PointsToInfoBase.h
@@ -11,6 +11,8 @@
 #define PHASAR_POINTER_POINTSTOINFOBASE_H
 
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/CRTPUtils.h"
+#include "phasar/Utils/PointerUtils.h"
 #include "phasar/Utils/TypeTraits.h"
 
 #include <optional>
@@ -52,7 +54,10 @@ PSR_CONCEPT is_equivalent_PointsToTraits_v = // NOLINT
 
 /// Base class of all points-to analysis implementations. Don't use this class
 /// directly. For a type-erased variant, use PointsToInfoRef or PointsToInfo.
-template <typename Derived> class PointsToInfoBase {
+template <typename Derived> class PointsToInfoBase : public CRTPBase<Derived> {
+  friend Derived;
+  using CRTPBase<Derived>::self;
+
 public:
   using v_t = typename PointsToTraits<Derived>::v_t;
   using n_t = typename PointsToTraits<Derived>::n_t;
@@ -60,12 +65,6 @@ template <typename Derived> class PointsToInfoBase {
   using PointsToSetTy = typename PointsToTraits<Derived>::PointsToSetTy;
   using PointsToSetPtrTy = typename PointsToTraits<Derived>::PointsToSetPtrTy;
 
-  explicit PointsToInfoBase() noexcept {
-    static_assert(std::is_base_of_v<PointsToInfoBase, Derived>,
-                  "Invalid CRTP instantiation: Derived must inherit from "
-                  "PointsToInfoBase<Derived>!");
-  }
-
   /// Creates an abstract object corresponding to the given pointer
   [[nodiscard]] o_t asAbstractObject(ByConstRef<v_t> Pointer) const noexcept {
     return self().asAbstractObjectImpl(Pointer);
@@ -102,29 +101,21 @@ template <typename Derived> class PointsToInfoBase {
     return self().getPointsToSetImpl(Pointer, AtInstruction);
   }
 
-  /// Gets all pointers v_t where we have non-empty points-to information at
-  /// this instruction
-  [[nodiscard]] decltype(auto)
-  getInterestingPointersAt(ByConstRef<n_t> AtInstruction) const {
-    static_assert(
-        is_iterable_over_v<
-            decltype(self().getInterestingPointersAtImpl(AtInstruction)), v_t>);
-    return self().getInterestingPointersAtImpl(AtInstruction);
-  }
-
 private:
-  template <typename V = v_t,
-            typename = std::enable_if_t<!std::is_same_v<V, o_t>>>
-  [[nodiscard]] bool mayPointsToImpl(ByConstRef<v_t> Pointer,
+  [[nodiscard]] bool mayPointsToImpl(ByConstRef<o_t> Pointer,
                                      ByConstRef<o_t> Obj,
                                      ByConstRef<n_t> AtInstruction) const {
-    return getPointsToSet(asAbstractObject(Pointer), AtInstruction)->count(Obj);
+    auto &&Pts = getPointsToSet(Pointer, AtInstruction);
+    return getPointerFrom(Pts)->count(Obj);
   }
 
-  [[nodiscard]] bool mayPointsToImpl(ByConstRef<o_t> Pointer,
+  template <typename V = v_t,
+            typename = std::enable_if_t<!std::is_same_v<V, o_t>>>
+  [[nodiscard]] bool mayPointsToImpl(ByConstRef<v_t> Pointer,
                                      ByConstRef<o_t> Obj,
                                      ByConstRef<n_t> AtInstruction) const {
-    return getPointsToSet(Pointer, AtInstruction)->count(Obj);
+    return self().mayPointsTo(self().asAbstractObject(Pointer), Obj,
+                              AtInstruction);
   }
 
   template <typename V = v_t,
@@ -134,13 +125,6 @@ template <typename Derived> class PointsToInfoBase {
                      ByConstRef<n_t> AtInstruction) const {
     return self().getPointsToSetImpl(asAbstractObject(Pointer), AtInstruction);
   }
-
-  [[nodiscard]] Derived &self() noexcept {
-    return static_cast<Derived &>(*this);
-  }
-  [[nodiscard]] const Derived &self() const noexcept {
-    return static_cast<const Derived &>(*this);
-  }
 };
 
 } // namespace psr
diff --git a/include/phasar/Utils/CRTPUtils.h b/include/phasar/Utils/CRTPUtils.h
new file mode 100644
index 0000000000..e66e394e00
--- /dev/null
+++ b/include/phasar/Utils/CRTPUtils.h
@@ -0,0 +1,32 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_CRTPUTILS_H
+#define PHASAR_UTILS_CRTPUTILS_H
+
+namespace psr {
+template <typename Derived> class CRTPBase {
+  friend Derived;
+
+protected:
+  constexpr CRTPBase() noexcept = default;
+
+  [[nodiscard]] constexpr Derived &self() & noexcept {
+    return static_cast<Derived &>(*this);
+  }
+  [[nodiscard]] constexpr Derived &&self() && noexcept {
+    return static_cast<Derived &&>(*this);
+  }
+  [[nodiscard]] constexpr const Derived &self() const & noexcept {
+    return static_cast<const Derived &>(*this);
+  }
+};
+} // namespace psr
+
+#endif // PHASAR_UTILS_CRTPUTILS_H
diff --git a/include/phasar/Utils/Fn.h b/include/phasar/Utils/Fn.h
new file mode 100644
index 0000000000..55cc644149
--- /dev/null
+++ b/include/phasar/Utils/Fn.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_FN_H
+#define PHASAR_UTILS_FN_H
+
+#include "phasar/Utils/Macros.h"
+
+#include <functional>
+#include <type_traits>
+
+namespace psr {
+/// \brief A helper that transforms a statically known function pointer into a
+/// type.
+///
+/// Useful for passing functions as callbacks, while avoiding either the
+/// indirect call overhead or wrapping a lambda around
+template <auto F> struct fn_t { // NOLINT(readability-identifier-naming)
+  template <typename... ArgsT>
+  constexpr std::invoke_result_t<decltype(F), ArgsT...>
+  operator()(ArgsT &&...Args) noexcept(
+      std::is_nothrow_invocable_v<decltype(F), ArgsT...>) {
+    return std::invoke(F, PSR_FWD(Args)...);
+  }
+};
+
+/// \brief A helper that transforms a statically known function pointer into a
+/// callable object.
+///
+/// Useful for passing functions as callbacks, while avoiding either the
+/// indirect call overhead or wrapping a lambda around
+template <auto F>
+static constexpr fn_t<F> fn{}; // NOLINT(readability-identifier-naming)
+
+} // namespace psr
+
+#endif // PHASAR_UTILS_FN_H
diff --git a/include/phasar/Utils/PointerUtils.h b/include/phasar/Utils/PointerUtils.h
index 117a5bea90..2023d9d693 100644
--- a/include/phasar/Utils/PointerUtils.h
+++ b/include/phasar/Utils/PointerUtils.h
@@ -4,25 +4,52 @@
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 
 #include <memory>
+#include <type_traits>
 
 namespace psr {
 
 /// A simple helper function to get a raw pointer from an arbitrary pointer type
 /// in generic code. This overload set is extendable.
 
+template <typename T>
+constexpr std::enable_if_t<!std::is_pointer_v<T>, T *>
+getPointerFrom(T &Ref) noexcept {
+  return std::addressof(Ref);
+}
+template <typename T>
+constexpr std::enable_if_t<!std::is_pointer_v<T>, const T *>
+getPointerFrom(const T &Ref) noexcept {
+  return std::addressof(Ref);
+}
+template <typename T>
+constexpr std::enable_if_t<!std::is_pointer_v<T>, T *>
+getPointerFrom(T &&Ref) noexcept = delete;
+
 template <typename T> T *getPointerFrom(T *Ptr) noexcept { return Ptr; }
 template <typename T>
 constexpr T *getPointerFrom(const std::unique_ptr<T> &Ptr) noexcept {
   return Ptr.get();
 }
 template <typename T>
+constexpr T *getPointerFrom(std::unique_ptr<T> &Ptr) noexcept {
+  return Ptr.get();
+}
+template <typename T>
 constexpr T *getPointerFrom(const std::shared_ptr<T> &Ptr) noexcept {
   return Ptr.get();
 }
 template <typename T>
+constexpr T *getPointerFrom(std::shared_ptr<T> &Ptr) noexcept {
+  return Ptr.get();
+}
+template <typename T>
 constexpr T *getPointerFrom(const llvm::IntrusiveRefCntPtr<T> &Ptr) noexcept {
   return Ptr.get();
 }
+template <typename T>
+constexpr T *getPointerFrom(llvm::IntrusiveRefCntPtr<T> &Ptr) noexcept {
+  return Ptr.get();
+}
 
 } // namespace psr
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 5cb0b04e8c..ffe1291f3b 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -42,6 +42,9 @@ endif()
 if(SQLite3_FOUND)
     list(APPEND PHASAR_LINK_LIBS phasar_db)
 endif()
+if(PHASAR_USE_SVF)
+    list(APPEND PHASAR_LINK_LIBS phasar_llvm_pointer_svf)
+endif()
 
 add_phasar_library(phasar ${PHASAR_DYNLIB_KIND}
     FILES
diff --git a/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp b/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp
new file mode 100644
index 0000000000..d4833b8c18
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp
@@ -0,0 +1,34 @@
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
+
+#include "phasar/Config/phasar-config.h"
+
+#ifdef PHASAR_USE_SVF
+#include "SVF/SVFBasedAliasAnalysis.h"
+#endif
+
+#include <memory>
+
+using namespace psr;
+
+std::unique_ptr<AliasAnalysisView>
+AliasAnalysisView::create(LLVMProjectIRDB &IRDB, bool UseLazyEvaluation,
+                          AliasAnalysisType PATy) {
+  switch (PATy) {
+  case AliasAnalysisType::SVFDDA:
+#ifndef PHASAR_USE_SVF
+    throw std::runtime_error("AliasAnalysisType::SVFVFS requires SVF, which is "
+                             "not included in your PhASAR build!");
+#else
+    return createSVFDDAAnalysis(IRDB);
+#endif
+  case AliasAnalysisType::SVFVFS:
+#ifndef PHASAR_USE_SVF
+    throw std::runtime_error("AliasAnalysisType::SVFDDA requires SVF, which is "
+                             "not included in your PhASAR build!");
+#else
+    return createSVFVFSAnalysis(IRDB);
+#endif
+  default:
+    return createLLVMBasedAnalysis(IRDB, UseLazyEvaluation, PATy);
+  }
+}
diff --git a/lib/PhasarLLVM/Pointer/CMakeLists.txt b/lib/PhasarLLVM/Pointer/CMakeLists.txt
index 35cabf8afb..522fd55e5e 100644
--- a/lib/PhasarLLVM/Pointer/CMakeLists.txt
+++ b/lib/PhasarLLVM/Pointer/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB_RECURSE POINTER_SRC *.h *.cpp)
+file(GLOB POINTER_SRC *.cpp)
 
 add_phasar_library(phasar_llvm_pointer
   ${POINTER_SRC}
@@ -19,3 +19,10 @@ add_phasar_library(phasar_llvm_pointer
   LINK_PRIVATE
     ${Boost_LIBRARIES}
 )
+
+add_subdirectory(external)
+
+if(PHASAR_USE_SVF)
+  add_subdirectory(SVF)
+  target_link_libraries(phasar_llvm_pointer PRIVATE phasar_llvm_pointer_svf)
+endif()
diff --git a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
index 1eac91310a..2766f8e5a9 100644
--- a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
@@ -9,6 +9,8 @@
 #include "phasar/Utils/NlohmannLogging.h"
 
 #include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/GlobalAlias.h"
+#include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/Instructions.h"
 
 #include "nlohmann/json_fwd.hpp"
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
index 6beca389fb..7b216842c2 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
@@ -10,10 +10,12 @@
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasResult.h"
 #include "phasar/Utils/BoxedPointer.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/NlohmannLogging.h"
@@ -45,10 +47,7 @@
 #include <cassert>
 #include <chrono>
 #include <cstdlib>
-#include <iomanip>
-#include <iterator>
 #include <memory>
-#include <type_traits>
 #include <utility>
 
 namespace psr {
@@ -59,7 +58,7 @@ template class AliasSetOwner<LLVMAliasInfo::AliasSetTy>;
 
 LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB, bool UseLazyEvaluation,
                            AliasAnalysisType PATy)
-    : PTA(*IRDB, UseLazyEvaluation, PATy) {
+    : PTA(AliasAnalysisView::create(*IRDB, UseLazyEvaluation, PATy)) {
   assert(IRDB != nullptr);
 
   auto NumGlobals = IRDB->getNumGlobals();
@@ -99,7 +98,7 @@ LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB, bool UseLazyEvaluation,
 
 LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB,
                            const nlohmann::json &SerializedPTS)
-    : PTA(*IRDB, true) {
+    : PTA(AliasAnalysisView::create(*IRDB, true, AliasAnalysisType::Basic)) {
   assert(IRDB != nullptr);
   // Assume, we already have validated the json schema
 
@@ -317,51 +316,13 @@ bool LLVMAliasSet::intraIsReachableAllocationSiteTy(
   return false;
 }
 
-static llvm::Type *getPointeeTypeOrNull(const llvm::Value *Ptr) {
-  assert(Ptr->getType()->isPointerTy());
-
-  if (!Ptr->getType()->isOpaquePointerTy()) {
-    return Ptr->getType()->getNonOpaquePointerElementType();
-  }
-
-  if (const auto *Arg = llvm::dyn_cast<llvm::Argument>(Ptr)) {
-    if (auto *Ty = Arg->getParamByValType()) {
-      return Ty;
-    }
-    if (auto *Ty = Arg->getParamStructRetType()) {
-      return Ty;
-    }
-  }
-  if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(Ptr)) {
-    return Alloca->getAllocatedType();
-  }
-  return nullptr;
-}
-
-static bool mayAlias(llvm::AAResults &AA, const llvm::DataLayout &DL,
+static bool mayAlias(FunctionAliasView AA, const llvm::DataLayout &DL,
                      const llvm::Value *V, const llvm::Value *Rep) {
-  assert(V->getType()->isPointerTy());
-  assert(Rep->getType()->isPointerTy());
-
-  auto *ElTy = getPointeeTypeOrNull(V);
-  auto *RepElTy = getPointeeTypeOrNull(Rep);
-
-  auto VSize = ElTy && ElTy->isSized()
-                   ? llvm::LocationSize::precise(DL.getTypeStoreSize(ElTy))
-                   : llvm::LocationSize::precise(1);
-
-  auto RepSize = RepElTy && RepElTy->isSized()
-                     ? llvm::LocationSize::precise(DL.getTypeStoreSize(RepElTy))
-                     : llvm::LocationSize::precise(1);
 
-  if (AA.alias(V, VSize, Rep, RepSize) != llvm::AliasResult::NoAlias) {
-    return true;
-  }
-
-  return false;
+  return AA.alias(V, Rep, DL) != AliasResult::NoAlias;
 }
 
-void LLVMAliasSet::addPointer(llvm::AAResults &AA, const llvm::DataLayout &DL,
+void LLVMAliasSet::addPointer(FunctionAliasView AA, const llvm::DataLayout &DL,
                               const llvm::Value *V,
                               std::vector<const llvm::Value *> &Reps) {
   llvm::SmallVector<unsigned> ToMerge;
@@ -474,13 +435,13 @@ void LLVMAliasSet::computeFunctionsAliasSet(llvm::Function *F) {
   PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMAliasSet",
                        "Analyzing function: " << F->getName());
 
-  llvm::AAResults &AA = *PTA.getAAResults(F);
+  auto AA = PTA->getAAResults(F);
   bool EvalAAMD = true;
 
   const llvm::DataLayout &DL = F->getParent()->getDataLayout();
 
-  auto addPointer = [this, &AA, &DL](const llvm::Value *V, // NOLINT
-                                     std::vector<const llvm::Value *> &Reps) {
+  auto addPointer = [this, AA, &DL](const llvm::Value *V, // NOLINT
+                                    std::vector<const llvm::Value *> &Reps) {
     return this->addPointer(AA, DL, V, Reps);
   };
 
@@ -567,7 +528,7 @@ void LLVMAliasSet::computeFunctionsAliasSet(llvm::Function *F) {
   }
 
   // we no longer need the LLVM representation
-  PTA.erase(F);
+  PTA->erase(F);
 }
 
 AliasResult LLVMAliasSet::alias(const llvm::Value *V1, const llvm::Value *V2,
diff --git a/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp
index 4473b19fe9..38a79105b0 100644
--- a/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.cpp
@@ -7,11 +7,13 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#include "phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h"
+#include "LLVMBasedAliasAnalysis.h"
 
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasResult.h"
 
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallVector.h"
@@ -38,41 +40,34 @@ using namespace psr;
 
 namespace psr {
 
-struct LLVMBasedAliasAnalysis::Impl {
-  llvm::PassBuilder PB{};
-  llvm::FunctionAnalysisManager FAM{};
-  llvm::FunctionPassManager FPM{};
-};
-
 bool LLVMBasedAliasAnalysis::hasAliasInfo(const llvm::Function &Fun) const {
   return AAInfos.find(&Fun) != AAInfos.end();
 }
 
 void LLVMBasedAliasAnalysis::computeAliasInfo(llvm::Function &Fun) {
-  assert(PImpl != nullptr);
-  llvm::PreservedAnalyses PA = PImpl->FPM.run(Fun, PImpl->FAM);
-  llvm::AAResults &AAR = PImpl->FAM.getResult<llvm::AAManager>(Fun);
+  llvm::PreservedAnalyses PA = FPM.run(Fun, FAM);
+  llvm::AAResults &AAR = FAM.getResult<llvm::AAManager>(Fun);
   AAInfos.insert(std::make_pair(&Fun, &AAR));
 }
 
-void LLVMBasedAliasAnalysis::erase(llvm::Function *F) noexcept {
+void LLVMBasedAliasAnalysis::doErase(llvm::Function *F) noexcept {
   // after we clear all stuff, we need to set it up for the next function-wise
   // analysis
   AAInfos.erase(F);
-  PImpl->FAM.clear(*F, F->getName());
+  FAM.clear(*F, F->getName());
 }
 
-void LLVMBasedAliasAnalysis::clear() noexcept {
+void LLVMBasedAliasAnalysis::doClear() noexcept {
   AAInfos.clear();
-  PImpl->FAM.clear();
+  FAM.clear();
 }
 
 LLVMBasedAliasAnalysis::LLVMBasedAliasAnalysis(LLVMProjectIRDB &IRDB,
                                                bool UseLazyEvaluation,
                                                AliasAnalysisType PATy)
-    : PImpl(new Impl{}), PATy(PATy) {
+    : AliasAnalysisView(PATy) {
 
-  PImpl->FAM.registerPass([&] {
+  FAM.registerPass([&] {
     llvm::AAManager AA;
     switch (PATy) {
     case AliasAnalysisType::CFLAnders:
@@ -95,7 +90,7 @@ LLVMBasedAliasAnalysis::LLVMBasedAliasAnalysis(LLVMProjectIRDB &IRDB,
     AA.registerFunctionAnalysis<llvm::BasicAA>();
     return AA;
   });
-  PImpl->PB.registerFunctionAnalyses(PImpl->FAM);
+  PB.registerFunctionAnalyses(FAM);
 
   if (!UseLazyEvaluation) {
     for (auto &F : *IRDB.getModule()) {
@@ -108,4 +103,66 @@ LLVMBasedAliasAnalysis::LLVMBasedAliasAnalysis(LLVMProjectIRDB &IRDB,
 
 LLVMBasedAliasAnalysis::~LLVMBasedAliasAnalysis() = default;
 
+static AliasResult translateAAResult(llvm::AliasResult Res) noexcept {
+  switch (Res) {
+  case llvm::AliasResult::NoAlias:
+    return AliasResult::NoAlias;
+  case llvm::AliasResult::MayAlias:
+    return AliasResult::MayAlias;
+  case llvm::AliasResult::PartialAlias:
+    return AliasResult::PartialAlias;
+  case llvm::AliasResult::MustAlias:
+    return AliasResult::MustAlias;
+  }
+}
+
+static llvm::Type *getPointeeTypeOrNull(const llvm::Value *Ptr) {
+  assert(Ptr->getType()->isPointerTy());
+
+  if (!Ptr->getType()->isOpaquePointerTy()) {
+    return Ptr->getType()->getNonOpaquePointerElementType();
+  }
+
+  if (const auto *Arg = llvm::dyn_cast<llvm::Argument>(Ptr)) {
+    if (auto *Ty = Arg->getParamByValType()) {
+      return Ty;
+    }
+    if (auto *Ty = Arg->getParamStructRetType()) {
+      return Ty;
+    }
+  }
+  if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(Ptr)) {
+    return Alloca->getAllocatedType();
+  }
+  return nullptr;
+}
+
+AliasResult LLVMBasedAliasAnalysis::aliasImpl(llvm::AAResults *AA,
+                                              const llvm::Value *V,
+                                              const llvm::Value *Rep,
+                                              const llvm::DataLayout &DL) {
+
+  assert(V->getType()->isPointerTy());
+  assert(Rep->getType()->isPointerTy());
+
+  auto *ElTy = getPointeeTypeOrNull(V);
+  auto *RepElTy = getPointeeTypeOrNull(Rep);
+
+  auto VSize = ElTy && ElTy->isSized()
+                   ? llvm::LocationSize::precise(DL.getTypeStoreSize(ElTy))
+                   : llvm::LocationSize::precise(1);
+
+  auto RepSize = RepElTy && RepElTy->isSized()
+                     ? llvm::LocationSize::precise(DL.getTypeStoreSize(RepElTy))
+                     : llvm::LocationSize::precise(1);
+
+  return translateAAResult(AA->alias(V, VSize, Rep, RepSize));
+}
+
+std::unique_ptr<AliasAnalysisView> AliasAnalysisView::createLLVMBasedAnalysis(
+    LLVMProjectIRDB &IRDB, bool UseLazyEvaluation, AliasAnalysisType PATy) {
+  return std::make_unique<LLVMBasedAliasAnalysis>(IRDB, UseLazyEvaluation,
+                                                  PATy);
+}
+
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
similarity index 55%
rename from include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
rename to lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
index 1195da6c82..2195d02ff4 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
+++ b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
@@ -10,9 +10,13 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_LLVMBASEDALIASANALYSIS_H_
 #define PHASAR_PHASARLLVM_POINTER_LLVMBASEDALIASANALYSIS_H_
 
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasResult.h"
+#include "phasar/Utils/Fn.h"
 
 #include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/Passes/PassBuilder.h"
 
 namespace llvm {
 class Value;
@@ -25,47 +29,42 @@ namespace psr {
 
 class LLVMProjectIRDB;
 
-class LLVMBasedAliasAnalysis {
-
+class LLVMBasedAliasAnalysis : public AliasAnalysisView {
 public:
   explicit LLVMBasedAliasAnalysis(
       LLVMProjectIRDB &IRDB, bool UseLazyEvaluation,
       AliasAnalysisType PATy = AliasAnalysisType::Basic);
 
-  LLVMBasedAliasAnalysis(LLVMBasedAliasAnalysis &&) noexcept = default;
-  LLVMBasedAliasAnalysis &
-  operator=(LLVMBasedAliasAnalysis &&) noexcept = default;
-
-  LLVMBasedAliasAnalysis(const LLVMBasedAliasAnalysis &) = delete;
-  LLVMBasedAliasAnalysis &operator=(const LLVMBasedAliasAnalysis &) = delete;
-  ~LLVMBasedAliasAnalysis();
+  ~LLVMBasedAliasAnalysis() override;
 
-  [[nodiscard]] inline llvm::AAResults *getAAResults(llvm::Function *F) {
+private:
+  FunctionAliasView doGetAAResults(const llvm::Function *F) override {
     if (!hasAliasInfo(*F)) {
-      computeAliasInfo(*F);
+      // NOLINTNEXTLINE - FIXME when it is fixed in LLVM
+      computeAliasInfo(const_cast<llvm::Function &>(*F));
     }
-    return AAInfos.lookup(F);
+    return createFAView(AAInfos.lookup(F));
   };
 
-  void erase(llvm::Function *F) noexcept;
+  void doErase(llvm::Function *F) noexcept override;
 
-  void clear() noexcept;
+  void doClear() noexcept override;
 
-  [[nodiscard]] inline AliasAnalysisType
-  getPointerAnalysisType() const noexcept {
-    return PATy;
-  };
+  static AliasResult aliasImpl(llvm::AAResults *, const llvm::Value *,
+                               const llvm::Value *, const llvm::DataLayout &);
+  [[nodiscard]] constexpr FunctionAliasView
+  createFAView(llvm::AAResults *AAR) noexcept {
+    return {AAR, fn<aliasImpl>};
+  }
 
-private:
   [[nodiscard]] bool hasAliasInfo(const llvm::Function &Fun) const;
 
   void computeAliasInfo(llvm::Function &Fun);
 
   // -- data members
-
-  struct Impl;
-  std::unique_ptr<Impl> PImpl;
-  AliasAnalysisType PATy;
+  llvm::PassBuilder PB;
+  llvm::FunctionAnalysisManager FAM;
+  llvm::FunctionPassManager FPM;
   llvm::DenseMap<const llvm::Function *, llvm::AAResults *> AAInfos;
 };
 
diff --git a/lib/PhasarLLVM/Pointer/SVF/CMakeLists.txt b/lib/PhasarLLVM/Pointer/SVF/CMakeLists.txt
new file mode 100644
index 0000000000..ec59ba7f2b
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/CMakeLists.txt
@@ -0,0 +1,24 @@
+file(GLOB_RECURSE SVF_AA_SRC *.h *.cpp)
+
+add_phasar_library(phasar_llvm_pointer_svf
+  ${SVF_AA_SRC}
+
+  LINKS
+    phasar_utils
+    phasar_pointer
+    phasar_llvm_utils
+    phasar_llvm_db
+
+  LLVM_LINK_COMPONENTS
+    Core
+    Support
+    Analysis
+    Passes
+    Demangle
+
+  LINK_PRIVATE
+    SvfLLVM SvfCore ${Z3_LIBRARIES}
+)
+
+target_include_directories(phasar_llvm_pointer_svf SYSTEM PRIVATE ${SVF_INSTALL_INCLUDE_DIR})
+target_link_directories(phasar_llvm_pointer_svf PUBLIC ${SVF_INSTALL_LIB_DIR})
diff --git a/lib/PhasarLLVM/Pointer/SVF/InitSVF.cpp b/lib/PhasarLLVM/Pointer/SVF/InitSVF.cpp
new file mode 100644
index 0000000000..32376f4ae2
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/InitSVF.cpp
@@ -0,0 +1,46 @@
+#include "InitSVF.h"
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/Utils/EmptyBaseOptimizationUtils.h"
+
+#include "SVF-LLVM/LLVMModule.h"
+#include "Util/CommandLine.h"
+#include "Util/DPItem.h"
+#include "Util/Options.h"
+
+static psr::EmptyType initializeSVFImpl() {
+  char EmptyStr[] = "";
+  char NoAliasCheck[] = "-alias-check=false";
+  char NoStat[] = "-stat=false";
+  char *MockArgv[] = {
+      EmptyStr,
+      NoAliasCheck,
+      NoStat,
+  };
+  OptionBase::parseOptions(std::size(MockArgv), MockArgv, "", "");
+
+  // Initialize these parameters to their default values.
+  // See https://github.com/SVF-tools/SVF/blob/master/svf/lib/DDA/DDAPass.cpp
+  // for reference
+  SVF::ContextCond::setMaxCxtLen(SVF::Options::MaxContextLen());
+  SVF::ContextCond::setMaxPathLen(SVF::Options::MaxPathLen());
+
+  return psr::EmptyType{};
+}
+
+void psr::initializeSVF() {
+  static const auto SVFInitialized = initializeSVFImpl();
+  (void)SVFInitialized;
+}
+
+SVF::SVFModule *psr::initSVFModule(psr::LLVMProjectIRDB &IRDB) {
+  psr::initializeSVF();
+
+  auto *Mod = SVF::LLVMModuleSet::buildSVFModule(*IRDB.getModule());
+  if (!Mod) {
+    throw std::runtime_error(
+        "SVF failed to create an SVFModule from an llvm::Module!");
+  }
+
+  return Mod;
+}
diff --git a/lib/PhasarLLVM/Pointer/SVF/InitSVF.h b/lib/PhasarLLVM/Pointer/SVF/InitSVF.h
new file mode 100644
index 0000000000..2599a3626e
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/InitSVF.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "llvm/Support/Compiler.h"
+
+namespace SVF {
+class SVFModule;
+} // namespace SVF
+
+namespace psr {
+class LLVMProjectIRDB;
+
+LLVM_LIBRARY_VISIBILITY void initializeSVF();
+LLVM_LIBRARY_VISIBILITY SVF::SVFModule *
+initSVFModule(psr::LLVMProjectIRDB &IRDB);
+} // namespace psr
diff --git a/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp b/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp
new file mode 100644
index 0000000000..0416a8415b
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp
@@ -0,0 +1,123 @@
+#include "SVFBasedAliasAnalysis.h"
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasResult.h"
+#include "phasar/Utils/Fn.h"
+
+#include "DDA/ContextDDA.h"
+#include "DDA/DDAClient.h"
+#include "InitSVF.h"
+#include "SVF-LLVM/SVFIRBuilder.h"
+#include "SVFIR/SVFIR.h"
+#include "SVFIR/SVFModule.h"
+#include "SVFIR/SVFType.h"
+#include "WPA/Andersen.h"
+#include "WPA/VersionedFlowSensitive.h"
+
+#include <memory>
+#include <optional>
+
+namespace psr {
+static constexpr psr::AliasResult
+translateSVFAliasResult(SVF::AliasResult AR) noexcept {
+  switch (AR) {
+  case SVF::NoAlias:
+    return AliasResult::NoAlias;
+  case SVF::MayAlias:
+    return AliasResult::MayAlias;
+  case SVF::MustAlias:
+    return AliasResult::MustAlias;
+  case SVF::PartialAlias:
+    return AliasResult::PartialAlias;
+  }
+}
+
+static psr::AliasResult aliasImpl(SVF::PointerAnalysis *AA,
+                                  const llvm::Value *V, const llvm::Value *Rep,
+                                  const llvm::DataLayout & /*DL*/) {
+  auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+  auto *Nod1 = ModSet->getSVFValue(V);
+  auto *Nod2 = ModSet->getSVFValue(Rep);
+
+  if (!Nod1 || !Nod2) {
+    return AliasResult::MayAlias;
+  }
+
+  return translateSVFAliasResult(AA->alias(Nod1, Nod2));
+}
+
+// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
+class SVFAliasAnalysisBase : public AliasAnalysisView {
+public:
+  SVFAliasAnalysisBase(SVF::SVFModule *Mod, AliasAnalysisType PATy)
+      : AliasAnalysisView(PATy), IRBuilder(Mod), PAG(IRBuilder.build()) {}
+
+  ~SVFAliasAnalysisBase() override {
+    SVF::SVFIR::releaseSVFIR();
+    SVF::AndersenWaveDiff::releaseAndersenWaveDiff();
+    SVF::SymbolTableInfo::releaseSymbolInfo();
+    SVF::LLVMModuleSet::releaseLLVMModuleSet();
+  }
+
+private:
+  void doErase(llvm::Function *F) noexcept override {}
+  void doClear() noexcept override {}
+
+protected:
+  SVF::SVFIRBuilder IRBuilder;
+  SVF::SVFIR *PAG;
+};
+
+class SVFVFSAnalysis : public SVFAliasAnalysisBase {
+public:
+  SVFVFSAnalysis(SVF::SVFModule *Mod)
+      : SVFAliasAnalysisBase(Mod, AliasAnalysisType::SVFVFS),
+        // Note: We must use the static createVFSWPA() function, otherwise SVF
+        // will leak memory
+        VFS(SVF::VersionedFlowSensitive::createVFSWPA(PAG)) {}
+
+  ~SVFVFSAnalysis() override { SVF::VersionedFlowSensitive::releaseVFSWPA(); }
+
+private:
+  FunctionAliasView doGetAAResults(const llvm::Function * /*F*/) override {
+    return {VFS, fn<aliasImpl>};
+  }
+
+  SVF::VersionedFlowSensitive *VFS;
+};
+
+class SVFDDAAnalysis : public SVFAliasAnalysisBase {
+public:
+  SVFDDAAnalysis(SVF::SVFModule *Mod)
+      : SVFAliasAnalysisBase(Mod, AliasAnalysisType::SVFVFS), Client(Mod) {
+    Client.initialise(Mod);
+    DDA.emplace(PAG, &Client);
+    DDA->initialize();
+    Client.answerQueries(&*DDA);
+    DDA->finalize();
+  }
+
+private:
+  FunctionAliasView doGetAAResults(const llvm::Function * /*F*/) override {
+    return {&*DDA, fn<aliasImpl>};
+  }
+
+  SVF::DDAClient Client;
+  std::optional<SVF::ContextDDA> DDA;
+};
+
+} // namespace psr
+
+[[nodiscard]] auto psr::createSVFVFSAnalysis(LLVMProjectIRDB &IRDB)
+    -> std::unique_ptr<AliasAnalysisView> {
+
+  return std::make_unique<SVFVFSAnalysis>(psr::initSVFModule(IRDB));
+}
+
+[[nodiscard]] auto psr::createSVFDDAAnalysis(LLVMProjectIRDB &IRDB)
+    -> std::unique_ptr<AliasAnalysisView> {
+
+  return std::make_unique<SVFDDAAnalysis>(psr::initSVFModule(IRDB));
+}
diff --git a/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.h b/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.h
new file mode 100644
index 0000000000..ec5955a0df
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.h
@@ -0,0 +1,25 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_POINTER_SVFBASEDALIASANALYSIS_H
+#define PHASAR_PHASARLLVM_POINTER_SVFBASEDALIASANALYSIS_H
+
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
+
+#include <memory>
+
+namespace psr {
+[[nodiscard]] std::unique_ptr<AliasAnalysisView>
+createSVFVFSAnalysis(LLVMProjectIRDB &IRDB);
+
+[[nodiscard]] std::unique_ptr<AliasAnalysisView>
+createSVFDDAAnalysis(LLVMProjectIRDB &IRDB);
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_SVFBASEDALIASANALYSIS_H
diff --git a/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp b/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp
new file mode 100644
index 0000000000..1aa5744403
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp
@@ -0,0 +1,153 @@
+#include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
+
+#include "phasar/Pointer/PointsToInfoBase.h"
+
+#include "DDA/ContextDDA.h"
+#include "DDA/DDAClient.h"
+#include "InitSVF.h"
+#include "MemoryModel/PointerAnalysis.h"
+#include "SVF-LLVM/LLVMModule.h"
+#include "SVF-LLVM/SVFIRBuilder.h"
+#include "WPA/Andersen.h"
+
+#include <utility>
+
+namespace {
+template <typename Derived> class SVFPointsToSet;
+struct DDAPointsToSetImpl;
+struct VFSPointsToSetImpl;
+} // namespace
+
+namespace psr {
+template <typename Derived>
+struct PointsToTraits<SVFPointsToSet<Derived>> : SVFPointsToInfoTraits {};
+template <>
+struct PointsToTraits<DDAPointsToSetImpl> : SVFPointsToInfoTraits {};
+template <>
+struct PointsToTraits<VFSPointsToSetImpl> : SVFPointsToInfoTraits {};
+} // namespace psr
+
+namespace {
+
+template <typename Derived>
+// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
+class SVFPointsToSet : public psr::PointsToInfoBase<SVFPointsToSet<Derived>> {
+  using base_t = psr::PointsToInfoBase<SVFPointsToSet<Derived>>;
+  friend base_t;
+
+public:
+  using typename base_t::n_t;
+  using typename base_t::o_t;
+  using typename base_t::PointsToSetPtrTy;
+  using typename base_t::PointsToSetTy;
+  using typename base_t::v_t;
+
+  ~SVFPointsToSet() {
+    SVF::SVFIR::releaseSVFIR();
+    SVF::AndersenWaveDiff::releaseAndersenWaveDiff();
+    SVF::SymbolTableInfo::releaseSymbolInfo();
+    SVF::LLVMModuleSet::releaseLLVMModuleSet();
+  }
+
+private:
+  SVFPointsToSet(SVF::SVFModule *Mod)
+      : IRBuilder(Mod), PAG(IRBuilder.build()) {}
+
+  [[nodiscard]] constexpr Derived &self() noexcept {
+    return static_cast<Derived &>(*this);
+  }
+  [[nodiscard]] constexpr const Derived &self() const noexcept {
+    return static_cast<const Derived &>(*this);
+  }
+
+  [[nodiscard]] o_t
+  asAbstractObjectImpl(psr::ByConstRef<v_t> Pointer) const noexcept {
+    auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+    auto *Nod = ModSet->getSVFValue(Pointer);
+
+    return PAG->getValueNode(Nod);
+  }
+
+  [[nodiscard]] std::optional<v_t> asPointerOrNullImpl(o_t Obj) const noexcept {
+    if (const auto *Val = PAG->getObject(Obj)->getValue()) {
+      auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+      if (const auto *LLVMVal = ModSet->getLLVMValue(Val)) {
+        return LLVMVal;
+      }
+    }
+
+    return std::nullopt;
+  }
+
+  bool mayPointsToImpl(o_t Pointer, o_t Obj, n_t /*AtInstruction*/) const {
+    auto &PTA = self().getPTA();
+    const auto &Pts = PTA.getPts(Pointer);
+    return Pts.test(Obj);
+  }
+
+  using base_t::mayPointsToImpl;
+
+  PointsToSetPtrTy getPointsToSetImpl(o_t Pointer,
+                                      n_t /*AtInstruction*/) const {
+    auto &PTA = self().getPTA();
+    const auto &Pts = PTA.getPts(Pointer);
+
+    // TODO: Should we cache this?
+    PointsToSetPtrTy Ret;
+    Ret.reserve(Pts.count());
+    Ret.insert(Pts.begin(), Pts.end());
+    return Ret;
+  }
+
+  using base_t::getPointsToSetImpl;
+
+protected:
+  SVF::SVFIRBuilder IRBuilder;
+  SVF::SVFIR *PAG;
+  friend Derived;
+};
+
+struct VFSPointsToSetImpl : SVFPointsToSet<VFSPointsToSetImpl> {
+  VFSPointsToSetImpl(SVF::SVFModule *Mod)
+      : SVFPointsToSet(Mod),
+        // Note: We must use the static createVFSWPA() function, otherwise SVF
+        // will leak memory
+        VFS(SVF::VersionedFlowSensitive::createVFSWPA(PAG)) {}
+
+  ~VFSPointsToSetImpl() { SVF::VersionedFlowSensitive::releaseVFSWPA(); }
+
+  [[nodiscard]] SVF::PointerAnalysis &getPTA() const noexcept { return *VFS; }
+
+  SVF::VersionedFlowSensitive *VFS;
+};
+
+struct DDAPointsToSetImpl : SVFPointsToSet<DDAPointsToSetImpl> {
+  DDAPointsToSetImpl(SVF::SVFModule *Mod) : SVFPointsToSet(Mod), Client(Mod) {
+    Client.initialise(Mod);
+    DDA.emplace(PAG, &Client);
+    DDA->initialize();
+    Client.answerQueries(&*DDA);
+    DDA->finalize();
+  }
+
+  [[nodiscard]] SVF::PointerAnalysis &getPTA() const noexcept { return *DDA; }
+
+  SVF::DDAClient Client;
+
+  // Note: SVF is not thread-safe anyway, so this 'mutable' should not be a
+  // problem
+  mutable std::optional<SVF::ContextDDA> DDA;
+};
+} // namespace
+
+auto psr::createSVFVFSPointsToInfo(LLVMProjectIRDB &IRDB)
+    -> SVFBasedPointsToInfo {
+  return SVFBasedPointsToInfo(std::in_place_type<VFSPointsToSetImpl>,
+                              psr::initSVFModule(IRDB));
+}
+
+auto psr::createSVFDDAPointsToInfo(LLVMProjectIRDB &IRDB)
+    -> SVFBasedPointsToInfo {
+  return SVFBasedPointsToInfo(std::in_place_type<DDAPointsToSetImpl>,
+                              psr::initSVFModule(IRDB));
+}
diff --git a/lib/PhasarLLVM/Pointer/external/CMakeLists.txt b/lib/PhasarLLVM/Pointer/external/CMakeLists.txt
new file mode 100644
index 0000000000..185b5103ea
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/external/CMakeLists.txt
@@ -0,0 +1,2 @@
+file(GLOB_RECURSE LLVM_AA_SRC *.h *.cpp)
+target_sources(phasar_llvm_pointer PRIVATE ${LLVM_AA_SRC})
diff --git a/lib/Pointer/PointsToInfo.cpp b/lib/Pointer/PointsToInfo.cpp
index df3079fcea..ed3ca3b485 100644
--- a/lib/Pointer/PointsToInfo.cpp
+++ b/lib/Pointer/PointsToInfo.cpp
@@ -11,6 +11,7 @@
 
 #include "phasar/Pointer/PointsToInfoBase.h"
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/PointerUtils.h"
 
 #include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/DenseSet.h"
@@ -60,11 +61,6 @@ class DummyFieldInsensitivePointsToAnalysis
     static PointsToSetTy Empty{};
     return &Empty;
   }
-
-  [[nodiscard]] std::vector<v_t>
-  getInterestingPointersAtImpl(ByConstRef<n_t> /*AtInstruction*/) const {
-    return {};
-  }
 };
 
 template class PointsToInfoBase<DummyFieldInsensitivePointsToAnalysis>;
@@ -129,23 +125,16 @@ class DummyFieldSensitivePointsToAnalysis
     static PointsToSetTy Empty{};
     return &Empty;
   }
-
-  [[nodiscard]] std::vector<v_t>
-  getInterestingPointersAtImpl(ByConstRef<n_t> /*AtInstruction*/) const {
-    return {};
-  }
 };
 
 [[maybe_unused]] void testTypeErasure() {
   DummyFieldInsensitivePointsToAnalysis PTA1;
   [[maybe_unused]] PointsToInfoRef<
-      PointsToTraits<DummyFieldInsensitivePointsToAnalysis>>
-      TEPTA1 = &PTA1;
+      PointsToTraits<DummyFieldInsensitivePointsToAnalysis>> TEPTA1 = &PTA1;
 
   DummyFieldSensitivePointsToAnalysis PTA2;
   [[maybe_unused]] PointsToInfoRef<
-      PointsToTraits<DummyFieldSensitivePointsToAnalysis>>
-      TEPTA2 = &PTA2;
+      PointsToTraits<DummyFieldSensitivePointsToAnalysis>> TEPTA2 = &PTA2;
 
   PointsToInfo<PointsToTraits<DummyFieldInsensitivePointsToAnalysis>> TEPTA3(
       std::in_place_type<DummyFieldInsensitivePointsToAnalysis>);
@@ -154,7 +143,7 @@ class DummyFieldSensitivePointsToAnalysis
       std::in_place_type<DummyFieldSensitivePointsToAnalysis>);
 
   // Make sure, the template gets instantiated:
-  std::ignore = TEPTA1.getInterestingPointersAt(nullptr);
+  std::ignore = TEPTA1.getPointsToSet({}, nullptr);
 }
 
 template class PointsToInfoBase<DummyFieldSensitivePointsToAnalysis>;
diff --git a/unittests/PhasarLLVM/Pointer/CMakeLists.txt b/unittests/PhasarLLVM/Pointer/CMakeLists.txt
index 8cf7152adf..290062d69e 100644
--- a/unittests/PhasarLLVM/Pointer/CMakeLists.txt
+++ b/unittests/PhasarLLVM/Pointer/CMakeLists.txt
@@ -1,9 +1,17 @@
-set(ControlFlowSources
+set(PointerFlowSources
 	LLVMAliasSetTest.cpp
 	LLVMAliasSetSerializationTest.cpp
 	FilteredLLVMAliasSetTest.cpp
 )
 
-foreach(TEST_SRC ${ControlFlowSources})
+if (PHASAR_USE_SVF)
+	list(APPEND PointerFlowSources SVFAliasSetTest.cpp)
+endif()
+
+foreach(TEST_SRC ${PointerFlowSources})
 	add_phasar_unittest(${TEST_SRC})
 endforeach(TEST_SRC)
+
+if(PHASAR_USE_SVF)
+	target_link_libraries(SVFAliasSetTest PRIVATE phasar_llvm_pointer_svf)
+endif()
diff --git a/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp b/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp
new file mode 100644
index 0000000000..4482d6071e
--- /dev/null
+++ b/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp
@@ -0,0 +1,92 @@
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasResult.h"
+
+#include "TestConfig.h"
+#include "gtest/gtest.h"
+
+using namespace psr;
+
+TEST(SVFAliasSetTest, Alias_01) {
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "pointers/basic_01_cpp_dbg.ll");
+
+  LLVMAliasSet AS(&IRDB, false, AliasAnalysisType::SVFVFS);
+
+  const auto *V = IRDB.getInstruction(5);
+  ASSERT_TRUE(V && V->getType()->isPointerTy());
+
+  const auto *Alias = IRDB.getInstruction(0);
+
+  auto ASet = AS.getAliasSet(V);
+  LLVMAliasSet::AliasSetTy GroundTruth = {V, Alias};
+  EXPECT_EQ(GroundTruth, *ASet);
+  EXPECT_NE(AliasResult::NoAlias, AS.alias(V, Alias));
+}
+
+TEST(SVFAliasSetTest, Alias_02) {
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "pointers/basic_01_cpp_dbg.ll");
+
+  LLVMAliasSet AS(&IRDB, false, AliasAnalysisType::SVFDDA);
+
+  const auto *V = IRDB.getInstruction(5);
+  ASSERT_TRUE(V && V->getType()->isPointerTy());
+
+  const auto *Alias = IRDB.getInstruction(0);
+
+  auto ASet = AS.getAliasSet(V);
+  LLVMAliasSet::AliasSetTy GroundTruth = {V, Alias};
+  EXPECT_EQ(GroundTruth, *ASet);
+  EXPECT_NE(AliasResult::NoAlias, AS.alias(V, Alias));
+}
+
+TEST(SVFAliasSetTest, PointsTo_01) {
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "pointers/basic_01_cpp_dbg.ll");
+
+  auto PT = createSVFVFSPointsToInfo(IRDB);
+
+  const auto *V = IRDB.getInstruction(5);
+  ASSERT_TRUE(V && V->getType()->isPointerTy());
+
+  const auto *Alloc = IRDB.getInstruction(0);
+
+  auto PSet = PT.getPointsToSet(V, V->getNextNode());
+  ASSERT_EQ(1, PSet.size());
+  EXPECT_EQ(Alloc, PT.asPointerOrNull(*PSet.begin()));
+
+  auto AllocObjs = PT.getPointsToSet(Alloc, Alloc->getNextNode());
+  ASSERT_EQ(1, AllocObjs.size());
+  auto AllocObj = *AllocObjs.begin();
+  EXPECT_TRUE(PT.mayPointsTo(V, AllocObj, V->getNextNode()));
+}
+
+TEST(SVFAliasSetTest, PointsTo_02) {
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "pointers/basic_01_cpp_dbg.ll");
+
+  auto PT = createSVFDDAPointsToInfo(IRDB);
+
+  const auto *V = IRDB.getInstruction(5);
+  ASSERT_TRUE(V && V->getType()->isPointerTy());
+
+  const auto *Alloc = IRDB.getInstruction(0);
+
+  auto PSet = PT.getPointsToSet(V, V->getNextNode());
+  ASSERT_EQ(1, PSet.size());
+  EXPECT_EQ(Alloc, PT.asPointerOrNull(*PSet.begin()));
+
+  auto AllocObjs = PT.getPointsToSet(Alloc, Alloc->getNextNode());
+  ASSERT_EQ(1, AllocObjs.size());
+  auto AllocObj = *AllocObjs.begin();
+  EXPECT_TRUE(PT.mayPointsTo(V, AllocObj, V->getNextNode()));
+}
+
+int main(int Argc, char **Argv) {
+  ::testing::InitGoogleTest(&Argc, Argv);
+  return RUN_ALL_TESTS();
+}

From b56205dab64e85095ac1de3f34a5888c9d85ae65 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 26 May 2025 18:05:19 +0200
Subject: [PATCH 08/24] More Heap-Allocating Functions (#772)

* Add more known heap-allocating functions + add singleton-returning functions

* Add two more heap allocating functions
---
 include/phasar/Utils/LibrarySummary.h   |  27 ++++
 lib/PhasarLLVM/Utils/LLVMShorthands.cpp |  13 +-
 lib/Utils/LibrarySummary.cpp            | 160 ++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 4 deletions(-)
 create mode 100644 include/phasar/Utils/LibrarySummary.h
 create mode 100644 lib/Utils/LibrarySummary.cpp

diff --git a/include/phasar/Utils/LibrarySummary.h b/include/phasar/Utils/LibrarySummary.h
new file mode 100644
index 0000000000..348ce0eedd
--- /dev/null
+++ b/include/phasar/Utils/LibrarySummary.h
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_LIBRARY_SUMMARY_H
+#define PHASAR_UTILS_LIBRARY_SUMMARY_H
+
+#include "llvm/ADT/StringRef.h"
+
+namespace psr {
+
+/// Checks, whether a function with the given (mangled) name is known to be a
+/// heap-allocating function, similar to malloc.
+[[nodiscard]] bool isHeapAllocatingFunction(llvm::StringRef FName) noexcept;
+
+/// Checks whether a function with the given (mangled) name is known to always
+/// return the same pointer
+[[nodiscard]] bool isSingletonReturningFunction(llvm::StringRef FName) noexcept;
+
+} // namespace psr
+
+#endif // PHASAR_UTILS_LIBRARY_SUMMARY_H
diff --git a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
index 99f8095137..2b8fac6aa3 100644
--- a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
@@ -17,11 +17,11 @@
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "phasar/Config/Configuration.h"
+#include "phasar/Utils/LibrarySummary.h"
 #include "phasar/Utils/Utilities.h"
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/StringSwitch.h"
 #include "llvm/Bitcode/BitcodeReader.h"
 #include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/IR/Constants.h"
@@ -67,9 +67,14 @@ bool psr::isAllocaInstOrHeapAllocaFunction(const llvm::Value *V) noexcept {
 }
 
 bool psr::isHeapAllocatingFunction(const llvm::Function *Fun) noexcept {
-  return llvm::StringSwitch<bool>(Fun->getName())
-      .Cases("_Znwm", "_Znam", "_ZnwPv", "malloc", "calloc", "realloc", true)
-      .Default(false);
+  auto FunName = Fun->getName();
+
+  if (FunName == "realloc") {
+    // For backwards compatibility. We should treat realloc specially.
+    return true;
+  }
+
+  return isHeapAllocatingFunction(FunName);
 }
 
 // For C-style polymorphism we need to check whether a callee candidate would
diff --git a/lib/Utils/LibrarySummary.cpp b/lib/Utils/LibrarySummary.cpp
new file mode 100644
index 0000000000..b6850eb4df
--- /dev/null
+++ b/lib/Utils/LibrarySummary.cpp
@@ -0,0 +1,160 @@
+#include "phasar/Utils/LibrarySummary.h"
+
+#include "llvm/ADT/DenseSet.h"
+#include "llvm/ADT/StringRef.h"
+
+static constexpr llvm::StringLiteral HeapAllocatingFunNames[] = {
+    // Also see SVF's extapi.c
+
+    // C functions:
+    "malloc",
+    "calloc",
+    "fopen",
+    "fopen64",
+    "fdopen",
+    "readdir64",
+    "tmpvoid64",
+    "zmalloc",
+    "gzdopen",
+    "iconv_open",
+    "lalloc",
+    "lalloc_clear",
+    "nhalloc",
+    "oballoc",
+    "popen",
+    "pthread_getspecific",
+    "readdir",
+    "safe_calloc",
+    "safe_malloc",
+    "safecalloc",
+    "safemalloc",
+    "setmntent",
+    "shmat",
+    "__sysv_signal",
+    "signal",
+    "tempnam",
+    "tmpvoid",
+    "xcalloc",
+    "xmalloc",
+    "xnmalloc",
+    "xcharalloc",
+    "xinmalloc",
+    "xizalloc",
+    "xzalloc",
+    "xpalloc",
+    "xicalloc",
+    "icalloc",
+    "imalloc",
+    "_gl_alloc_nomem",
+    "aligned_alloc",
+    "memalign",
+    "valloc",
+    "mmap64",
+    "XSetLocaleModifiers",
+    "__strdup",
+    "xmemdup",
+    "crypt",
+    "ctime",
+    "dlerror",
+    "dlopen",
+    "gai_strerror",
+    "gcry_cipher_algo_name",
+    "svfgcry_md_algo_name_",
+    "getenv",
+    "getlogin",
+    "getpass",
+    "gnutls_strerror",
+    "gpg_strerror",
+    "gzerror",
+    "inet_ntoa",
+    "initscr",
+    "llvm_stacksave",
+    "mmap",
+    "newwin",
+    "nl_langinfo",
+    "opendir",
+    "sbrk",
+    "strdup",
+    "xstrdup",
+    "strerror",
+    "strsignal",
+    "textdomain",
+    "tgetstr",
+    "tigetstr",
+    "tmpnam",
+    "ttyname",
+    "tzalloc",
+
+    // C++ functions:
+    "_Znwm",
+    "_Znam",
+    "_Znwj",
+    "_Znaj",
+    "_ZnwmRKSt9nothrow_t",
+    "_ZnamRKSt9nothrow_t",
+    "_ZnwmSt11align_val_t",
+    "_ZnamSt11align_val_t",
+    "_ZnwmSt11align_val_tRKSt9nothrow_t",
+    "_ZnamSt11align_val_tRKSt9nothrow_t",
+    "__cxa_allocate_exception",
+};
+
+static constexpr llvm::StringLiteral SingletonReturningFunctions[] = {
+    "__ctype_b_loc",
+    "__ctype_tolower_loc",
+    "__ctype_toupper_loc",
+    "__errno_location",
+    "__h_errno_location",
+    "__res_state",
+    "asctime",
+    "bindtextdomain",
+    "bind_textdomain_codeset",
+    "dcgettext",
+    "dgettext",
+    "dngettext",
+    "getgrgid",
+    "getgrnam",
+    "gethostbyaddr",
+    "gethostbyname",
+    "gethostbyname2",
+    "getmntent",
+    "getprotobyname",
+    "getprotobynumber",
+    "getpwent",
+    "getpwnam",
+    "getpwuid",
+    "getservbyname",
+    "getservbyport",
+    "getspnam",
+    "gettext",
+    "gmtime",
+    "gnu_get_libc_version",
+    "gnutls_check_version",
+    "localeconv",
+    "localtime",
+    "ngettext",
+    "pango_cairo_font_map_get_default",
+    "re_comp",
+    "setlocale",
+    "tgoto",
+    "tparm",
+    "zError",
+};
+
+bool psr::isHeapAllocatingFunction(llvm::StringRef FName) noexcept {
+  // Note: For a performance comparison of different search strategies, see
+  // https://quick-bench.com/q/lNjDT6z-M-L08h372fbCfYjwM64
+
+  static const llvm::DenseSet<llvm::StringRef> HAFs(
+      std::begin(HeapAllocatingFunNames), std::end(HeapAllocatingFunNames));
+
+  return HAFs.count(FName);
+}
+
+bool psr::isSingletonReturningFunction(llvm::StringRef FName) noexcept {
+  static const llvm::DenseSet<llvm::StringRef> SRFs(
+      std::begin(SingletonReturningFunctions),
+      std::end(SingletonReturningFunctions));
+
+  return SRFs.count(FName);
+}

From ed7995aad6c0628eee94f32a5477be0b120ada6a Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Wed, 28 May 2025 17:50:17 +0200
Subject: [PATCH 09/24] Improved Code Documentation (#771)

* comments to doxygen

* some more descriptions

* Overhauled README.dox

* Added texts + fixed typos

* More descriptions and typo fixes

* Revert change in LLVM code

* Fix existing docs

* Some more comments + update Doxyfile.in

* Add gh-pages deploy script

* pre-commit

* Small compiler fix

* pre-commit with newer clang version

* install Doxygen in CI

* test

* add token

* Remove gh-pages deploy trigger on pull-request

* install graphviz in CI to draw pretty class diagrams

* update website

* Remove gh-pages deploy trigger on pull-request

* Apply review comments

---------

Co-authored-by: mxHuber <huber.maximilian.leo@gmail.com>
---
 .github/workflows/deploy-docs.yml             |  41 ++
 README.md                                     |   2 +-
 docs/Doxyfile.in                              |  46 +-
 docs/README.dox                               |  25 +-
 .../phasar/AnalysisStrategy/AnalysisSetup.h   |   2 +-
 include/phasar/ControlFlow/CallGraphData.h    |   6 +-
 include/phasar/ControlFlow/ICFGBase.h         |   2 +-
 include/phasar/DB/ProjectIRDBBase.h           |   2 +-
 .../phasar/DataFlow/IfdsIde/EdgeFunction.h    |  26 +-
 .../phasar/DataFlow/IfdsIde/EdgeFunctions.h   | 405 +++++++-------
 .../phasar/DataFlow/IfdsIde/FlowFunctions.h   | 522 +++++++++---------
 .../DataFlow/IfdsIde/IDETabulationProblem.h   |  17 +
 .../DataFlow/IfdsIde/IFDSIDESolverConfig.h    |  18 +
 .../DataFlow/IfdsIde/IFDSTabulationProblem.h  |  17 +
 .../phasar/DataFlow/IfdsIde/InitialSeeds.h    |   3 +
 .../DataFlow/IfdsIde/Solver/Compressor.h      |  16 +
 .../IfdsIde/Solver/FlowFunctionCache.h        |   4 +
 .../IfdsIde/Solver/GenericSolverResults.h     |   2 +-
 .../DataFlow/IfdsIde/Solver/IFDSSolver.h      |   8 +
 .../IfdsIde/Solver/IterativeIDESolver.h       |   2 +-
 .../phasar/DataFlow/IfdsIde/SolverResults.h   |  22 +-
 .../DataFlow/IfdsIde/SpecialSummaries.h       |  26 +-
 .../DataFlow/Mono/Contexts/CallStringCTX.h    |   4 +
 .../phasar/DataFlow/Mono/InterMonoProblem.h   |  11 +
 .../phasar/DataFlow/Mono/IntraMonoProblem.h   |  13 +-
 .../DataFlow/Mono/Solver/InterMonoSolver.h    |   6 +
 .../DataFlow/Mono/Solver/IntraMonoSolver.h    |   4 +
 .../PathSensitivity/PathSensitivityManager.h  |   2 +
 .../PathSensitivityManagerMixin.h             |  20 +
 include/phasar/Domain/AnalysisDomain.h        |  39 +-
 .../ControlFlow/GlobalCtorsDtorsModel.h       |  21 +-
 .../ControlFlow/LLVMBasedBackwardCFG.h        |   2 +
 .../ControlFlow/LLVMBasedBackwardICFG.h       |   4 +-
 .../PhasarLLVM/ControlFlow/LLVMBasedCFG.h     |   2 +
 .../PhasarLLVM/ControlFlow/LLVMBasedICFG.h    |   2 +
 .../ControlFlow/LLVMVFTableProvider.h         |   6 +
 .../ControlFlow/Resolver/CHAResolver.h        |   3 +
 .../ControlFlow/Resolver/NOResolver.h         |   1 +
 .../ControlFlow/Resolver/OTFResolver.h        |   2 +
 .../ControlFlow/Resolver/RTAResolver.h        |   3 +
 .../ControlFlow/Resolver/Resolver.h           |   4 +
 .../ControlFlow/SparseLLVMBasedCFG.h          |   2 +
 .../ControlFlow/SparseLLVMBasedICFG.h         |   8 +
 .../ControlFlow/SparseLLVMBasedICFGView.h     |  11 +-
 .../phasar/PhasarLLVM/DB/LLVMProjectIRDB.h    |   1 +
 .../DataFlow/IfdsIde/FunctionDataFlowFacts.h  |   7 +-
 .../IfdsIde/LLVMFunctionDataFlowFacts.h       |   9 +-
 .../DataFlow/IfdsIde/LLVMZeroValue.h          |   7 +-
 .../Problems/IDEExtendedTaintAnalysis.h       |   2 +
 .../Z3BasedPathSensitvityManager.h            |  14 +
 .../PhasarLLVM/Domain/LLVMAnalysisDomain.h    |   4 +
 .../phasar/PhasarLLVM/Pointer/LLVMAliasSet.h  |  33 +-
 .../PhasarLLVM/Pointer/LLVMAliasSetData.h     |   3 +
 .../TypeHierarchy/DIBasedTypeHierarchy.h      |  26 +-
 .../TypeHierarchy/DIBasedTypeHierarchyData.h  |   3 +
 include/phasar/PhasarLLVM/Utils/Annotation.h  |   5 +-
 include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h |   7 +
 .../phasar/PhasarLLVM/Utils/LLVMShorthands.h  |  20 +-
 include/phasar/PhasarPass/PhasarPass.h        |  14 +
 include/phasar/Pointer/AliasInfo.h            |  15 +-
 include/phasar/TypeHierarchy/VFTable.h        |   1 +
 include/phasar/Utils/AnalysisPrinterBase.h    |   2 +
 include/phasar/Utils/DebugOutput.h            |   3 +
 include/phasar/Utils/DefaultAnalysisPrinter.h |   5 +-
 include/phasar/Utils/EquivalenceClassMap.h    |  43 +-
 include/phasar/Utils/ErrorHandling.h          |   4 +
 include/phasar/Utils/IO.h                     |   3 +
 .../phasar/Utils/OnTheFlyAnalysisPrinter.h    |   9 +-
 include/phasar/Utils/Utilities.h              |  12 +-
 .../Pointer/LLVMBasedAliasAnalysis.h          |   4 +
 .../TaintConfig/LLVMTaintConfig.cpp           |   2 +-
 71 files changed, 1014 insertions(+), 628 deletions(-)
 create mode 100644 .github/workflows/deploy-docs.yml

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
new file mode 100644
index 0000000000..7588c25fd2
--- /dev/null
+++ b/.github/workflows/deploy-docs.yml
@@ -0,0 +1,41 @@
+name: Build and Deploy Doxygen Docs
+on:
+  push:
+    branches: [ development ]
+  # pull_request: # For testing only.  Remove before merge!
+  #   branches: [ development ]
+permissions:
+  contents: write
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: true
+    continue-on-error: false
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install Phasar Dependencies
+        shell: bash
+        run: |
+          ./utils/InstallAptDependencies.sh --noninteractive tzdata doxygen graphviz
+
+      - name: Build Doxygen Docs
+        shell: bash
+        env:
+          CXX: clang++-15
+          CC: clang-15
+        run: |
+           cmake -S . -B build -DPHASAR_BUILD_DOC=ON
+           cmake --build ./build --target doc_doxygen
+
+      - name: Deploy Doxygen Docs on GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          folder: build/docs/html
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index d15020fae3..17396e5464 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Currently, PhASAR is maintained by
 PhASAR requires at least C++-17.
 
 However, building in C++20 mode is supported. You may enable this setting the cmake variable `CMAKE_CXX_STANDARD` to `20`.
-Although phasar currently does not make use of C++-20 features (except for some `concept`s behind an #ifdef border), your client application that just *uses* phasar as a library may want to use C++20 ealier.
+Although phasar currently does not make use of C++-20 features (except for some `concept`s behind an #ifdef border), your client application that just *uses* phasar as a library may want to use C++20 earlier.
 
 ## Currently Supported Version of LLVM
 
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index b45f14eebd..2014d73648 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -32,19 +32,19 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "PhASAR"
+PROJECT_NAME           = PhASAR
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = @PHASAR_VERSION@
+PROJECT_NUMBER         = @PHASAR_VERSION@@development
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "PhASAR a LLVM-based Static Analysis Framework"
+PROJECT_BRIEF          = "A LLVM-based Static Analysis Framework"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
@@ -144,7 +144,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
-STRIP_FROM_PATH        =
+STRIP_FROM_PATH        = @PHASAR_SRC_DIR@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
@@ -153,8 +153,7 @@ STRIP_FROM_PATH        =
 # specify the list of include paths that are normally passed to the compiler
 # using the -I flag.
 
-STRIP_FROM_INC_PATH    =
-
+STRIP_FROM_INC_PATH    = @PHASAR_SRC_DIR@/include
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
 # less readable) file names. This can be useful is your file systems doesn't
 # support long names like on DOS, Mac, or CD-ROM.
@@ -398,7 +397,7 @@ LOOKUP_CACHE_SIZE      = 0
 # normally produced when WARNINGS is set to YES.
 # The default value is: NO.
 
-EXTRACT_ALL            = NO
+EXTRACT_ALL            = YES
 
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
 # be included in the documentation.
@@ -743,7 +742,8 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/include/ @CMAKE_CURRENT_SOURCE_DIR@/lib/ @CMAKE_CURRENT_SOURCE_DIR@/docs
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/include/ \
+                         @CMAKE_CURRENT_SOURCE_DIR@/docs
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -794,7 +794,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */external/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -805,7 +805,7 @@ EXCLUDE_PATTERNS       =
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = *::detail::*
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
@@ -905,7 +905,7 @@ INLINE_SOURCES         = NO
 # Fortran comments will always remain visible.
 # The default value is: YES.
 
-STRIP_CODE_COMMENTS    = YES
+STRIP_CODE_COMMENTS    = NO
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
 # function all documented functions referencing it will be listed.
@@ -917,7 +917,7 @@ REFERENCED_BY_RELATION = YES
 # all documented entities called/used by that function will be listed.
 # The default value is: NO.
 
-REFERENCES_RELATION    = NO
+REFERENCES_RELATION    = YES
 
 # If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
 # to YES, then the hyperlinks from functions in REFERENCES_RELATION and
@@ -1407,7 +1407,7 @@ FORMULA_TRANSPARENT    = YES
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_MATHJAX            = NO
+USE_MATHJAX            = YES
 
 # When MathJax is enabled you can set the default output format to be used for
 # the MathJax output. See the MathJax site (see:
@@ -1521,7 +1521,7 @@ SEARCHDATA_FILE        = searchdata.xml
 # projects and redirect the results back to the right project.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
-EXTERNAL_SEARCH_ID     =
+EXTERNAL_SEARCH_ID     = phasar
 
 # The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
 # projects other than the one defined by this configuration file, but that are
@@ -1540,7 +1540,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1917,7 +1917,7 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           =
+INCLUDE_PATH           = @PHASAR_BINARY_DIR@/include
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2040,7 +2040,7 @@ DIA_PATH               =
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
-HIDE_UNDOC_RELATIONS   = YES
+HIDE_UNDOC_RELATIONS   = NO
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
@@ -2100,7 +2100,7 @@ CLASS_GRAPH            = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-COLLABORATION_GRAPH    = YES
+COLLABORATION_GRAPH    = NO
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
 # groups, showing the direct groups dependencies.
@@ -2136,7 +2136,7 @@ UML_LIMIT_NUM_FIELDS   = 10
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-TEMPLATE_RELATIONS     = NO
+TEMPLATE_RELATIONS     = YES
 
 # If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
 # YES then doxygen will generate a graph for each documented file showing the
@@ -2145,7 +2145,7 @@ TEMPLATE_RELATIONS     = NO
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INCLUDE_GRAPH          = YES
+INCLUDE_GRAPH          = NO
 
 # If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
 # set to YES then doxygen will generate a graph for each documented file showing
@@ -2154,7 +2154,7 @@ INCLUDE_GRAPH          = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-INCLUDED_BY_GRAPH      = YES
+INCLUDED_BY_GRAPH      = NO
 
 # If the CALL_GRAPH tag is set to YES then doxygen will generate a call
 # dependency graph for every global function or class method.
@@ -2203,7 +2203,7 @@ DIRECTORY_GRAPH        = YES
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = svg
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.
@@ -2276,7 +2276,7 @@ MAX_DOT_GRAPH_DEPTH    = 0
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_TRANSPARENT        = NO
+DOT_TRANSPARENT        = YES
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
diff --git a/docs/README.dox b/docs/README.dox
index e00ef59771..6ae3b786c0 100644
--- a/docs/README.dox
+++ b/docs/README.dox
@@ -2,14 +2,27 @@
 
 @mainpage PhASAR: A LLVM-based Static Analysis Framework
 
-@author Philipp Schubert (E-Mail: philipp.schubert@upb.de) and others
+PhASAR is a LLVM-based static analysis framework written in C++. It allows users to specify arbitrary data-flow problems which are then solved in a fully-automated manner on the specified LLVM IR target code. Computing points-to information, call-graph(s), etc. is done by the framework, thus you can focus on what matters.
 
-\b Copyright \n
-	Copyright 2017 Philipp Schubert. All rights reserved.
+This page contains the generated code documentation of PhASAR.
+You can find the original source on GitHub: <https://github.com/secure-software-engineering/phasar>. The README should already give you a good first overview.
 
-\b License \n
-	See LICENSE.txt
+For further information, please checkout PhASAR's [Wiki](https://github.com/secure-software-engineering/phasar/wiki).
+
+@subsubsection SSEG Secure Software Engineering Group
+
+PhASAR is primarily developed and maintained by the [Secure Software Engineering Group](https://www.hni.uni-paderborn.de/sse) at Heinz Nixdorf Institute (University of Paderborn) and [Fraunhofer IEM](https://www.iem.fraunhofer.de/).
 
-TODO: add detailed description.
+PhASAR was initially developed by Philipp Dominik Schubert (<a href="https://github.com/pdschubert">@pdschubert</a>)(<philipp.schubert@upb.de>).
+
+\b Currently, PhASAR is maintained by
+- Fabian Schiebel (<a href="https://github.com/fabianbs96">@fabianbs96</a>)(fabian.schiebel@iem.fraunhofer.de)
+- Sriteja Kummita (<a href="https://github.com/sritejakv">@sritejakv</a>)
+- Lucas Briese (<a href="https://github.com/jusito">@jusito</a>)
+- Martin Mory (<a href="https://github.com/MMory">@MMory</a>)(martin.mory@upb.de)
+- *others*
+
+\b License \n
+	PhASAR is made available under the permissive MIT License. See <a href="https://github.com/secure-software-engineering/phasar/blob/development/LICENSE.txt">LICENSE.txt</a>
 
 */
diff --git a/include/phasar/AnalysisStrategy/AnalysisSetup.h b/include/phasar/AnalysisStrategy/AnalysisSetup.h
index 975ed1c292..7b40140d4c 100644
--- a/include/phasar/AnalysisStrategy/AnalysisSetup.h
+++ b/include/phasar/AnalysisStrategy/AnalysisSetup.h
@@ -16,7 +16,7 @@
 
 namespace psr {
 
-// Indicates that an analysis does not need a special configuration (file).
+/// Indicates that an analysis does not need a special configuration (file).
 struct HasNoConfigurationType {};
 
 struct AnalysisSetup {
diff --git a/include/phasar/ControlFlow/CallGraphData.h b/include/phasar/ControlFlow/CallGraphData.h
index ed50d66e42..58393936a9 100644
--- a/include/phasar/ControlFlow/CallGraphData.h
+++ b/include/phasar/ControlFlow/CallGraphData.h
@@ -18,8 +18,12 @@
 #include <vector>
 
 namespace psr {
+
+/// A data structure used for storing, serializing and deserializing call-graph
+/// information.
 struct CallGraphData {
-  // Mangled FunName --> [CS-IDs]
+
+  /// Mangled FunName --> [CS-IDs]
   std::unordered_map<std::string, std::vector<uint32_t>> FToFunctionVertexTy{};
 
   CallGraphData() noexcept = default;
diff --git a/include/phasar/ControlFlow/ICFGBase.h b/include/phasar/ControlFlow/ICFGBase.h
index 71f340462c..4b1ceab7b4 100644
--- a/include/phasar/ControlFlow/ICFGBase.h
+++ b/include/phasar/ControlFlow/ICFGBase.h
@@ -36,7 +36,7 @@ template <typename Derived> class ICFGBase : public CRTPBase<Derived> {
   }
 
   /// returns the function definition or declaration with the given name. If
-  /// ther eis no such function, returns a default constructed f_t (nullptr for
+  /// there is no such function, returns a default constructed f_t (nullptr for
   /// pointers).
   [[nodiscard]] f_t getFunction(llvm::StringRef Fun) const {
     return self().getFunctionImpl(Fun);
diff --git a/include/phasar/DB/ProjectIRDBBase.h b/include/phasar/DB/ProjectIRDBBase.h
index 092019686d..8b68b81910 100644
--- a/include/phasar/DB/ProjectIRDBBase.h
+++ b/include/phasar/DB/ProjectIRDBBase.h
@@ -24,7 +24,7 @@ template <typename DB> struct ProjectIRDBTraits {
   // using g_t
 };
 
-/// This class owns the IR code of the project under analysis and some
+/// This class owns the IR code of the target being analyzed and some
 /// very important information associated with the IR.
 /// When an object of this class is destroyed it will clean up all IR related
 /// stuff that is stored in it.
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
index 4a74d9e3ff..ca6c0ad706 100644
--- a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
@@ -65,7 +65,7 @@ concept IsEdgeFunction = requires(const T &EF, const EdgeFunction<typename T::l_
   {T::compose(CEF, TEEF)}  -> std::same_as<EdgeFunction<typename T::l_t>>;
   {T::join(CEF, TEEF)}     -> std::same_as<EdgeFunction<typename T::l_t>>;
 };
-  // clang-format on
+// clang-format on
 
 #endif
 
@@ -78,10 +78,10 @@ enum class EdgeFunctionAllocationPolicy {
 class EdgeFunctionBase {
 public:
   template <typename ConcreteEF>
-  static constexpr bool
-      IsSOOCandidate = sizeof(ConcreteEF) <= sizeof(void *) && // NOLINT
-                       alignof(ConcreteEF) <= alignof(void *) &&
-                       std::is_trivially_copyable_v<ConcreteEF>;
+  static constexpr bool IsSOOCandidate =
+      sizeof(ConcreteEF) <= sizeof(void *) && // NOLINT
+      alignof(ConcreteEF) <= alignof(void *) &&
+      std::is_trivially_copyable_v<ConcreteEF>;
 
   using AllocationPolicy = EdgeFunctionAllocationPolicy;
 
@@ -89,7 +89,9 @@ class EdgeFunctionBase {
   struct RefCountedBase {
     mutable std::atomic_size_t Rc = 0;
   };
-  template <typename T> struct RefCounted : RefCountedBase { T Value; };
+  template <typename T> struct RefCounted : RefCountedBase {
+    T Value;
+  };
 
   template <typename T> struct CachedRefCounted : RefCounted<T> {
     EdgeFunctionSingletonCache<T> *Cache{};
@@ -118,8 +120,8 @@ class EdgeFunctionBase {
                                  : AllocationPolicy::CustomHeapAllocated;
 };
 
-/// Non-null reference to an edge function that is guarenteed to be managed by
-/// an EdgeFunction object.
+/// \brief Non-null reference to an edge function that is guarenteed to be
+/// managed by an EdgeFunction object.
 template <typename EF>
 class [[clang::trivial_abi]] EdgeFunctionRef final : EdgeFunctionBase {
   template <typename L> friend class EdgeFunction;
@@ -164,8 +166,8 @@ class [[clang::trivial_abi]] EdgeFunctionRef final : EdgeFunctionBase {
       IsCached{};
 };
 
-/// Ref-counted and type-erased edge function with small-object optimization.
-/// Supports caching.
+/// \brief Ref-counted and type-erased edge function with small-object
+/// optimization. Supports caching.
 template <typename L>
 // -- combined copy and move assignment
 // NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
@@ -265,8 +267,8 @@ class [[clang::trivial_abi]] EdgeFunction final : EdgeFunctionBase {
   explicit EdgeFunction(
       std::in_place_type_t<ConcreteEF> /*unused*/,
       ArgTys &&...Args) noexcept(IsSOOCandidate<std::decay_t<ConcreteEF>> &&
-                                     std::is_nothrow_constructible_v<ConcreteEF,
-                                                                     ArgTys...>)
+                                 std::is_nothrow_constructible_v<ConcreteEF,
+                                                                 ArgTys...>)
       : EdgeFunction(
             [](auto &&...Args) {
               if constexpr (IsSOOCandidate<std::decay_t<ConcreteEF>>) {
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
index 3b90341336..e6b4cd2e17 100644
--- a/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
@@ -42,222 +42,225 @@ template <typename AnalysisDomainTy> class EdgeFunctions {
 
   virtual ~EdgeFunctions() = default;
 
-  //
-  // Also refer to FlowFunctions::getNormalFlowFunction()
-  //
-  // Describes a value computation problem along a normal (non-call, non-return)
-  // intra-procedural exploded supergraph edge. A normal edge function
-  // implementation is queried for each edge that has been generated by appling
-  // the flow function returned by FlowFunctions::getNormalFlowFunction(). The
-  // supergraph edge whose computation is requested is defined by the supergraph
-  // nodes CurrNode and SuccNode.
-  //
-  // Let instruction_1 := Curr, instruction_2 := Succ, and 0 the tautological
-  // lambda fact.
-  //
-  // The concrete implementation of an edge function e is depending on the
-  // analysis problem. In the following, we present a brief, contrived example:
-  //
-  // Consider the following flow function implementation (cf.
-  // FlowFunctions::getNormalFlowfunction()):
-  //
-  //    f(0) -> {0}       // pass the lambda (or zero fact) as identity
-  //    f(o) -> {o, x}    // generate a new fact x from o
-  //    f(.) -> {.}       // pass all other facts that hold before instruction_1
-  //                      // as identity
-  //
-  // The above flow-function implementation corresponds to the following edges
-  // in the exploded supergraph.
-  //
-  //                                 0  o      ...
-  //                                 |  |\     ...
-  // Curr := x = instruction_1 o p   |  | \    ...
-  //                                 |  |  |   ...
-  //                                 v  v  v   ...
-  //                                 0  o  x   ...
-  //
-  // Succ := y = instruction_2 q r
-  //
-  // For each edge generated by the respective flow function a normal edge
-  // function is queried that describes a value computation. This results in the
-  // following queries:
-  //
-  // getNormalEdgeFunction(0, Curr, 0 Succ);
-  // getNormalEdgeFunction(o, Curr, o Succ);
-  // getNormalEdgeFunction(o, Curr, x Succ);
-  //
+  ///
+  /// Also refer to FlowFunctions::getNormalFlowFunction()
+  ///
+  /// Describes a value computation problem along a normal (non-call,
+  /// non-return) intra-procedural exploded supergraph edge. A normal edge
+  /// function implementation is queried for each edge that has been generated
+  /// by appling the flow function returned by
+  /// FlowFunctions::getNormalFlowFunction(). The supergraph edge whose
+  /// computation is requested is defined by the supergraph nodes CurrNode and
+  /// SuccNode.
+  ///
+  /// Let instruction_1 := Curr, instruction_2 := Succ, and 0 the tautological
+  /// lambda fact.
+  ///
+  /// The concrete implementation of an edge function e is depending on the
+  /// analysis problem. In the following, we present a brief, contrived example:
+  ///
+  /// Consider the following flow function implementation (cf.
+  /// FlowFunctions::getNormalFlowfunction()):
+  /// \code
+  ///    f(0) -> {0}       // pass the lambda (or zero fact) as identity
+  ///    f(o) -> {o, x}    // generate a new fact x from o
+  ///    f(.) -> {.}       // pass all other facts that hold before
+  ///                      // instruction_1 as identity
+  /// \endcode
+  ///
+  /// The above flow-function implementation corresponds to the following edges
+  /// in the exploded supergraph.
+  /// \code
+  ///                                 0  o      ...
+  ///                                 |  |\     ...
+  /// Curr := x = instruction_1 o p   |  | \    ...
+  ///                                 |  |  |   ...
+  ///                                 v  v  v   ...
+  ///                                 0  o  x   ...
+  ///
+  /// Succ := y = instruction_2 q r
+  /// \endcode
+  /// For each edge generated by the respective flow function a normal edge
+  /// function is queried that describes a value computation. This results in
+  /// the following queries:
+  ///
+  /// \code
+  /// getNormalEdgeFunction(0, Curr, 0 Succ);
+  /// getNormalEdgeFunction(o, Curr, o Succ);
+  /// getNormalEdgeFunction(o, Curr, x Succ);
+  /// \endcode
   virtual EdgeFunction<l_t> getNormalEdgeFunction(n_t Curr, d_t CurrNode,
                                                   n_t Succ, d_t SuccNode) = 0;
 
-  //
-  // Also refer to FlowFunctions::getCallFlowFunction()
-  //
-  // Describes a value computation problem along a call flow. A call edge
-  // function is queried for each edge that has been generated by applying the
-  // flow function that has been returned by FlowFunctions::getCallFlowFunction.
-  // The supergraph edge whose computation is requested is defined by the
-  // supergraph nodes SrcNode and DestNode.
-  //
-  // The concrete implementation of an edge function e is depending on the
-  // analysis problem. In the following, we present a brief, contrived example:
-  //
-  // Consider the following flow function implementation (cf.
-  // FlowFunctions::getCallFlowFunction()):
-  //
-  //    f(0) -> {0}       // pass as identity into the callee target
-  //    f(o) -> {q}       // map actual o into formal q
-  //    f(p) -> {r}       // map actual p into formal r
-  //    f(.) -> {}        // kill all other facts that are not visible to the
-  //                      // callee target
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                                        0  o  p   ...
-  //                                         \  \  \  ...
-  // CallInst := x = CalleeFun(o, p, ...)     \  \  +----------------+
-  //                                           \  +----------------  |
-  //                                             +-------------+  +  |
-  //                                                  ...      |  |  |
-  //                                                  ...      |  |  |
-  //                                        0  o  p   ...      |  |  |
-  //                                                           |  |  |
-  //                                                           |  |  |
-  //                                                           |  |  |
-  //                                 Ty CalleeFun(q, r, ...)   |  |  |
-  //                                                           v  v  v
-  //                                                           0  q  r   ...
-  //
-  //                                             start point
-  //
-  // For each edge generated by the respective flow function a call edge
-  // function is queried that describes a value computation. This results in the
-  // following queries:
-  //
-  // getCallEdgeFunction(CallInst, 0, CalleeFun, 0);
-  // getCallEdgeFunction(CallInst, o, CalleeFun, q);
-  // getCallEdgeFunction(CallInst, p, CalleeFun, r);
-  //
+  ///
+  /// Also refer to FlowFunctions::getCallFlowFunction()
+  ///
+  /// Describes a value computation problem along a call flow. A call edge
+  /// function is queried for each edge that has been generated by applying the
+  /// flow function that has been returned by
+  /// FlowFunctions::getCallFlowFunction. The supergraph edge whose computation
+  /// is requested is defined by the supergraph nodes SrcNode and DestNode.
+  ///
+  /// The concrete implementation of an edge function e is depending on the
+  /// analysis problem. In the following, we present a brief, contrived example:
+  ///
+  /// Consider the following flow function implementation (cf.
+  /// FlowFunctions::getCallFlowFunction()):
+  /// \code
+  ///    f(0) -> {0}       // pass as identity into the callee target
+  ///    f(o) -> {q}       // map actual o into formal q
+  ///    f(p) -> {r}       // map actual p into formal r
+  ///    f(.) -> {}        // kill all other facts that are not visible to the
+  ///                      // callee target
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                                        0  o  p   ...
+  ///                                         \  \  \  ...
+  /// CallInst := x = CalleeFun(o, p, ...)     \  \  +----------------+
+  ///                                           \  +----------------  |
+  ///                                             +-------------+  +  |
+  ///                                                  ...      |  |  |
+  ///                                                  ...      |  |  |
+  ///                                        0  o  p   ...      |  |  |
+  ///                                                           |  |  |
+  ///                                                           |  |  |
+  ///                                                           |  |  |
+  ///                                 Ty CalleeFun(q, r, ...)   |  |  |
+  ///                                                           v  v  v
+  ///                                                           0  q  r   ...
+  ///
+  ///                                             start point
+  /// \endcode
+  /// For each edge generated by the respective flow function a call edge
+  /// function is queried that describes a value computation. This results in
+  /// the following queries:
+  /// \code
+  /// getCallEdgeFunction(CallInst, 0, CalleeFun, 0);
+  /// getCallEdgeFunction(CallInst, o, CalleeFun, q);
+  /// getCallEdgeFunction(CallInst, p, CalleeFun, r);
+  /// \endcode
   virtual EdgeFunction<l_t> getCallEdgeFunction(n_t CallInst, d_t SrcNode,
                                                 f_t CalleeFun,
                                                 d_t DestNode) = 0;
 
-  //
-  // Also refer to FlowFunction::getRetFlowFunction()
-  //
-  // Describes a value computation problem along a return flow. A return edge
-  // function implementation is queried for each edge that has been generated by
-  // applying the flow function that has been returned by
-  // FlowFunctions::getRetFlowFunction(). The supergraph edge whose computation
-  // is requested is defined by the supergraph nodes ExitNode and RetNode.
-  //
-  // The concrete implementation of an edge function e is depending on the
-  // analysis problem. In the following, we present a brief, contrived example:
-  //
-  // Consider the following flow function implementation (cf.
-  // FlowFunctions::getRetFlowFunction()):
-  //
-  //    f(0) -> {0}       // pass as identity into the callee target
-  //    f(r) -> {x}       // map return value to lhs variable at CallSite
-  //    f(q) -> {o}       // map pointer-typed formal q to actual o
-  //    f(.) -> {}        // kill all other facts that are not visible to the
-  //                      // caller
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                                               0  o   ...
-  //
-  // CallSite = RetSite := x = CalleeFun(o, ...)
-  //                                                     +------------------+
-  //                                                  +--|---------------+  |
-  //                                               +--|--|------------+  |  |
-  //                                               v  v  v   ...      |  |  |
-  //                                               0  o  x   ...      |  |  |
-  //                                                                  |  |  |
-  //                                                                  |  |  |
-  //                                                                  |  |  |
-  //                                           Ty CalleeFun(q, ...)   |  |  |
-  //                                                                  |  |  |
-  //                                                                  0  q  r
-  //
-  //                                           ExitInst := return r
-  //
-  // For each edge generated by the respective flow function a return edge
-  // function is queried that describes a value computation. This results in the
-  // following queries:
-  //
-  // getReturnEdgeFunction(CallSite, CalleeFun, ExitInst, 0, RetSite, 0);
-  // getReturnEdgeFunction(CallSite, CalleeFun, ExitInst, q, RetSite, o);
-  // getReturnEdgeFunction(CallSite, CalleeFun, ExitInst, r, RetSite, x);
-  //
+  ///
+  /// Also refer to FlowFunction::getRetFlowFunction()
+  ///
+  /// Describes a value computation problem along a return flow. A return edge
+  /// function implementation is queried for each edge that has been generated
+  /// by applying the flow function that has been returned by
+  /// FlowFunctions::getRetFlowFunction(). The supergraph edge whose computation
+  /// is requested is defined by the supergraph nodes ExitNode and RetNode.
+  ///
+  /// The concrete implementation of an edge function e is depending on the
+  /// analysis problem. In the following, we present a brief, contrived example:
+  ///
+  /// Consider the following flow function implementation (cf.
+  /// FlowFunctions::getRetFlowFunction()):
+  /// \code
+  ///    f(0) -> {0}       // pass as identity into the callee target
+  ///    f(r) -> {x}       // map return value to lhs variable at CallSite
+  ///    f(q) -> {o}       // map pointer-typed formal q to actual o
+  ///    f(.) -> {}        // kill all other facts that are not visible to the
+  ///                      // caller
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                                               0  o   ...
+  ///
+  /// CallSite = RetSite := x = CalleeFun(o, ...)
+  ///                                                     +------------------+
+  ///                                                  +--|---------------+  |
+  ///                                               +--|--|------------+  |  |
+  ///                                               v  v  v   ...      |  |  |
+  ///                                               0  o  x   ...      |  |  |
+  ///                                                                  |  |  |
+  ///                                                                  |  |  |
+  ///                                                                  |  |  |
+  ///                                           Ty CalleeFun(q, ...)   |  |  |
+  ///                                                                  |  |  |
+  ///                                                                  0  q  r
+  ///
+  ///                                           ExitInst := return r
+  /// \endcode
+  /// For each edge generated by the respective flow function a return edge
+  /// function is queried that describes a value computation. This results in
+  /// the following queries:
+  /// \code
+  /// getReturnEdgeFunction(CallSite, CalleeFun, ExitInst, 0, RetSite, 0);
+  /// getReturnEdgeFunction(CallSite, CalleeFun, ExitInst, q, RetSite, o);
+  /// getReturnEdgeFunction(CallSite, CalleeFun, ExitInst, r, RetSite, x);
+  /// \endcode
   virtual EdgeFunction<l_t> getReturnEdgeFunction(n_t CallSite, f_t CalleeFun,
                                                   n_t ExitInst, d_t ExitNode,
                                                   n_t RetSite, d_t RetNode) = 0;
 
-  //
-  // Also refer to FlowFunctions::getCallToRetFlowFunction()
-  //
-  // Describes a value computation problem along data-flows alongsite a
-  // CallSite. A return edge function implementation is queried for each edge
-  // that has been generated by applying the flow function that has been
-  // returned by FlowFunctions::getCallToRetFlowFunction(). The supergraph edge
-  // whose computation is requested is defined by the supergraph nodes CallNode
-  // and RetSiteNode.
-  //
-  // The concrete implementation of an edge function e is depending on the
-  // analysis problem. In the following, we present a brief, contrived example:
-  //
-  // Consider the following flow function implementation (cf.
-  // FlowFunctions::getCallToRetFlowFunction()):
-  //
-  //    f(0) -> {0}       // pass lambda as identity alongsite the CallSite
-  //    f(o) -> {o}       // assuming that o is passed by value, it is passed
-  //                      // alongsite the CallSite
-  //    f(p) -> {}        // assuming that p is a pointer-typed value, we need
-  //                      // to kill p, as it will be handled by the call- and
-  //                      // return-flow functions
-  //    f(.) -> {.}       // pass everything that is not involved in the call as
-  //                      // identity
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                                                  0  o   ...
-  //                                                  |  |
-  //                                                  |  +-------+
-  //                                                  +--------+ |
-  //                                                           | |
-  // CallSite = RetSite := x = CalleeFun(o, p, ...)            | |
-  //                                                           | |
-  //                                                  +--------+ |
-  //                                                  |  +-------+
-  //                                                  v  v
-  //                                                  0  o  x   ...
-  //
-  // For each edge generated by the respective flow function a call-to-return
-  // edge function is queried that describes a value computation. This results
-  // in the following queries:
-  //
-  // getCallToRetEdgeFunction(CallSite, 0, RetSite, 0, {CalleeFun});
-  // getCallToRetEdgeFunction(CallSite, o, RetSite, o, {CalleeFun});
-  //
+  ///
+  /// Also refer to FlowFunctions::getCallToRetFlowFunction()
+  ///
+  /// Describes a value computation problem along data-flows alongsite a
+  /// CallSite. A return edge function implementation is queried for each edge
+  /// that has been generated by applying the flow function that has been
+  /// returned by FlowFunctions::getCallToRetFlowFunction(). The supergraph edge
+  /// whose computation is requested is defined by the supergraph nodes CallNode
+  /// and RetSiteNode.
+  ///
+  /// The concrete implementation of an edge function e is depending on the
+  /// analysis problem. In the following, we present a brief, contrived example:
+  ///
+  /// Consider the following flow function implementation (cf.
+  /// FlowFunctions::getCallToRetFlowFunction()):
+  /// \code
+  ///    f(0) -> {0}       // pass lambda as identity alongsite the CallSite
+  ///    f(o) -> {o}       // assuming that o is passed by value, it is passed
+  ///                      // alongsite the CallSite
+  ///    f(p) -> {}        // assuming that p is a pointer-typed value, we need
+  ///                      // to kill p, as it will be handled by the call- and
+  ///                      // return-flow functions
+  ///    f(.) -> {.}       // pass everything that is not involved in the call
+  ///                      // as identity
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                                                  0  o   ...
+  ///                                                  |  |
+  ///                                                  |  +-------+
+  ///                                                  +--------+ |
+  ///                                                           | |
+  /// CallSite = RetSite := x = CalleeFun(o, p, ...)            | |
+  ///                                                           | |
+  ///                                                  +--------+ |
+  ///                                                  |  +-------+
+  ///                                                  v  v
+  ///                                                  0  o  x   ...
+  /// \endcode
+  /// For each edge generated by the respective flow function a call-to-return
+  /// edge function is queried that describes a value computation. This results
+  /// in the following queries:
+  ///
+  /// getCallToRetEdgeFunction(CallSite, 0, RetSite, 0, {CalleeFun});
+  /// getCallToRetEdgeFunction(CallSite, o, RetSite, o, {CalleeFun});
+  ///
   virtual EdgeFunction<l_t>
   getCallToRetEdgeFunction(n_t CallSite, d_t CallNode, n_t RetSite,
                            d_t RetSiteNode, llvm::ArrayRef<f_t> Callees) = 0;
 
-  //
-  // Also refer to FlowFunction::getSummaryFlowFunction()
-  //
-  // Describes a value computation problem along a summary data flow. A summary
-  // edge function implementation is queried for each edge that has been
-  // generated by FlowFunctions::getSummaryFlowFunction(). The supergraph edge
-  // whose computation is requested is defined by the supergraph nodes CurrNode
-  // and SuccNode.
-  //
-  // The default implementation returns a nullptr to indicate that the mechanism
-  // should not be used.
-  //
+  ///
+  /// Also refer to FlowFunction::getSummaryFlowFunction()
+  ///
+  /// Describes a value computation problem along a summary data flow. A summary
+  /// edge function implementation is queried for each edge that has been
+  /// generated by FlowFunctions::getSummaryFlowFunction(). The supergraph edge
+  /// whose computation is requested is defined by the supergraph nodes CurrNode
+  /// and SuccNode.
+  ///
+  /// The default implementation returns a nullptr to indicate that the
+  /// mechanism should not be used.
+  ///
   virtual EdgeFunction<l_t> getSummaryEdgeFunction(n_t /*Curr*/,
                                                    d_t /*CurrNode*/,
                                                    n_t /*Succ*/,
diff --git a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
index 2f3fa53f5c..6e54fe3936 100644
--- a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
+++ b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
@@ -36,9 +36,9 @@ namespace psr {
 //                              FlowFunction Class
 //===----------------------------------------------------------------------===//
 
-//
-// This class models a flow function for distributive data-flow problems.
-//
+///
+/// This class models a flow function for distributive data-flow problems.
+///
 template <typename D, typename Container = std::set<D>> class FlowFunction {
   static_assert(std::is_same<typename Container::value_type, D>::value,
                 "Container values needs to be the same as D");
@@ -52,17 +52,17 @@ template <typename D, typename Container = std::set<D>> class FlowFunction {
 
   virtual ~FlowFunction() = default;
 
-  //
-  // This function is called for each data-flow fact Source that holds before
-  // the instruction under analysis. The return value is a (potentially empty)
-  // set of data-flow facts that are generated from Source and hold after the
-  // instruction under analysis. In other words: the function describes what
-  // exploded supergraph edges have to be "drawn".
-  //
-  // Please also refer to the various flow function factories of the
-  // FlowFunctions interface: FlowFunctions::get*FlowFunction() for more
-  // details.
-  //
+  ///
+  /// This function is called for each data-flow fact Source that holds before
+  /// the instruction under analysis. The return value is a (potentially empty)
+  /// set of data-flow facts that are generated from Source and hold after the
+  /// instruction under analysis. In other words: the function describes what
+  /// exploded supergraph edges have to be "drawn".
+  ///
+  /// Please also refer to the various flow function factories of the
+  /// FlowFunctions interface: FlowFunctions::get*FlowFunction() for more
+  /// details.
+  ///
   virtual container_type computeTargets(D Source) = 0;
 };
 
@@ -153,13 +153,13 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   /// dataflow-facts x, f(x) = {x}.
   ///
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///                   x1  x1  x3 ...
   ///                   |   |   |  ...
   ///  id-instruction   |   |   |  ...
   ///                   v   v   v  ...
   ///                   x1  x2  x3 ...
-  ///
+  /// \endcode
   static auto identityFlow() {
     struct IdFF final : public FlowFunction<d_t, container_type> {
       container_type computeTargets(d_t Source) override {
@@ -178,14 +178,14 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   /// dataflow-facts x, f(x) = F(x).
   ///
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///                 x
   ///                 |
   ///  inst           F
   ///           /  /  |  \  \  ...
   ///          v  v   v   v  v
   ///          x1 x2  x  x3 x4
-  ///
+  /// \endcode
   template <typename Fn> static auto lambdaFlow(Fn &&F) {
     struct LambdaFlow final : public FlowFunction<d_t, container_type> {
       LambdaFlow(Fn &&F) : Flow(std::forward<Fn>(F)) {}
@@ -208,21 +208,22 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = generateFlow(v, w), then for all incoming
   /// dataflow facts x:
+  /// \code
   ///   f(w) = {v, w},
   ///   f(x) = {x}.
-  ///
+  /// \endcode
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///       x  w     u ...
   ///       |  |\    | ...
   ///  inst |  | \   | ...
   ///       v  v  v  v ...
   ///       x  w  v  u
-  ///
+  /// \endcode
   /// \note If the FactToGenerate already holds at the beginning of the
   /// statement, this flow function does not kill it. For IFDS analysis it makes
   /// no difference, but in the case of IDE, the corresponding edge functions
-  /// are being joined together potentially lowing precition. If that is an
+  /// are being joined together potentially lowering precision. If that is an
   /// issue, use transferFlow instead.
   static auto generateFlow(d_t FactToGenerate, d_t From) {
     struct GenFrom final : public FlowFunction<d_t, container_type> {
@@ -250,9 +251,10 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// So, given a flow function f = generateFlowIf(v, p), for all incoming
   /// dataflow facts x:
+  /// \code
   ///   f(x) = {v, x}   if p(x) == true
   ///   f(x) = {x}      else.
-  ///
+  /// \endcode
   template <typename Fn = psr::TrueFn,
             typename = std::enable_if_t<std::is_invocable_r_v<bool, Fn, d_t>>>
   static auto generateFlowIf(d_t FactToGenerate, Fn Predicate) {
@@ -281,17 +283,18 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = generateManyFlows({v1, v2, ..., vN}, w), for all
   /// incoming dataflow facts x:
+  /// \code
   ///   f(w) = {v1, v2, ..., vN, w}
   ///   f(x) = {x}.
-  ///
+  /// \endcode
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///       x  w                u ...
   ///       |  |\  \ ... \      | ...
   ///  inst |  | \  \ ... \     | ...
   ///       v  v  v  v ... \    v ...
   ///       x  w  v1 v2 ... vN  u
-  ///
+  /// \endcode
   template <typename Range = std::initializer_list<d_t>,
             typename = std::enable_if_t<is_iterable_over_v<Range, d_t>>>
   static auto generateManyFlows(Range &&FactsToGenerate, d_t From) {
@@ -324,17 +327,18 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   /// (FactToKill).
   ///
   /// Given a flow function f = killFlow(v), for all incoming dataflow facts x:
+  /// \code
   ///   f(v) = {}
   ///   f(x) = {x}
-  ///
+  /// \endcode
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///           u  v  w ...
   ///           |  |  |
   ///  inst     |     |
   ///           v     v
   ///           u  v  w ...
-  ///
+  /// \endcode
   static auto killFlow(d_t FactToKill) {
     struct KillFlow final : public FlowFunction<d_t, container_type> {
       KillFlow(d_t KillValue) : KillValue(std::move(KillValue)) {}
@@ -355,9 +359,10 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = killFlowIf(p), for all incoming dataflow facts
   /// x:
+  /// \code
   ///   f(x) = {}   if p(x) == true
   ///   f(x) = {x}  else.
-  ///
+  /// \endcode
   template <typename Fn = psr::TrueFn,
             typename = std::enable_if_t<std::is_invocable_r_v<bool, Fn, d_t>>>
   static auto killFlowIf(Fn Predicate) {
@@ -382,20 +387,21 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = killManyFlows({v1, v2, ..., vN}), for all
   /// incoming dataflow facts x:
+  /// \code
   ///   f(v1) = {}
   ///   f(v2) = {}
   ///   ...
   ///   f(vN) = {}
   ///   f(x)  = {x}.
-  ///
+  /// \endcode
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///           u  v1  v2 ... vN  w ...
   ///           |  |   |       |  |
   ///  inst     |                 |
   ///           v                 v
   ///           u  v1  v2 ... vN  w ...
-  ///
+  /// \endcode
   template <typename Range = std::initializer_list<d_t>,
             typename = std::enable_if_t<is_iterable_over_v<Range, d_t>>>
   static auto killManyFlows(Range &&FactsToKill) {
@@ -419,8 +425,9 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   /// A flow function that stops propagating *all* incoming dataflow facts.
   ///
   /// Given a flow function f = killAllFlows(), for all incoming dataflow facts
+  /// \code
   /// x, f(x) = {}.
-  ///
+  /// \endcode
   static auto killAllFlows() {
     struct KillAllFF final : public FlowFunction<d_t, container_type> {
       Container computeTargets(d_t /*Source*/) override { return Container(); }
@@ -440,20 +447,21 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = generateFlowAndKillAllOthers(v, w), for all
   /// incoming dataflow facts x:
+  /// \code
   ///   f(w) = {v, w}
   ///   f(x) = {}.
-  ///
+  /// \endcode
   /// Equivalent to: killFlowIf(λz.z!=w) o generateFlow(v, w) (where o denotes
   /// function composition)
   ///
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///         x  w     u ...
   ///         |  |\    |
   ///  inst      | \     ...
   ///            v  v
   ///         x  w  v  u
-  ///
+  /// \endcode
   static auto generateFlowAndKillAllOthers(d_t FactToGenerate, d_t From) {
     struct GenFlowAndKillAllOthers final
         : public FlowFunction<d_t, container_type> {
@@ -481,17 +489,18 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = generateManyFlowsAndKillAllOthers({v1, v2, ...,
   /// vN}, w), for all incoming dataflow facts x:
+  /// \code
   ///   f(w) = {v1, v2, ..., vN, w}
   ///   f(x) = {}.
-  ///
+  /// \endcode
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///       x  w                u ...
   ///       |  |\  \ ... \      | ...
   ///  inst    | \  \ ... \       ...
   ///          v  v  v ... \      ...
   ///       x  w  v1 v2 ... vN  u
-  ///
+  /// \endcode
   template <typename Range = std::initializer_list<d_t>,
             typename = std::enable_if_t<is_iterable_over_v<Range, d_t>>>
   static auto generateManyFlowsAndKillAllOthers(Range &&FactsToGenerate,
@@ -533,19 +542,20 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = transferFlow(v, w), for all incoming dataflow
   /// facts x:
+  /// \code
   ///   f(v) = {}
   ///   f(w) = {v, w}
   ///   f(x) = {x}.
-  ///
+  /// \endcode
   /// In the exploded supergraph it may look as follows:
-  ///
+  /// \code
   ///       x  w   v  u ...
   ///       |  |\  |  | ...
   ///       |  | \    | ...
   ///  inst |  |  \   | ...
   ///       v  v   v  v ...
   ///       x  w   v  u
-  ///
+  /// \endcode
   static auto transferFlow(d_t FactToGenerate, d_t From) {
     struct TransferFlow final : public FlowFunction<d_t, container_type> {
       TransferFlow(d_t GenValue, d_t FromValue)
@@ -575,8 +585,9 @@ template <typename D, typename Container> class FlowFunctionTemplates {
   ///
   /// Given a flow function f = unionFlows(g, h), for all incoming dataflow
   /// facts x:
+  /// \code
   ///   f(x) = g(x) u h(x).     (where u denotes set-union)
-  ///
+  /// \endcode
   template <typename F1, typename F2,
             typename = std::enable_if_t<
                 std::is_same_v<d_t, typename F2::value_type> &&
@@ -635,242 +646,239 @@ class FlowFunctions
 
   virtual ~FlowFunctions() = default;
 
-  //
-  // Describes the effects of the current instruction, i.e. data-flows, along
-  // normal (non-call, non-return) instructions. Analysis writers are free to
-  // inspect the successor instructions, too, as a lookahead.
-  //
-  // Let instruction_1 := Curr, instruction_2 := Succ, and 0 the tautological
-  // lambda fact.
-  //
-  // The returned flow function implementation f
-  // (FlowFunction::computeTargets()) is applied to each data-flow fact d_i that
-  // holds before the current statement under analysis. f's return type is a set
-  // of (target) facts that have to be generated from the source fact d_i by the
-  // data-flow solver. Each combination of input fact d_i (given as an input to
-  // f) and respective output facts (f(d_i)) represents an edge that must be
-  // "drawn" to construct the exploded supergraph for the analysis problem to be
-  // solved.
-  //
-  // The concrete implementation of f is depending on the analysis problem. In
-  // the following, we present a brief, contrived example:
-  //
-  // f is applied to each data-flow fact d_i that holds before instruction_1. We
-  // assume that f is implemented to produce the following outputs.
-  //
-  //    f(0) -> {0}       // pass the lambda (or zero fact) as identity
-  //    f(o) -> {o, x}    // generate a new fact x from o
-  //    f(.) -> {.}       // pass all other facts that hold before instruction_1
-  //                      // as identity
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                         0  o      ...
-  //                         |  |\     ...
-  // x = instruction_1 o p   |  | \    ...
-  //                         |  |  |   ...
-  //                         v  v  v   ...
-  //                         0  o  x   ...
-  //
-  // y = instruction_2 q r
-  //
+  ///
+  /// Describes the effects of the current instruction, i.e. data-flows, along
+  /// normal (non-call, non-return) instructions. Analysis writers are free to
+  /// inspect the successor instructions, too, as a lookahead.
+  ///
+  /// Let instruction_1 := Curr, instruction_2 := Succ, and 0 the tautological
+  /// lambda fact.
+  ///
+  /// The returned flow function implementation f
+  /// (FlowFunction::computeTargets()) is applied to each data-flow fact d_i
+  /// that holds before the current statement under analysis. f's return type is
+  /// a set of (target) facts that have to be generated from the source fact d_i
+  /// by the data-flow solver. Each combination of input fact d_i (given as an
+  /// input to f) and respective output facts (f(d_i)) represents an edge that
+  /// must be "drawn" to construct the exploded supergraph for the analysis
+  /// problem to be solved.
+  ///
+  /// The concrete implementation of f is depending on the analysis problem. In
+  /// the following, we present a brief, contrived example:
+  ///
+  /// f is applied to each data-flow fact d_i that holds before instruction_1.
+  /// We assume that f is implemented to produce the following outputs.
+  /// \code
+  ///    f(0) -> {0}       // pass the lambda (or zero fact) as identity
+  ///    f(o) -> {o, x}    // generate a new fact x from o
+  ///    f(.) -> {.}       // pass all other facts that hold before
+  ///                      // instruction_1 as identity
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                         0  o      ...
+  ///                         |  |\     ...
+  /// x = instruction_1 o p   |  | \    ...
+  ///                         |  |  |   ...
+  ///                         v  v  v   ...
+  ///                         0  o  x   ...
+  ///
+  /// y = instruction_2 q r
+  /// \endcode
   virtual FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) = 0;
 
-  //
-  // Handles call flows: describes the effects of a function call at callInst
-  // to the callee target destFun. If a call instruction has multiple callee
-  // targets, for instance, because it is an indirect function call that cannot
-  // be analyzed precisely in a static manner, the call flow function will be
-  // queried for each callee target.
-  //
-  // This flow function usually handles parameter passing and maps actual to
-  // formal parameters. If an analysis writer does not wish to analyze a given
-  // callee target they can return a flow function implementation that kills all
-  // data-flow facts (e.g. KillAll) such that call is not followed. A commonly
-  // used trick to model the effects of functions that are not present (e.g.
-  // library functions such as malloc(), free(), etc.) is to kill all facts at
-  // the call to the respective target and plugin the semantics in the
-  // call-to-return flow function. In the call-to-return flow function, an
-  // analysis writer can check if the function of interest is one of the
-  // possible targets and then, return a flow function implementation that
-  // describes the special semantics of that function call.
-  //
-  // Let start_point be the starting point of the callee target CalleeFun.
-  //
-  // The returned flow function implementation f
-  // (FlowFunction::computeTargets()) is applied to each data-flow fact d_i that
-  // holds right before the CallInst. f's return type is a set
-  // of (target) facts that have to be generated from the source fact d_i by the
-  // data-flow solver. Each target fact that is generated will hold before
-  // start_point.
-  //
-  // The concrete implementation of f is depending on the analysis problem. In
-  // the following, we present a brief, contrived example:
-  //
-  // f is applied to each data-flow fact d_i that holds before CallInst. We
-  // assume that f is implemented to produce the following outputs.
-  //
-  //    f(0) -> {0}       // pass as identity into the callee target
-  //    f(o) -> {q}       // map actual o into formal q
-  //    f(p) -> {r}       // map actual p into formal r
-  //    f(.) -> {}        // kill all other facts that are not visible to the
-  //                      // callee target
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                            0  o  p   ...
-  //                             \  \  \  ...
-  // x = CalleeFun(o, p, ...)     \  \  +----------------+
-  //                               \  +----------------  |
-  //                                 +-------------+  +  |
-  //                                      ...      |  |  |
-  //                                      ...      |  |  |
-  //                            0  o  p   ...      |  |  |
-  //                                               |  |  |
-  //                                               |  |  |
-  //                                               |  |  |
-  //                     Ty CalleeFun(q, r, ...)   |  |  |
-  //                                               v  v  v
-  //                                               0  q  r   ...
-  //
-  //                                 start point
-  //
+  ///
+  /// Handles call flows: describes the effects of a function call at callInst
+  /// to the callee target destFun. If a call instruction has multiple callee
+  /// targets, for instance, because it is an indirect function call that cannot
+  /// be analyzed precisely in a static manner, the call flow function will be
+  /// queried for each callee target.
+  ///
+  /// This flow function usually handles parameter passing and maps actual to
+  /// formal parameters. If an analysis writer does not wish to analyze a given
+  /// callee target they can return a flow function implementation that kills
+  /// all data-flow facts (e.g. KillAll) such that call is not followed. A
+  /// commonly used trick to model the effects of functions that are not present
+  /// (e.g. library functions such as malloc(), free(), etc.) is to kill all
+  /// facts at the call to the respective target and plugin the semantics in the
+  /// call-to-return flow function. In the call-to-return flow function, an
+  /// analysis writer can check if the function of interest is one of the
+  /// possible targets and then, return a flow function implementation that
+  /// describes the special semantics of that function call.
+  ///
+  /// Let start_point be the starting point of the callee target CalleeFun.
+  ///
+  /// The returned flow function implementation f
+  /// (FlowFunction::computeTargets()) is applied to each data-flow fact d_i
+  /// that holds right before the CallInst. f's return type is a set of (target)
+  /// facts that have to be generated from the source fact d_i by the data-flow
+  /// solver. Each target fact that is generated will hold before start_point.
+  ///
+  /// The concrete implementation of f is depending on the analysis problem. In
+  /// the following, we present a brief, contrived example:
+  ///
+  /// f is applied to each data-flow fact d_i that holds before CallInst. We
+  /// assume that f is implemented to produce the following outputs.
+  /// \code
+  ///    f(0) -> {0}       // pass as identity into the callee target
+  ///    f(o) -> {q}       // map actual o into formal q
+  ///    f(p) -> {r}       // map actual p into formal r
+  ///    f(.) -> {}        // kill all other facts that are not visible to the
+  ///                      // callee target
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                            0  o  p   ...
+  ///                             \  \  \  ...
+  /// x = CalleeFun(o, p, ...)     \  \  +----------------+
+  ///                               \  +----------------  |
+  ///                                 +-------------+  +  |
+  ///                                      ...      |  |  |
+  ///                                      ...      |  |  |
+  ///                            0  o  p   ...      |  |  |
+  ///                                               |  |  |
+  ///                                               |  |  |
+  ///                                               |  |  |
+  ///                     Ty CalleeFun(q, r, ...)   |  |  |
+  ///                                               v  v  v
+  ///                                               0  q  r   ...
+  ///
+  ///                                 start point
+  /// \endcode
   virtual FlowFunctionPtrType getCallFlowFunction(n_t CallInst,
                                                   f_t CalleeFun) = 0;
 
-  //
-  // Handles return flows: describes the data-flows from an ExitInst to the
-  // corresponding RetSite.
-  //
-  // This flow function usually handles the returned value of the callee target
-  // as well as the parameter mapping back to the caller of CalleeFun for
-  // pointer parameters as modifications made by CalleeFun are visible to the
-  // caller. Data-flow facts that are not returned or escape via function
-  // pointer parameters (or global variables) are usually killed.
-  //
-  // The returned flow function implementation f
-  // (FlowFunction::computeTargets()) is applied to each data-flow fact d_i that
-  // holds right before the ExitInst. f's return type is a set
-  // of (target) facts that have to be generated from the source fact d_i by the
-  // data-flow solver. Each target fact that is generated will hold after
-  // CallSite.
-  //
-  // The concrete implementation of f is depending on the analysis problem. In
-  // the following, we present a brief, contrived example:
-  //
-  // f is applied to each data-flow fact d_i that holds before ExitInst. We
-  // assume that f is implemented to produce the following outputs.
-  //
-  //    f(0) -> {0}       // pass as identity into the callee target
-  //    f(r) -> {x}       // map return value to lhs variable at CallSite
-  //    f(q) -> {o}       // map pointer-typed formal q to actual o
-  //    f(.) -> {}        // kill all other facts that are not visible to the
-  //                      // caller
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                         0  o   ...
-  //
-  // x = CalleeFun(o, ...)
-  //                               +------------------+
-  //                            +--|---------------+  |
-  //                         +--|--|------------+  |  |
-  //                         v  v  v   ...      |  |  |
-  //                         0  o  x   ...      |  |  |
-  //                                            |  |  |
-  //                                            |  |  |
-  //                                            |  |  |
-  //                     Ty CalleeFun(q, ...)   |  |  |
-  //                                            |  |  |
-  //                                            0  q  r   ...
-  //
-  //                                 return r
-  //
+  ///
+  /// Handles return flows: describes the data-flows from an ExitInst to the
+  /// corresponding RetSite.
+  ///
+  /// This flow function usually handles the returned value of the callee target
+  /// as well as the parameter mapping back to the caller of CalleeFun for
+  /// pointer parameters as modifications made by CalleeFun are visible to the
+  /// caller. Data-flow facts that are not returned or escape via function
+  /// pointer parameters (or global variables) are usually killed.
+  ///
+  /// The returned flow function implementation f
+  /// (FlowFunction::computeTargets()) is applied to each data-flow fact d_i
+  /// that holds right before the ExitInst. f's return type is a set of (target)
+  /// facts that have to be generated from the source fact d_i by the data-flow
+  /// solver. Each target fact that is generated will hold after CallSite.
+  ///
+  /// The concrete implementation of f is depending on the analysis problem. In
+  /// the following, we present a brief, contrived example:
+  ///
+  /// f is applied to each data-flow fact d_i that holds before ExitInst. We
+  /// assume that f is implemented to produce the following outputs.
+  /// \code
+  ///    f(0) -> {0}       // pass as identity into the callee target
+  ///    f(r) -> {x}       // map return value to lhs variable at CallSite
+  ///    f(q) -> {o}       // map pointer-typed formal q to actual o
+  ///    f(.) -> {}        // kill all other facts that are not visible to the
+  ///                      // caller
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                         0  o   ...
+  ///
+  /// x = CalleeFun(o, ...)
+  ///                               +------------------+
+  ///                            +--|---------------+  |
+  ///                         +--|--|------------+  |  |
+  ///                         v  v  v   ...      |  |  |
+  ///                         0  o  x   ...      |  |  |
+  ///                                            |  |  |
+  ///                                            |  |  |
+  ///                                            |  |  |
+  ///                     Ty CalleeFun(q, ...)   |  |  |
+  ///                                            |  |  |
+  ///                                            0  q  r   ...
+  ///
+  ///                                 return r
+  /// \endcode
   virtual FlowFunctionPtrType getRetFlowFunction(n_t CallSite, f_t CalleeFun,
                                                  n_t ExitInst, n_t RetSite) = 0;
 
-  // Performs any side-effects of a return-flow-function
-  //
-  // In case of unbalanced returns (if the option `followReturnsPastSeeds` is
-  // activated in the IfdsIdeSolverConfig), we will eventually reach a function
-  // that is not called from other functions. Still, we may want to apply a
-  // return-flow-function -- just for its side-effects, such as registering a
-  // taint
+  /// Performs any side-effects of a return-flow-function
+  ///
+  /// In case of unbalanced returns (if the option `followReturnsPastSeeds` is
+  /// activated in the IfdsIdeSolverConfig), we will eventually reach a function
+  /// that is not called from other functions. Still, we may want to apply a
+  /// return-flow-function -- just for its side-effects, such as registering a
+  /// taint
   virtual void applyUnbalancedRetFlowFunctionSideEffects(f_t CalleeFun,
                                                          n_t ExitInst,
                                                          d_t Source) {
     // By default, do nothing
   }
 
-  //
-  // Describes the data-flows alongsite a CallSite.
-  //
-  // This flow function usually passes all data-flow facts that are not involved
-  // in the function call alongsite the CallSite. Data-flow facts that are not
-  // actual parameters or passed by value, modifications to those within a
-  // callee are not visible in the caller context, are mostly passed as
-  // identity. The call-to-return flow function may also be used to describe
-  // special semantics (cf. getCallFlowFunction()).
-  //
-  // The returned flow function implementation f
-  // (FlowFunction::computeTargets()) is applied to each data-flow fact d_i that
-  // holds right before the CallSite. f's return type is a set
-  // of (target) facts that have to be generated from the source fact d_i by the
-  // data-flow solver. Each target fact that is generated will hold after
-  // CallSite.
-  //
-  // The concrete implementation of f is depending on the analysis problem. In
-  // the following, we present a brief, contrived example:
-  //
-  // f is applied to each data-flow fact d_i that holds before CallSite. We
-  // assume that f is implemented to produce the following outputs.
-  //
-  //    f(0) -> {0}       // pass lambda as identity alongsite the CallSite
-  //    f(o) -> {o}       // assuming that o is passed by value, it is passed
-  //                      // alongsite the CallSite
-  //    f(p) -> {}        // assuming that p is a pointer-typed value, we need
-  //                      // to kill p, as it will be handled by the call- and
-  //                      // return-flow functions
-  //    f(.) -> {.}       // pass everything that is not involved in the call as
-  //                      // identity
-  //
-  // The above implementation corresponds to the following edges in the exploded
-  // supergraph.
-  //
-  //                            0  o   ...
-  //                            |  |
-  //                            |  +-------+
-  //                            +--------+ |
-  //                                     | |
-  // x = CalleeFun(o, p, ...)            | |
-  //                                     | |
-  //                            +--------+ |
-  //                            |  +-------+
-  //                            v  v
-  //                            0  o  x   ...
-  //
+  ///
+  /// Describes the data-flows alongsite a CallSite.
+  ///
+  /// This flow function usually passes all data-flow facts that are not
+  /// involved in the function call alongsite the CallSite. Data-flow facts that
+  /// are not actual parameters or passed by value, modifications to those
+  /// within a callee are not visible in the caller context, are mostly passed
+  /// as identity. The call-to-return flow function may also be used to describe
+  /// special semantics (cf. getCallFlowFunction()).
+  ///
+  /// The returned flow function implementation f
+  /// (FlowFunction::computeTargets()) is applied to each data-flow fact d_i
+  /// that holds right before the CallSite. f's return type is a set of (target)
+  /// facts that have to be generated from the source fact d_i by the data-flow
+  /// solver. Each target fact that is generated will hold after CallSite.
+  ///
+  /// The concrete implementation of f is depending on the analysis problem. In
+  /// the following, we present a brief, contrived example:
+  ///
+  /// f is applied to each data-flow fact d_i that holds before CallSite. We
+  /// assume that f is implemented to produce the following outputs.
+  /// \code
+  ///    f(0) -> {0}       // pass lambda as identity alongsite the CallSite
+  ///    f(o) -> {o}       // assuming that o is passed by value, it is passed
+  ///                      // alongsite the CallSite
+  ///    f(p) -> {}        // assuming that p is a pointer-typed value, we need
+  ///                      // to kill p, as it will be handled by the call- and
+  ///                      // return-flow functions
+  ///    f(.) -> {.}       // pass everything that is not involved in the call
+  ///                      // as identity
+  /// \endcode
+  /// The above implementation corresponds to the following edges in the
+  /// exploded supergraph.
+  /// \code
+  ///                            0  o   ...
+  ///                            |  |
+  ///                            |  +-------+
+  ///                            +--------+ |
+  ///                                     | |
+  /// x = CalleeFun(o, p, ...)            | |
+  ///                                     | |
+  ///                            +--------+ |
+  ///                            |  +-------+
+  ///                            v  v
+  ///                            0  o  x   ...
+  /// \endcode
   virtual FlowFunctionPtrType
   getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
                            llvm::ArrayRef<f_t> Callees) = 0;
 
-  //
-  // May be used to encode special sementics of a given callee target (whose
-  // call should not be directly followed by the data-flow solver) similar to
-  // the getCallFlowFunction() --> getCallToRetFlowFunction() trick (cf.
-  // getCallFlowFunction()).
-  //
-  // The default implementation returns a nullptr to indicate that the mechanism
-  // should not be used.
-  //
+  ///
+  /// May be used to encode special sementics of a given callee target (whose
+  /// call should not be directly followed by the data-flow solver) similar to
+  /// the getCallFlowFunction() --> getCallToRetFlowFunction() trick (cf.
+  /// getCallFlowFunction()).
+  ///
+  /// The default implementation returns a nullptr to indicate that the
+  /// mechanism should not be used.
+  ///
   virtual FlowFunctionPtrType getSummaryFlowFunction(n_t /*Curr*/,
                                                      f_t /*CalleeFun*/) {
     return nullptr;
   }
 };
 
-} // namespace  psr
+} // namespace psr
 
 #endif
diff --git a/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
index 57120a4398..46e1cee632 100644
--- a/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
+++ b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
@@ -53,6 +53,12 @@ class AllTopFnProvider<
   }
 };
 
+/// \brief The analysis problem interface for IDE problems (solvable by the
+/// IDESolver). Create a subclass from this and override all pure-virtual
+/// functions to create your own IDE analysis.
+///
+/// For more information on how to write an IDE analysis, see [Writing an IDE
+/// Analysis](https://github.com/secure-software-engineering/phasar/wiki/Writing-an-IDE-analysis)
 template <typename AnalysisDomainTy,
           typename Container = std::set<typename AnalysisDomainTy::d_t>>
 class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
@@ -73,6 +79,17 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
 
   using ConfigurationTy = HasNoConfigurationType;
 
+  /// Takes an IR database (IRDB) and collects information from it to create a
+  /// tabulation problem.
+  /// @param[in] IRDB The project IR database, that holds the code under
+  /// analysis
+  /// @param[in] EntryPoints The (mangled) names of all entry functions of the
+  /// target being analyzed, given as a vector of strings. An example would
+  /// simply be `{"main"}`. To set every function as entry point, pass
+  /// `"__ALL__"`
+  /// @param[in] ZeroValue Provides the special tautological zero value (aka.
+  /// Λ). If not provided here, you must set it via \link initializeZeroValue()
+  /// \endlink.
   explicit IDETabulationProblem(
       const ProjectIRDBBase<db_t> *IRDB, std::vector<std::string> EntryPoints,
       std::optional<d_t>
diff --git a/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h b/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
index 71dcba326d..8f2046fcb0 100644
--- a/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
+++ b/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
@@ -39,22 +39,40 @@ enum class SolverConfigOptions : uint32_t {
   All = ~0U
 };
 
+/// \brief Configuration options for the solving process of IFDS/IDE problems
 struct IFDSIDESolverConfig {
   IFDSIDESolverConfig() noexcept = default;
   IFDSIDESolverConfig(SolverConfigOptions Options) noexcept;
 
+  /// Returns whether the solver should handle unbalanced returns (default:
+  /// false)
   [[nodiscard]] bool followReturnsPastSeeds() const;
+  /// Returns whether the solver should automatically insert an identityFlow
+  /// propagation for the special zero value (default: true)
   [[nodiscard]] bool autoAddZero() const;
+  /// Returns whether the IDE solver should perform IDE's phase 2 (default:
+  /// true). You may want to turn this off for IFDS analyses.
   [[nodiscard]] bool computeValues() const;
+  /// Returns, whether the solver should record all ESG edges (default: false)
+  /// \note This option may severly hurt the solver's performance
   [[nodiscard]] bool recordEdges() const;
+  /// Returns, whether the solver should emit the ESG as DOT graph on the
+  /// command-line (default: false)
   [[nodiscard]] bool emitESG() const;
+  /// Currently unused
   [[nodiscard]] bool computePersistedSummaries() const;
 
+  /// \see followReturnsPastSeeds
   void setFollowReturnsPastSeeds(bool Set = true);
+  /// \see autoAddZero
   void setAutoAddZero(bool Set = true);
+  /// \see computeValues
   void setComputeValues(bool Set = true);
+  /// \see recordEdges
   void setRecordEdges(bool Set = true);
+  /// \see emitESG
   void setEmitESG(bool Set = true);
+  /// \see computePersistedSummaries
   void setComputePersistedSummaries(bool Set = true);
 
   void setConfig(SolverConfigOptions Opt);
diff --git a/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
index cbafa68c3a..2f884bd842 100644
--- a/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
+++ b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
@@ -19,6 +19,12 @@
 
 namespace psr {
 
+/// \brief The analysis problem interface for IFDS problems (solvable by the
+/// IFDSSolver). Create a subclass from this and override all pure-virtual
+/// functions to create your own IFDS analysis.
+///
+/// For more information on how to write an IFDS analysis, see [Writing an IFDS
+/// Analysis](https://github.com/secure-software-engineering/phasar/wiki/Writing-an-IFDS-analysis)
 template <typename AnalysisDomainTy,
           typename Container = std::set<typename AnalysisDomainTy::d_t>>
 class IFDSTabulationProblem
@@ -38,6 +44,17 @@ class IFDSTabulationProblem
   using typename Base::t_t;
   using typename Base::v_t;
 
+  /// Takes an IR database (IRDB) and collects information from it to create a
+  /// tabulation problem.
+  /// @param[in] IRDB The project IR database, that holds the code under
+  /// analysis
+  /// @param[in] EntryPoints The (mangled) names of all entry functions of the
+  /// target being analyzed, given as a vector of strings. An example would
+  /// simply be `{"main"}`. To set every function as entry point, pass
+  /// `"__ALL__"`
+  /// @param[in] ZeroValue Provides the special tautological zero value (aka.
+  /// Λ).
+  /// \endlink.
   explicit IFDSTabulationProblem(const ProjectIRDBBase<db_t> *IRDB,
                                  std::vector<std::string> EntryPoints,
                                  d_t ZeroValue)
diff --git a/include/phasar/DataFlow/IfdsIde/InitialSeeds.h b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
index db7ea654e7..fa2f86fe14 100644
--- a/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
+++ b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
@@ -22,6 +22,9 @@
 
 namespace psr {
 
+/// \brief Represent the starting points of the analysis.
+///
+/// The initial facts that should hold at the entry points.
 template <typename N, typename D, typename L> class InitialSeeds {
 public:
   using GeneralizedSeeds = std::map<N, std::map<D, L>>;
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h b/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
index 7d357a0a05..d0f9472d9c 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
@@ -18,6 +18,10 @@
 namespace psr {
 template <typename T, typename Enable = void> class Compressor;
 
+/// \brief A utility class that assigns a sequential Id to every inserted
+/// object.
+///
+/// This specialization handles types that can be efficiently passed by value
 template <typename T>
 class Compressor<T, std::enable_if_t<CanEfficientlyPassByValue<T>>> {
 public:
@@ -61,6 +65,10 @@ class Compressor<T, std::enable_if_t<CanEfficientlyPassByValue<T>>> {
   llvm::SmallVector<T, 0> FromInt;
 };
 
+/// \brief A utility class that assigns a sequential Id to every inserted
+/// object.
+///
+/// This specialization handles types that cannot be efficiently passed by value
 template <typename T>
 class Compressor<T, std::enable_if_t<!CanEfficientlyPassByValue<T>>> {
 public:
@@ -69,6 +77,9 @@ class Compressor<T, std::enable_if_t<!CanEfficientlyPassByValue<T>>> {
     ToInt.reserve(Capacity);
   }
 
+  /// Returns the index of the given element in the compressors storage. If the
+  /// element isn't present yet, it will be added first and its index will
+  /// then be returned.
   uint32_t getOrInsert(const T &Elem) {
     if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
       return It->second;
@@ -79,6 +90,9 @@ class Compressor<T, std::enable_if_t<!CanEfficientlyPassByValue<T>>> {
     return Ret;
   }
 
+  /// Returns the index of the given element in the compressors storage. If the
+  /// element isn't present yet, it will be added first and its index will
+  /// then be returned.
   uint32_t getOrInsert(T &&Elem) {
     if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
       return It->second;
@@ -89,6 +103,8 @@ class Compressor<T, std::enable_if_t<!CanEfficientlyPassByValue<T>>> {
     return Ret;
   }
 
+  /// Returns the index of the given element in the compressors storage. If the
+  /// element isn't present, std::nullopt will be returned
   std::optional<uint32_t> getOrNull(const T &Elem) const {
     if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
       return It->second;
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
index a0f42d821f..f6c0c3a5db 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h
@@ -137,6 +137,10 @@ template <typename ProblemTy> struct FlowFunctionCacheBase {
 
 } // namespace detail
 
+/// This class caches flow and edge functions to avoid their reconstruction.
+/// When a flow or edge function must be applied multiple times, a cached
+/// version is used if it exists, otherwise a new one is created and inserted
+/// into the cache. This class is used within both IDE solver implementations.
 template <typename ProblemTy, bool AutoAddZero>
 class FlowFunctionCache
     : detail::FlowFunctionCacheBase<ProblemTy>,
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h b/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
index 744c8e7e38..20ff8b6c3e 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h
@@ -21,7 +21,7 @@ namespace psr {
 /// XXX (#734): When upgrading to C++20, create a concept checking valid
 /// SolverResults types
 
-/// A type-erased version of the main functionality of SolverResults.
+/// \brief A type-erased version of the main functionality of SolverResults.
 /// Can be accepted by consumers that don't need deep access to the internals
 /// (so, the usual ones). As we have now two kinds of solver-results
 /// (SolverResults and IdBasedSolverResults), we need a common way of accessing
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
index e6423bab0e..cfebf428e3 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h
@@ -27,6 +27,14 @@
 
 namespace psr {
 
+/// \brief Solves the given IFDSTabulationProblem as described in the 1995 paper
+/// by Reps, Horwitz and Sagiv. To solve the problem, call solve(). Results can
+/// then be queried by using resultAt() and resultsAt().
+///
+/// \note PhASAR implements IFDS in terms of IDE, so in case you do not need the
+/// raw SolverResults, for maximum performance you should use
+/// IFDSIDESolverConfig#setComputeValues(bool) to disable IDE's
+/// phase 2.
 template <typename AnalysisDomainTy,
           typename Container = std::set<typename AnalysisDomainTy::d_t>>
 class IFDSSolver
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
index bab1509d0d..68ee40cb80 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
@@ -50,7 +50,7 @@ namespace psr {
 /// This solver implements the optimizations and the $JF_N$ layout from the
 /// paper "Scaling Interprocedural Static Data-Flow Analysis to Large C/C++
 /// Applications: An Experience Report"
-/// (https://doi.org/10.4230/LIPIcs.ECOOP.2024.36) by Schiebel, Sattler,
+/// (<https://doi.org/10.4230/LIPIcs.ECOOP.2024.36>) by Schiebel, Sattler,
 /// Schubert, Apel, and Bodden.
 template <typename ProblemTy,
           typename StaticSolverConfigTy = DefaultIDESolverConfig<ProblemTy>>
diff --git a/include/phasar/DataFlow/IfdsIde/SolverResults.h b/include/phasar/DataFlow/IfdsIde/SolverResults.h
index 664d0e111d..51b8b3ce9d 100644
--- a/include/phasar/DataFlow/IfdsIde/SolverResults.h
+++ b/include/phasar/DataFlow/IfdsIde/SolverResults.h
@@ -46,11 +46,22 @@ class SolverResultsBase {
   using d_t = D;
   using l_t = L;
 
+  /// Returns the result that the IDE analysis computed for the fact Node right
+  /// after the statement Stmt.
+  ///
+  /// A default-constructed l_t, if no analysis result was computed at this
+  /// point.
   [[nodiscard]] ByConstRef<l_t> resultAt(ByConstRef<n_t> Stmt,
                                          ByConstRef<d_t> Node) const {
     return self().Results.get(Stmt, Node);
   }
 
+  /// Returns the results that the IDE analysis computed right after the
+  /// statement Stmt.
+  ///
+  /// \param Stmt The statement, where the analysis results are requested
+  /// \param StripZero Whether the special zero value should be stripped from
+  /// the result.
   [[nodiscard]] std::unordered_map<d_t, l_t> resultsAt(ByConstRef<n_t> Stmt,
                                                        bool StripZero) const {
     std::unordered_map<d_t, l_t> Result = self().Results.row(Stmt);
@@ -60,19 +71,26 @@ class SolverResultsBase {
     return Result;
   }
 
+  /// Returns the results that the IDE analysis computed right after the
+  /// statement Stmt.
+  ///
+  /// Does not strip the special zero value from the result.
   [[nodiscard]] const std::unordered_map<d_t, l_t> &
   resultsAt(ByConstRef<n_t> Stmt) const {
     return self().Results.row(Stmt);
   }
 
+  /// The internal representation of this SolverResults object.
   [[nodiscard]] const auto &rowMapView() const {
     return self().Results.rowMapView();
   }
 
+  /// Whether the analysis has computed any results for the statement Stmt.
   [[nodiscard]] bool containsNode(ByConstRef<N> Stmt) const {
     return self().Results.containsRow(Stmt);
   }
 
+  /// Similar to resultsAt(ByConstRef<N>).
   [[nodiscard]] const auto &row(ByConstRef<N> Stmt) const {
     return self().Results.row(Stmt);
   }
@@ -247,12 +265,12 @@ class OwningSolverResults
                       D ZV) noexcept(std::is_nothrow_move_constructible_v<D>)
       : Results(std::move(ResTab)), ZV(std::move(ZV)) {}
 
-  [[nodiscard]] SolverResults<N, D, L> get() const &noexcept {
+  [[nodiscard]] SolverResults<N, D, L> get() const & noexcept {
     return {Results, ZV};
   }
   SolverResults<N, D, L> get() && = delete;
 
-  [[nodiscard]] operator SolverResults<N, D, L>() const &noexcept {
+  [[nodiscard]] operator SolverResults<N, D, L>() const & noexcept {
     return get();
   }
 
diff --git a/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h b/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
index 41cb4d58e1..f7cbd0cfc6 100644
--- a/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
+++ b/include/phasar/DataFlow/IfdsIde/SpecialSummaries.h
@@ -45,9 +45,9 @@ class [[deprecated("This ancient API is not maintained and should not be used "
   std::map<std::string, EdgeFunction<V>> SpecialEdgeFunctions;
   std::vector<std::string> SpecialFunctionNames;
 
-  // Constructs the SpecialSummaryMap such that it contains all glibc,
-  // llvm.intrinsics and C++'s new, new[], delete, delete[] with identity
-  // flow functions.
+  /// Constructs the SpecialSummaryMap such that it contains all glibc,
+  /// llvm.intrinsics and C++'s new, new[], delete, delete[] with identity
+  /// flow functions.
   SpecialSummaries() {
     // insert default flow and edge functions
     for (const auto &FunctionName :
@@ -71,7 +71,7 @@ class [[deprecated("This ancient API is not maintained and should not be used "
     return Instance;
   }
 
-  // Returns true, when an existing function is overwritten, false otherwise.
+  /// Returns true, when an existing function is overwritten, false otherwise.
   bool provideSpecialSummary(const std::string &Name,
                              FlowFunctionPtrType FlowFunc) {
     bool Override = containsSpecialSummary(Name);
@@ -79,7 +79,7 @@ class [[deprecated("This ancient API is not maintained and should not be used "
     return Override;
   }
 
-  // Returns true, when an existing function is overwritten, false otherwise.
+  /// Returns true, when an existing function is overwritten, false otherwise.
   bool provideSpecialSummary(const std::string &Name,
                              FlowFunctionPtrType FlowFunc,
                              std::shared_ptr<EdgeFunction<V>> EdgeFunc) {
@@ -97,8 +97,8 @@ class [[deprecated("This ancient API is not maintained and should not be used "
     return SpecialFlowFunctions.count(Name);
   }
 
-  FlowFunctionPtrType getSpecialFlowFunctionSummary(
-      const llvm::Function *Func) {
+  FlowFunctionPtrType
+  getSpecialFlowFunctionSummary(const llvm::Function *Func) {
     return getSpecialFlowFunctionSummary(Func->getName());
   }
 
@@ -106,18 +106,18 @@ class [[deprecated("This ancient API is not maintained and should not be used "
     return SpecialFlowFunctions[Name];
   }
 
-  std::shared_ptr<EdgeFunction<V>> getSpecialEdgeFunctionSummary(
-      const llvm::Function *Func) {
+  std::shared_ptr<EdgeFunction<V>>
+  getSpecialEdgeFunctionSummary(const llvm::Function *Func) {
     return getSpecialEdgeFunctionSummary(Func->getName());
   }
 
-  std::shared_ptr<EdgeFunction<V>> getSpecialEdgeFunctionSummary(
-      const std::string &Name) {
+  std::shared_ptr<EdgeFunction<V>>
+  getSpecialEdgeFunctionSummary(const std::string &Name) {
     return SpecialEdgeFunctions[Name];
   }
 
-  friend llvm::raw_ostream &operator<<(
-      llvm::raw_ostream &OS, const SpecialSummaries<D> &SpecialSumms) {
+  friend llvm::raw_ostream &
+  operator<<(llvm::raw_ostream &OS, const SpecialSummaries<D> &SpecialSumms) {
     OS << "SpecialSummaries:\n";
     for (auto &Entry : SpecialSumms.SpecialFunctionNames) {
       OS << Entry.first << " ";
diff --git a/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h b/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
index 098c4ff217..c7326729b8 100644
--- a/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
+++ b/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
@@ -13,6 +13,10 @@
 
 namespace psr {
 
+/// Stores a call-string context that can be used in interprocedural monotone
+/// analysis to achieve (limited) context sensitivity.
+/// @tparam N Type of the call-string elements.
+/// @tparam K Maximal length the call string can have.
 template <typename N, unsigned K> class CallStringCTX {
 protected:
   std::deque<N> CallString;
diff --git a/include/phasar/DataFlow/Mono/InterMonoProblem.h b/include/phasar/DataFlow/Mono/InterMonoProblem.h
index 9ee1b3298f..326cf9df91 100644
--- a/include/phasar/DataFlow/Mono/InterMonoProblem.h
+++ b/include/phasar/DataFlow/Mono/InterMonoProblem.h
@@ -31,6 +31,9 @@ namespace psr {
 template <typename T, typename F> class TypeHierarchy;
 template <typename N, typename F> class ICFG;
 
+/// \brief The analysis problem interface for interprocedural monotone problems
+/// (solvable by the InterMonoSolver). Create a subclass from this and override
+/// all pure-virtual functions to create your own inter-mono analysis.
 template <typename AnalysisDomainTy>
 class InterMonoProblem : public IntraMonoProblem<AnalysisDomainTy> {
 public:
@@ -47,6 +50,14 @@ class InterMonoProblem : public IntraMonoProblem<AnalysisDomainTy> {
   const i_t *ICF;
 
 public:
+  /// An interprocedural monotone problem generated from an intermediate
+  /// representation, a type hierarchy of said representation, a control flow
+  /// graph, points-to information and optionally a vector of entry points.
+  /// @param[in] IRDB A project IR database.
+  /// @param[in] TH A type hierarchy based on the given IRDB.
+  /// @param[in] CF A control flow graph based on the given IRDB.
+  /// @param[in] PT Points-to information based on the given IRDB.
+  /// @param[in] EntryPoints A vector of entry points. Provide at least one.
   InterMonoProblem(const ProjectIRDBBase<db_t> *IRDB,
                    const TypeHierarchy<t_t, f_t> *TH, const i_t *ICF,
                    AliasInfoRef<v_t, n_t> PT,
diff --git a/include/phasar/DataFlow/Mono/IntraMonoProblem.h b/include/phasar/DataFlow/Mono/IntraMonoProblem.h
index 4915cfe4f9..954d2913a8 100644
--- a/include/phasar/DataFlow/Mono/IntraMonoProblem.h
+++ b/include/phasar/DataFlow/Mono/IntraMonoProblem.h
@@ -35,6 +35,9 @@ struct HasNoConfigurationType;
 template <typename T, typename F> class TypeHierarchy;
 template <typename N, typename F> class CFG;
 
+/// \brief The analysis problem interface for intraprocedural monotone problems
+/// (solvable by the IntraMonoSolver). Create a subclass from this and override
+/// all pure-virtual functions to create your own mono analysis.
 template <typename AnalysisDomainTy> class IntraMonoProblem {
 public:
   using n_t = typename AnalysisDomainTy::n_t;
@@ -58,10 +61,16 @@ template <typename AnalysisDomainTy> class IntraMonoProblem {
   [[maybe_unused]] Soundness S = Soundness::Soundy;
 
 public:
-  // denote that a problem does not require a configuration (type/file)
-  // a user problem can override the type of configuration to be used, if any
   using ConfigurationTy = HasNoConfigurationType;
 
+  /// An intraprocedural monotone problem generated from an intermediate
+  /// representation, a type hierarchy of said representation, a control flow
+  /// graph, points-to information and optionally a vector of entry points.
+  /// @param[in] IRDB A project IR database.
+  /// @param[in] TH A type hierarchy based on the given IRDB.
+  /// @param[in] CF A control flow graph based on the given IRDB.
+  /// @param[in] PT Points-to information based on the given IRDB.
+  /// @param[in] EntryPoints A vector of entry points. Provide at least one.
   IntraMonoProblem(const ProjectIRDBBase<db_t> *IRDB,
                    const TypeHierarchy<t_t, f_t> *TH, const CFGBase<c_t> *CF,
                    AliasInfoRef<v_t, n_t> PT,
diff --git a/include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h b/include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h
index 0be77db3d3..b0abf88354 100644
--- a/include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h
+++ b/include/phasar/DataFlow/Mono/Solver/InterMonoSolver.h
@@ -27,6 +27,12 @@
 
 namespace psr {
 
+/// \brief A solver class for interprocedual monotone problems (derived from
+/// InterMonoProblem). To solve the problem, call solve().
+///
+/// \tparam AnalysisDomainTy type of the analysis domain.
+/// \tparam K An unsigned integer used as the maximum length for call-string
+/// contexts.
 template <typename AnalysisDomainTy, unsigned K> class InterMonoSolver {
 public:
   using ProblemTy = InterMonoProblem<AnalysisDomainTy>;
diff --git a/include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h b/include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h
index 739b6fa301..ed5b1f449d 100644
--- a/include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h
+++ b/include/phasar/DataFlow/Mono/Solver/IntraMonoSolver.h
@@ -29,6 +29,10 @@
 
 namespace psr {
 
+/// \brief A solver class for intraprocedual monotone problems. To solve the
+/// problem, call solve().
+///
+/// \tparam AnalysisDomainTy type of the analysis domain.
 template <typename AnalysisDomainTy> class IntraMonoSolver {
 public:
   using ProblemTy = IntraMonoProblem<AnalysisDomainTy>;
diff --git a/include/phasar/DataFlow/PathSensitivity/PathSensitivityManager.h b/include/phasar/DataFlow/PathSensitivity/PathSensitivityManager.h
index d781d127f5..b973932313 100644
--- a/include/phasar/DataFlow/PathSensitivity/PathSensitivityManager.h
+++ b/include/phasar/DataFlow/PathSensitivity/PathSensitivityManager.h
@@ -28,6 +28,8 @@
 
 namespace psr {
 
+/// \brief A utility class that allows path-reconstruction for IFDS/IDE solver
+/// results.
 template <typename AnalysisDomainTy>
 class PathSensitivityManager
     : public PathSensitivityManagerBase<typename AnalysisDomainTy::n_t>,
diff --git a/include/phasar/DataFlow/PathSensitivity/PathSensitivityManagerMixin.h b/include/phasar/DataFlow/PathSensitivity/PathSensitivityManagerMixin.h
index c92c35aae3..74ed9e1c51 100644
--- a/include/phasar/DataFlow/PathSensitivity/PathSensitivityManagerMixin.h
+++ b/include/phasar/DataFlow/PathSensitivity/PathSensitivityManagerMixin.h
@@ -67,6 +67,11 @@ class PathSensitivityManagerMixin {
   }
 
 public:
+  /// Reconstruct the combined control- and data-flow paths the lead to any of
+  /// the given data-flow facts in FactsRange holding right after Inst.
+  ///
+  /// The result is given as graph, where cycles are unrolled once in an
+  /// implementation-defined way.
   template <
       typename FactsRangeTy, typename ConfigTy,
       typename Filter = DefaultPathTracingFilter,
@@ -147,6 +152,11 @@ class PathSensitivityManagerMixin {
     return Dag;
   }
 
+  /// Reconstruct the combined control- and data-flow paths the lead to any of
+  /// the given data-flow facts holding right after Inst.
+  ///
+  /// The result is given as graph, where cycles are unrolled once in an
+  /// implementation-defined way.
   template <
       typename ConfigTy, typename L, typename Filter = DefaultPathTracingFilter,
       typename = std::enable_if_t<is_pathtracingfilter_for_v<Filter, NodeRef>>>
@@ -159,6 +169,11 @@ class PathSensitivityManagerMixin {
     return pathsDagToAll(std::move(Inst), FactsRange, Config, PFilter);
   }
 
+  /// Reconstruct the combined control- and data-flow paths the lead to the
+  /// given data-flow fact Fact holding right after Inst.
+  ///
+  /// The result is given as graph, where cycles are unrolled once in an
+  /// implementation-defined way.
   template <
       typename ConfigTy, typename Filter = DefaultPathTracingFilter,
       typename = std::enable_if_t<is_pathtracingfilter_for_v<Filter, NodeRef>>>
@@ -171,6 +186,11 @@ class PathSensitivityManagerMixin {
                          PFilter);
   }
 
+  /// Reconstruct the combined control- and data-flow paths the lead to any of
+  /// the given data-flow facts in FactsRange holding at Inst.
+  ///
+  /// The result is given as graph, where cycles are unrolled once in an
+  /// implementation-defined way.
   template <
       typename ConfigTy, typename Filter = DefaultPathTracingFilter,
       typename = std::enable_if_t<is_pathtracingfilter_for_v<Filter, NodeRef>>>
diff --git a/include/phasar/Domain/AnalysisDomain.h b/include/phasar/Domain/AnalysisDomain.h
index bf79fe7970..a4622695a8 100644
--- a/include/phasar/Domain/AnalysisDomain.h
+++ b/include/phasar/Domain/AnalysisDomain.h
@@ -14,30 +14,31 @@
 
 namespace psr {
 
-// AnalysisDomain - This class should be specialized by different static
-// analyses types... which is why the default version declares all analysis
-// domains as aliases of void.
-//
-// Virtually all of PhASAR's internal analyses are implemented in a generic way
-// using interfaces and template parameters. In order to specify concrete types
-// for the template parameters such that an analysis can compute some useful
-// information on some concrete target code, a configuration template parameter
-// of type AnalysisDomain is passed around to make the necessary information
-// available to the required analyses.
-//
-// If a type is not meant to be used by an analysis it should be left as an
-// alias to void. If any analysis detects that a parameter is required to
-// conduct an analysis but not correctly set, it will statically report an error
-// and ask for the missing piece of information.
+/// AnalysisDomain - This class should be specialized by different static
+/// analyses types... which is why the default version declares all analysis
+/// domains as aliases of void.
+///
+/// Virtually all of PhASAR's internal analyses are implemented in a generic way
+/// using interfaces and template parameters. In order to specify concrete types
+/// for the template parameters such that an analysis can compute some useful
+/// information on some concrete target code, a configuration template parameter
+/// of type AnalysisDomain is passed around to make the necessary information
+/// available to the required analyses.
+///
+/// If a type is not meant to be used by an analysis it should be left as an
+/// alias to void. If any analysis detects that a parameter is required to
+/// conduct an analysis but not correctly set, it will statically report an
+/// error and ask for the missing piece of information.
 struct AnalysisDomain {
-  // Data-flow fact --- Specifies the type of an individual data-flow fact that
-  // is propagated through the program under analysis.
+  /// Data-flow fact --- Specifies the type of an individual data-flow fact that
+  /// is propagated through the program under analysis.
   using d_t = void;
   // (Control-flow) Node --- Specifies the type of a node in the
   // (inter-procedural) control-flow graph and can be though of as an individual
-  // statement or instruction of the program.
+  // statement or instruction of the target program.
   using n_t = void;
-  // Function --- Specifies the type of functions.
+  // Function --- Specifies the type of functions/procedures in the target
+  // program.
   using f_t = void;
   // (User-defined) type --- Specifies the type of a user-defined (i.e. struct
   // or class) data type.
diff --git a/include/phasar/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.h b/include/phasar/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.h
index 348f341f41..9f0a7f8dc1 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.h
@@ -16,6 +16,12 @@
 namespace psr {
 class LLVMProjectIRDB;
 
+/// \brief  Provides utilities to inject a function into the IR under analysis
+/// that captures global constructors and destructors as described in the 2021
+/// Paper "Modeling the Effects of Global Variables in Data-Flow Analysis for
+/// C/C++" by Schubert et al.
+///
+/// See <10.1109/SCAM52516.2021.00010> for more information.
 class GlobalCtorsDtorsModel {
 public:
   static constexpr llvm::StringLiteral ModelName =
@@ -30,14 +36,27 @@ class GlobalCtorsDtorsModel {
   static constexpr llvm::StringLiteral UserEntrySelectorName =
       "__psrCRuntimeUserEntrySelector";
 
+  /// @brief Function that creates a new global model and inserts it into the
+  /// IRDB. The returned function is the global model that was inserted.
+  /// @param[in, out] IRDB IR database that will have the global model
+  /// inserted.
+  /// @param[in] UserEntryPoints Entry points for the program given as
+  /// llvm::Function pointers. You usually want to pass here the main function
   static llvm::Function *
   buildModel(LLVMProjectIRDB &IRDB,
              llvm::ArrayRef<llvm::Function *> UserEntryPoints);
+
+  /// @brief Function that creates a new global model and inserts it into the
+  /// IRDB. The returned function is the global model that was inserted.
+  /// @param[in, out] IRDB IR database that will have the global model
+  /// inserted.
+  /// @param[in] UserEntryPoints Entry points for the program given as
+  /// std::strings. You usually want to pass here the main function
   static llvm::Function *
   buildModel(LLVMProjectIRDB &IRDB,
              llvm::ArrayRef<std::string> UserEntryPoints);
 
-  /// Returns true, if a function was generated by phasar.
+  /// Returns true, if a function was generated by the GlobalCtorsDtorsModel.
   [[nodiscard]] static bool isPhasarGenerated(const llvm::Function &F) noexcept;
 };
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
index a488e9b469..be69af1348 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h
@@ -22,6 +22,8 @@ namespace psr {
 class LLVMProjectIRDB;
 class LLVMBasedBackwardCFG;
 
+/// \brief A class that represents a backwards control flow graph. Conforms to
+/// the CFGBase CRTP interface.
 class LLVMBasedBackwardCFG
     : public detail::LLVMBasedCFGImpl<LLVMBasedBackwardCFG> {
   friend CFGBase;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
index d9bbb1786a..670a6a6c9d 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
@@ -25,6 +25,8 @@ template <typename N, typename F> class CallGraph;
 template <>
 struct CFGTraits<LLVMBasedBackwardICFG> : CFGTraits<LLVMBasedBackwardCFG> {};
 
+/// \brief  A class that represents a backwards interprocedural control flow
+/// graph. Conforms to the ICFGBase CRTP interface.
 class LLVMBasedBackwardICFG : public LLVMBasedBackwardCFG,
                               public ICFGBase<LLVMBasedBackwardICFG> {
   friend ICFGBase;
@@ -35,7 +37,7 @@ class LLVMBasedBackwardICFG : public LLVMBasedBackwardCFG,
 
   public:
     LLVMBackwardRet(llvm::LLVMContext &Ctx)
-        : Instance(llvm::ReturnInst::Create(Ctx)){};
+        : Instance(llvm::ReturnInst::Create(Ctx)) {};
     [[nodiscard]] const llvm::ReturnInst *getInstance() const noexcept {
       return Instance;
     }
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
index 9eee1395d6..6a3f97c56e 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h
@@ -36,6 +36,8 @@ template <> struct CFGTraits<LLVMBasedCFG> {
 
 template <> struct CFGTraits<LLVMBasedBackwardCFG> : CFGTraits<LLVMBasedCFG> {};
 
+/// \brief A class that implements a control flow graph. Conforms to the CFGBase
+/// CRTP interface.
 namespace detail {
 template <typename Derived> class LLVMBasedCFGImpl : public CFGBase<Derived> {
   friend class LLVMBasedBackwardCFG;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
index 9ed1799e0b..fbb2693c95 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
@@ -44,6 +44,8 @@ class Resolver;
 class LLVMBasedICFG;
 template <> struct CFGTraits<LLVMBasedICFG> : CFGTraits<LLVMBasedCFG> {};
 
+/// \brief A class that implements a inter-procedural control flow graph.
+/// Conforms to the ICFGBase CRTP interface.
 class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   friend ICFGBase;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
index 1fdc8100bf..646ff71322 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
@@ -23,6 +23,12 @@ class GlobalVariable;
 namespace psr {
 class LLVMProjectIRDB;
 
+/// \brief A class that provides access to all C++ virtual function tables
+/// (VTables) found in the target program.
+///
+/// Useful for constructing a call graph for a C++-based target.
+/// \note This class only works, if the target program's IR was generated with
+/// debug information. Pass `-g` to the compiler to achieve this.
 class LLVMVFTableProvider {
 public:
   explicit LLVMVFTableProvider(const llvm::Module &Mod);
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
index 818a59de8d..dc6f7c8ff1 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
@@ -26,6 +26,9 @@ class CallBase;
 
 namespace psr {
 class DIBasedTypeHierarchy;
+
+/// \brief A resolver that performs Class Hierarchy Analysis to resolve calls
+/// to C++ virtual functions. Requires debug information.
 class CHAResolver : public Resolver {
 public:
   CHAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
index 376eb59623..88afa796e5 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
@@ -18,6 +18,7 @@ class CallBase;
 
 namespace psr {
 
+/// \brief A resolver that doesn't resolve indirect- and virtual calls
 class NOResolver final : public Resolver {
 public:
   NOResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP);
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
index 3bbdc83f5e..eca760ae77 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
@@ -36,6 +36,8 @@ namespace psr {
 
 class DIBasedTypeHierarchy;
 
+/// \brief A resolver that uses alias information to resolve indirect and
+/// virtual calls
 class OTFResolver : public Resolver {
 public:
   OTFResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
index f4371c6082..c6e003211f 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
@@ -28,6 +28,9 @@ class DICompositeType;
 
 namespace psr {
 class DIBasedTypeHierarchy;
+
+/// \brief A resolver that performs Rapid Type Analysis to resolve calls
+/// to C++ virtual functions. Requires debug information.
 class RTAResolver : public CHAResolver {
 public:
   RTAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
index 8748e56aa2..c59717c25f 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
@@ -68,6 +68,10 @@ getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
 [[nodiscard]] bool isVirtualCall(const llvm::Instruction *Inst,
                                  const LLVMVFTableProvider &VTP);
 
+/// \brief A base class for call-target resolvers. Used to build call graphs.
+///
+/// Create a specific resolver by making a new class, inheriting this resolver
+/// class and implementing the virtual functions as needed.
 class Resolver {
 protected:
   const LLVMProjectIRDB *IRDB;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
index 8645f5c725..6524bfad04 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
@@ -23,6 +23,8 @@ template <> struct CFGTraits<SparseLLVMBasedCFG> : CFGTraits<LLVMBasedCFG> {
   using v_t = const llvm::Value *;
 };
 
+/// \brief A class that implements a sparse control flow graph. Conforms to the
+/// CFGBase CRTP interface.
 class SparseLLVMBasedCFG : public LLVMBasedCFG,
                            public SparseCFGBase<SparseLLVMBasedCFG> {
   friend struct SVFGCache;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
index 2d43ae64ea..df946ae27a 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
@@ -20,12 +20,20 @@ class SparseLLVMBasedCFG;
 class DIBasedTypeHierarchy;
 struct SVFGCache;
 
+/// \brief A class that implements a sparse interprocedural control flow graph.
+/// Conforms to the ICFGBase CRTP interface.
+///
+/// Use this in the IDESolver or IFDSSolver to profit from the SparseIFDS or
+/// SparseIDE optimization after Karakays et al. "Symbol-Specific Sparsification
+/// of Interprocedural Distributive Environment Problems"
+/// <https://doi.org/10.48550/arXiv.2401.14813>
 class SparseLLVMBasedICFG
     : public LLVMBasedICFG,
       public SparseLLVMBasedCFGProvider<SparseLLVMBasedICFG> {
   friend SparseLLVMBasedCFGProvider<SparseLLVMBasedICFG>;
 
 public:
+  /// Constructor that delegates all arguments to the ctor of LLVMBasedICFG
   explicit SparseLLVMBasedICFG(LLVMProjectIRDB *IRDB,
                                CallGraphAnalysisType CGType,
                                llvm::ArrayRef<std::string> EntryPoints = {},
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
index 8c0aaa9dac..7fbbb65a5e 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
@@ -29,9 +29,14 @@ struct SVFGCache;
 template <>
 struct CFGTraits<SparseLLVMBasedICFGView> : CFGTraits<LLVMBasedCFG> {};
 
-/// Similar to SparseLLVMBasedICFG; the only difference is that this one *is* no
-/// LLVMBasedICFG -- it contains a pointer to an already existing one.
-/// It still owns the sparse value-flow graphs
+/// \brief Similar to SparseLLVMBasedICFG; the only difference is that this one
+/// *is* no LLVMBasedICFG -- it contains a pointer to an already existing one.
+/// It still owns the sparse value-flow graphs.
+///
+/// Use this in the IDESolver or IFDSSolver to profit from the SparseIFDS or
+/// SparseIDE optimization after Karakays et al. "Symbol-Specific Sparsification
+/// of Interprocedural Distributive Environment Problems"
+/// <https://doi.org/10.48550/arXiv.2401.14813>
 class SparseLLVMBasedICFGView
     : public LLVMBasedCFG,
       public ICFGBase<SparseLLVMBasedICFGView>,
diff --git a/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h b/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
index 677b26639d..0b970fcfed 100644
--- a/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
+++ b/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
@@ -36,6 +36,7 @@ template <> struct ProjectIRDBTraits<LLVMProjectIRDB> {
   using g_t = const llvm::GlobalVariable *;
 };
 
+/// \brief Project IR Database that manages a LLVM IR module.
 class LLVMProjectIRDB : public ProjectIRDBBase<LLVMProjectIRDB> {
   friend ProjectIRDBBase;
 
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
index e40d109abe..98cdd56f73 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
@@ -23,9 +23,10 @@ struct DataFlowFact {
   std::variant<Parameter, ReturnValue> Fact;
 };
 
+/// \brief Simple representation of a serializable data-flow summary
 class FunctionDataFlowFacts {
 public:
-  using ParamaterMappingTy =
+  using ParameterMappingTy =
       std::unordered_map<uint32_t, std::vector<DataFlowFact>>;
 
   FunctionDataFlowFacts() noexcept = default;
@@ -67,10 +68,10 @@ class FunctionDataFlowFacts {
       return It->second;
     }
 
-    return getDefaultValue<ParamaterMappingTy>();
+    return getDefaultValue<ParameterMappingTy>();
   }
 
-  llvm::StringMap<ParamaterMappingTy> Fdff;
+  llvm::StringMap<ParameterMappingTy> Fdff;
 };
 
 } // namespace psr::library_summary
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
index 19e03b49bf..8afba2f715 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
@@ -14,10 +14,11 @@ class LLVMFunctionDataFlowFacts;
 [[nodiscard]] LLVMFunctionDataFlowFacts
 readFromFDFF(const FunctionDataFlowFacts &Fdff, const LLVMProjectIRDB &Irdb);
 
+/// @brief A LLVM-specific mapping of FunctionDataFlowFacts
 class LLVMFunctionDataFlowFacts {
 public:
   LLVMFunctionDataFlowFacts() noexcept = default;
-  using ParamaterMappingTy = FunctionDataFlowFacts::ParamaterMappingTy;
+  using ParameterMappingTy = FunctionDataFlowFacts::ParameterMappingTy;
 
   /// insert a set of data flow facts
   void insertSet(const llvm::Function *Fun, uint32_t Index,
@@ -56,19 +57,19 @@ class LLVMFunctionDataFlowFacts {
     return getFacts(Fun, Arg->getArgNo());
   }
 
-  [[nodiscard]] const ParamaterMappingTy &
+  [[nodiscard]] const ParameterMappingTy &
   getFactsForFunction(const llvm::Function *Fun) {
     auto Iter = LLVMFdff.find(Fun);
     if (Iter != LLVMFdff.end()) {
       return Iter->second;
     }
-    return getDefaultValue<ParamaterMappingTy>();
+    return getDefaultValue<ParameterMappingTy>();
   }
 
   friend LLVMFunctionDataFlowFacts
   readFromFDFF(const FunctionDataFlowFacts &Fdff, const LLVMProjectIRDB &Irdb);
 
 private:
-  std::unordered_map<const llvm::Function *, ParamaterMappingTy> LLVMFdff;
+  std::unordered_map<const llvm::Function *, ParameterMappingTy> LLVMFdff;
 };
 } // namespace psr::library_summary
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
index ad55a98402..729e3c44a5 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
@@ -28,10 +28,9 @@ class Value;
 
 namespace psr {
 
-/**
- * This class may be used to represent the special zero value for IFDS
- * and IDE problems. The LLVMZeroValue is implemented as a singleton.
- */
+/// \brief This class may be used to represent the special zero value (aka. Λ)
+/// for IFDS and IDE problems. The LLVMZeroValue is implemented as a singleton.
+///
 class LLVMZeroValue : public llvm::GlobalVariable {
 private:
   LLVMZeroValue(llvm::Module &Mod);
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
index 34012ec334..bad969a70e 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
@@ -51,6 +51,8 @@ struct IDEExtendedTaintAnalysisDomain : public LLVMAnalysisDomainDefault {
 };
 namespace XTaint {
 
+/// \brief An IDE-based taint analysis that uses k-limited field-access paths to
+/// achieve field sensitivity
 class IDEExtendedTaintAnalysis
     : public IDETabulationProblem<IDEExtendedTaintAnalysisDomain>,
       public AnalysisBase {
diff --git a/include/phasar/PhasarLLVM/DataFlow/PathSensitivity/Z3BasedPathSensitvityManager.h b/include/phasar/PhasarLLVM/DataFlow/PathSensitivity/Z3BasedPathSensitvityManager.h
index 988a977c4a..b3c79d7032 100644
--- a/include/phasar/PhasarLLVM/DataFlow/PathSensitivity/Z3BasedPathSensitvityManager.h
+++ b/include/phasar/PhasarLLVM/DataFlow/PathSensitivity/Z3BasedPathSensitvityManager.h
@@ -61,6 +61,12 @@ class Z3BasedPathSensitivityManagerBase
   static void deduplicatePaths(FlowPathSequence<n_t> &Paths);
 };
 
+/// \brief An extension of the path-reconstruction mechanism of the
+/// PathSensitivityManager that provides means to extract concrete combined
+/// control- and data-flow paths.
+///
+/// Filters out paths that are considered infeasible by the Z3
+/// constraint solver.
 template <typename AnalysisDomainTy,
           typename = std::enable_if_t<std::is_same_v<
               typename AnalysisDomainTy::n_t, const llvm::Instruction *>>>
@@ -89,6 +95,14 @@ class Z3BasedPathSensitivityManager
     }
   }
 
+  /// Reconstruct the feasible control- and data-flow paths the lead to
+  /// the given data-flow fact Fact holding right after Inst.
+  ///
+  /// The result is given as list of paths, where cycles are unrolled once in an
+  /// implementation-defined way.
+  /// It is strongly recommended to Use the Z3BasedPathSensitivityConfig in the
+  /// Z3BasedPathSensitivityManager's ctor to limit the returned paths;
+  /// otherwise this function quickly becomes a performance bottleneck.
   FlowPathSequence<n_t> pathsTo(n_t Inst, d_t Fact) const {
     if (Config.DAGSizeThreshold != SIZE_MAX) {
       PHASAR_LOG_LEVEL(
diff --git a/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h b/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
index 755bbc9230..c4330c4e4b 100644
--- a/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
+++ b/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
@@ -25,6 +25,8 @@ class LLVMProjectIRDB;
 class LLVMBasedICFG;
 class LLVMBasedCFG;
 
+/// \brief An AnalysisDomain that specializes sensible defaults for LLVM-based
+/// analysis
 struct LLVMAnalysisDomainDefault : public AnalysisDomain {
   using d_t = const llvm::Value *;
   using n_t = const llvm::Instruction *;
@@ -36,6 +38,8 @@ struct LLVMAnalysisDomainDefault : public AnalysisDomain {
   using db_t = LLVMProjectIRDB;
 };
 
+/// \brief An AnalysisDomain that specializes sensible defaults for LLVM-based
+/// IFDS analysis
 using LLVMIFDSAnalysisDomainDefault =
     WithBinaryValueDomain<LLVMAnalysisDomainDefault>;
 
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
index 1c77b6f0cd..eeffe7412a 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
@@ -53,14 +53,15 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
   using AllocationSiteSetPtrTy = traits_t::AllocationSiteSetPtrTy;
   using AliasSetMap = llvm::DenseMap<const llvm::Value *, BoxedPtr<AliasSetTy>>;
 
-  /**
-   * Creates points-to set(s) for all functions in the IRDB. If
-   * UseLazyEvaluation is true, computes points-to-sets for functions that do
-   * not use global variables on the fly
-   */
+  /// \brief Creates alias-sets for all functions in the IRDB.
+  ///
+  /// If UseLazyEvaluation is true, computes alias-sets only for functions that
+  /// use global variables directly and delays all others to when they are first
+  /// requested
   explicit LLVMAliasSet(LLVMProjectIRDB *IRDB, bool UseLazyEvaluation = true,
                         AliasAnalysisType PATy = AliasAnalysisType::CFLAnders);
 
+  /// Loads alias sets from JSON
   explicit LLVMAliasSet(LLVMProjectIRDB *IRDB,
                         const nlohmann::json &SerializedPTS);
 
@@ -103,22 +104,18 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
     return AnalysisProperties::None;
   }
 
-  /**
-   * Shows a parts of an alias set. Good for debugging when one wants to peak
-   * into a points to set.
-   *
-   * @param ValueSetPair a pair on an Value* and the corresponding points to set
-   * @param Peak the amount of instrutions shown from the points to set
-   */
+  /// Shows a parts of an alias set. Good for debugging when one wants to peak
+  /// into a points to set.
+  ///
+  /// \param ValueSetPair a pair on a Value* and the corresponding points-to set
+  /// \param Peak the amount of instructions shown from the points-to set
   static void peakIntoAliasSet(const AliasSetMap::value_type &ValueSetPair,
                                int Peak);
 
-  /**
-   * Prints out the size distribution for all points to sets.
-   *
-   * @param Peak the amount of instrutions shown from one of the biggest points
-   * to sets, use 0 show nothing.
-   */
+  /// Prints out the size distribution for all points to sets.
+  ///
+  /// \param Peak the amount of instructions shown from one of the biggest
+  /// points-to sets, use 0 to show nothing.
   void drawAliasSetsDistribution(int Peak = 10) const;
 
   [[nodiscard]] inline bool empty() const { return AnalyzedFunctions.empty(); }
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h
index bf924e39cf..d895741ad2 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h
@@ -15,6 +15,9 @@
 #include <string>
 
 namespace psr {
+
+/// A data structure used for storing, serializing and deserializing a
+/// LLVMAliasSet
 struct LLVMAliasSetData {
   std::vector<std::vector<std::string>> AliasSets;
   std::vector<std::string> AnalyzedFunctions;
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
index 1b5694c6d4..d4554958a8 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
@@ -25,6 +25,10 @@
 namespace psr {
 class LLVMProjectIRDB;
 
+/// \brief Represents the type hierarchy of the target program.
+///
+/// \note This class only works, if the target program's IR was generated with
+/// debug information. Pass `-g` to the compiler to achieve this.
 class DIBasedTypeHierarchy
     : public TypeHierarchy<const llvm::DIType *, const llvm::Function *> {
 public:
@@ -39,7 +43,17 @@ class DIBasedTypeHierarchy
   static inline constexpr llvm::StringLiteral PureVirtualCallName =
       "__cxa_pure_virtual";
 
+  /// \brief Creates a type hierarchy based on an intermediate representation
+  /// database.
+  /// \param[in] IRDB The IR database of which the type hierarchy will be based
+  /// upon. This MUST contain debug information for the algorithm to work!
   explicit DIBasedTypeHierarchy(const LLVMProjectIRDB &IRDB);
+
+  /// \brief Loads an already computed type hierarchy.
+  /// \param[in] IRDB The IR database of the type hierarchy.
+  /// \param[in] SerializedData The already existing type hierarchy, given by
+  /// the appropiate class DIBasedTypeHierarchyData, which contains all
+  /// neccesary information.
   explicit DIBasedTypeHierarchy(const LLVMProjectIRDB *IRDB,
                                 const DIBasedTypeHierarchyData &SerializedData);
   ~DIBasedTypeHierarchy() override = default;
@@ -93,16 +107,12 @@ class DIBasedTypeHierarchy
 
   void print(llvm::raw_ostream &OS = llvm::outs()) const override;
 
-  /**
-   * 	@brief Prints the class hierarchy to an ostream in dot format.
-   * 	@param OS outputstream
-   */
+  /// \brief Prints the class hierarchy to an ostream in dot format.
+  /// \param OS outputstream
   void printAsDot(llvm::raw_ostream &OS = llvm::outs()) const;
 
-  /**
-   * @brief Prints the class hierarchy to an ostream in json format.
-   * @param an outputstream
-   */
+  /// \brief Prints the class hierarchy to an ostream in JSON format.
+  /// \param OS outputstream
   void printAsJson(llvm::raw_ostream &OS = llvm::outs()) const override;
 
 private:
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchyData.h b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchyData.h
index 52cd855699..da579b8f83 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchyData.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchyData.h
@@ -18,6 +18,9 @@
 #include <string>
 
 namespace psr {
+/// \brief A structure that is used to store already calculated type hierarchy
+/// data, serialize that data or deserialize a json file with a previously
+/// serialized type hierarchy.
 struct DIBasedTypeHierarchyData {
   // DITypes and llvm::Function * are serialized by serializing their names and
   // using the DebugInfoFinder to deserialize them
diff --git a/include/phasar/PhasarLLVM/Utils/Annotation.h b/include/phasar/PhasarLLVM/Utils/Annotation.h
index 31d9c42ba0..bf5527e7cc 100644
--- a/include/phasar/PhasarLLVM/Utils/Annotation.h
+++ b/include/phasar/PhasarLLVM/Utils/Annotation.h
@@ -10,9 +10,8 @@
 
 namespace psr {
 
-//===----------------------------------------------------------------------===//
-// Helper classes that allow for an easier retrieval of annotation information.
-//===----------------------------------------------------------------------===//
+/// \file Helper classes that allow for an easier retrieval of annotation
+/// information.
 
 class VarAnnotation {
 public:
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h b/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
index f9d3d91d72..fd57c81e0d 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
@@ -39,6 +39,11 @@ class DILocation;
 
 namespace psr {
 
+/// \file This file contains useful structs and functions to get and store
+/// information about the source code or the intermediate representation of the
+/// target being analyzed.
+
+/// \brief Minimal source-code information, based on LLVM debug information
 struct DebugLocation {
   unsigned Line{};
   unsigned Column{};
@@ -47,6 +52,8 @@ struct DebugLocation {
 
 [[nodiscard]] llvm::DILocalVariable *getDILocalVariable(const llvm::Value *V);
 
+/// \brief A struct that contains information about a source code line, function
+/// name, file name corresponding to the IR statement.
 struct SourceCodeInfo {
   std::string SourceCodeLine;
   std::string SourceCodeFilename;
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
index b0d8bccf9a..1292499460 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
@@ -53,11 +53,23 @@ bool isIntegerLikeType(const llvm::Type *T) noexcept;
 bool isAllocaInstOrHeapAllocaFunction(const llvm::Value *V) noexcept;
 bool isHeapAllocatingFunction(const llvm::Function *F) noexcept;
 
-// TODO add description
+/// Returns true if the provided function and the function type are both not
+/// null and have the same number of parameters and the same return type. If the
+/// argument ExactMatch is set to true, which it is by default, the two provided
+/// arguments must also have the same type for each argument, for the function
+/// to return true.
+///
+/// \note This function is less useful in practice than you may think. Consider
+/// using isConsistentCall() instead.
 bool matchesSignature(const llvm::Function *F, const llvm::FunctionType *FType,
                       bool ExactMatch = true);
 
-// TODO add description
+/// Returns true iff the provided functions are both not null and have the same
+/// number of paramters, the same return type and each parameter of both
+/// functions has the same type aswell.
+///
+/// \note This function is less useful in practice than you may think. Consider
+/// using isConsistentCall() instead.
 bool matchesSignature(const llvm::FunctionType *FType1,
                       const llvm::FunctionType *FType2);
 
@@ -230,7 +242,7 @@ bool isGuardVariable(const llvm::Value *V);
 bool isStaticVariableLazyInitializationBranch(const llvm::BranchInst *Inst);
 
 /**
- * Tests for https://llvm.org/docs/LangRef.html#llvm-var-annotation-intrinsic
+ * Tests for <https://llvm.org/docs/LangRef.html#llvm-var-annotation-intrinsic>
  * e.g.
  * int boo __attribute__((annotate("bar"));
  * @param F The function to test - Target of the call instruction
@@ -239,7 +251,7 @@ bool isVarAnnotationIntrinsic(const llvm::Function *F);
 
 /**
  * Retrieves String annotation value as per
- * https://llvm.org/docs/LangRef.html#llvm-var-annotation-intrinsic
+ * <https://llvm.org/docs/LangRef.html#llvm-var-annotation-intrinsic>
  * Test the call function be tested by isVarAnnotationIntrinsic
  *
  */
diff --git a/include/phasar/PhasarPass/PhasarPass.h b/include/phasar/PhasarPass/PhasarPass.h
index d8272b98c3..53fdc174a5 100644
--- a/include/phasar/PhasarPass/PhasarPass.h
+++ b/include/phasar/PhasarPass/PhasarPass.h
@@ -20,6 +20,20 @@ class raw_ostream;
 
 namespace psr {
 
+/// \brief PhasarPass is an implementation of llvm passes for the PhASAR
+/// framework.
+///
+/// Allows to run phasar-based analyses with LLVM's pass manager for easy
+/// integration into opt/clang.
+///
+/// What is a pass?
+/// "The LLVM pass framework is an important part of the LLVM system,
+/// because LLVM passes are where most of the interesting parts of the compiler
+/// exist. Passes perform the transformations and optimizations that make up the
+/// compiler, they build the analysis results that are used by these
+/// transformations, and they are, above all, a structuring technique for
+/// compiler code."
+/// Source: <https://llvm.org/docs/WritingAnLLVMNewPMPass.html>
 class PhasarPass : public llvm::ModulePass {
 public:
   static inline char ID = 12;
diff --git a/include/phasar/Pointer/AliasInfo.h b/include/phasar/Pointer/AliasInfo.h
index db861acdca..a5f2f5f577 100644
--- a/include/phasar/Pointer/AliasInfo.h
+++ b/include/phasar/Pointer/AliasInfo.h
@@ -41,7 +41,7 @@ struct AliasInfoTraits<AliasInfoRef<V, N>> : DefaultAATraits<V, N> {};
 template <typename V, typename N>
 struct AliasInfoTraits<AliasInfo<V, N>> : DefaultAATraits<V, N> {};
 
-/// A type-erased reference to any object implementing the IsAliasInfo
+/// \brief A type-erased reference to any object implementing the IsAliasInfo
 /// interface. Use this, if your analysis is not tied to a specific alias info
 /// implementation.
 ///
@@ -260,8 +260,9 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
   const VTable *VT{};
 };
 
-/// Similar to AliasInfoRef, but exclusively owns the held reference. Use this,
-/// if you need to decide dynamically, which alias info implementation to use.
+/// \brief Similar to AliasInfoRef, but exclusively owns the held reference. Use
+/// this, if you need to decide dynamically, which alias info implementation to
+/// use.
 ///
 /// Implicitly convertible to AliasInfoRef.
 ///
@@ -314,13 +315,13 @@ class [[clang::trivial_abi]] AliasInfo final : public AliasInfoRef<V, N> {
     }
   }
 
-  [[nodiscard]] base_t asRef() &noexcept { return *this; }
-  [[nodiscard]] AliasInfoRef<V, N> asRef() const &noexcept { return *this; }
+  [[nodiscard]] base_t asRef() & noexcept { return *this; }
+  [[nodiscard]] AliasInfoRef<V, N> asRef() const & noexcept { return *this; }
   [[nodiscard]] AliasInfoRef<V, N> asRef() && = delete;
 
   /// For better interoperability with unique_ptr
-  [[nodiscard]] base_t get() &noexcept { return asRef(); }
-  [[nodiscard]] AliasInfoRef<V, N> get() const &noexcept { return asRef(); }
+  [[nodiscard]] base_t get() & noexcept { return asRef(); }
+  [[nodiscard]] AliasInfoRef<V, N> get() const & noexcept { return asRef(); }
   [[nodiscard]] AliasInfoRef<V, N> get() && = delete;
 };
 
diff --git a/include/phasar/TypeHierarchy/VFTable.h b/include/phasar/TypeHierarchy/VFTable.h
index a236f2e345..4fc331cf53 100644
--- a/include/phasar/TypeHierarchy/VFTable.h
+++ b/include/phasar/TypeHierarchy/VFTable.h
@@ -20,6 +20,7 @@ class raw_ostream;
 
 namespace psr {
 
+/// \brief A generic class to represent a virtual function table
 template <typename F> class VFTable {
 public:
   virtual ~VFTable() = default;
diff --git a/include/phasar/Utils/AnalysisPrinterBase.h b/include/phasar/Utils/AnalysisPrinterBase.h
index a1ca6aee39..ec95b47d79 100644
--- a/include/phasar/Utils/AnalysisPrinterBase.h
+++ b/include/phasar/Utils/AnalysisPrinterBase.h
@@ -10,6 +10,8 @@
 
 namespace psr {
 
+/// \brief A generic class that serves as the basis for a custom analysis
+/// printer implementation.
 template <typename AnalysisDomainTy> class AnalysisPrinterBase {
   using n_t = typename AnalysisDomainTy::n_t;
   using d_t = typename AnalysisDomainTy::d_t;
diff --git a/include/phasar/Utils/DebugOutput.h b/include/phasar/Utils/DebugOutput.h
index 03f6098b38..bfd282183f 100644
--- a/include/phasar/Utils/DebugOutput.h
+++ b/include/phasar/Utils/DebugOutput.h
@@ -23,6 +23,9 @@
 namespace psr {
 namespace detail {
 
+/// \file This file contains many useful ways of printing information for
+/// debugging purposes.
+
 template <typename OS_t, typename T> void printHelper(OS_t &OS, const T &Data);
 
 template <typename OS_t, typename... Args, size_t... Idx>
diff --git a/include/phasar/Utils/DefaultAnalysisPrinter.h b/include/phasar/Utils/DefaultAnalysisPrinter.h
index f9008b9461..8923c21d58 100644
--- a/include/phasar/Utils/DefaultAnalysisPrinter.h
+++ b/include/phasar/Utils/DefaultAnalysisPrinter.h
@@ -30,6 +30,8 @@ template <typename AnalysisDomainTy> struct Warning {
         LatticeElement(std::move(Lattice)), AnalysisType(DfAnalysisType) {}
 };
 
+/// \brief A default implementation of the AnalysisPrinterBase. Aggregates all
+/// analysis results in a vector and prints them when the analysis is finished.
 template <typename AnalysisDomainTy>
 class DefaultAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   using n_t = typename AnalysisDomainTy::n_t;
@@ -41,7 +43,8 @@ class DefaultAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
       : OS(&OS) {}
 
   explicit DefaultAnalysisPrinter(const llvm::Twine &Filename)
-      : AnalysisPrinterBase<AnalysisDomainTy>(), OS(openFileStream(Filename)){};
+      : AnalysisPrinterBase<AnalysisDomainTy>(),
+        OS(openFileStream(Filename)) {};
 
   ~DefaultAnalysisPrinter() override = default;
 
diff --git a/include/phasar/Utils/EquivalenceClassMap.h b/include/phasar/Utils/EquivalenceClassMap.h
index a11d3fe4ed..20691aa3cf 100644
--- a/include/phasar/Utils/EquivalenceClassMap.h
+++ b/include/phasar/Utils/EquivalenceClassMap.h
@@ -23,11 +23,12 @@
 
 namespace psr {
 
-// EquivalenceClassMap is a special map type that splits the keys into
-// equivalence classes regarding their mapped values. Meaning, that all keys
-// that are equivalent are mapped to the same value. Two keys are treated as
-// equivalent and merged into a equivalence class when they refer to Values
-// that compare equal.
+/// \brief EquivalenceClassMap is a special map type that splits the keys into
+/// equivalence classes regarding their mapped values.
+///
+/// Meaning, that all keys that are equivalent are mapped to the same value. Two
+/// keys are treated as equivalent and merged into an equivalence class when
+/// they refer to Values that are considered equal according to operator==.
 template <typename KeyT, typename ValueT> struct EquivalenceClassMap {
   template <typename... Ts> using SetType = std::set<Ts...>;
   using EquivalenceClassBucketT = std::pair<SetType<KeyT>, ValueT>;
@@ -69,41 +70,41 @@ template <typename KeyT, typename ValueT> struct EquivalenceClassMap {
     return llvm::make_range(begin(), end());
   }
 
-  // Inserts Key into the corresponding equivalence class for Value. If Value
-  // is not already in the map a new equivalence class is created.
+  /// Inserts Key into the corresponding equivalence class for Value. If Value
+  /// is not already in the map a new equivalence class is created.
   template <typename ValueType = ValueT>
   insert_return_type insert(const KeyT &Key, ValueType &&Value) {
     return try_emplace(Key, std::forward<ValueType>(Value));
   }
 
-  // Inserts Key into the corresponding equivalence class for Value. If Value
-  // is not already in the map a new equivalence class is created.
+  /// Inserts Key into the corresponding equivalence class for Value. If Value
+  /// is not already in the map a new equivalence class is created.
   template <typename ValueType = ValueT>
   insert_return_type insert(KeyT &&Key, ValueType &&Value) {
     return try_emplace(std::move(Key), std::forward<ValueType>(Value));
   }
 
-  // Inserts Key into the corresponding equivalence class for Value. If Value
-  // is not already in the map a new equivalence class is created.
+  /// Inserts Key into the corresponding equivalence class for Value. If Value
+  /// is not already in the map a new equivalence class is created.
   insert_return_type insert(const std::pair<KeyT, ValueT> &KVPair) {
     return try_emplace(KVPair.first, KVPair.second);
   }
 
-  // Inserts Key into the corresponding equivalence class for Value. If Value
-  // is not already in the map a new equivalence class is created.
+  /// Inserts Key into the corresponding equivalence class for Value. If Value
+  /// is not already in the map a new equivalence class is created.
   insert_return_type insert(std::pair<KeyT, ValueT> &&KVPair) {
     return try_emplace(std::move(KVPair.first), std::move(KVPair.second));
   }
 
-  // Insert a range of Key Values pairs into the map.
+  /// Insert a range of Key Values pairs into the map.
   template <typename InputIt> void insert(InputIt I, InputIt End) {
     for (; I != End; ++I) {
       try_emplace(I->first, I->second);
     }
   }
 
-  // Inserts Key into the corresponding equivalence class for Value. If Value
-  // is not already in the map a new equivalence class is created.
+  /// Inserts Key into the corresponding equivalence class for Value. If Value
+  /// is not already in the map a new equivalence class is created.
   template <typename... Ts>
   insert_return_type try_emplace(KeyT &&Key, Ts &&...Args) {
     ValueT Val{std::forward<Ts...>(Args...)};
@@ -118,8 +119,8 @@ template <typename KeyT, typename ValueT> struct EquivalenceClassMap {
     return std::make_pair(StoredData.back().first.begin(), true);
   }
 
-  // Inserts Key into the corresponding equivalence class for Value. If Value
-  // is not already in the map a new equivalence class is created.
+  /// Inserts Key into the corresponding equivalence class for Value. If Value
+  /// is not already in the map a new equivalence class is created.
   template <typename... Ts>
   insert_return_type try_emplace(const KeyT &Key, Ts &&...Args) {
     ValueT Val{std::forward<Ts...>(Args...)};
@@ -134,7 +135,7 @@ template <typename KeyT, typename ValueT> struct EquivalenceClassMap {
     return std::make_pair(StoredData.back().first.begin(), true);
   }
 
-  // Return 1 if the specified key is in the map, 0 otherwise.
+  /// Return 1 if the specified key is in the map, 0 otherwise.
   [[nodiscard]] inline size_type count(const KeyT &Key) const {
     for (auto &KVPair : StoredData) {
       if (KVPair.first.count(Key) >= 1) {
@@ -148,7 +149,7 @@ template <typename KeyT, typename ValueT> struct EquivalenceClassMap {
     return StoredData.size();
   }
 
-  // Returns the size of the map, i.e., the number of equivalence classes.
+  /// Returns the size of the map, i.e., the number of equivalence classes.
   [[nodiscard]] inline size_type size() const {
     return numEquivalenceClasses();
   }
@@ -273,7 +274,7 @@ class EquivalenceClassMapNG {
     return Values.size();
   }
 
-  // Returns the size of the map, i.e., the number of equivalence classes.
+  /// Returns the size of the map, i.e., the number of equivalence classes.
   [[nodiscard]] inline size_t size() const noexcept {
     return numEquivalenceClasses();
   }
diff --git a/include/phasar/Utils/ErrorHandling.h b/include/phasar/Utils/ErrorHandling.h
index 3e5920af13..93dfacf2c4 100644
--- a/include/phasar/Utils/ErrorHandling.h
+++ b/include/phasar/Utils/ErrorHandling.h
@@ -18,6 +18,10 @@
 #include <type_traits>
 
 namespace psr {
+
+/// \file This file contains useful functions for handling errors, by using
+/// std::system_error, or returning null or a default value.
+
 template <typename T> T getOrThrow(llvm::ErrorOr<T> ValOrErr) {
   if (ValOrErr) {
     return std::move(*ValOrErr);
diff --git a/include/phasar/Utils/IO.h b/include/phasar/Utils/IO.h
index f9966df631..27669460b3 100644
--- a/include/phasar/Utils/IO.h
+++ b/include/phasar/Utils/IO.h
@@ -28,6 +28,9 @@
 
 namespace psr {
 
+/// \file This file contains functions for reading in text files and json files
+/// and provides error handling capabilities as well, if needed.
+
 [[nodiscard]] llvm::ErrorOr<std::string>
 readTextFileOrErr(const llvm::Twine &Path);
 [[nodiscard]] llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
diff --git a/include/phasar/Utils/OnTheFlyAnalysisPrinter.h b/include/phasar/Utils/OnTheFlyAnalysisPrinter.h
index aa3e4ef232..9d3bf73270 100644
--- a/include/phasar/Utils/OnTheFlyAnalysisPrinter.h
+++ b/include/phasar/Utils/OnTheFlyAnalysisPrinter.h
@@ -13,6 +13,10 @@
 #include <cassert>
 namespace psr {
 
+/// This class implements the AnalysisPrinterBase that prints the analysis
+/// results *while* the analysis is still running.
+///
+/// Override doOnResult() to customize, how the results are printed.
 template <typename AnalysisDomainTy>
 class OnTheFlyAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   using n_t = typename AnalysisDomainTy::n_t;
@@ -21,10 +25,11 @@ class OnTheFlyAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
 
 public:
   explicit OnTheFlyAnalysisPrinter(llvm::raw_ostream &OS)
-      : AnalysisPrinterBase<AnalysisDomainTy>(), OS(&OS){};
+      : AnalysisPrinterBase<AnalysisDomainTy>(), OS(&OS) {};
 
   explicit OnTheFlyAnalysisPrinter(const llvm::Twine &Filename)
-      : AnalysisPrinterBase<AnalysisDomainTy>(), OS(openFileStream(Filename)){};
+      : AnalysisPrinterBase<AnalysisDomainTy>(),
+        OS(openFileStream(Filename)) {};
 
   OnTheFlyAnalysisPrinter() = default;
   ~OnTheFlyAnalysisPrinter() = default;
diff --git a/include/phasar/Utils/Utilities.h b/include/phasar/Utils/Utilities.h
index f2c7504c74..612732679f 100644
--- a/include/phasar/Utils/Utilities.h
+++ b/include/phasar/Utils/Utilities.h
@@ -147,7 +147,7 @@ struct StringIDLess {
   bool operator()(const std::string &LHS, const std::string &RHS) const;
 };
 
-/// See "https://en.cppreference.com/w/cpp/experimental/scope_exit/scope_exit"
+/// See <https://en.cppreference.com/w/cpp/experimental/scope_exit/scope_exit>
 template <typename Fn> class scope_exit { // NOLINT
 public:
   template <typename FFn, typename = decltype(std::declval<FFn>()())>
@@ -168,14 +168,16 @@ template <typename Fn> class scope_exit { // NOLINT
 
 template <typename Fn> scope_exit(Fn) -> scope_exit<Fn>;
 
-// Copied from "https://en.cppreference.com/w/cpp/utility/variant/visit"
-template <class... Ts> struct Overloaded : Ts... { using Ts::operator()...; };
+// Copied from <https://en.cppreference.com/w/cpp/utility/variant/visit>
+template <class... Ts> struct Overloaded : Ts... {
+  using Ts::operator()...;
+};
 
 // explicit deduction guide (not needed as of C++20)
 template <class... Ts> Overloaded(Ts...) -> Overloaded<Ts...>;
 
 /// Based on the reference implementation of std::remove_if
-/// "https://en.cppreference.com/w/cpp/algorithm/remove" and optimized for the
+/// <https://en.cppreference.com/w/cpp/algorithm/remove> and optimized for the
 /// case that a sorted list of indices is given instead of an unary predicate
 /// specifying the elements to be removed.
 template <typename It, typename EndIt, typename IdxIt,
@@ -247,7 +249,7 @@ auto remove_by_index(Container &Cont, const Indices &Idx) {
   return remove_by_index(begin(Cont), end(Cont), begin(Idx), end(Idx));
 }
 
-/// See https://en.cppreference.com/w/cpp/utility/forward_like
+/// See <https://en.cppreference.com/w/cpp/utility/forward_like>
 template <class T, class U>
 [[nodiscard]] constexpr auto &&forward_like(U &&X) noexcept { // NOLINT
   // NOLINTNEXTLINE
diff --git a/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
index 2195d02ff4..4f47e7428d 100644
--- a/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
+++ b/lib/PhasarLLVM/Pointer/LLVMBasedAliasAnalysis.h
@@ -29,6 +29,10 @@ namespace psr {
 
 class LLVMProjectIRDB;
 
+/// \brief Wrapper over alias analyses that provide point-wise alias
+/// information.
+///
+/// Used to construct an LLVMAliasSet.
 class LLVMBasedAliasAnalysis : public AliasAnalysisView {
 public:
   explicit LLVMBasedAliasAnalysis(
diff --git a/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp b/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp
index c7465cdd85..fbdb822424 100644
--- a/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp
+++ b/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp
@@ -366,7 +366,7 @@ void LLVMTaintConfig::forAllLeakCandidatesAtImpl(
     }
   }
 
-  // Do not iterate over the actual paramaters of Inst as we did in
+  // Do not iterate over the actual parameters of Inst as we did in
   // forAllGeneratedValuesAt, because sink-values are not propagated in the
   // current taint analyses. Handling sink-values should be done in the
   // SinkCallBack

From 64e824199f40192e32b8fb2f93aec64f5ebffd5a Mon Sep 17 00:00:00 2001
From: Maximilian Leo Huber <huber.maximilian.leo@gmail.com>
Date: Wed, 18 Jun 2025 12:21:01 +0000
Subject: [PATCH 10/24] Added default reachable allocation sites functions
 (#781)

* Base files

* Added missing alias elements

* tests + normalflow impl

* added RAS tests

* WIP reworking flow functions

* ret and call flow, tests seq fault

* fixed seq faults in tests

* fixed bugs and unittests

* Cleanup + small fixes

* pre-commit

* Add missing header guards and file headers

---------

Co-authored-by: Fabian Schiebel <fabianbs@mail.upb.de>
---
 .../IfdsIde/DefaultAliasAwareIDEProblem.h     |  41 ++--
 .../IfdsIde/DefaultNoAliasIDEProblem.h        |  24 +-
 ...efaultReachableAllocationSitesIDEProblem.h | 150 ++++++++++++
 .../DataFlow/IfdsIde/FunctionDataFlowFacts.h  |  13 ++
 .../IfdsIde/LLVMFunctionDataFlowFacts.h       |  14 ++
 .../PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h |  14 +-
 .../DefaultAliasAwareIDEFlowFunctions.cpp     |  14 --
 ...aultReachableAllocationSitesIDEProblem.cpp | 123 ++++++++++
 .../IfdsIde/DefaultFlowFunctionTest.cpp       | 217 +++++++++++++++++-
 9 files changed, 551 insertions(+), 59 deletions(-)
 create mode 100644 include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
 create mode 100644 lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp

diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
index 9a73977f97..98933d2caf 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
@@ -1,3 +1,12 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel, mxHuber and others
+ *****************************************************************************/
+
 #ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDEALIASINFOTABULATIONPROBLEM_H
 #define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDEALIASINFOTABULATIONPROBLEM_H
 
@@ -38,17 +47,14 @@ class IDEAliasAwareDefaultFlowFunctionsImpl
 
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunctionImpl(n_t Curr,
                                                               n_t /*Succ*/);
-  [[nodiscard]] FlowFunctionPtrType getCallFlowFunctionImpl(n_t CallInst,
-                                                            f_t CalleeFun);
   [[nodiscard]] FlowFunctionPtrType getRetFlowFunctionImpl(n_t CallSite,
                                                            f_t /*CalleeFun*/,
                                                            n_t ExitInst,
                                                            n_t /*RetSite*/);
-  [[nodiscard]] FlowFunctionPtrType
-  getCallToRetFlowFunctionImpl(n_t CallSite, n_t /*RetSite*/,
-                               llvm::ArrayRef<f_t> /*Callees*/);
+  using IDENoAliasDefaultFlowFunctionsImpl::getCallFlowFunctionImpl;
+  using IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl;
 
-private:
+protected:
   LLVMAliasInfoRef AS;
 };
 } // namespace detail
@@ -58,22 +64,7 @@ class DefaultAliasAwareIDEProblem
     : public IDETabulationProblem<AnalysisDomainTy>,
       protected detail::IDEAliasAwareDefaultFlowFunctionsImpl {
 public:
-  using ProblemAnalysisDomain = AnalysisDomainTy;
-  using d_t = typename AnalysisDomainTy::d_t;
-  using n_t = typename AnalysisDomainTy::n_t;
-  using f_t = typename AnalysisDomainTy::f_t;
-  using t_t = typename AnalysisDomainTy::t_t;
-  using v_t = typename AnalysisDomainTy::v_t;
-  using l_t = typename AnalysisDomainTy::l_t;
-  using i_t = typename AnalysisDomainTy::i_t;
-  using db_t = typename AnalysisDomainTy::db_t;
-
-  using ConfigurationTy = HasNoConfigurationType;
-
-  using FlowFunctionType = FlowFunction<d_t>;
-  using FlowFunctionPtrType = typename FlowFunctionType::FlowFunctionPtrType;
-
-  using container_type = typename FlowFunctionType::container_type;
+  using typename IDETabulationProblem<AnalysisDomainTy>::db_t;
 
   /// Constructs an IDETabulationProblem with the usual arguments + alias
   /// information.
@@ -86,9 +77,11 @@ class DefaultAliasAwareIDEProblem
       std::optional<d_t>
           ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
       : IDETabulationProblem<AnalysisDomainTy>(IRDB, std::move(EntryPoints),
-                                               std::move(ZeroValue)),
+                                               ZeroValue),
         detail::IDEAliasAwareDefaultFlowFunctionsImpl(AS) {}
 
+  using detail::IDEAliasAwareDefaultFlowFunctionsImpl::getAliasInfo;
+
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
                                                           n_t Succ) override {
     return getNormalFlowFunctionImpl(Curr, Succ);
@@ -129,6 +122,8 @@ class DefaultAliasAwareIFDSProblem
       : IFDSTabulationProblem(IRDB, std::move(EntryPoints), ZeroValue),
         detail::IDEAliasAwareDefaultFlowFunctionsImpl(AS) {}
 
+  using detail::IDEAliasAwareDefaultFlowFunctionsImpl::getAliasInfo;
+
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
                                                           n_t Succ) override {
     return getNormalFlowFunctionImpl(Curr, Succ);
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
index 1865f749f2..3bb35b42ca 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
@@ -1,3 +1,12 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel, mxHuber and others
+ *****************************************************************************/
+
 #ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDENOALIASINFOTABULATIONPROBLEM_H
 #define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_IDENOALIASINFOTABULATIONPROBLEM_H
 
@@ -48,21 +57,6 @@ class DefaultNoAliasIDEProblem
     : public IDETabulationProblem<AnalysisDomainTy>,
       protected detail::IDENoAliasDefaultFlowFunctionsImpl {
 public:
-  using ProblemAnalysisDomain = AnalysisDomainTy;
-  using d_t = typename AnalysisDomainTy::d_t;
-  using n_t = typename AnalysisDomainTy::n_t;
-  using f_t = typename AnalysisDomainTy::f_t;
-  using t_t = typename AnalysisDomainTy::t_t;
-  using v_t = typename AnalysisDomainTy::v_t;
-  using l_t = typename AnalysisDomainTy::l_t;
-  using i_t = typename AnalysisDomainTy::i_t;
-  using db_t = typename AnalysisDomainTy::db_t;
-
-  using ConfigurationTy = HasNoConfigurationType;
-
-  using FlowFunctionType = FlowFunction<d_t>;
-  using FlowFunctionPtrType = typename FlowFunctionType::FlowFunctionPtrType;
-
   using IDETabulationProblem<AnalysisDomainTy>::IDETabulationProblem;
 
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
new file mode 100644
index 0000000000..eac661ccd4
--- /dev/null
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
@@ -0,0 +1,150 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel, mxHuber and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_DEFAULTREACHABLEALLOCATIONSITESIDEPROBLEM_H
+#define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_DEFAULTREACHABLEALLOCATIONSITESIDEPROBLEM_H
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+
+// Forward declaration of types for which we only use its pointer or ref type
+namespace llvm {
+class Value;
+class Instruction;
+class Function;
+} // namespace llvm
+
+namespace psr {
+
+namespace detail {
+class IDEReachableAllocationSitesDefaultFlowFunctionsImpl
+    : private IDENoAliasDefaultFlowFunctionsImpl {
+public:
+  using typename IDENoAliasDefaultFlowFunctionsImpl::d_t;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::f_t;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::FlowFunctionPtrType;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::FlowFunctionType;
+  using typename IDENoAliasDefaultFlowFunctionsImpl::n_t;
+
+  using IDENoAliasDefaultFlowFunctionsImpl::isFunctionModeled;
+
+  [[nodiscard]] constexpr LLVMAliasInfoRef getAliasInfo() const noexcept {
+    return AS;
+  }
+
+  constexpr IDEReachableAllocationSitesDefaultFlowFunctionsImpl(
+      LLVMAliasInfoRef AS) noexcept
+      : AS(AS) {
+    assert(AS && "You must provide an alias information handle!");
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunctionImpl(n_t Curr,
+                                                              n_t /*Succ*/);
+  [[nodiscard]] FlowFunctionPtrType getCallFlowFunctionImpl(n_t CallInst,
+                                                            f_t CalleeFun);
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunctionImpl(n_t CallSite,
+                                                           f_t /*CalleeFun*/,
+                                                           n_t ExitInst,
+                                                           n_t /*RetSite*/);
+
+  using IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl;
+
+protected:
+  LLVMAliasInfoRef AS;
+};
+} // namespace detail
+
+template <typename AnalysisDomainTy>
+class DefaultReachableAllocationSitesIDEProblem
+    : public IDETabulationProblem<AnalysisDomainTy>,
+      protected detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl {
+public:
+  using typename IDETabulationProblem<AnalysisDomainTy>::db_t;
+
+  /// Constructs an IDETabulationProblem with the usual arguments + alias
+  /// information.
+  ///
+  /// \note It is useful to use an instance of FilteredAliasSet for the alias
+  /// information to lower suprious aliases
+  explicit DefaultReachableAllocationSitesIDEProblem(
+      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      std::vector<std::string> EntryPoints,
+      std::optional<d_t>
+          ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
+      : IDETabulationProblem<AnalysisDomainTy>(IRDB, std::move(EntryPoints),
+                                               ZeroValue),
+        detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl(AS) {}
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
+                                                          n_t Succ) override {
+    return getNormalFlowFunctionImpl(Curr, Succ);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallFlowFunction(n_t CallInst, f_t CalleeFun) override {
+    return getCallFlowFunctionImpl(CallInst, CalleeFun);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunction(n_t CallSite,
+                                                       f_t CalleeFun,
+                                                       n_t ExitInst,
+                                                       n_t RetSite) override {
+    return getRetFlowFunctionImpl(CallSite, CalleeFun, ExitInst, RetSite);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
+                           llvm::ArrayRef<f_t> Callees) override {
+    return getCallToRetFlowFunctionImpl(CallSite, RetSite, Callees);
+  }
+};
+
+class DefaultReachableAllocationSitesIFDSProblem
+    : public IFDSTabulationProblem<LLVMIFDSAnalysisDomainDefault>,
+      protected detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl {
+public:
+  /// Constructs an IFDSTabulationProblem with the usual arguments + alias
+  /// information.
+  ///
+  /// \note It is useful to use an instance of FilteredAliasSet for the alias
+  /// information to lower suprious aliases
+  explicit DefaultReachableAllocationSitesIFDSProblem(
+      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      std::vector<std::string> EntryPoints,
+      d_t ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
+      : IFDSTabulationProblem(IRDB, std::move(EntryPoints), ZeroValue),
+        detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl(AS) {}
+
+  [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
+                                                          n_t Succ) override {
+    return getNormalFlowFunctionImpl(Curr, Succ);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallFlowFunction(n_t CallInst, f_t CalleeFun) override {
+    return getCallFlowFunctionImpl(CallInst, CalleeFun);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType getRetFlowFunction(n_t CallSite,
+                                                       f_t CalleeFun,
+                                                       n_t ExitInst,
+                                                       n_t RetSite) override {
+    return getRetFlowFunctionImpl(CallSite, CalleeFun, ExitInst, RetSite);
+  }
+
+  [[nodiscard]] FlowFunctionPtrType
+  getCallToRetFlowFunction(n_t CallSite, n_t RetSite,
+                           llvm::ArrayRef<f_t> Callees) override {
+    return getCallToRetFlowFunctionImpl(CallSite, RetSite, Callees);
+  }
+};
+
+} // namespace psr
+
+#endif
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
index 98cdd56f73..ccb4c6b7c2 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h
@@ -1,3 +1,14 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel, bulletspace and others
+ *****************************************************************************/
+#ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_FUNCTIONDATAFLOWFACTS_H
+#define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_FUNCTIONDATAFLOWFACTS_H
+
 #include "phasar/Utils/DefaultValue.h"
 
 #include "llvm/ADT/StringMap.h"
@@ -75,3 +86,5 @@ class FunctionDataFlowFacts {
 };
 
 } // namespace psr::library_summary
+
+#endif // PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_FUNCTIONDATAFLOWFACTS_H
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
index 8afba2f715..da04b93b1b 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFunctionDataFlowFacts.h
@@ -1,3 +1,15 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel, bulletspace and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LLVMFUNCTIONDATAFLOWFACTS_H
+#define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LLVMFUNCTIONDATAFLOWFACTS_H
+
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/FunctionDataFlowFacts.h"
 #include "phasar/Utils/DefaultValue.h"
@@ -73,3 +85,5 @@ class LLVMFunctionDataFlowFacts {
   std::unordered_map<const llvm::Function *, ParameterMappingTy> LLVMFdff;
 };
 } // namespace psr::library_summary
+
+#endif // PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LLVMFUNCTIONDATAFLOWFACTS_H
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h
index cea1c2772c..fdb0c7a164 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h
@@ -1,4 +1,14 @@
-#pragma once
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel, bulletspace and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LIBCSUMMARY_H
+#define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LIBCSUMMARY_H
 
 namespace psr {
 namespace library_summary {
@@ -7,3 +17,5 @@ class FunctionDataFlowFacts;
 
 [[nodiscard]] const library_summary::FunctionDataFlowFacts &getLibCSummary();
 } // namespace psr
+
+#endif // PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LIBCSUMMARY_H
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
index ed18352cee..82725b65b1 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
@@ -39,12 +39,6 @@ auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
       Curr, Succ);
 }
 
-auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getCallFlowFunctionImpl(
-    n_t CallInst, f_t CalleeFun) -> FlowFunctionPtrType {
-  return this->IDENoAliasDefaultFlowFunctionsImpl::getCallFlowFunctionImpl(
-      CallInst, CalleeFun);
-}
-
 static void populateWithMayAliases(LLVMAliasInfoRef AS, container_type &Facts,
                                    const llvm::Instruction *Context) {
   container_type Tmp = Facts;
@@ -92,11 +86,3 @@ auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getRetFlowFunctionImpl(
 
   return FFTemplates::killAllFlows();
 }
-
-auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::
-    getCallToRetFlowFunctionImpl(n_t CallSite, n_t RetSite,
-                                 llvm::ArrayRef<f_t> Callees)
-        -> FlowFunctionPtrType {
-  return this->IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl(
-      CallSite, RetSite, Callees);
-}
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp
new file mode 100644
index 0000000000..f76f660ca8
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp
@@ -0,0 +1,123 @@
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h"
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+
+#include "llvm/IR/Instructions.h"
+#include "llvm/Support/Casting.h"
+
+#include <cstdlib>
+
+using namespace psr;
+
+using FFTemplates = FlowFunctionTemplates<
+    detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::d_t,
+    detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
+        FlowFunctionType::container_type>;
+using container_type = FFTemplates::container_type;
+
+auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
+    getNormalFlowFunctionImpl(n_t Curr, n_t Succ) -> FlowFunctionPtrType {
+
+  if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
+
+    auto AliasSet =
+        AS.getReachableAllocationSites(Store->getPointerOperand(), true, Store);
+
+    container_type Gen(AliasSet->begin(), AliasSet->end());
+
+    return FFTemplates::lambdaFlow(
+        [Store, Gen{std::move(Gen)}, AS = AS](d_t Source) -> container_type {
+          if (Store->getPointerOperand() == Source) {
+            return {};
+          }
+          if (Store->getValueOperand() == Source ||
+              AS.isInReachableAllocationSites(Store->getValueOperand(), Source,
+                                              true, Store)) {
+            auto Ret = Gen;
+            Ret.insert(Source);
+            return Ret;
+          }
+
+          return {Source};
+        });
+  }
+
+  if (const auto *Load = llvm::dyn_cast<llvm::LoadInst>(Curr)) {
+    return FFTemplates::lambdaFlow(
+        [Load, AS = AS](d_t Source) -> container_type {
+          if (Load->getPointerOperand() == Source ||
+              AS.isInReachableAllocationSites(Load->getPointerOperand(), Source,
+                                              true, Load)) {
+            return {Source, Load};
+          }
+
+          return {Source};
+        });
+  }
+
+  return this->IDENoAliasDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
+      Curr, Succ);
+}
+
+auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
+    getCallFlowFunctionImpl(n_t CallInst, f_t CalleeFun)
+        -> FlowFunctionPtrType {
+  const auto *Call = llvm::cast<llvm::CallBase>(CallInst);
+
+  return mapFactsToCallee(
+      Call, CalleeFun, [Call, AS = AS](d_t Arg, d_t Source) -> bool {
+        if (Arg == Source) {
+          return true;
+        }
+
+        return Arg->getType()->isPointerTy() &&
+               Source->getType()->isPointerTy() &&
+               AS.isInReachableAllocationSites(Arg, Source, true, Call);
+      });
+}
+
+static void populateWithMayAliases(LLVMAliasInfoRef AS, container_type &Facts,
+                                   const llvm::Instruction *Context) {
+  container_type Tmp = Facts;
+  for (const auto *Fact : Tmp) {
+    auto Aliases = AS.getReachableAllocationSites(Fact, true, Context);
+    Facts.insert(Aliases->begin(), Aliases->end());
+  }
+}
+
+auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
+    getRetFlowFunctionImpl(n_t CallSite, f_t /*CalleeFun*/, n_t ExitInst,
+                           n_t /*RetSite*/) -> FlowFunctionPtrType {
+  const auto *Call = llvm::cast<llvm::CallBase>(CallSite);
+  const auto PostProcessFacts = [AS = AS, Call](container_type &Facts) {
+    populateWithMayAliases(AS, Facts, Call);
+  };
+
+  return mapFactsToCaller(
+      Call, ExitInst,
+      [AS = AS, ExitInst](d_t Param, d_t Source) {
+        if (!Param->getType()->isPointerTy()) {
+          return false;
+        }
+
+        if (Param == Source) {
+          return true;
+        }
+
+        // Arguments are counted as allocation-sites, so we have generated them
+        // as aliases
+        return !llvm::isa<llvm::Argument>(Source) &&
+               AS.isInReachableAllocationSites(Param, Source, true, ExitInst);
+      },
+      [AS = AS, ExitInst](d_t Ret, d_t Source) {
+        if (Ret == Source) {
+          return true;
+        }
+
+        return Ret->getType()->isPointerTy() &&
+               Source->getType()->isPointerTy() &&
+               AS.isInReachableAllocationSites(Ret, Source, true, ExitInst);
+      },
+      {}, true, true, PostProcessFacts);
+}
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
index 71d12e3129..619617ccd0 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
@@ -1,6 +1,7 @@
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h"
 #include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
@@ -24,7 +25,7 @@ namespace {
 class IDEAliasImpl : public DefaultAliasAwareIFDSProblem {
 public:
   IDEAliasImpl(LLVMProjectIRDB *IRDB)
-      : DefaultAliasAwareIFDSProblem(IRDB, &PT, {}, {}), PT(IRDB){};
+      : DefaultAliasAwareIFDSProblem(IRDB, &PT, {}, {}), PT(IRDB) {};
 
   [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
     return {};
@@ -37,13 +38,28 @@ class IDEAliasImpl : public DefaultAliasAwareIFDSProblem {
 class IDENoAliasImpl : public DefaultNoAliasIFDSProblem {
 public:
   IDENoAliasImpl(LLVMProjectIRDB *IRDB)
-      : DefaultNoAliasIFDSProblem(IRDB, {}, {}){};
+      : DefaultNoAliasIFDSProblem(IRDB, {}, {}) {};
 
   [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
     return {};
   };
 };
 
+class IDEReachableAllocationSitesImpl
+    : public DefaultReachableAllocationSitesIFDSProblem {
+public:
+  IDEReachableAllocationSitesImpl(LLVMProjectIRDB *IRDB)
+      : DefaultReachableAllocationSitesIFDSProblem(IRDB, &PT, {}, {}),
+        PT(IRDB) {};
+
+  [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
+    return {};
+  };
+
+private:
+  FilteredLLVMAliasSet PT;
+};
+
 std::set<const llvm::Value *>
 getNormalFlowValueSet(const llvm::Instruction *Instr, IDEAliasImpl &AliasImpl,
                       const llvm::Value *Arg) {
@@ -62,6 +78,15 @@ getNormalFlowValueSet(const llvm::Instruction *Instr,
   return NoAliasLLVMValueSet;
 }
 
+std::set<const llvm::Value *>
+getNormalFlowValueSet(const llvm::Instruction *Instr,
+                      IDEReachableAllocationSitesImpl &RASImpl,
+                      const llvm::Value *Arg) {
+  const auto RASNormalFlowFunc = RASImpl.getNormalFlowFunction(Instr, nullptr);
+  const auto RASLLVMValueSet = RASNormalFlowFunc->computeTargets(Arg);
+  return RASLLVMValueSet;
+}
+
 std::set<const llvm::Value *>
 getCallFlowValueSet(const llvm::Instruction *Instr, IDEAliasImpl &AliasImpl,
                     const llvm::Value *Arg, const llvm::Function *CalleeFunc) {
@@ -82,6 +107,16 @@ getCallFlowValueSet(const llvm::Instruction *Instr, IDENoAliasImpl &NoAliasImpl,
   return NoAliasLLVMValueSet;
 }
 
+std::set<const llvm::Value *>
+getCallFlowValueSet(const llvm::Instruction *Instr,
+                    IDEReachableAllocationSitesImpl &RASImpl,
+                    const llvm::Value *Arg, const llvm::Function *CalleeFunc) {
+  const auto RASCallFlowFunc = RASImpl.getCallFlowFunction(Instr, CalleeFunc);
+  std::set<const llvm::Value *> RASLLVMValueSet =
+      RASCallFlowFunc->computeTargets(Arg);
+  return RASLLVMValueSet;
+}
+
 std::set<const llvm::Value *>
 getRetFlowValueSet(const llvm::Instruction *Instr, IDEAliasImpl &AliasImpl,
                    const llvm::Value *Arg, const llvm::Instruction *ExitInst) {
@@ -102,6 +137,17 @@ getRetFlowValueSet(const llvm::Instruction *Instr, IDENoAliasImpl &NoAliasImpl,
   return NoAliasLLVMValueSet;
 }
 
+std::set<const llvm::Value *>
+getRetFlowValueSet(const llvm::Instruction *Instr,
+                   IDEReachableAllocationSitesImpl &RASImpl,
+                   const llvm::Value *Arg, const llvm::Instruction *ExitInst) {
+  const auto RASRetFlowFunc =
+      RASImpl.getRetFlowFunction(Instr, nullptr, ExitInst, nullptr);
+  std::set<const llvm::Value *> RASLLVMValueSet =
+      RASRetFlowFunc->computeTargets(Arg);
+  return RASLLVMValueSet;
+}
+
 std::set<const llvm::Value *>
 getCallToRetFlowValueSet(const llvm::Instruction *Instr,
                          IDEAliasImpl &AliasImpl, const llvm::Value *Arg) {
@@ -121,6 +167,16 @@ getCallToRetFlowValueSet(const llvm::Instruction *Instr,
   return NoAliasLLVMValueSet;
 }
 
+std::set<const llvm::Value *>
+getCallToRetFlowValueSet(const llvm::Instruction *Instr,
+                         IDEReachableAllocationSitesImpl &RASImpl,
+                         const llvm::Value *Arg) {
+  const auto RASCallToRetFlowFunc =
+      RASImpl.getCallToRetFlowFunction(Instr, nullptr, {});
+  const auto RASLLVMValueSet = RASCallToRetFlowFunc->computeTargets(Arg);
+  return RASLLVMValueSet;
+}
+
 std::string stringifyValueSet(const std::set<const llvm::Value *> &Vals) {
   std::string Ret;
   llvm::raw_string_ostream ROS(Ret);
@@ -140,6 +196,8 @@ TEST(PureFlow, NormalFlow01) {
                         "pure_flow/normal_flow/normal_flow_01_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   const auto *MainFunc = IRDB.getFunction("main");
   // %0
@@ -166,10 +224,14 @@ TEST(PureFlow, NormalFlow01) {
             getNormalFlowValueSet(Instr8, AliasImpl, PercentZero));
   EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr1}),
             getNormalFlowValueSet(Instr8, NoAliasImpl, PercentZero));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr1}),
+            getNormalFlowValueSet(Instr8, RASImpl, PercentZero));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr8, AliasImpl, Instr1));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr8, NoAliasImpl, Instr1));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr8, RASImpl, Instr1));
 
   // store ptr %1, ptr %.addr1, align 8
   const auto *Instr10 = IRDB.getInstruction(10);
@@ -178,10 +240,14 @@ TEST(PureFlow, NormalFlow01) {
             getNormalFlowValueSet(Instr10, AliasImpl, PercentOne));
   EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr2}),
             getNormalFlowValueSet(Instr10, NoAliasImpl, PercentOne));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr2}),
+            getNormalFlowValueSet(Instr10, RASImpl, PercentOne));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr10, AliasImpl, Instr2));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr10, NoAliasImpl, Instr2));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr10, RASImpl, Instr2));
 
   // store ptr %One, ptr %OnePtr, align 8, !dbg !225
   const auto *Instr17 = IRDB.getInstruction(17);
@@ -190,10 +256,14 @@ TEST(PureFlow, NormalFlow01) {
             getNormalFlowValueSet(Instr17, AliasImpl, Instr3));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr5}),
             getNormalFlowValueSet(Instr17, NoAliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr5}),
+            getNormalFlowValueSet(Instr17, RASImpl, Instr3));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr17, AliasImpl, Instr5));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr17, NoAliasImpl, Instr5));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr17, RASImpl, Instr5));
 
   // store ptr %Two, ptr %TwoAddr, align 8, !dbg !228
   const auto *Instr19 = IRDB.getInstruction(19);
@@ -202,16 +272,22 @@ TEST(PureFlow, NormalFlow01) {
             getNormalFlowValueSet(Instr19, AliasImpl, Instr4));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr4, Instr6}),
             getNormalFlowValueSet(Instr19, NoAliasImpl, Instr4));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr4, Instr6}),
+            getNormalFlowValueSet(Instr19, RASImpl, Instr4));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr19, AliasImpl, Instr6));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getNormalFlowValueSet(Instr19, NoAliasImpl, Instr6));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getNormalFlowValueSet(Instr19, RASImpl, Instr6));
 
   // Other arg
   EXPECT_EQ(std::set<const llvm::Value *>{Instr19},
             getNormalFlowValueSet(Instr19, AliasImpl, Instr19));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr19},
             getNormalFlowValueSet(Instr19, NoAliasImpl, Instr19));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr19},
+            getNormalFlowValueSet(Instr19, RASImpl, Instr19));
 }
 
 TEST(PureFlow, NormalFlow02) {
@@ -219,6 +295,8 @@ TEST(PureFlow, NormalFlow02) {
                         "pure_flow/normal_flow/normal_flow_02_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   const auto *MainFunc = IRDB.getFunction("main");
   ASSERT_TRUE(MainFunc);
@@ -242,10 +320,14 @@ TEST(PureFlow, NormalFlow02) {
             getNormalFlowValueSet(Instr8, AliasImpl, PercentZero));
   EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr2}),
             getNormalFlowValueSet(Instr8, NoAliasImpl, PercentZero));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentZero, Instr2}),
+            getNormalFlowValueSet(Instr8, RASImpl, PercentZero));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr8, AliasImpl, Instr2));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr8, NoAliasImpl, Instr2));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr8, RASImpl, Instr2));
 
   // store ptr %1, ptr %.addr1, align 8, !psr.id !231; | ID: 10
   const auto *Instr10 = IRDB.getInstruction(10);
@@ -254,16 +336,22 @@ TEST(PureFlow, NormalFlow02) {
             getNormalFlowValueSet(Instr10, AliasImpl, PercentOne));
   EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr3}),
             getNormalFlowValueSet(Instr10, NoAliasImpl, PercentOne));
+  EXPECT_EQ((std::set<const llvm::Value *>{PercentOne, Instr3}),
+            getNormalFlowValueSet(Instr10, RASImpl, PercentOne));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr10, AliasImpl, Instr3));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr10, NoAliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr10, RASImpl, Instr3));
 
   // Other arg
   EXPECT_EQ(std::set<const llvm::Value *>{Instr10},
             getNormalFlowValueSet(Instr10, AliasImpl, Instr10));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr10},
             getNormalFlowValueSet(Instr10, NoAliasImpl, Instr10));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr10},
+            getNormalFlowValueSet(Instr10, RASImpl, Instr10));
 }
 
 TEST(PureFlow, NormalFlow03) {
@@ -271,6 +359,8 @@ TEST(PureFlow, NormalFlow03) {
                         "pure_flow/normal_flow/normal_flow_03_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // %One = alloca i32, align 4, !psr.id !222; | ID: 3
   const auto *Instr3 = IRDB.getInstruction(3);
@@ -286,6 +376,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr18, AliasImpl, Instr3));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr18}),
             getNormalFlowValueSet(Instr18, NoAliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr18}),
+            getNormalFlowValueSet(Instr18, RASImpl, Instr3));
   // %3 = load i32, ptr %One, align 4, !dbg !251, !psr.id !252; | ID: 21
   const auto *Instr21 = IRDB.getInstruction(21);
   ASSERT_TRUE(Instr21);
@@ -293,6 +385,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr21, AliasImpl, Instr3));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr21}),
             getNormalFlowValueSet(Instr21, NoAliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr21}),
+            getNormalFlowValueSet(Instr21, RASImpl, Instr3));
 
   // %tobool = icmp ne i32 %3, 0, !dbg !251, !psr.id !253; | ID: 22
   const auto *Instr22 = IRDB.getInstruction(22);
@@ -304,6 +398,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr23, AliasImpl, Instr22));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr22, Instr23}),
             getNormalFlowValueSet(Instr23, NoAliasImpl, Instr22));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr22, Instr23}),
+            getNormalFlowValueSet(Instr23, RASImpl, Instr22));
 
   // %4 = load i32, ptr %One, align 4, !dbg !261, !psr.id !262; | ID: 27
   const auto *Instr27 = IRDB.getInstruction(27);
@@ -312,6 +408,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr27, AliasImpl, Instr3));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr27}),
             getNormalFlowValueSet(Instr27, NoAliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr27}),
+            getNormalFlowValueSet(Instr27, RASImpl, Instr3));
 
   // %5 = load i32, ptr %One, align 4, !dbg !263, !psr.id !264; | ID: 28
   const auto *Instr28 = IRDB.getInstruction(28);
@@ -320,6 +418,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr28, AliasImpl, Instr3));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr28}),
             getNormalFlowValueSet(Instr28, NoAliasImpl, Instr3));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr3, Instr28}),
+            getNormalFlowValueSet(Instr28, RASImpl, Instr3));
 
   // %add = add nsw i32 %4, %5, !dbg !265, !psr.id !266; | ID: 29
   const auto *Instr29 = IRDB.getInstruction(29);
@@ -328,10 +428,14 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr29, AliasImpl, Instr27));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr27, Instr29}),
             getNormalFlowValueSet(Instr29, NoAliasImpl, Instr27));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr27, Instr29}),
+            getNormalFlowValueSet(Instr29, RASImpl, Instr27));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr28, Instr29}),
             getNormalFlowValueSet(Instr29, AliasImpl, Instr28));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr28, Instr29}),
             getNormalFlowValueSet(Instr29, NoAliasImpl, Instr28));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr28, Instr29}),
+            getNormalFlowValueSet(Instr29, RASImpl, Instr28));
 
   // %One2 = getelementptr inbounds %struct.StructOne, ptr %ForGEP, i32 0, i32
   // 0, !dbg !282, !psr.id !283; | ID: 37
@@ -341,6 +445,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr37, AliasImpl, Instr8));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr37}),
             getNormalFlowValueSet(Instr37, NoAliasImpl, Instr8));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr37}),
+            getNormalFlowValueSet(Instr37, RASImpl, Instr8));
 
   // %6 = load i32, ptr %One2, align 4, !dbg !282, !psr.id !284; | ID: 38
   const auto *Instr38 = IRDB.getInstruction(38);
@@ -349,6 +455,8 @@ TEST(PureFlow, NormalFlow03) {
             getNormalFlowValueSet(Instr38, AliasImpl, Instr37));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr37, Instr38}),
             getNormalFlowValueSet(Instr38, NoAliasImpl, Instr37));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr37, Instr38}),
+            getNormalFlowValueSet(Instr38, RASImpl, Instr37));
 }
 
 TEST(PureFlow, NormalFlow04) {
@@ -356,6 +464,8 @@ TEST(PureFlow, NormalFlow04) {
                         "pure_flow/normal_flow/normal_flow_04_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // %Deref1 = alloca i32, align 4, !psr.id !222; | ID: 7
   const auto *Instr7 = IRDB.getInstruction(7);
@@ -383,10 +493,14 @@ TEST(PureFlow, NormalFlow04) {
             getNormalFlowValueSet(Instr26, AliasImpl, Instr25));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr25, Instr7}),
             getNormalFlowValueSet(Instr26, NoAliasImpl, Instr25));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr25, Instr7}),
+            getNormalFlowValueSet(Instr26, RASImpl, Instr25));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr26, AliasImpl, Instr7));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr26, NoAliasImpl, Instr7));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr26, RASImpl, Instr7));
 
   // store i32 %6, ptr %Deref2, align 4, !dbg !262, !psr.id !270; | ID: 31
   const auto *Instr31 = IRDB.getInstruction(31);
@@ -395,10 +509,14 @@ TEST(PureFlow, NormalFlow04) {
             getNormalFlowValueSet(Instr31, AliasImpl, Instr30));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr30}),
             getNormalFlowValueSet(Instr31, NoAliasImpl, Instr30));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr8, Instr30}),
+            getNormalFlowValueSet(Instr31, RASImpl, Instr30));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr31, AliasImpl, Instr8));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr31, NoAliasImpl, Instr8));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr31, RASImpl, Instr8));
 
   // store i32 %10, ptr %Deref3, align 4, !dbg !272, !psr.id !282; | ID: 37
   const auto *Instr37 = IRDB.getInstruction(37);
@@ -407,10 +525,14 @@ TEST(PureFlow, NormalFlow04) {
             getNormalFlowValueSet(Instr37, AliasImpl, Instr36));
   EXPECT_EQ((std::set<const llvm::Value *>{Instr9, Instr36}),
             getNormalFlowValueSet(Instr37, NoAliasImpl, Instr36));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr9, Instr36}),
+            getNormalFlowValueSet(Instr37, RASImpl, Instr36));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr37, AliasImpl, Instr9));
   EXPECT_EQ((std::set<const llvm::Value *>{}),
             getNormalFlowValueSet(Instr37, NoAliasImpl, Instr9));
+  EXPECT_EQ((std::set<const llvm::Value *>{}),
+            getNormalFlowValueSet(Instr37, RASImpl, Instr9));
 }
 
 /*
@@ -422,6 +544,8 @@ TEST(PureFlow, CallFlow01) {
                         "pure_flow/call_flow/call_flow_01_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // call void @_Z4callii(i32 noundef %2, i32 noundef %3), !dbg !261, !psr.id
   // !262; | ID: 26
@@ -446,6 +570,12 @@ TEST(PureFlow, CallFlow01) {
     EXPECT_EQ(std::set<const llvm::Value *>{Param1},
               getCallFlowValueSet(Instr26, NoAliasImpl,
                                   CallSite->getArgOperand(1), FuncForInstr26));
+    EXPECT_EQ(std::set<const llvm::Value *>{Param0},
+              getCallFlowValueSet(Instr26, RASImpl, CallSite->getArgOperand(0),
+                                  FuncForInstr26));
+    EXPECT_EQ(std::set<const llvm::Value *>{Param1},
+              getCallFlowValueSet(Instr26, RASImpl, CallSite->getArgOperand(1),
+                                  FuncForInstr26));
   } else {
     FAIL();
   }
@@ -456,6 +586,8 @@ TEST(PureFlow, CallFlow02) {
                         "pure_flow/call_flow/call_flow_02_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // %One = alloca i32, align 4, !psr.id !251; | ID: 17
   const auto *Instr17 = IRDB.getInstruction(17);
@@ -508,6 +640,9 @@ TEST(PureFlow, CallFlow02) {
   EXPECT_EQ((std::set<const llvm::Value *>{CallFunc->getArg(0)}),
             getCallFlowValueSet(Instr50, NoAliasImpl,
                                 CSCallFunc->getArgOperand(0), CallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{CallFunc->getArg(0)}),
+            getCallFlowValueSet(Instr50, RASImpl, CSCallFunc->getArgOperand(0),
+                                CallFunc));
 
   EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(0)}),
             getCallFlowValueSet(Instr54, AliasImpl,
@@ -517,6 +652,10 @@ TEST(PureFlow, CallFlow02) {
             getCallFlowValueSet(Instr54, NoAliasImpl,
                                 CSSecondCallFunc->getArgOperand(0),
                                 SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(0)}),
+            getCallFlowValueSet(Instr54, RASImpl,
+                                CSSecondCallFunc->getArgOperand(0),
+                                SecondCallFunc));
   EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(1)}),
             getCallFlowValueSet(Instr54, AliasImpl,
                                 CSSecondCallFunc->getArgOperand(1),
@@ -525,6 +664,10 @@ TEST(PureFlow, CallFlow02) {
             getCallFlowValueSet(Instr54, NoAliasImpl,
                                 CSSecondCallFunc->getArgOperand(1),
                                 SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(1)}),
+            getCallFlowValueSet(Instr54, RASImpl,
+                                CSSecondCallFunc->getArgOperand(1),
+                                SecondCallFunc));
   EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(2)}),
             getCallFlowValueSet(Instr54, AliasImpl,
                                 CSSecondCallFunc->getArgOperand(2),
@@ -533,6 +676,10 @@ TEST(PureFlow, CallFlow02) {
             getCallFlowValueSet(Instr54, NoAliasImpl,
                                 CSSecondCallFunc->getArgOperand(2),
                                 SecondCallFunc));
+  EXPECT_EQ((std::set<const llvm::Value *>{SecondCallFunc->getArg(2)}),
+            getCallFlowValueSet(Instr54, RASImpl,
+                                CSSecondCallFunc->getArgOperand(2),
+                                SecondCallFunc));
 }
 
 /*
@@ -544,6 +691,8 @@ TEST(PureFlow, RetFlow01) {
                         "pure_flow/ret_flow/ret_flow_01_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // %Two = alloca i32, align 4, !psr.id !251; | ID: 20
   const auto *UnusedValue = IRDB.getValueFromId(20);
@@ -559,6 +708,8 @@ TEST(PureFlow, RetFlow01) {
             getRetFlowValueSet(Instr9, AliasImpl, UnusedValue, Instr0));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getRetFlowValueSet(Instr9, NoAliasImpl, UnusedValue, Instr0));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr9, RASImpl, UnusedValue, Instr0));
 
   // %call = call noundef i32 @_Z4callii(i32 noundef %2, i32 noundef %3), !dbg
   // !281, !psr.id !282; | ID: 36
@@ -581,6 +732,12 @@ TEST(PureFlow, RetFlow01) {
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getRetFlowValueSet(Instr36, NoAliasImpl, FuncZ4callii->getArg(1),
                                Instr14));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr36, RASImpl, FuncZ4callii->getArg(0), Instr14));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr36, RASImpl, FuncZ4callii->getArg(1), Instr14));
 
   // negative tests
   EXPECT_EQ(
@@ -589,6 +746,9 @@ TEST(PureFlow, RetFlow01) {
   EXPECT_EQ(
       std::set<const llvm::Value *>{},
       getRetFlowValueSet(Instr9, NoAliasImpl, FuncZ4callii->getArg(1), Instr0));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr9, RASImpl, FuncZ4callii->getArg(1), Instr0));
 }
 
 TEST(PureFlow, RetFlow02) {
@@ -596,6 +756,8 @@ TEST(PureFlow, RetFlow02) {
                         "pure_flow/ret_flow/ret_flow_02_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // %Two = alloca i32, align 4, !psr.id !268; | ID: 29
   const auto *UnusedValue = IRDB.getValueFromId(29);
@@ -611,6 +773,8 @@ TEST(PureFlow, RetFlow02) {
             getRetFlowValueSet(Instr14, AliasImpl, UnusedValue, Instr0));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getRetFlowValueSet(Instr14, NoAliasImpl, UnusedValue, Instr0));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr14, RASImpl, UnusedValue, Instr0));
 
   // %call1 = call noundef i32 @_Z8newThreev(), !dbg !247, !psr.id !248; | ID:
   // 18
@@ -624,6 +788,8 @@ TEST(PureFlow, RetFlow02) {
             getRetFlowValueSet(Instr18, AliasImpl, UnusedValue, Instr4));
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getRetFlowValueSet(Instr18, NoAliasImpl, UnusedValue, Instr4));
+  EXPECT_EQ(std::set<const llvm::Value *>{},
+            getRetFlowValueSet(Instr18, RASImpl, UnusedValue, Instr4));
 
   //  %call = call noundef i32 @_Z4callii(i32 noundef %2, i32 noundef %3), !dbg
   //  !298, !psr.id !299; | ID: 45
@@ -646,6 +812,12 @@ TEST(PureFlow, RetFlow02) {
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getRetFlowValueSet(Instr45, NoAliasImpl, FuncZ4callii->getArg(1),
                                Instr23));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr45, RASImpl, FuncZ4callii->getArg(0), Instr23));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr45, RASImpl, FuncZ4callii->getArg(1), Instr23));
 
   // negative tests
   EXPECT_EQ(
@@ -654,6 +826,9 @@ TEST(PureFlow, RetFlow02) {
   EXPECT_EQ(std::set<const llvm::Value *>{},
             getRetFlowValueSet(Instr14, NoAliasImpl, FuncZ4callii->getArg(1),
                                Instr0));
+  EXPECT_EQ(
+      std::set<const llvm::Value *>{},
+      getRetFlowValueSet(Instr14, RASImpl, FuncZ4callii->getArg(1), Instr0));
 }
 
 TEST(PureFlow, RetFlow03) {
@@ -661,6 +836,8 @@ TEST(PureFlow, RetFlow03) {
                         "pure_flow/ret_flow/ret_flow_03_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // %ThreeInCall = alloca i32, align 4, !psr.id !254; | ID: 15
   const auto *Instr15 = IRDB.getValueFromId(15);
@@ -691,15 +868,17 @@ TEST(PureFlow, RetFlow03) {
 
   const auto &Got = getRetFlowValueSet(
       Instruction30, AliasImpl, FunctionZ8newThreePKi->getArg(0), Instruction9);
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr29},
+            getRetFlowValueSet(Instruction30, NoAliasImpl,
+                               FunctionZ8newThreePKi->getArg(0), Instruction9));
+  EXPECT_EQ((std::set<const llvm::Value *>{Instr29, Instr15, Instruction30}),
+            getRetFlowValueSet(Instruction30, RASImpl,
+                               FunctionZ8newThreePKi->getArg(0), Instruction9));
 
   EXPECT_EQ((std::set<const llvm::Value *>{Instr15, Instr16, Instr29, Instr30}),
             Got)
       << stringifyValueSet(Got);
 
-  EXPECT_EQ(std::set<const llvm::Value *>{Instr29},
-            getRetFlowValueSet(Instruction30, NoAliasImpl,
-                               FunctionZ8newThreePKi->getArg(0), Instruction9));
-
   // ret ptr @GlobalFour, !dbg !240, !psr.id !241; | ID: 10
   const auto *Instruction10 = IRDB.getInstruction(10);
   ASSERT_TRUE(Instruction10);
@@ -739,12 +918,18 @@ TEST(PureFlow, RetFlow03) {
   EXPECT_EQ(std::set<const llvm::Value *>{Instr52},
             getRetFlowValueSet(Instruction68, NoAliasImpl,
                                FuncZ4callRiPKi->getArg(0), Instruction48));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr52},
+            getRetFlowValueSet(Instruction68, RASImpl,
+                               FuncZ4callRiPKi->getArg(0), Instruction48));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr53},
             getRetFlowValueSet(Instruction68, AliasImpl,
                                FuncZ4callRiPKi->getArg(1), Instruction48));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr53},
             getRetFlowValueSet(Instruction68, NoAliasImpl,
                                FuncZ4callRiPKi->getArg(1), Instruction48));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr53},
+            getRetFlowValueSet(Instruction68, RASImpl,
+                               FuncZ4callRiPKi->getArg(1), Instruction48));
 }
 
 /*
@@ -757,6 +942,8 @@ TEST(PureFlow, CallToRetFlow01) {
        "pure_flow/call_to_ret_flow/call_to_ret_flow_01_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // store i32 0, ptr %Zero, align 4, !dbg !252, !psr.id !254; | ID: 22
   const auto *Instr22 = IRDB.getInstruction(22);
@@ -774,16 +961,22 @@ TEST(PureFlow, CallToRetFlow01) {
             getCallToRetFlowValueSet(Instr30, AliasImpl, Instr22));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
             getCallToRetFlowValueSet(Instr30, NoAliasImpl, Instr22));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
+            getCallToRetFlowValueSet(Instr30, RASImpl, Instr22));
 
   EXPECT_EQ(std::set<const llvm::Value *>{Instr24},
             getCallToRetFlowValueSet(Instr30, AliasImpl, Instr24));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr24},
             getCallToRetFlowValueSet(Instr30, NoAliasImpl, Instr24));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr24},
+            getCallToRetFlowValueSet(Instr30, RASImpl, Instr24));
 
   EXPECT_EQ(std::set<const llvm::Value *>{Instr30},
             getCallToRetFlowValueSet(Instr30, AliasImpl, Instr30));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr30},
             getCallToRetFlowValueSet(Instr30, NoAliasImpl, Instr30));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr30},
+            getCallToRetFlowValueSet(Instr30, RASImpl, Instr30));
 }
 
 TEST(PureFlow, CallToRetFlow02) {
@@ -792,6 +985,8 @@ TEST(PureFlow, CallToRetFlow02) {
        "pure_flow/call_to_ret_flow/call_to_ret_flow_02_cpp_dbg.ll"});
   IDEAliasImpl AliasImpl = IDEAliasImpl(&IRDB);
   IDENoAliasImpl NoAliasImpl = IDENoAliasImpl(&IRDB);
+  IDEReachableAllocationSitesImpl RASImpl =
+      IDEReachableAllocationSitesImpl(&IRDB);
 
   // store i32 3, ptr %Three, align 4, !dbg !223, !psr.id !225; | ID: 5
   const auto *Instr5 = IRDB.getInstruction(5);
@@ -809,11 +1004,15 @@ TEST(PureFlow, CallToRetFlow02) {
             getCallToRetFlowValueSet(Instr10, AliasImpl, Instr5));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr5},
             getCallToRetFlowValueSet(Instr10, NoAliasImpl, Instr5));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr5},
+            getCallToRetFlowValueSet(Instr10, RASImpl, Instr5));
 
   EXPECT_EQ(std::set<const llvm::Value *>{Instr8},
             getCallToRetFlowValueSet(Instr10, AliasImpl, Instr8));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr8},
             getCallToRetFlowValueSet(Instr10, NoAliasImpl, Instr8));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr8},
+            getCallToRetFlowValueSet(Instr10, RASImpl, Instr8));
 
   // store i32 1, ptr %One, align 4, !dbg !255, !psr.id !257; | ID: 22
   const auto *Instr22 = IRDB.getInstruction(22);
@@ -831,16 +1030,22 @@ TEST(PureFlow, CallToRetFlow02) {
             getCallToRetFlowValueSet(Instr27, AliasImpl, Instr22));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
             getCallToRetFlowValueSet(Instr27, NoAliasImpl, Instr22));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr22},
+            getCallToRetFlowValueSet(Instr27, RASImpl, Instr22));
 
   EXPECT_EQ(std::set<const llvm::Value *>{Instr25},
             getCallToRetFlowValueSet(Instr27, AliasImpl, Instr25));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr25},
             getCallToRetFlowValueSet(Instr27, NoAliasImpl, Instr25));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr25},
+            getCallToRetFlowValueSet(Instr27, RASImpl, Instr25));
 
   EXPECT_EQ(std::set<const llvm::Value *>{Instr27},
             getCallToRetFlowValueSet(Instr27, AliasImpl, Instr27));
   EXPECT_EQ(std::set<const llvm::Value *>{Instr27},
             getCallToRetFlowValueSet(Instr27, NoAliasImpl, Instr27));
+  EXPECT_EQ(std::set<const llvm::Value *>{Instr27},
+            getCallToRetFlowValueSet(Instr27, RASImpl, Instr27));
 }
 
 }; // namespace

From f5a9b43d9f9cfb2be70f7adc031046f2f7c5e121 Mon Sep 17 00:00:00 2001
From: Maximilian Leo Huber <huber.maximilian.leo@gmail.com>
Date: Sat, 21 Jun 2025 18:39:34 +0000
Subject: [PATCH 11/24] Added c++ 20 modules support (#775)

* Simple proof of concept

* Extended POC

* add hello-modules example tool + modules for phasar.db and phasar.control_flow

* made hello_modules tool work

* some meeting changes + rest of files

* completed all cppm files

* added missing folders

* Seperated namespaces + bugfixes

* added missing macro + removed internal

* Simple proof of concept

* Extended POC

* add hello-modules example tool + modules for phasar.db and phasar.control_flow

* made hello_modules tool work

* some meeting changes + rest of files

* completed all cppm files

* added missing folders

* Seperated namespaces + bugfixes

* added missing macro + removed internal

* Fix compilation in C++17 mode and fix some modules

* Add phasar-svf to module phasar.llvm.pointer

* Fix cyclic dependency between phasar_llvm and phasar_llvm_ifdside

* Update README.md

---------

Co-authored-by: Fabian Schiebel <fabian.schiebel@iem.fraunhofer.de>
Co-authored-by: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
---
 CMakeLists.txt                                |   2 +
 Config.cmake.in                               |   1 +
 README.md                                     |   2 +
 cmake/phasar_macros.cmake                     |  28 ++-
 .../phasar/AnalysisStrategy/AnalysisSetup.h   |   7 +-
 .../phasar/ControlFlow/SparseCFGProvider.h    |   2 +-
 .../IfdsIde/Solver/StaticIDESolverConfig.h    |  15 +-
 .../ControlFlow/SparseLLVMBasedICFGView.h     |   6 +-
 include/phasar/TypeHierarchy/TypeHierarchy.h  |   4 +-
 include/phasar/TypeHierarchy/VFTable.h        |   4 +-
 include/phasar/Utils/TypeTraits.h             |   8 +-
 lib/AnalysisStrategy/CMakeLists.txt           |   7 +-
 lib/AnalysisStrategy/Strategies.cppm          |  19 ++
 lib/CMakeLists.txt                            |  41 ++--
 lib/Config/CMakeLists.txt                     |  15 +-
 lib/Config/Config.cppm                        |   9 +
 lib/ControlFlow/CMakeLists.txt                |  12 +-
 lib/ControlFlow/ControlFlow.cppm              |  32 +++
 lib/DB/CMakeLists.txt                         |  15 +-
 lib/DB/DB.cppm                                |  33 +++
 lib/DataFlow/CMakeLists.txt                   |  17 ++
 lib/DataFlow/DataFlow.cppm                    |   7 +
 lib/DataFlow/IfdsIde/CMakeLists.txt           |  11 +
 lib/DataFlow/IfdsIde/IfdsIde.cppm             | 122 +++++++++++
 lib/DataFlow/Mono/CMakeLists.txt              |  11 +
 lib/DataFlow/Mono/Mono.cppm                   |  20 ++
 lib/DataFlow/PathSensitivity/CMakeLists.txt   |  11 +
 .../PathSensitivity/PathSensitivity.cppm      |  20 ++
 lib/Domain/CMakeLists.txt                     |  11 +
 lib/Domain/Domain.cppm                        |  25 +++
 lib/PhasarLLVM/CMakeLists.txt                 |  18 +-
 lib/PhasarLLVM/ControlFlow/CMakeLists.txt     |   3 +
 lib/PhasarLLVM/ControlFlow/ControlFlow.cppm   |  48 +++++
 lib/PhasarLLVM/DB/CMakeLists.txt              |   3 +
 lib/PhasarLLVM/DB/DB.cppm                     |  11 +
 lib/PhasarLLVM/DataFlow/CMakeLists.txt        |  10 +
 lib/PhasarLLVM/DataFlow/DataFlow.cppm         |   7 +
 .../DataFlow/IfdsIde/CMakeLists.txt           |   4 +-
 lib/PhasarLLVM/DataFlow/IfdsIde/IfdsIde.cppm  | 172 +++++++++++++++
 lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt   |   5 +-
 lib/PhasarLLVM/DataFlow/Mono/Mono.cppm        |  32 +++
 .../DataFlow/PathSensitivity/CMakeLists.txt   |   3 +
 .../PathSensitivity/PathSensitivity.cppm      |  14 ++
 lib/PhasarLLVM/Domain/CMakeLists.txt          |   8 +
 lib/PhasarLLVM/Domain/Domain.cppm             |  11 +
 lib/PhasarLLVM/Passes/CMakeLists.txt          |   3 +
 lib/PhasarLLVM/Passes/Passes.cppm             |  15 ++
 lib/PhasarLLVM/PhasarLLVM.cppm                |  21 ++
 lib/PhasarLLVM/Pointer/CMakeLists.txt         |   3 +
 lib/PhasarLLVM/Pointer/Pointer.cppm           |  36 ++++
 lib/PhasarLLVM/TaintConfig/CMakeLists.txt     |   3 +
 lib/PhasarLLVM/TaintConfig/TaintConfig.cppm   |  23 ++
 lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt   |   3 +
 .../TypeHierarchy/TypeHierarchy.cppm          |  19 ++
 lib/PhasarLLVM/Utils/CMakeLists.txt           |   3 +
 lib/PhasarLLVM/Utils/Utils.cppm               |  76 +++++++
 lib/PhasarPass/CMakeLists.txt                 |   5 +-
 lib/PhasarPass/PhasarPass.cppm                |  20 ++
 lib/Pointer/CMakeLists.txt                    |   3 +
 lib/Pointer/PhasarPointer.cppm                |  38 ++++
 lib/TypeHierarchy/CMakeLists.txt              |   9 +
 lib/TypeHierarchy/TypeHierarchy.cppm          |  12 ++
 lib/Utils/CMakeLists.txt                      |   3 +
 lib/Utils/Utils.cppm                          | 199 ++++++++++++++++++
 tools/CMakeLists.txt                          |   3 +
 tools/hello-modules-tool/CMakeLists.txt       |  18 ++
 tools/hello-modules-tool/hello_modules.cpp    |  65 ++++++
 67 files changed, 1392 insertions(+), 54 deletions(-)
 create mode 100644 lib/AnalysisStrategy/Strategies.cppm
 create mode 100644 lib/Config/Config.cppm
 create mode 100644 lib/ControlFlow/ControlFlow.cppm
 create mode 100644 lib/DB/DB.cppm
 create mode 100644 lib/DataFlow/CMakeLists.txt
 create mode 100644 lib/DataFlow/DataFlow.cppm
 create mode 100644 lib/DataFlow/IfdsIde/CMakeLists.txt
 create mode 100644 lib/DataFlow/IfdsIde/IfdsIde.cppm
 create mode 100644 lib/DataFlow/Mono/CMakeLists.txt
 create mode 100644 lib/DataFlow/Mono/Mono.cppm
 create mode 100644 lib/DataFlow/PathSensitivity/CMakeLists.txt
 create mode 100644 lib/DataFlow/PathSensitivity/PathSensitivity.cppm
 create mode 100644 lib/Domain/CMakeLists.txt
 create mode 100644 lib/Domain/Domain.cppm
 create mode 100644 lib/PhasarLLVM/ControlFlow/ControlFlow.cppm
 create mode 100644 lib/PhasarLLVM/DB/DB.cppm
 create mode 100644 lib/PhasarLLVM/DataFlow/DataFlow.cppm
 create mode 100644 lib/PhasarLLVM/DataFlow/IfdsIde/IfdsIde.cppm
 create mode 100644 lib/PhasarLLVM/DataFlow/Mono/Mono.cppm
 create mode 100644 lib/PhasarLLVM/DataFlow/PathSensitivity/PathSensitivity.cppm
 create mode 100644 lib/PhasarLLVM/Domain/CMakeLists.txt
 create mode 100644 lib/PhasarLLVM/Domain/Domain.cppm
 create mode 100644 lib/PhasarLLVM/Passes/Passes.cppm
 create mode 100644 lib/PhasarLLVM/PhasarLLVM.cppm
 create mode 100644 lib/PhasarLLVM/Pointer/Pointer.cppm
 create mode 100644 lib/PhasarLLVM/TaintConfig/TaintConfig.cppm
 create mode 100644 lib/PhasarLLVM/TypeHierarchy/TypeHierarchy.cppm
 create mode 100644 lib/PhasarLLVM/Utils/Utils.cppm
 create mode 100644 lib/PhasarPass/PhasarPass.cppm
 create mode 100644 lib/Pointer/PhasarPointer.cppm
 create mode 100644 lib/TypeHierarchy/CMakeLists.txt
 create mode 100644 lib/TypeHierarchy/TypeHierarchy.cppm
 create mode 100644 lib/Utils/Utils.cppm
 create mode 100644 tools/hello-modules-tool/CMakeLists.txt
 create mode 100644 tools/hello-modules-tool/hello_modules.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5370c88ee3..58083e3b98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,6 +78,8 @@ string(APPEND CMAKE_CXX_FLAGS_RELEASE "")
 
 option(CMAKE_VISIBILITY_INLINES_HIDDEN "Hide inlined functions from the DSO table (default ON)" ON)
 
+option(PHASAR_BUILD_MODULES "Build C++20 modules for phasar" OFF)
+
 include(CheckCXXCompilerFlag)
 
 # Handle memory issues with linking
diff --git a/Config.cmake.in b/Config.cmake.in
index fce796ba73..ecdb47dbc9 100644
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -16,6 +16,7 @@ set(PHASAR_USE_LLVM_FAT_LIB @USE_LLVM_FAT_LIB@)
 set(PHASAR_BUILD_DYNLIB @PHASAR_BUILD_DYNLIB@)
 set(PHASAR_USE_Z3 @PHASAR_USE_Z3@)
 set(PHASAR_HAS_SQLITE @PHASAR_HAS_SQLITE@)
+set(PHASAR_BUILD_MODULES @PHASAR_BUILD_MODULES@)
 
 if (PHASAR_USE_Z3)
   find_dependency(Z3 REQUIRED)
diff --git a/README.md b/README.md
index 17396e5464..d5a5538a7b 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,8 @@ PhASAR requires at least C++-17.
 However, building in C++20 mode is supported. You may enable this setting the cmake variable `CMAKE_CXX_STANDARD` to `20`.
 Although phasar currently does not make use of C++-20 features (except for some `concept`s behind an #ifdef border), your client application that just *uses* phasar as a library may want to use C++20 earlier.
 
+**NEW**: PhASAR supports C++20 modules as an experimental feature.
+
 ## Currently Supported Version of LLVM
 
 PhASAR is currently set up to support LLVM-15.0.*
diff --git a/cmake/phasar_macros.cmake b/cmake/phasar_macros.cmake
index c991f508db..2bd952852c 100644
--- a/cmake/phasar_macros.cmake
+++ b/cmake/phasar_macros.cmake
@@ -241,7 +241,7 @@ endmacro(add_phasar_executable)
 
 function(add_phasar_library name)
   set(PHASAR_LIB_OPTIONS SHARED STATIC MODULE INTERFACE)
-  set(PHASAR_LIB_MULTIVAL LLVM_LINK_COMPONENTS LINKS LINK_PUBLIC LINK_PRIVATE FILES)
+  set(PHASAR_LIB_MULTIVAL LLVM_LINK_COMPONENTS LINKS LINK_PUBLIC LINK_PRIVATE FILES MODULE_FILES)
   cmake_parse_arguments(PHASAR_LIB "${PHASAR_LIB_OPTIONS}" "" "${PHASAR_LIB_MULTIVAL}" ${ARGN})
   set(srcs ${PHASAR_LIB_UNPARSED_ARGUMENTS})
   list(APPEND srcs ${PHASAR_LIB_FILES})
@@ -277,6 +277,28 @@ function(add_phasar_library name)
 
   target_compile_features(${name} PUBLIC cxx_std_17)
 
+  set(install_module)
+  if(PHASAR_LIB_MODULE_FILES)
+    if(PHASAR_BUILD_MODULES)
+      target_sources(${name} PUBLIC
+        FILE_SET cxx_modules
+        TYPE CXX_MODULES
+        FILES ${PHASAR_LIB_MODULE_FILES}
+      )
+
+      target_compile_features(${name} PUBLIC cxx_std_20)
+
+      set(install_module FILE_SET cxx_modules DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    elseif(NOT srcs)
+      # Add dummy src to prevent cmake error
+      set(dummy_src "${CMAKE_CURRENT_BINARY_DIR}/${name}_dummysrc.cpp")
+      if(NOT EXISTS "${dummy_src}")
+        file(WRITE "${dummy_src}" "")
+      endif()
+      target_sources(${name} PRIVATE "${dummy_src}")
+    endif()
+  endif()
+
   if(LLVM_COMMON_DEPENDS)
     add_dependencies(${name} ${LLVM_COMMON_DEPENDS})
   endif(LLVM_COMMON_DEPENDS)
@@ -316,13 +338,15 @@ function(add_phasar_library name)
       EXPORT LLVMExports
       LIBRARY DESTINATION lib
       ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+      ${install_module}
     )
   else()
     install(TARGETS ${name}
       EXPORT PhasarExports
-
       # NOTE: Library, archive and runtime destination are automatically set by
       # GNUInstallDirs which is included in the top-level CMakeLists.txt
+
+      ${install_module}
     )
   endif()
 
diff --git a/include/phasar/AnalysisStrategy/AnalysisSetup.h b/include/phasar/AnalysisStrategy/AnalysisSetup.h
index 7b40140d4c..42005c36d2 100644
--- a/include/phasar/AnalysisStrategy/AnalysisSetup.h
+++ b/include/phasar/AnalysisStrategy/AnalysisSetup.h
@@ -10,11 +10,10 @@
 #ifndef PHASAR_ANALYSISSTRATEGY_ANALYSISSETUP_H
 #define PHASAR_ANALYSISSTRATEGY_ANALYSISSETUP_H
 
-#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
-
 namespace psr {
+class LLVMAliasSet;
+class LLVMBasedICFG;
+class DIBasedTypeHierarchy;
 
 /// Indicates that an analysis does not need a special configuration (file).
 struct HasNoConfigurationType {};
diff --git a/include/phasar/ControlFlow/SparseCFGProvider.h b/include/phasar/ControlFlow/SparseCFGProvider.h
index 1ef2882f6a..e048310310 100644
--- a/include/phasar/ControlFlow/SparseCFGProvider.h
+++ b/include/phasar/ControlFlow/SparseCFGProvider.h
@@ -48,7 +48,7 @@ struct has_getSparseCFG<
 
 template <typename T, typename D>
 // NOLINTNEXTLINE
-static constexpr bool has_getSparseCFG_v = has_getSparseCFG<T, D>::value;
+constexpr bool has_getSparseCFG_v = has_getSparseCFG<T, D>::value;
 } // namespace psr
 
 #endif // PHASAR_CONTROLFLOW_SPARSECFGPROVIDER_H
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h b/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
index 1dc2316524..42b882b27e 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/StaticIDESolverConfig.h
@@ -25,16 +25,15 @@ enum class JumpFunctionGCMode {
 
 struct IDESolverConfigBase {
   template <typename K, typename V>
-  static inline constexpr bool
-      IsSimple1d = sizeof(std::pair<K, V>) <= 32 &&
-                   std::is_nothrow_move_constructible_v<K>
-                       &&std::is_nothrow_move_constructible_v<V>
-                           &&has_llvm_dense_map_info<K>;
+  static inline constexpr bool IsSimple1d =
+      sizeof(std::pair<K, V>) <= 32 &&
+      std::is_nothrow_move_constructible_v<K> &&
+      std::is_nothrow_move_constructible_v<V> && has_llvm_dense_map_info<K>;
 
   template <typename T>
-  static inline constexpr bool
-      IsSimpleVal = sizeof(T) <= 32 && std::is_nothrow_move_constructible_v<T>
-                                           &&has_llvm_dense_map_info<T>;
+  static inline constexpr bool IsSimpleVal =
+      sizeof(T) <= 32 && std::is_nothrow_move_constructible_v<T> &&
+      has_llvm_dense_map_info<T>;
 
   template <typename K, typename V>
   using map_t = std::conditional_t<IsSimple1d<K, V>, DenseTable1d<K, V>,
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
index 7fbbb65a5e..64010f2935 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
@@ -7,8 +7,8 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_SPARSELLVMBASEDICFG_H
-#define PHASAR_PHASARLLVM_CONTROLFLOW_SPARSELLVMBASEDICFG_H
+#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_SPARSELLVMBASEDICFG_VIEW_H
+#define PHASAR_PHASARLLVM_CONTROLFLOW_SPARSELLVMBASEDICFG_VIEW_H
 
 #include "phasar/ControlFlow/CallGraph.h"
 #include "phasar/ControlFlow/ICFGBase.h"
@@ -75,4 +75,4 @@ class SparseLLVMBasedICFGView
 };
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_CONTROLFLOW_SPARSELLVMBASEDICFG_H
+#endif // PHASAR_PHASARLLVM_CONTROLFLOW_SPARSELLVMBASEDICFG_VIEW_H
diff --git a/include/phasar/TypeHierarchy/TypeHierarchy.h b/include/phasar/TypeHierarchy/TypeHierarchy.h
index 5d06705d1b..6c54407cd8 100644
--- a/include/phasar/TypeHierarchy/TypeHierarchy.h
+++ b/include/phasar/TypeHierarchy/TypeHierarchy.h
@@ -42,8 +42,8 @@ template <typename T, typename F> class TypeHierarchy {
 };
 
 template <typename T, typename F>
-static inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                            const TypeHierarchy<T, F> &TH) {
+inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                     const TypeHierarchy<T, F> &TH) {
   TH.print(OS);
   return OS;
 }
diff --git a/include/phasar/TypeHierarchy/VFTable.h b/include/phasar/TypeHierarchy/VFTable.h
index 4fc331cf53..62eb4432af 100644
--- a/include/phasar/TypeHierarchy/VFTable.h
+++ b/include/phasar/TypeHierarchy/VFTable.h
@@ -41,8 +41,8 @@ template <typename F> class VFTable {
 };
 
 template <typename T, typename F>
-static inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                            const VFTable<F> &Table) {
+inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                     const VFTable<F> &Table) {
   Table.print(OS);
   return OS;
 }
diff --git a/include/phasar/Utils/TypeTraits.h b/include/phasar/Utils/TypeTraits.h
index 7f0023af2f..1e2f2524cc 100644
--- a/include/phasar/Utils/TypeTraits.h
+++ b/include/phasar/Utils/TypeTraits.h
@@ -28,7 +28,9 @@
 namespace psr {
 
 #if __cplusplus < 202002L
-template <typename T> struct type_identity { using type = T; };
+template <typename T> struct type_identity {
+  using type = T;
+};
 #else
 template <typename T> using type_identity = std::type_identity<T>;
 #endif
@@ -275,12 +277,12 @@ PSR_CONCEPT has_isInteresting_v = // NOLINT
     detail::has_isInteresting<ProblemTy>::value;
 
 template <typename T>
-static constexpr bool has_llvm_dense_map_info =
+constexpr bool has_llvm_dense_map_info =
     detail::has_llvm_dense_map_info<T>::value;
 template <typename T> using type_identity_t = typename type_identity<T>::type;
 
 template <typename Var, typename T>
-static constexpr size_t variant_idx = detail::variant_idx<Var, T>::value;
+constexpr size_t variant_idx = detail::variant_idx<Var, T>::value;
 
 template <typename Container>
 using ElementType = typename detail::ElementType<Container>::type;
diff --git a/lib/AnalysisStrategy/CMakeLists.txt b/lib/AnalysisStrategy/CMakeLists.txt
index 8a194cc68a..3ecd9f9c15 100644
--- a/lib/AnalysisStrategy/CMakeLists.txt
+++ b/lib/AnalysisStrategy/CMakeLists.txt
@@ -2,5 +2,10 @@ file(GLOB_RECURSE ANALYSIS_STRATEGY_SRC *.h *.cpp)
 
 add_phasar_library(phasar_analysis_strategy
   ${ANALYSIS_STRATEGY_SRC}
-  LLVM_LINK_COMPONENTS Support
+
+  LLVM_LINK_COMPONENTS
+    Support
+
+  MODULE_FILES
+    Strategies.cppm
 )
diff --git a/lib/AnalysisStrategy/Strategies.cppm b/lib/AnalysisStrategy/Strategies.cppm
new file mode 100644
index 0000000000..6b776ede28
--- /dev/null
+++ b/lib/AnalysisStrategy/Strategies.cppm
@@ -0,0 +1,19 @@
+module;
+
+#include "phasar/AnalysisStrategy.h"
+
+export module phasar.analysisstrategy;
+
+export namespace psr {
+using psr::AnalysisSetup;
+using psr::AnalysisStrategy;
+using psr::DefaultAnalysisSetup;
+using psr::DemandDrivenAnalysis;
+using psr::HasNoConfigurationType;
+using psr::IncrementalUpdateAnalysis;
+using psr::ModuleWiseAnalysis;
+using psr::toAnalysisStrategy;
+using psr::toString;
+using psr::VariationalAnalysis;
+using psr::operator<<;
+} // namespace psr
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index ffe1291f3b..3351b1c590 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,11 +1,15 @@
 add_subdirectory(AnalysisStrategy)
+add_subdirectory(Config)
+add_subdirectory(ControlFlow)
+add_subdirectory(DataFlow)
+add_subdirectory(DB)
+add_subdirectory(Domain)
 add_subdirectory(PhasarLLVM)
 add_subdirectory(PhasarPass)
-add_subdirectory(DB)
-add_subdirectory(Config)
-add_subdirectory(Utils)
 add_subdirectory(Pointer)
-add_subdirectory(ControlFlow)
+add_subdirectory(TypeHierarchy)
+add_subdirectory(Utils)
+
 if(BUILD_PHASAR_CLANG)
     if(PHASAR_IN_TREE)
         add_dependencies(phasar_interface intrinsics_gen)
@@ -18,23 +22,34 @@ if(PHASAR_BUILD_DYNLIB)
 endif()
 
 set(PHASAR_LINK_LIBS
-    phasar_utils
-    phasar_passes
+    phasar_analysis_strategy
     phasar_config
-    phasar_pointer
     phasar_controlflow
+    phasar_dataflow
+    phasar_dataflow_ifdside
+    phasar_dataflow_mono
+    phasar_dataflow_pathsensitivity
+    phasar_db
+    phasar_domain
 
-    phasar_llvm_utils
+    phasar_llvm
+    phasar_llvm_controlflow
+    phasar_llvm_ifdside
+    phasar_llvm_mono
+    phasar_llvm_pathsensitivity
+    phasar_llvm_dataflow
     phasar_llvm_db
+    phasar_llvm_domain
     phasar_llvm_pointer
     phasar_llvm_typehierarchy
-    phasar_llvm_controlflow
+    phasar_llvm_utils
 
+    phasar_pass
+    phasar_passes
+    phasar_pointer
     phasar_taintconfig
-    phasar_mono
-    phasar_llvm
-    phasar_llvm_ifdside
-    phasar_analysis_strategy
+    phasar_typehierarchy
+    phasar_utils
 )
 if(BUILD_PHASAR_CLANG)
     list(APPEND PHASAR_LINK_LIBS phasar_clang)
diff --git a/lib/Config/CMakeLists.txt b/lib/Config/CMakeLists.txt
index 455fa8fbf8..4c125ca131 100644
--- a/lib/Config/CMakeLists.txt
+++ b/lib/Config/CMakeLists.txt
@@ -2,7 +2,16 @@ file(GLOB_RECURSE CONFIG_SRC *.h *.cpp)
 
 add_phasar_library(phasar_config
   ${CONFIG_SRC}
-  LINKS phasar_utils
-  LINK_PRIVATE ${Boost_LIBRARIES}
-  LLVM_LINK_COMPONENTS Support
+
+  LINKS
+    phasar_utils
+
+  LINK_PRIVATE
+    ${Boost_LIBRARIES}
+
+  LLVM_LINK_COMPONENTS
+    Support
+
+  MODULE_FILES
+    Config.cppm
 )
diff --git a/lib/Config/Config.cppm b/lib/Config/Config.cppm
new file mode 100644
index 0000000000..be5b46dfca
--- /dev/null
+++ b/lib/Config/Config.cppm
@@ -0,0 +1,9 @@
+module;
+
+#include "phasar/Config.h"
+
+export module phasar.config;
+
+export namespace psr {
+using psr::PhasarConfig;
+} // namespace psr
diff --git a/lib/ControlFlow/CMakeLists.txt b/lib/ControlFlow/CMakeLists.txt
index d6f91baa6b..adebfe73ae 100644
--- a/lib/ControlFlow/CMakeLists.txt
+++ b/lib/ControlFlow/CMakeLists.txt
@@ -2,8 +2,16 @@ file(GLOB_RECURSE CONTROLFLOW_SRC *.h *.cpp)
 
 add_phasar_library(phasar_controlflow
   ${CONTROLFLOW_SRC}
+
   LINKS
     phasar_utils
-  LLVM_LINK_COMPONENTS Support
-  LINK_PRIVATE nlohmann_json::nlohmann_json
+
+  LLVM_LINK_COMPONENTS
+    Support
+
+  LINK_PRIVATE
+    nlohmann_json::nlohmann_json
+
+  MODULE_FILES
+    ControlFlow.cppm
 )
diff --git a/lib/ControlFlow/ControlFlow.cppm b/lib/ControlFlow/ControlFlow.cppm
new file mode 100644
index 0000000000..04ae8d675d
--- /dev/null
+++ b/lib/ControlFlow/ControlFlow.cppm
@@ -0,0 +1,32 @@
+module;
+
+#include "phasar/ControlFlow.h"
+#include "phasar/ControlFlow/SparseCFGBase.h"
+#include "phasar/ControlFlow/SparseCFGProvider.h"
+
+export module phasar.controlflow;
+
+export namespace psr {
+using psr::CallGraph;
+using psr::CallGraphAnalysisType;
+using psr::CallGraphBuilder;
+using psr::CGTraits;
+using psr::toCallGraphAnalysisType;
+using psr::toString;
+using psr::operator<<;
+using psr::CallGraphBase;
+using psr::CallGraphData;
+using psr::CFGBase;
+using psr::CFGTraits;
+using psr::has_getSparseCFG;
+using psr::has_getSparseCFG_v;
+using psr::ICFGBase;
+using psr::is_cfg_v;
+using psr::is_icfg_v;
+using psr::is_sparse_cfg_v;
+using psr::SparseCFGBase;
+using psr::SparseCFGProvider;
+using psr::SpecialMemberFunctionType;
+using psr::toSpecialMemberFunctionType;
+using psr::valueOf;
+} // namespace psr
diff --git a/lib/DB/CMakeLists.txt b/lib/DB/CMakeLists.txt
index 74fef8d36a..5469d9933d 100644
--- a/lib/DB/CMakeLists.txt
+++ b/lib/DB/CMakeLists.txt
@@ -3,8 +3,17 @@ if(SQLite3_FOUND)
 
   add_phasar_library(phasar_db
     ${DB_SRC}
-    LINKS phasar_passes phasar_utils
-    LLVM_LINK_COMPONENTS Support
-    LINK_PRIVATE SQLite::SQLite3
+
+    LINKS phasar_passes
+      phasar_utils
+
+    LLVM_LINK_COMPONENTS
+      Support
+
+    LINK_PRIVATE
+      SQLite::SQLite3
+
+    MODULE_FILES
+      DB.cppm
   )
 endif()
diff --git a/lib/DB/DB.cppm b/lib/DB/DB.cppm
new file mode 100644
index 0000000000..70c396ce87
--- /dev/null
+++ b/lib/DB/DB.cppm
@@ -0,0 +1,33 @@
+module;
+
+#include "phasar/DB/Hexastore.h"
+#include "phasar/DB/ProjectIRDBBase.h"
+#include "phasar/DB/Queries.h"
+
+export module phasar.db;
+
+export namespace psr {
+using psr::IRDBGetFunctionDef;
+using psr::ProjectIRDBBase;
+using psr::ProjectIRDBTraits;
+
+#ifdef PHASAR_HAS_SQLITE
+using psr::Hexastore;
+using psr::HSResult;
+using psr::INIT;
+using psr::OPSInsert;
+using psr::OSPInsert;
+using psr::POSInsert;
+using psr::PSOInsert;
+using psr::SearchSPO;
+using psr::SearchSPX;
+using psr::SearchSXO;
+using psr::SearchSXX;
+using psr::SearchXPO;
+using psr::SearchXPX;
+using psr::SearchXXO;
+using psr::SearchXXX;
+using psr::SOPInsert;
+using psr::SPOInsert;
+#endif
+} // namespace psr
diff --git a/lib/DataFlow/CMakeLists.txt b/lib/DataFlow/CMakeLists.txt
new file mode 100644
index 0000000000..8fbdcb465a
--- /dev/null
+++ b/lib/DataFlow/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_subdirectory(IfdsIde)
+add_subdirectory(Mono)
+add_subdirectory(PathSensitivity)
+
+file(GLOB_RECURSE DATAFLOW_SRC *.h *.cpp)
+
+add_phasar_library(phasar_dataflow
+  ${DATAFLOW_SRC}
+
+  LINKS
+    phasar_dataflow_ifdside
+    phasar_dataflow_mono
+    phasar_dataflow_pathsensitivity
+
+  MODULE_FILES
+    DataFlow.cppm
+)
diff --git a/lib/DataFlow/DataFlow.cppm b/lib/DataFlow/DataFlow.cppm
new file mode 100644
index 0000000000..674406d5f4
--- /dev/null
+++ b/lib/DataFlow/DataFlow.cppm
@@ -0,0 +1,7 @@
+module;
+
+export module phasar.dataflow;
+
+export import phasar.dataflow.ifdside;
+export import phasar.dataflow.mono;
+export import phasar.dataflow.pathsensitivity;
diff --git a/lib/DataFlow/IfdsIde/CMakeLists.txt b/lib/DataFlow/IfdsIde/CMakeLists.txt
new file mode 100644
index 0000000000..763e5bb437
--- /dev/null
+++ b/lib/DataFlow/IfdsIde/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB_RECURSE IFDSIDE_SRC *.h *.cpp)
+
+add_phasar_library(phasar_dataflow_ifdside
+  ${IFDSIDE_SRC}
+
+  LINK_PRIVATE
+    nlohmann_json::nlohmann_json
+
+  MODULE_FILES
+    IfdsIde.cppm
+)
diff --git a/lib/DataFlow/IfdsIde/IfdsIde.cppm b/lib/DataFlow/IfdsIde/IfdsIde.cppm
new file mode 100644
index 0000000000..58d2744f7f
--- /dev/null
+++ b/lib/DataFlow/IfdsIde/IfdsIde.cppm
@@ -0,0 +1,122 @@
+module;
+
+#include "phasar/DataFlow/IfdsIde/DefaultEdgeFunctionSingletonCache.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionStats.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
+#include "phasar/DataFlow/IfdsIde/EntryPointUtils.h"
+#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
+#include "phasar/DataFlow/IfdsIde/GenericFlowFunction.h"
+#include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h"
+#include "phasar/DataFlow/IfdsIde/Solver/Compressor.h"
+#include "phasar/DataFlow/IfdsIde/Solver/EdgeFunctionCache.h"
+#include "phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCacheNG.h"
+#include "phasar/DataFlow/IfdsIde/Solver/FlowFunctionCache.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IdBasedSolverResults.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h"
+#include "phasar/DataFlow/IfdsIde/Solver/PathAwareIDESolver.h"
+
+export module phasar.dataflow.ifdside;
+
+export namespace psr {
+using psr::AllBottom;
+using psr::AllTop;
+using psr::CachedEdgeFunction;
+using psr::ConstantEdgeFunction;
+using psr::defaultComposeOrNull;
+using psr::DefaultEdgeFunctionSingletonCache;
+using psr::DefaultEdgeFunctionSingletonCacheImpl;
+using psr::EdgeFunction;
+using psr::EdgeFunctionAllocationPolicy;
+using psr::EdgeFunctionBase;
+using psr::EdgeFunctionRef;
+using psr::EdgeFunctions;
+using psr::EdgeFunctionSingletonCache;
+using psr::EdgeFunctionStats;
+using psr::EdgeIdentity;
+using psr::IsEdgeFunction;
+using psr::operator==;
+using psr::operator<<;
+using psr::addSeedsForStartingPoints;
+using psr::AllTopFnProvider;
+using psr::checkSREquality;
+using psr::Compressor;
+using psr::ConstantEdgeFunction;
+using psr::defaultJoinOrNull;
+using psr::DefaultMapKeyCompressor;
+using psr::EdgeFunctionCache;
+using psr::EdgeFunctionCacheStats;
+using psr::EdgeFunctionComposer;
+using psr::EdgeFunctionKind;
+using psr::ESGEdgeKind;
+using psr::FlowEdgeFunctionCache;
+using psr::FlowEdgeFunctionCacheNG;
+using psr::FlowEdgeFunctionCacheStats;
+using psr::FlowFunction;
+using psr::FlowFunctionCache;
+using psr::FlowFunctionCacheStats;
+using psr::FlowFunctionPtrTypeOf;
+using psr::FlowFunctions;
+using psr::FlowFunctionTemplates;
+using psr::forallStartingPoints;
+using psr::GenericFlowFunction;
+using psr::GenericFlowFunctionView;
+using psr::GenericSolverResults;
+using psr::getMetaDataID;
+using psr::IdBasedSolverResults;
+using psr::IDESolver;
+using psr::IDETabulationProblem;
+using psr::ifdsEqual;
+using psr::IFDSIDESolverConfig;
+using psr::IFDSSolver;
+using psr::IFDSTabulationProblem;
+using psr::InitialSeeds;
+using psr::IsFlowFunction;
+using psr::JoinEdgeFunction;
+using psr::LLVMMapKeyCompressor;
+using psr::MapKeyCompressorCombinator;
+using psr::NodeCompressorTraits;
+using psr::NoneCompressor;
+using psr::OwningSolverResults;
+using psr::SolverConfigOptions;
+using psr::SolverResults;
+using psr::ValCompressorTraits;
+using psr::ZeroedFlowFunction;
+using psr::operator<<;
+using psr::DefaultIDESolverConfig;
+using psr::DequeWorkList;
+using psr::IDESolverAPIMixin;
+using psr::IDESolverConfigBase;
+using psr::IterativeIDESolver;
+using psr::IterativeIDESolverBase;
+using psr::IterativeIDESolverStats;
+using psr::IterIDEPropagationJob;
+using psr::JumpFunctionGCMode;
+using psr::JumpFunctions;
+using psr::OwningSolverResults;
+using psr::PathAwareIDESolver;
+using psr::PathEdge;
+using psr::SmallVectorWorkList;
+using psr::solveIDEProblem;
+using psr::solveIFDSProblem;
+using psr::SolverStatsSelector;
+using psr::VectorWorkList;
+using psr::WithComputeValues;
+using psr::WithEndSummaryTab;
+using psr::WithGCMode;
+using psr::WithStats;
+using psr::WithWorkList;
+} // namespace psr
+
+export namespace llvm {
+using llvm::cast_convert_val;
+using llvm::cast_or_null;
+using llvm::cast_retty_impl;
+using llvm::CastInfo;
+using llvm::CastIsPossible;
+using llvm::DenseMapInfo;
+using llvm::dyn_cast_or_null;
+using llvm::isa_impl_cl;
+} // namespace llvm
diff --git a/lib/DataFlow/Mono/CMakeLists.txt b/lib/DataFlow/Mono/CMakeLists.txt
new file mode 100644
index 0000000000..abf6f6397a
--- /dev/null
+++ b/lib/DataFlow/Mono/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB_RECURSE MONO_SRC *.h *.cpp)
+
+add_phasar_library(phasar_dataflow_mono
+  ${MONO_SRC}
+
+  LINK_PRIVATE
+    nlohmann_json::nlohmann_json
+
+  MODULE_FILES
+    Mono.cppm
+)
diff --git a/lib/DataFlow/Mono/Mono.cppm b/lib/DataFlow/Mono/Mono.cppm
new file mode 100644
index 0000000000..8d0f77d825
--- /dev/null
+++ b/lib/DataFlow/Mono/Mono.cppm
@@ -0,0 +1,20 @@
+module;
+
+#include "phasar/DataFlow/Mono/Contexts/CallStringCTX.h"
+#include "phasar/DataFlow/Mono/InterMonoProblem.h"
+#include "phasar/DataFlow/Mono/Solver/InterMonoSolver.h"
+#include "phasar/DataFlow/Mono/Solver/IntraMonoSolver.h"
+
+export module phasar.dataflow.mono;
+
+export namespace psr {
+using psr::CallStringCTX;
+using psr::InterMonoProblem;
+using psr::InterMonoSolver;
+using psr::IntraMonoProblem;
+using psr::IntraMonoSolver;
+} // namespace psr
+
+export namespace std {
+using std::hash;
+} // namespace std
diff --git a/lib/DataFlow/PathSensitivity/CMakeLists.txt b/lib/DataFlow/PathSensitivity/CMakeLists.txt
new file mode 100644
index 0000000000..6ed81a3225
--- /dev/null
+++ b/lib/DataFlow/PathSensitivity/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB_RECURSE PATHSENSITIVITY_SRC *.h *.cpp)
+
+add_phasar_library(phasar_dataflow_pathsensitivity
+  ${PATHSENSITIVITY_SRC}
+
+  LINK_PRIVATE
+    nlohmann_json::nlohmann_json
+
+  MODULE_FILES
+    PathSensitivity.cppm
+)
diff --git a/lib/DataFlow/PathSensitivity/PathSensitivity.cppm b/lib/DataFlow/PathSensitivity/PathSensitivity.cppm
new file mode 100644
index 0000000000..f913d862af
--- /dev/null
+++ b/lib/DataFlow/PathSensitivity/PathSensitivity.cppm
@@ -0,0 +1,20 @@
+module;
+
+#include "phasar/DataFlow/PathSensitivity/ExplodedSuperGraph.h"
+#include "phasar/DataFlow/PathSensitivity/FlowPath.h"
+#include "phasar/DataFlow/PathSensitivity/PathSensitivityConfig.h"
+#include "phasar/DataFlow/PathSensitivity/PathSensitivityManager.h"
+
+export module phasar.dataflow.pathsensitivity;
+
+export namespace psr {
+using psr::ExplodedSuperGraph;
+using psr::FlowPath;
+using psr::is_pathtracingfilter_for;
+using psr::PathSensitivityConfig;
+using psr::PathSensitivityConfigBase;
+using psr::PathSensitivityManager;
+using psr::PathSensitivityManagerBase;
+using psr::PathSensitivityManagerMixin;
+using psr::PathTracingFilter;
+} // namespace psr
diff --git a/lib/Domain/CMakeLists.txt b/lib/Domain/CMakeLists.txt
new file mode 100644
index 0000000000..2879357b44
--- /dev/null
+++ b/lib/Domain/CMakeLists.txt
@@ -0,0 +1,11 @@
+file(GLOB_RECURSE DOMAIN_SRC *.h *.cpp)
+
+add_phasar_library(phasar_domain
+  ${DOMAIN_SRC}
+
+  LINK_PRIVATE
+    nlohmann_json::nlohmann_json
+
+  MODULE_FILES
+    Domain.cppm
+)
diff --git a/lib/Domain/Domain.cppm b/lib/Domain/Domain.cppm
new file mode 100644
index 0000000000..2b78a69370
--- /dev/null
+++ b/lib/Domain/Domain.cppm
@@ -0,0 +1,25 @@
+module;
+
+#include "phasar/Domain/AnalysisDomain.h"
+#include "phasar/Domain/BinaryDomain.h"
+#include "phasar/Domain/LatticeDomain.h"
+
+export module phasar.domain;
+
+export namespace psr {
+using psr::AnalysisDomain;
+using psr::BinaryDomain;
+using psr::to_string;
+using psr::operator<<;
+using psr::operator==;
+using psr::operator<;
+using psr::Bottom;
+using psr::JoinLatticeTraits;
+using psr::LatticeDomain;
+using psr::NonTopBotValue;
+using psr::Top;
+} // namespace psr
+
+export namespace std {
+using std::hash;
+} // namespace std
diff --git a/lib/PhasarLLVM/CMakeLists.txt b/lib/PhasarLLVM/CMakeLists.txt
index be4adc5e0b..2a3908722b 100644
--- a/lib/PhasarLLVM/CMakeLists.txt
+++ b/lib/PhasarLLVM/CMakeLists.txt
@@ -1,6 +1,7 @@
-add_subdirectory(DB)
 add_subdirectory(ControlFlow)
 add_subdirectory(DataFlow)
+add_subdirectory(DB)
+add_subdirectory(Domain)
 add_subdirectory(Passes)
 add_subdirectory(Pointer)
 add_subdirectory(TaintConfig)
@@ -13,13 +14,22 @@ add_phasar_library(phasar_llvm
   ${PHASAR_LLVM_SRC}
 
   LINKS
-    phasar_utils
-    phasar_llvm_pointer
-    phasar_llvm_db
     phasar_llvm_controlflow
+    phasar_llvm_dataflow
+    phasar_llvm_db
+    phasar_llvm_domain
+    phasar_llvm_ifdside
+    phasar_llvm_pointer
     phasar_llvm_typehierarchy
+    phasar_llvm_utils
+    phasar_passes
+    phasar_utils
+    phasar_taintconfig
 
   LLVM_LINK_COMPONENTS
     Core
     Support
+
+  MODULE_FILES
+    PhasarLLVM.cppm
 )
diff --git a/lib/PhasarLLVM/ControlFlow/CMakeLists.txt b/lib/PhasarLLVM/ControlFlow/CMakeLists.txt
index 0000f7b1ad..23c251cf49 100644
--- a/lib/PhasarLLVM/ControlFlow/CMakeLists.txt
+++ b/lib/PhasarLLVM/ControlFlow/CMakeLists.txt
@@ -13,4 +13,7 @@ add_phasar_library(phasar_llvm_controlflow
     Core
     Support
     Demangle
+
+  MODULE_FILES
+    ControlFlow.cppm
 )
diff --git a/lib/PhasarLLVM/ControlFlow/ControlFlow.cppm b/lib/PhasarLLVM/ControlFlow/ControlFlow.cppm
new file mode 100644
index 0000000000..271967a5b2
--- /dev/null
+++ b/lib/PhasarLLVM/ControlFlow/ControlFlow.cppm
@@ -0,0 +1,48 @@
+module;
+
+#include "phasar/PhasarLLVM/ControlFlow/EntryFunctionUtils.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h"
+#include "phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h"
+#include "phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFGProvider.h"
+#include "phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h"
+
+export module phasar.llvm.controlflow;
+
+export namespace psr {
+using psr::buildLLVMBasedCallGraph;
+using psr::CFGTraits;
+using psr::CHAResolver;
+using psr::getEntryFunctions;
+using psr::getEntryFunctionsMut;
+using psr::getNonPureVirtualVFTEntry;
+using psr::getReceiverType;
+using psr::getReceiverTypeName;
+using psr::getVFTIndex;
+using psr::GlobalCtorsDtorsModel;
+using psr::ICFGBase;
+using psr::isConsistentCall;
+using psr::isHeapAllocatingFunction;
+using psr::isVirtualCall;
+using psr::LLVMBasedBackwardCFG;
+using psr::LLVMBasedBackwardICFG;
+using psr::LLVMBasedCallGraph;
+using psr::LLVMBasedCFG;
+using psr::LLVMBasedICFG;
+using psr::LLVMVFTableProvider;
+using psr::NOResolver;
+using psr::OTFResolver;
+using psr::Resolver;
+using psr::RTAResolver;
+using psr::SparseLLVMBasedCFG;
+using psr::SparseLLVMBasedCFGProvider;
+using psr::SparseLLVMBasedICFG;
+using psr::SparseLLVMBasedICFGView;
+using psr::valueOf;
+} // namespace psr
diff --git a/lib/PhasarLLVM/DB/CMakeLists.txt b/lib/PhasarLLVM/DB/CMakeLists.txt
index bb6e3c3960..062af754c8 100644
--- a/lib/PhasarLLVM/DB/CMakeLists.txt
+++ b/lib/PhasarLLVM/DB/CMakeLists.txt
@@ -11,4 +11,7 @@ add_phasar_library(phasar_llvm_db
     Core
     Support
     IRReader
+
+  MODULE_FILES
+    DB.cppm
 )
diff --git a/lib/PhasarLLVM/DB/DB.cppm b/lib/PhasarLLVM/DB/DB.cppm
new file mode 100644
index 0000000000..ec8a41b961
--- /dev/null
+++ b/lib/PhasarLLVM/DB/DB.cppm
@@ -0,0 +1,11 @@
+module;
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+
+export module phasar.llvm.db;
+
+export namespace psr {
+using psr::fromMetaDataId;
+using psr::LLVMProjectIRDB;
+using psr::ProjectIRDBTraits;
+} // namespace psr
diff --git a/lib/PhasarLLVM/DataFlow/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/CMakeLists.txt
index 3af5da4864..06e922a93e 100644
--- a/lib/PhasarLLVM/DataFlow/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlow/CMakeLists.txt
@@ -1,3 +1,13 @@
 add_subdirectory(IfdsIde)
 add_subdirectory(Mono)
 add_subdirectory(PathSensitivity)
+
+add_phasar_library(phasar_llvm_dataflow
+  LINKS
+    phasar_llvm_ifdside
+    phasar_llvm_mono
+    phasar_llvm_pathsensitivity
+
+  MODULE_FILES
+    DataFlow.cppm
+)
diff --git a/lib/PhasarLLVM/DataFlow/DataFlow.cppm b/lib/PhasarLLVM/DataFlow/DataFlow.cppm
new file mode 100644
index 0000000000..5a769f0546
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/DataFlow.cppm
@@ -0,0 +1,7 @@
+module;
+
+export module phasar.llvm.dataflow;
+
+export import phasar.llvm.dataflow.ifdside;
+export import phasar.llvm.dataflow.mono;
+export import phasar.llvm.dataflow.pathsensitivity;
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
index 327eb03afd..4c66687fb5 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/CMakeLists.txt
@@ -7,7 +7,6 @@ add_phasar_library(phasar_llvm_ifdside
     phasar_config
     phasar_utils
     phasar_llvm_pointer
-    phasar_llvm
     phasar_llvm_typehierarchy
     phasar_llvm_controlflow
     phasar_llvm_utils
@@ -20,4 +19,7 @@ add_phasar_library(phasar_llvm_ifdside
 
   LINK_PRIVATE
     ${Boost_LIBRARIES}
+
+  MODULE_FILES
+    IfdsIde.cppm
 )
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/IfdsIde.cppm b/lib/PhasarLLVM/DataFlow/IfdsIde/IfdsIde.cppm
new file mode 100644
index 0000000000..94a9f38607
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/IfdsIde.cppm
@@ -0,0 +1,172 @@
+module;
+
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LibCSummary.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AbstractMemoryLocationFactory.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/AllSanitized.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/ComposeEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/GenEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/Helpers.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/KillIfSanitizedEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/TransferEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintAnalysisBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/ExtendedTaintAnalysis/XTaintEdgeFunctionBase.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/BinaryEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/LCAEdgeFunctionComposer.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/TypecastEdgeFunction.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEProtoAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESecureHeapPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDESolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSProtoAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSignAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTypeAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h"
+
+export module phasar.llvm.dataflow.ifdside;
+
+export namespace psr {
+using psr::AbstractMemoryLocation;
+using psr::AbstractMemoryLocationFactory;
+using psr::BasicBlockOrdering;
+using psr::DToString;
+using psr::FeatureTaintGenerator;
+using psr::hash_value;
+using psr::IDEExtendedTaintAnalysis;
+using psr::IDEExtendedTaintAnalysisDomain;
+using psr::IDEFeatureTaintAnalysis;
+using psr::IDEFeatureTaintAnalysisDomain;
+using psr::IDEFeatureTaintEdgeFact;
+using psr::IDEIIAFlowFact;
+using psr::IDELinearConstantAnalysis;
+using psr::IFDSSolverTest;
+using psr::JoinLatticeTraits;
+using psr::LToString;
+using psr::NonTopBotValue;
+using psr::operator<<;
+using psr::DefaultAliasAwareIDEProblem;
+using psr::DefaultAliasAwareIFDSProblem;
+using psr::DefaultNoAliasIDEProblem;
+using psr::DefaultNoAliasIFDSProblem;
+using psr::DToString;
+using psr::IDEExtendedTaintAnalysis;
+using psr::IDEInstInteractionAnalysis;
+using psr::IDEInstInteractionAnalysisDomain;
+using psr::IDEInstInteractionAnalysisT;
+using psr::IDELinearConstantAnalysis;
+using psr::IDELinearConstantAnalysisDomain;
+using psr::IDEProtoAnalysis;
+using psr::IDEProtoAnalysisDomain;
+using psr::IDESecureHeapPropagation;
+using psr::IDESecureHeapPropagationAnalysisDomain;
+using psr::IDESolverTest;
+using psr::IDESolverTestAnalysisDomain;
+using psr::IDETypeStateAnalysis;
+using psr::IDETypeStateAnalysisDomain;
+using psr::IFDSConstAnalysis;
+using psr::IFDSProtoAnalysis;
+using psr::IFDSSignAnalysis;
+using psr::IFDSSolverTest;
+using psr::IFDSTaintAnalysis;
+using psr::IFDSTypeAnalysis;
+using psr::IFDSUninitializedVariables;
+using psr::JoinLatticeTraits;
+using psr::LLVMZeroValue;
+using psr::LToString;
+using psr::mapFactsAlongsideCallSite;
+using psr::mapFactsToCallee;
+using psr::mapFactsToCaller;
+using psr::SecureHeapFact;
+using psr::SecureHeapValue;
+using psr::strongUpdateStore;
+using psr::operator<<;
+using psr::operator==;
+using psr::CSTDFILEIOState;
+using psr::EdgeFunctionBase;
+using psr::IDEGeneralizedLCA;
+using psr::IDEGeneralizedLCADomain;
+using psr::JoinLatticeTraits;
+using psr::to_string;
+using psr::operator<<;
+using psr::CSTDFILEIOTypeStateDescription;
+using psr::getLibCSummary;
+using psr::IDETypeStateAnalysis;
+using psr::OpenSSLEVPKDFCTXDescription;
+using psr::OpenSSLEVPKDFCTXState;
+using psr::OpenSSLEVPKDFDescription;
+using psr::OpenSSLEVPKDFState;
+using psr::OpenSSLSecureHeapDescription;
+using psr::OpenSSLSecureHeapState;
+using psr::OpenSSLSecureMemoryDescription;
+using psr::OpenSSLSecureMemoryState;
+using psr::to_string;
+using psr::TypeStateDescription;
+using psr::TypeStateDescriptionBase;
+} // namespace psr
+
+export namespace std {
+using std::hash;
+} // namespace std
+
+export namespace psr::library_summary {
+using psr::library_summary::DataFlowFact;
+using psr::library_summary::FunctionDataFlowFacts;
+using psr::library_summary::LLVMFunctionDataFlowFacts;
+using psr::library_summary::Parameter;
+using psr::library_summary::readFromFDFF;
+using psr::library_summary::ReturnValue;
+} // namespace psr::library_summary
+
+export namespace llvm {
+using llvm::DenseMapInfo;
+} // namespace llvm
+
+export namespace psr::XTaint {
+using psr::XTaint::AnalysisBase;
+using psr::XTaint::ComposeEdgeFunction;
+using psr::XTaint::EdgeDomain;
+using psr::XTaint::KillIfSanitizedEdgeFunction;
+using psr::XTaint::makeComposeEF;
+using psr::XTaint::makeFF;
+using psr::XTaint::Sanitized;
+using psr::XTaint::TransferEdgeFunction;
+} // namespace psr::XTaint
+
+namespace psr::glca {
+using psr::glca::BinaryEdgeFunction;
+using psr::glca::compare;
+using psr::glca::EdgeValue;
+using psr::glca::EdgeValueSet;
+using psr::glca::isConstant;
+using psr::glca::join;
+using psr::glca::Ordering;
+using psr::glca::performBinOp;
+using psr::glca::performTypecast;
+using psr::glca::operator<;
+using psr::glca::isTopValue;
+using psr::glca::operator<<;
+using psr::glca::EdgeValueSet;
+using psr::glca::LCAEdgeFunctionComposer;
+using psr::glca::MapFactsToCalleeFlowFunction;
+using psr::glca::MapFactsToCallerFlowFunction;
+using psr::glca::TypecastEdgeFunction;
+using psr::glca::operator==;
+using psr::glca::operator<<;
+} // namespace psr::glca
diff --git a/lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
index 4bbda61731..d7e8cab632 100644
--- a/lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlow/Mono/CMakeLists.txt
@@ -1,6 +1,6 @@
 file(GLOB_RECURSE MONO_SRC *.h *.cpp)
 
-add_phasar_library(phasar_mono
+add_phasar_library(phasar_llvm_mono
   ${MONO_SRC}
 
   LINKS
@@ -13,4 +13,7 @@ add_phasar_library(phasar_mono
   LLVM_LINK_COMPONENTS
     Core
     Support
+
+  MODULE_FILES
+    Mono.cppm
 )
diff --git a/lib/PhasarLLVM/DataFlow/Mono/Mono.cppm b/lib/PhasarLLVM/DataFlow/Mono/Mono.cppm
new file mode 100644
index 0000000000..7b104ef449
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/Mono/Mono.cppm
@@ -0,0 +1,32 @@
+module;
+
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoFullConstantPropagation.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/InterMonoTaintAnalysis.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoSolverTest.h"
+#include "phasar/PhasarLLVM/DataFlow/Mono/Problems/IntraMonoUninitVariables.h"
+
+export module phasar.llvm.dataflow.mono;
+
+export namespace psr {
+using psr::DIBasedTypeHierarchy;
+using psr::DToString;
+using psr::InterMonoFullConstantPropagation;
+using psr::InterMonoSolverTest;
+using psr::InterMonoSolverTestDomain;
+using psr::InterMonoTaintAnalysis;
+using psr::InterMonoTaintAnalysisDomain;
+using psr::IntraMonoFCAFact;
+using psr::IntraMonoFullConstantPropagation;
+using psr::IntraMonoFullConstantPropagationAnalysisDomain;
+using psr::IntraMonoSolverTest;
+using psr::IntraMonoSolverTestAnalysisDomain;
+using psr::IntraMonoUninitVariables;
+using psr::IntraMonoUninitVariablesDomain;
+using psr::LLVMBasedCFG;
+using psr::LLVMBasedICFG;
+} // namespace psr
+
+namespace std {
+using std::hash;
+} // namespace std
diff --git a/lib/PhasarLLVM/DataFlow/PathSensitivity/CMakeLists.txt b/lib/PhasarLLVM/DataFlow/PathSensitivity/CMakeLists.txt
index e0d554e718..877cd983a7 100644
--- a/lib/PhasarLLVM/DataFlow/PathSensitivity/CMakeLists.txt
+++ b/lib/PhasarLLVM/DataFlow/PathSensitivity/CMakeLists.txt
@@ -41,4 +41,7 @@ add_phasar_library(phasar_llvm_pathsensitivity
   LINK_PUBLIC
     nlohmann_json::nlohmann_json
     ${ADDITIONAL_LINK_LIBS}
+
+  MODULE_FILES
+    PathSensitivity.cppm
 )
diff --git a/lib/PhasarLLVM/DataFlow/PathSensitivity/PathSensitivity.cppm b/lib/PhasarLLVM/DataFlow/PathSensitivity/PathSensitivity.cppm
new file mode 100644
index 0000000000..39a683287e
--- /dev/null
+++ b/lib/PhasarLLVM/DataFlow/PathSensitivity/PathSensitivity.cppm
@@ -0,0 +1,14 @@
+module;
+
+#include "phasar/PhasarLLVM/DataFlow/PathSensitivity/LLVMPathConstraints.h"
+#include "phasar/PhasarLLVM/DataFlow/PathSensitivity/Z3BasedPathSensitivityConfig.h"
+#include "phasar/PhasarLLVM/DataFlow/PathSensitivity/Z3BasedPathSensitvityManager.h"
+
+export module phasar.llvm.dataflow.pathsensitivity;
+
+export namespace psr {
+using psr::LLVMPathConstraints;
+using psr::Z3BasedPathSensitivityConfig;
+using psr::Z3BasedPathSensitivityManager;
+using psr::Z3BasedPathSensitivityManagerBase;
+} // namespace psr
diff --git a/lib/PhasarLLVM/Domain/CMakeLists.txt b/lib/PhasarLLVM/Domain/CMakeLists.txt
new file mode 100644
index 0000000000..e7dd25cf52
--- /dev/null
+++ b/lib/PhasarLLVM/Domain/CMakeLists.txt
@@ -0,0 +1,8 @@
+file(GLOB_RECURSE PSR_LLVM_DOMAIN_SRC *.h *.cpp)
+
+add_phasar_library(phasar_llvm_domain
+  ${PSR_LLVM_DOMAIN_SRC}
+
+  MODULE_FILES
+    Domain.cppm
+)
diff --git a/lib/PhasarLLVM/Domain/Domain.cppm b/lib/PhasarLLVM/Domain/Domain.cppm
new file mode 100644
index 0000000000..251de12cdf
--- /dev/null
+++ b/lib/PhasarLLVM/Domain/Domain.cppm
@@ -0,0 +1,11 @@
+module;
+
+#include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
+
+export module phasar.llvm.domain;
+
+export namespace psr {
+using psr::LLVMAnalysisDomainDefault;
+using LLVMIFDSAnalysisDomainDefault =
+    WithBinaryValueDomain<LLVMAnalysisDomainDefault>;
+} // namespace psr
diff --git a/lib/PhasarLLVM/Passes/CMakeLists.txt b/lib/PhasarLLVM/Passes/CMakeLists.txt
index d7b8613ba4..6349833195 100644
--- a/lib/PhasarLLVM/Passes/CMakeLists.txt
+++ b/lib/PhasarLLVM/Passes/CMakeLists.txt
@@ -11,4 +11,7 @@ add_phasar_library(phasar_passes
     Support
     Analysis
     Demangle
+
+  MODULE_FILES
+    Passes.cppm
 )
diff --git a/lib/PhasarLLVM/Passes/Passes.cppm b/lib/PhasarLLVM/Passes/Passes.cppm
new file mode 100644
index 0000000000..5dba1c68bf
--- /dev/null
+++ b/lib/PhasarLLVM/Passes/Passes.cppm
@@ -0,0 +1,15 @@
+module;
+
+#include "phasar/PhasarLLVM/Passes/ExampleModulePass.h"
+#include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
+#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
+
+export module phasar.llvm.passes;
+
+export namespace psr {
+using psr::ExampleModulePass;
+using psr::GeneralStatistics;
+using psr::GeneralStatisticsAnalysis;
+using psr::ValueAnnotationPass;
+using psr::operator<<;
+} // namespace psr
diff --git a/lib/PhasarLLVM/PhasarLLVM.cppm b/lib/PhasarLLVM/PhasarLLVM.cppm
new file mode 100644
index 0000000000..20e7a71a94
--- /dev/null
+++ b/lib/PhasarLLVM/PhasarLLVM.cppm
@@ -0,0 +1,21 @@
+module;
+
+#include "phasar/PhasarLLVM/HelperAnalyses.h"
+#include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
+
+export module phasar.llvm;
+
+export import phasar.llvm.controlflow;
+export import phasar.llvm.dataflow;
+export import phasar.llvm.db;
+export import phasar.llvm.domain;
+export import phasar.llvm.passes;
+export import phasar.llvm.pointer;
+export import phasar.llvm.taintconfig;
+export import phasar.llvm.typehierarchy;
+export import phasar.llvm.utils;
+
+export namespace psr {
+using psr::createAnalysisProblem;
+using psr::HelperAnalyses;
+} // namespace psr
diff --git a/lib/PhasarLLVM/Pointer/CMakeLists.txt b/lib/PhasarLLVM/Pointer/CMakeLists.txt
index 522fd55e5e..f863a86046 100644
--- a/lib/PhasarLLVM/Pointer/CMakeLists.txt
+++ b/lib/PhasarLLVM/Pointer/CMakeLists.txt
@@ -18,6 +18,9 @@ add_phasar_library(phasar_llvm_pointer
 
   LINK_PRIVATE
     ${Boost_LIBRARIES}
+
+  MODULE_FILES
+    Pointer.cppm
 )
 
 add_subdirectory(external)
diff --git a/lib/PhasarLLVM/Pointer/Pointer.cppm b/lib/PhasarLLVM/Pointer/Pointer.cppm
new file mode 100644
index 0000000000..d7c812df74
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/Pointer.cppm
@@ -0,0 +1,36 @@
+module;
+
+#include "phasar/Config/phasar-config.h"
+#include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
+#include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
+
+#ifdef PHASAR_USE_SVF
+#include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
+#endif
+
+export module phasar.llvm.pointer;
+
+export namespace psr {
+using psr::AliasAnalysisView;
+using psr::AliasInfoTraits;
+using psr::FilteredLLVMAliasSet;
+using psr::FunctionAliasView;
+using psr::isInterestingPointer;
+using psr::LLVMAliasInfo;
+using psr::LLVMAliasInfoRef;
+using psr::LLVMAliasSet;
+using psr::LLVMAliasSetData;
+
+#ifdef PHASAR_USE_SVF
+using psr::createSVFDDAPointsToInfo;
+using psr::createSVFVFSPointsToInfo;
+using psr::SVFBasedPointsToInfo;
+using psr::SVFBasedPointsToInfoRef;
+using psr::SVFPointsToInfoTraits;
+#endif
+
+} // namespace psr
diff --git a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
index e3a9050f3e..09f24c3132 100644
--- a/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
+++ b/lib/PhasarLLVM/TaintConfig/CMakeLists.txt
@@ -15,4 +15,7 @@ add_phasar_library(phasar_taintconfig
   LLVM_LINK_COMPONENTS
     Core
     Support
+
+  MODULE_FILES
+    TaintConfig.cppm
 )
diff --git a/lib/PhasarLLVM/TaintConfig/TaintConfig.cppm b/lib/PhasarLLVM/TaintConfig/TaintConfig.cppm
new file mode 100644
index 0000000000..0a57589687
--- /dev/null
+++ b/lib/PhasarLLVM/TaintConfig/TaintConfig.cppm
@@ -0,0 +1,23 @@
+module;
+
+#include "phasar/PhasarLLVM/TaintConfig/LLVMTaintConfig.h"
+#include "phasar/PhasarLLVM/TaintConfig/TaintConfigBase.h"
+#include "phasar/PhasarLLVM/TaintConfig/TaintConfigData.h"
+#include "phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h"
+
+export module phasar.llvm.taintconfig;
+
+export namespace psr {
+using psr::collectGeneratedFacts;
+using psr::collectLeakedFacts;
+using psr::collectSanitizedFacts;
+using psr::FunctionData;
+using psr::LLVMTaintConfig;
+using psr::parseTaintConfig;
+using psr::parseTaintConfigOrNull;
+using psr::TaintCategory;
+using psr::TaintConfigBase;
+using psr::TaintConfigData;
+using psr::TaintConfigTraits;
+using psr::VariableData;
+} // namespace psr
diff --git a/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt b/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
index d717d39f59..2f9d48f4b6 100644
--- a/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
+++ b/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
@@ -16,4 +16,7 @@ add_phasar_library(phasar_llvm_typehierarchy
 
   LINK_PRIVATE
     ${Boost_LIBRARIES}
+
+  MODULE_FILES
+    TypeHierarchy.cppm
 )
diff --git a/lib/PhasarLLVM/TypeHierarchy/TypeHierarchy.cppm b/lib/PhasarLLVM/TypeHierarchy/TypeHierarchy.cppm
new file mode 100644
index 0000000000..073668c6a3
--- /dev/null
+++ b/lib/PhasarLLVM/TypeHierarchy/TypeHierarchy.cppm
@@ -0,0 +1,19 @@
+module;
+
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchyData.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchyData.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTableData.h"
+
+export module phasar.llvm.typehierarchy;
+
+export namespace psr {
+using psr::DIBasedTypeHierarchy;
+using psr::DIBasedTypeHierarchyData;
+using psr::LLVMProjectIRDB;
+using psr::LLVMTypeHierarchyData;
+using psr::LLVMVFTable;
+using psr::LLVMVFTableData;
+} // namespace psr
diff --git a/lib/PhasarLLVM/Utils/CMakeLists.txt b/lib/PhasarLLVM/Utils/CMakeLists.txt
index b88ee9d75b..e3def7c7f9 100644
--- a/lib/PhasarLLVM/Utils/CMakeLists.txt
+++ b/lib/PhasarLLVM/Utils/CMakeLists.txt
@@ -12,4 +12,7 @@ add_phasar_library(phasar_llvm_utils
     Support
     BitWriter
     Demangle
+
+  MODULE_FILES
+    Utils.cppm
 )
diff --git a/lib/PhasarLLVM/Utils/Utils.cppm b/lib/PhasarLLVM/Utils/Utils.cppm
new file mode 100644
index 0000000000..44043bc45d
--- /dev/null
+++ b/lib/PhasarLLVM/Utils/Utils.cppm
@@ -0,0 +1,76 @@
+module;
+
+#include "phasar/PhasarLLVM/Utils/Annotation.h"
+#include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
+#include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
+#include "phasar/PhasarLLVM/Utils/LLVMBasedContainerConfig.h"
+#include "phasar/PhasarLLVM/Utils/LLVMCXXShorthands.h"
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/PhasarLLVM/Utils/LLVMSourceManager.h"
+#include "phasar/PhasarLLVM/Utils/SourceMgrPrinter.h"
+
+export module phasar.llvm.utils;
+
+export namespace psr {
+using psr::DataFlowAnalysisType;
+using psr::DefaultDominatorTreeAnalysis;
+using psr::GlobalAnnotation;
+using psr::toDataFlowAnalysisType;
+using psr::toString;
+using psr::VarAnnotation;
+using psr::operator<<;
+using psr::appendAllExitPoints;
+using psr::computeModuleHash;
+using psr::DebugLocation;
+using psr::dumpIRValue;
+using psr::from_json;
+using psr::getAllExitPoints;
+using psr::getColumnFromIR;
+using psr::getDebugLocation;
+using psr::getDIFileFromIR;
+using psr::getDILocalVariable;
+using psr::getDILocation;
+using psr::getDirectoryFromIR;
+using psr::getFilePathFromIR;
+using psr::getFunctionArgumentNr;
+using psr::getFunctionNameFromIR;
+using psr::getLastInstructionOf;
+using psr::getLineAndColFromIR;
+using psr::getLineFromIR;
+using psr::getMetaDataID;
+using psr::getModuleFromVal;
+using psr::getModuleIDFromIR;
+using psr::getModuleNameFromVal;
+using psr::getModuleSlotTrackerFor;
+using psr::getNthFunctionArgument;
+using psr::getNthInstruction;
+using psr::getNthStoreInstruction;
+using psr::getNthTermInstruction;
+using psr::getSrcCodeFromIR;
+using psr::getSrcCodeInfoFromIR;
+using psr::getVarAnnotationIntrinsicName;
+using psr::getVarNameFromIR;
+using psr::getVarTypeFromIR;
+using psr::globalValuesUsedinFunction;
+using psr::isAllocaInstOrHeapAllocaFunction;
+using psr::isGuardVariable;
+using psr::isHeapAllocatingFunction;
+using psr::isIntegerLikeType;
+using psr::isStaticVariableLazyInitializationBranch;
+using psr::isTouchVTableInst;
+using psr::isVarAnnotationIntrinsic;
+using psr::llvmIRToShortString;
+using psr::llvmIRToStableString;
+using psr::llvmIRToString;
+using psr::LLVMSourceManager;
+using psr::llvmTypeToString;
+using psr::LLVMValueIDLess;
+using psr::ManagedDebugLocation;
+using psr::matchesSignature;
+using psr::ModulesToSlotTracker;
+using psr::Ref2PointerConverter;
+using psr::SourceCodeInfo;
+using psr::SourceMgrPrinter;
+using psr::to_json;
+} // namespace psr
diff --git a/lib/PhasarPass/CMakeLists.txt b/lib/PhasarPass/CMakeLists.txt
index dd4dff3cb4..19e02c7084 100644
--- a/lib/PhasarPass/CMakeLists.txt
+++ b/lib/PhasarPass/CMakeLists.txt
@@ -11,7 +11,7 @@ add_phasar_library(phasar_pass
     phasar_llvm_controlflow
     phasar_llvm_db
     phasar_llvm_ifdside
-    phasar_mono
+    phasar_llvm_mono
     phasar_passes
     phasar_llvm_utils
     phasar_llvm_pointer
@@ -25,4 +25,7 @@ add_phasar_library(phasar_pass
   LINK_PUBLIC
     ${CMAKE_THREAD_LIBS_INIT}
     ${Boost_LIBRARIES}
+
+  MODULE_FILES
+    PhasarPass.cppm
 )
diff --git a/lib/PhasarPass/PhasarPass.cppm b/lib/PhasarPass/PhasarPass.cppm
new file mode 100644
index 0000000000..b4dfd79f81
--- /dev/null
+++ b/lib/PhasarPass/PhasarPass.cppm
@@ -0,0 +1,20 @@
+module;
+
+#include "phasar/PhasarPass/Options.h"
+#include "phasar/PhasarPass/PhasarPass.h"
+#include "phasar/PhasarPass/PhasarPrinterPass.h"
+
+export module phasar.phasarpass;
+
+export namespace psr {
+using psr::CallGraphAnalysis;
+using psr::DataFlowAnalysis;
+using psr::DumpResults;
+using psr::EntryPoints;
+using psr::InitLogger;
+using psr::PammOutputFile;
+using psr::PhasarPass;
+using psr::PhasarPrinterPass;
+using psr::PointerAnalysis;
+using psr::PrintEdgeRecorder;
+} // namespace psr
diff --git a/lib/Pointer/CMakeLists.txt b/lib/Pointer/CMakeLists.txt
index 4695aeb0ae..66b1d2710f 100644
--- a/lib/Pointer/CMakeLists.txt
+++ b/lib/Pointer/CMakeLists.txt
@@ -9,4 +9,7 @@ add_phasar_library(phasar_pointer
 
   LLVM_LINK_COMPONENTS
     Support
+
+  MODULE_FILES
+    PhasarPointer.cppm
 )
diff --git a/lib/Pointer/PhasarPointer.cppm b/lib/Pointer/PhasarPointer.cppm
new file mode 100644
index 0000000000..21e84a075a
--- /dev/null
+++ b/lib/Pointer/PhasarPointer.cppm
@@ -0,0 +1,38 @@
+module;
+
+#include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasInfo.h"
+#include "phasar/Pointer/AliasInfoBase.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasResult.h"
+#include "phasar/Pointer/AliasSetOwner.h"
+#include "phasar/Pointer/PointsToInfo.h"
+
+export module phasar.pointer;
+
+export namespace psr {
+using psr::AliasAnalysisType;
+using psr::toAliasAnalysisType;
+using psr::toString;
+using psr::operator<<;
+using psr::AliasAnalysisType;
+using psr::AliasInfo;
+using psr::AliasInfoBaseUtils;
+using psr::AliasInfoRef;
+using psr::AliasInfoTraits;
+using psr::AliasResult;
+using psr::AnalysisProperties;
+using psr::DefaultAATraits;
+using psr::IsAliasInfo;
+using psr::toAliasResult;
+using psr::toString;
+using psr::operator<<;
+using psr::AliasSetOwner;
+using psr::is_equivalent_PointsToTraits_v;
+using psr::is_PointsToTraits;
+using psr::is_PointsToTraits_v;
+using psr::PointsToInfo;
+using psr::PointsToInfoBase;
+using psr::PointsToInfoRef;
+using psr::PointsToTraits;
+} // namespace psr
diff --git a/lib/TypeHierarchy/CMakeLists.txt b/lib/TypeHierarchy/CMakeLists.txt
new file mode 100644
index 0000000000..734cb7c9d7
--- /dev/null
+++ b/lib/TypeHierarchy/CMakeLists.txt
@@ -0,0 +1,9 @@
+file(GLOB_RECURSE TYPEHIERARCHY *.h *.cpp)
+
+# Handle the library files
+add_phasar_library(phasar_typehierarchy
+  ${TYPEHIERARCHY}
+
+  MODULE_FILES
+    TypeHierarchy.cppm
+)
diff --git a/lib/TypeHierarchy/TypeHierarchy.cppm b/lib/TypeHierarchy/TypeHierarchy.cppm
new file mode 100644
index 0000000000..a7bcbd7ccd
--- /dev/null
+++ b/lib/TypeHierarchy/TypeHierarchy.cppm
@@ -0,0 +1,12 @@
+module;
+
+#include "phasar/TypeHierarchy/TypeHierarchy.h"
+#include "phasar/TypeHierarchy/VFTable.h"
+
+export module phasar.typehierarchy;
+
+export namespace psr {
+using psr::TypeHierarchy;
+using psr::operator<<;
+using psr::VFTable;
+} // namespace psr
diff --git a/lib/Utils/CMakeLists.txt b/lib/Utils/CMakeLists.txt
index c105696638..2bee013212 100644
--- a/lib/Utils/CMakeLists.txt
+++ b/lib/Utils/CMakeLists.txt
@@ -19,6 +19,9 @@ add_phasar_library(phasar_utils
     ${PHASAR_STD_FILESYSTEM}
   LINK_PUBLIC
     nlohmann_json::nlohmann_json
+
+  MODULE_FILES
+    Utils.cppm
 )
 
 set_target_properties(phasar_utils
diff --git a/lib/Utils/Utils.cppm b/lib/Utils/Utils.cppm
new file mode 100644
index 0000000000..9440d6c5dd
--- /dev/null
+++ b/lib/Utils/Utils.cppm
@@ -0,0 +1,199 @@
+module;
+
+#include "phasar/Utils/AdjacencyList.h"
+#include "phasar/Utils/AnalysisPrinterBase.h"
+#include "phasar/Utils/AnalysisProperties.h"
+#include "phasar/Utils/Average.h"
+#include "phasar/Utils/BitVectorSet.h"
+#include "phasar/Utils/BoxedPointer.h"
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/ChronoUtils.h"
+#include "phasar/Utils/DFAMinimizer.h"
+#include "phasar/Utils/DOTGraph.h"
+#include "phasar/Utils/DebugOutput.h"
+#include "phasar/Utils/DefaultAnalysisPrinter.h"
+#include "phasar/Utils/DefaultValue.h"
+#include "phasar/Utils/EmptyBaseOptimizationUtils.h"
+#include "phasar/Utils/EnumFlags.h"
+#include "phasar/Utils/EquivalenceClassMap.h"
+#include "phasar/Utils/ErrorHandling.h"
+#include "phasar/Utils/GraphTraits.h"
+#include "phasar/Utils/IO.h"
+#include "phasar/Utils/InitPhasar.h"
+#include "phasar/Utils/IotaIterator.h"
+#include "phasar/Utils/JoinLattice.h"
+#include "phasar/Utils/Macros.h"
+#include "phasar/Utils/MaybeUniquePtr.h"
+#include "phasar/Utils/NullAnalysisPrinter.h"
+#include "phasar/Utils/Nullable.h"
+#include "phasar/Utils/OnTheFlyAnalysisPrinter.h"
+#include "phasar/Utils/PAMM.h"
+#include "phasar/Utils/PAMMMacros.h"
+#include "phasar/Utils/PointerUtils.h"
+#include "phasar/Utils/Printer.h"
+#include "phasar/Utils/RepeatIterator.h"
+#include "phasar/Utils/SemiRing.h"
+#include "phasar/Utils/Soundness.h"
+#include "phasar/Utils/StableVector.h"
+#include "phasar/Utils/Table.h"
+#include "phasar/Utils/TableWrappers.h"
+#include "phasar/Utils/Timer.h"
+#include "phasar/Utils/TypeTraits.h"
+#include "phasar/Utils/Utilities.h"
+
+export module phasar.utils;
+
+export namespace psr {
+using psr::AdjacencyList;
+using psr::AnalysisPrinterBase;
+using psr::AnalysisProperties;
+using psr::GraphTraits;
+using psr::to_string;
+using psr::operator<<;
+using psr::AnalysisPropertiesMixin;
+using psr::BitVectorSet;
+using psr::BoxedConstPtr;
+using psr::BoxedPtr;
+using psr::CanEfficientlyPassByValue;
+using psr::hms;
+using psr::intersectWith;
+using psr::PrettyPrinter;
+using psr::Sampler;
+using psr::operator<<;
+using psr::createEquivalentGraphFrom;
+using psr::DefaultAnalysisPrinter;
+using psr::DOTConfig;
+using psr::DOTEdge;
+using psr::DOTNode;
+using psr::getDefaultValue;
+using psr::minimizeGraph;
+using psr::Warning;
+using psr::operator<;
+using psr::operator==;
+using psr::DOTFactSubGraph;
+using psr::DOTFunctionSubGraph;
+using psr::DOTGraph;
+using psr::DummyPair;
+using psr::EmptyType;
+using psr::EnumFlagAutoBool;
+using psr::operator&=;
+using psr::operator|;
+using psr::operator|=;
+using psr::operator^;
+using psr::operator^=;
+using psr::operator~;
+using psr::DefaultNodeTransform;
+using psr::EquivalenceClassMap;
+using psr::EquivalenceClassMapNG;
+using psr::getOrEmpty;
+using psr::getOrNull;
+using psr::getOrThrow;
+using psr::GraphTraits;
+using psr::hasFlag;
+using psr::InitPhasar;
+using psr::iota;
+using psr::IotaIterator;
+using psr::is_graph;
+using psr::is_graph_edge;
+using psr::is_graph_trait;
+using psr::is_removable_graph_trait_v;
+using psr::is_reservable_graph_trait_v;
+using psr::JoinLattice;
+using psr::JoinLatticeTraits;
+using psr::Logger;
+using psr::mapValue;
+using psr::MaybeUniquePtr;
+using psr::NonTopBotValue;
+using psr::openFileStream;
+using psr::parseSeverityLevel;
+using psr::printGraph;
+using psr::readFile;
+using psr::readFileOrErr;
+using psr::readFileOrNull;
+using psr::readJsonFile;
+using psr::readTextFile;
+using psr::readTextFileOrErr;
+using psr::readTextFileOrNull;
+using psr::reverseGraph;
+using psr::setFlag;
+using psr::SeverityLevel;
+using psr::to_string;
+using psr::unsetFlag;
+using psr::writeTextFile;
+using psr::operator<<;
+using psr::DToString;
+using psr::FToString;
+using psr::getPointerFrom;
+using psr::LToString;
+using psr::NToString;
+using psr::NullAnalysisPrinter;
+using psr::OnTheFlyAnalysisPrinter;
+using psr::PAMM;
+using psr::PAMM_SEVERITY_LEVEL;
+using psr::repeat;
+using psr::RepeatIterator;
+using psr::SemiRing;
+using psr::Soundness;
+using psr::toSoundness;
+using psr::toString;
+using psr::unwrapNullable;
+using psr::operator<<;
+using psr::adl_to_string;
+using psr::AreEqualityComparable;
+using psr::assertAllNotNull;
+using psr::assertNotNull;
+using psr::computePowerSet;
+using psr::createTimeStamp;
+using psr::DefaultConstruct;
+using psr::DenseSet;
+using psr::DenseTable1d;
+using psr::DummyDenseTable1d;
+using psr::DummyUnorderedTable1d;
+using psr::ElementType;
+using psr::FalseFn;
+using psr::forward_like;
+using psr::has_adl_to_string_v;
+using psr::has_erase_iterator_v;
+using psr::has_getAsJson;
+using psr::has_getHashCode;
+using psr::has_isInteresting_v;
+using psr::has_llvm_dense_map_info;
+using psr::has_std_hash;
+using psr::has_str_v;
+using psr::HasDepth;
+using psr::HasIsConstant;
+using psr::identity;
+using psr::IdentityFn;
+using psr::IgnoreArgs;
+using psr::intersectWith;
+using psr::is_crtp_base_of_v;
+using psr::is_iterable_over_v;
+using psr::is_iterable_v;
+using psr::is_llvm_hashable_v;
+using psr::is_llvm_printable_v;
+using psr::is_pair_v;
+using psr::is_printable_v;
+using psr::is_std_hashable_v;
+using psr::is_std_printable_v;
+using psr::is_string_like_v;
+using psr::is_tuple_v;
+using psr::is_variant;
+using psr::is_variant_v;
+using psr::isConstructor;
+using psr::IsEqualityComparable;
+using psr::isMangled;
+using psr::Overloaded;
+using psr::remove_by_index;
+using psr::reserveIfPossible;
+using psr::scope_exit;
+using psr::SmallDenseTable1d;
+using psr::StableVector;
+using psr::StringIDLess;
+using psr::Table;
+using psr::Timer;
+using psr::TrueFn;
+using psr::UnorderedSet;
+using psr::UnorderedTable1d;
+using psr::variant_idx;
+// using psr::variant_idx;
+} // namespace psr
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 64a97d80a7..a1b50268ee 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,2 +1,5 @@
 add_subdirectory(example-tool)
 add_subdirectory(phasar-cli)
+if (PHASAR_BUILD_MODULES)
+  add_subdirectory(hello-modules-tool)
+endif()
diff --git a/tools/hello-modules-tool/CMakeLists.txt b/tools/hello-modules-tool/CMakeLists.txt
new file mode 100644
index 0000000000..f38f50030e
--- /dev/null
+++ b/tools/hello-modules-tool/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Build a stand-alone executable
+if(PHASAR_IN_TREE)
+  # Build a small test tool to show how phasar may be used
+  add_phasar_executable(hello-modules
+    hello_modules.cpp
+  )
+else()
+  # Build a small test tool to show how phasar may be used
+  add_executable(hello-modules
+    hello_modules.cpp
+  )
+endif()
+
+target_link_libraries(hello-modules
+  PRIVATE
+    phasar
+    ${PHASAR_STD_FILESYSTEM}
+)
diff --git a/tools/hello-modules-tool/hello_modules.cpp b/tools/hello-modules-tool/hello_modules.cpp
new file mode 100644
index 0000000000..edccb798f0
--- /dev/null
+++ b/tools/hello-modules-tool/hello_modules.cpp
@@ -0,0 +1,65 @@
+#include "llvm/Support/raw_ostream.h"
+
+#include <filesystem>
+#include <string>
+#include <vector>
+
+import phasar.analysisstrategy;
+import phasar.config;
+import phasar.controlflow;
+import phasar.dataflow;
+import phasar.db;
+import phasar.domain;
+import phasar.llvm;
+import phasar.phasarpass;
+import phasar.pointer;
+import phasar.typehierarchy;
+import phasar.utils;
+
+using namespace psr;
+
+int main(int Argc, const char **Argv) {
+  using namespace std::string_literals;
+
+  if (Argc < 2 || !std::filesystem::exists(Argv[1]) ||
+      std::filesystem::is_directory(Argv[1])) {
+    llvm::errs() << "myphasartool\n"
+                    "A small PhASAR-based example program\n\n"
+                    "Usage: myphasartool <LLVM IR file>\n";
+    return 1;
+  }
+
+  std::vector EntryPoints = {"main"s};
+
+  HelperAnalyses HA(Argv[1], EntryPoints);
+  if (!HA.getProjectIRDB().isValid()) {
+    return 1;
+  }
+
+  if (const auto *F = HA.getProjectIRDB().getFunctionDefinition("main")) {
+    // print type hierarchy
+    HA.getTypeHierarchy().print();
+    // print points-to information
+    HA.getAliasInfo().print();
+    // print inter-procedural control-flow graph
+    HA.getICFG().print();
+
+    // IFDS template parametrization test
+    llvm::outs() << "Testing IFDS:\n";
+    auto L = createAnalysisProblem<IFDSSolverTest>(HA, EntryPoints);
+    IFDSSolver S(L, &HA.getICFG());
+    auto IFDSResults = S.solve();
+    IFDSResults.dumpResults(HA.getICFG());
+
+    // IDE template parametrization test
+    llvm::outs() << "Testing IDE:\n";
+    auto M = createAnalysisProblem<IDELinearConstantAnalysis>(HA, EntryPoints);
+    // Alternative way of solving an IFDS/IDEProblem:
+    auto IDEResults = solveIDEProblem(M, HA.getICFG());
+    IDEResults.dumpResults(HA.getICFG());
+
+  } else {
+    llvm::errs() << "error: file does not contain a 'main' function!\n";
+  }
+  return 0;
+}

From e3908bd34d66317ff60003551e99ad9655a1b0d0 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 30 Jun 2025 17:49:38 +0200
Subject: [PATCH 12/24] Example Programs (#774)

* Update llvm-hello-world + add examples for load-llvm-ir and build-type-hierarchy with phasar

* Add examples on how to build a call-graph

* Update CG examples to include the reverse-CG + add example for alias info

* Add taint analysis example

* Add IDE linear constant analysis example

* Build and run example programs in CI

* Fixing small isuues

* Fix examples path in CI

* Install phasar to custom location in CI

* Set env for install and examples-build in CI

* Next attempt to fix CI

* Adding simple example on how to write an IFDS analysis

* Improve TaintConfigUtilities to provide API that *returns* affected facts, instead of inserting them into an already-existing set

* minor

* Small simplification

* Add example on how to write an IDE linear constant analysis based on the corresponding Wiki entry

* Update readmes

* Fix broken compile due to merge

* minor restructure in README.md

* cleanup readme
---
 .github/workflows/ci.yml                      |   15 +-
 BUILD.md                                      |  130 +++
 README.md                                     |  167 +--
 .../how-to/00-load-llvm-ir/CMakeLists.txt     |   19 +
 examples/how-to/00-load-llvm-ir/README.md     |   24 +
 examples/how-to/00-load-llvm-ir/main.cpp      |   55 +
 .../01-build-type-hierarchy/CMakeLists.txt    |   19 +
 .../how-to/01-build-type-hierarchy/README.md  |   24 +
 .../how-to/01-build-type-hierarchy/main.cpp   |   47 +
 .../how-to/02-build-call-graph/CMakeLists.txt |   23 +
 examples/how-to/02-build-call-graph/README.md |   38 +
 .../build_llvm_based_call_graph.cpp           |   87 ++
 .../build_llvm_based_icfg.cpp                 |   81 ++
 .../how-to/02-build-call-graph/img/cg.svg     |  298 +++++
 .../03-create-alias-info/CMakeLists.txt       |   19 +
 .../how-to/03-create-alias-info/README.md     |   24 +
 examples/how-to/03-create-alias-info/main.cpp |   84 ++
 .../04-run-ifds-analysis/CMakeLists.txt       |   31 +
 .../how-to/04-run-ifds-analysis/README.md     |   34 +
 .../04-run-ifds-analysis/helper-analyses.cpp  |   52 +
 .../04-run-ifds-analysis/ifds-solver.cpp      |   73 ++
 .../04-run-ifds-analysis/otf-reporter.cpp     |   65 ++
 .../how-to/04-run-ifds-analysis/simple.cpp    |   71 ++
 .../how-to/05-run-ide-analysis/CMakeLists.txt |   27 +
 examples/how-to/05-run-ide-analysis/README.md |   32 +
 .../05-run-ide-analysis/helper-analyses.cpp   |   65 ++
 .../how-to/05-run-ide-analysis/ide-solver.cpp |   73 ++
 .../how-to/05-run-ide-analysis/simple.cpp     |   59 +
 .../07-write-ifds-analysis/CMakeLists.txt     |   20 +
 .../how-to/07-write-ifds-analysis/README.md   |   28 +
 .../how-to/07-write-ifds-analysis/simple.cpp  |  146 +++
 .../08-write-ide-analysis/CMakeLists.txt      |   20 +
 .../how-to/08-write-ide-analysis/README.md    |   29 +
 .../how-to/08-write-ide-analysis/simple.cpp   |  484 ++++++++
 examples/how-to/CMakeLists.txt                |   13 +
 examples/how-to/README.md                     |   13 +
 examples/llvm-hello-world/CMakeLists.txt      |   13 +
 examples/llvm-hello-world/README.md           |   30 +
 examples/llvm-hello-world/README.txt          |   12 -
 examples/llvm-hello-world/main.cpp            |    4 -
 .../llvm-hello-world/target/CMakeLists.txt    |   12 +
 examples/llvm-hello-world/target/branching.ll |  116 +-
 .../llvm-hello-world/target/branching2.ll     |  122 +-
 examples/llvm-hello-world/target/call.ll      |   66 +-
 examples/llvm-hello-world/target/call2.ll     |  170 ++-
 .../target/class_hierarchy.cpp                |   33 +
 .../target/class_hierarchy.ll                 |  596 ++++++++++
 examples/llvm-hello-world/target/exception.ll | 1012 +++++++++++++++--
 examples/llvm-hello-world/target/functions.ll |  157 ++-
 .../llvm-hello-world/target/functions2.ll     |  433 ++++---
 .../target/llvm_intrinsic_functions.ll        |  170 ++-
 .../target/llvm_intrinsic_functions2.ll       |  435 ++++++-
 examples/llvm-hello-world/target/loop.ll      |  136 ++-
 examples/llvm-hello-world/target/loop2.ll     |   99 +-
 examples/llvm-hello-world/target/pointers.ll  |  101 +-
 examples/llvm-hello-world/target/pointers2.ll |  363 +++++-
 examples/llvm-hello-world/target/simple.ll    |   72 +-
 examples/llvm-hello-world/target/simple2.ll   |  120 +-
 examples/llvm-hello-world/target/struct.ll    |   91 +-
 examples/llvm-hello-world/target/struct2.ll   |  146 ++-
 examples/llvm-hello-world/target/struct3.ll   |  223 ++--
 examples/llvm-hello-world/target/taint.cpp    |   35 +
 examples/llvm-hello-world/target/taint.ll     |  673 +++++++++++
 examples/use-phasar-as-library/README.md      |    1 +
 .../use-phasar-with-fetch-content/README.md   |    2 +
 .../phasar/DataFlow/IfdsIde/EntryPointUtils.h |   43 +-
 .../phasar/DataFlow/IfdsIde/InitialSeeds.h    |    4 +
 include/phasar/PhasarLLVM/DataFlow.h          |    2 +
 .../IfdsIde/DefaultAliasAwareIDEProblem.h     |    4 +-
 .../TaintConfig/TaintConfigUtilities.h        |   47 +
 .../TaintConfig/LLVMTaintConfig.cpp           |    2 +-
 phasar-clang_more_help.txt                    |   11 -
 phasar-llvm_more_help.txt                     |   32 -
 73 files changed, 6971 insertions(+), 1106 deletions(-)
 create mode 100644 BUILD.md
 create mode 100644 examples/how-to/00-load-llvm-ir/CMakeLists.txt
 create mode 100644 examples/how-to/00-load-llvm-ir/README.md
 create mode 100644 examples/how-to/00-load-llvm-ir/main.cpp
 create mode 100644 examples/how-to/01-build-type-hierarchy/CMakeLists.txt
 create mode 100644 examples/how-to/01-build-type-hierarchy/README.md
 create mode 100644 examples/how-to/01-build-type-hierarchy/main.cpp
 create mode 100644 examples/how-to/02-build-call-graph/CMakeLists.txt
 create mode 100644 examples/how-to/02-build-call-graph/README.md
 create mode 100644 examples/how-to/02-build-call-graph/build_llvm_based_call_graph.cpp
 create mode 100644 examples/how-to/02-build-call-graph/build_llvm_based_icfg.cpp
 create mode 100644 examples/how-to/02-build-call-graph/img/cg.svg
 create mode 100644 examples/how-to/03-create-alias-info/CMakeLists.txt
 create mode 100644 examples/how-to/03-create-alias-info/README.md
 create mode 100644 examples/how-to/03-create-alias-info/main.cpp
 create mode 100644 examples/how-to/04-run-ifds-analysis/CMakeLists.txt
 create mode 100644 examples/how-to/04-run-ifds-analysis/README.md
 create mode 100644 examples/how-to/04-run-ifds-analysis/helper-analyses.cpp
 create mode 100644 examples/how-to/04-run-ifds-analysis/ifds-solver.cpp
 create mode 100644 examples/how-to/04-run-ifds-analysis/otf-reporter.cpp
 create mode 100644 examples/how-to/04-run-ifds-analysis/simple.cpp
 create mode 100644 examples/how-to/05-run-ide-analysis/CMakeLists.txt
 create mode 100644 examples/how-to/05-run-ide-analysis/README.md
 create mode 100644 examples/how-to/05-run-ide-analysis/helper-analyses.cpp
 create mode 100644 examples/how-to/05-run-ide-analysis/ide-solver.cpp
 create mode 100644 examples/how-to/05-run-ide-analysis/simple.cpp
 create mode 100644 examples/how-to/07-write-ifds-analysis/CMakeLists.txt
 create mode 100644 examples/how-to/07-write-ifds-analysis/README.md
 create mode 100644 examples/how-to/07-write-ifds-analysis/simple.cpp
 create mode 100644 examples/how-to/08-write-ide-analysis/CMakeLists.txt
 create mode 100644 examples/how-to/08-write-ide-analysis/README.md
 create mode 100644 examples/how-to/08-write-ide-analysis/simple.cpp
 create mode 100644 examples/how-to/CMakeLists.txt
 create mode 100644 examples/how-to/README.md
 create mode 100644 examples/llvm-hello-world/CMakeLists.txt
 create mode 100644 examples/llvm-hello-world/README.md
 delete mode 100644 examples/llvm-hello-world/README.txt
 create mode 100644 examples/llvm-hello-world/target/CMakeLists.txt
 create mode 100644 examples/llvm-hello-world/target/class_hierarchy.cpp
 create mode 100644 examples/llvm-hello-world/target/class_hierarchy.ll
 create mode 100644 examples/llvm-hello-world/target/taint.cpp
 create mode 100644 examples/llvm-hello-world/target/taint.ll
 delete mode 100644 phasar-clang_more_help.txt
 delete mode 100644 phasar-llvm_more_help.txt

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a68d15bcdc..0031d9ef5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,5 +63,16 @@ jobs:
       - name: Run Unittests
         shell: bash
         run: |
-          cd build
-          cmake --build . --target check-phasar-unittests
+          cmake --build ./build --target check-phasar-unittests
+
+      - name: Install PhASAR and Build Examples
+        if: matrix.build == 'DebugLibdeps' # Circumvent conflicting ASAn flags
+        env:
+          CXX: ${{ matrix.compiler[0] }}
+          CC: ${{ matrix.compiler[1] }}
+        shell: bash
+        run: |
+          cmake -DCMAKE_INSTALL_PREFIX=./INSTALL -P ./build/cmake_install.cmake
+          cd ./examples/how-to
+          cmake -S . -B build -Dphasar_ROOT=../../INSTALL
+          cmake --build ./build --target run_sample_programs
diff --git a/BUILD.md b/BUILD.md
new file mode 100644
index 0000000000..a98acf7cdb
--- /dev/null
+++ b/BUILD.md
@@ -0,0 +1,130 @@
+# Building PhASAR
+
+
+It is recommended to compile PhASAR yourself in order to get the full C++ experience and to have full control over the build mode.
+However, you may also want to try out one of the pre-built versions of PhASAR or the Docker container.
+
+As a shortcut for the very first PhASAR build on your system, you can use our [bootstrap](./bootstrap.sh) script.
+Please note that you must have python installed for the script to work properly.
+
+```bash
+./bootstrap.sh
+```
+
+Note: If you want to do changes within PhASAR, it is recommended to build it in Debug mode:
+
+```bash
+./bootstrap.sh -DCMAKE_BUILD_TYPE=Debug
+```
+
+The bootstrap script may ask for superuser permissions (to install the dependencies); however it is not recommended to start the whole script with `sudo`.
+
+For subsequent builds, see [Compiling PhASAR](#compiling-phasar-if-not-already-done-using-the-installation-scripts).
+
+### Compiling PhASAR (if not already done using the bootstrap script)
+
+Set the system's variables for the C and C++ compiler to clang:
+
+```bash
+export CC=/usr/local/bin/clang
+export CXX=/usr/local/bin/clang++
+```
+
+You may need to adjust the paths according to your system. When you cloned PhASAR from Github you need to initialize PhASAR's submodules before building it:
+
+```bash
+git submodule update --init
+```
+
+If you downloaded PhASAR as a compressed release (e.g. .zip or .tar.gz) you can use the `init-submodules-release.sh` script that manually clones the required submodules:
+
+```bash
+utils/init-submodules-release.sh
+```
+
+Navigate into the PhASAR directory. The following commands will do the job and compile the PhASAR framework:
+
+```bash
+mkdir build
+cd build/
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
+ninja -j $(nproc) # or use a different number of cores to compile it
+sudo ninja install # only if you wish to install PhASAR system wide
+```
+
+When you have used the `bootstrap.sh` script to install PhASAR, the above steps are already done.
+Use them as a reference if you wish to modify PhASAR and recompile it.
+
+After compilation using cmake the following two binaries can be found in the build/tools directory:
+
++ `phasar-cli` - the PhASAR command-line tool (previously called `phasar-llvm`) that provides access to analyses that are already implemented within PhASAR. Use this if you don't want to build an own tool on top of PhASAR.
++ `myphasartool` - an example tool that shows how tools can be build on top of PhASAR
+
+Please be careful and check if errors occur during the compilation.
+
+When using CMake to compile PhASAR the following optional parameters can be used:
+
+| Parameter : Type|  Effect |
+|-----------|--------|
+| **BUILD_SHARED_LIBS** : BOOL | Build shared libraries -- Not recommended anymore. You may want to use PHASAR_BUILD_DYNLIB instead (default is OFF) |
+| **PHASAR_BUILD_DYNLIB** : BOOL | Build one fat shared library (default is OFF) |
+| **CMAKE_BUILD_TYPE** : STRING | Build PhASAR in 'Debug', 'RelWithDebInfo' or 'Release' mode (default is 'Debug') |
+| **CMAKE_INSTALL_PREFIX** : PATH | Path where PhASAR will be installed if "ninja install” is invoked or the “install” target is built (default is /usr/local/phasar) |
+| **PHASAR_CUSTOM_CONFIG_INSTALL_DIR** : PATH | If set, customizes the directory, where configuration files for PhASAR are installed (default is /usr/local/.phasar-config)|
+| **PHASAR_ENABLE_DYNAMIC_LOG** : BOOL|Makes it possible to switch the logger on and off at runtime (default is ON)|
+| **PHASAR_BUILD_DOC** : BOOL | Build PhASAR documentation (default is OFF) |
+| **PHASAR_BUILD_UNITTESTS** : BOOL | Build PhASAR unit tests (default is ON) |
+| **PHASAR_BUILD_IR** : BOOL | Build PhASAR IR (required for running the unit tests) (default is ON) |
+| **PHASAR_BUILD_OPENSSL_TS_UNITTESTS** : BOOL | Build PhASAR unit tests that require OpenSSL (default is OFF) |
+| **PHASAR_ENABLE_PAMM** : STRING | Enable the performance measurement mechanism ('Off', 'Core' or 'Full', default is Off) |
+| **PHASAR_ENABLE_PIC** : BOOL | Build Position-Independed Code (default is ON) |
+| **PHASAR_ENABLE_WARNINGS** : BOOL | Enable compiler warnings (default is ON) |
+| **CMAKE_CXX_STANDARD** : INT|Build phasar in C++17 or C++20 mode (default is 17)|
+
+You can use these parameters either directly or modify the installer-script `bootstrap.sh`
+
+#### A Remark on Compile Time
+
+C++'s long compile times are always a pain. As shown in the above, when using cmake the compilation can easily be run in parallel, resulting in shorter compilation times. Make use of it!
+
+### Running a Test Solver
+
+To test if everything works as expected please run the following command:
+
+`$ phasar-cli -m test/llvm_test_code/basic/module_cpp.ll -D ifds-solvertest`
+
+You can find the `phasar-cli` tool in the build-tree under `tools/phasar-cli`.
+
+If you obtain output other than a segmentation fault or an exception terminating the program abnormally everything works as expected.
+
+### Building PhASAR on a MacOS System
+
+Due to unfortunate updates to MacOS and the handling of C++, especially on the newer M1 processors, we can't support native development on Mac.
+The easiest solution to develop PhASAR on a Mac right now is to use [dockers development environments](https://docs.docker.com/desktop/dev-environments/). Clone this repository as described in their documentation. Afterwards, you have to login once manually, as a root user by running `docker exec -it -u root <container name> /bin/bash` to complete the rest of the build process as described in this readme (install submodules, run bootstrap.sh, ...).
+Now you can just attach your docker container to VS Code or any other IDE, which supports remote development.
+
+## Installation
+
+PhASAR can be installed using the installer scripts as explained in the following.
+However, you do not need to install PhASAR in order to use it.
+
+### Installing PhASAR on an Ubuntu System
+
+In the following, we would like to give an complete example of how to install
+PhASAR using an Ubuntu or Unix-like system.
+
+Therefore, we provide an installation script. To install PhASAR, just navigate to the top-level
+directory of PhASAR and use the following command:
+
+```bash
+./bootstrap.sh --install
+```
+
+The bootstrap script may ask for superuser permissions.
+
+Done!
+
+If You have already built phasar, you can just invoke
+```bash
+sudo ninja install
+```
diff --git a/README.md b/README.md
index d5a5538a7b..a6342ea32e 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,33 @@
 ![PhASAR logo](img/Logo_RGB/Phasar_Logo.png)
 
-# PhASAR a LLVM-based Static Analysis Framework
+# PhASAR: A LLVM-based Static Analysis Framework
 
 [![C++ Standard](https://img.shields.io/badge/C++_Standard-C%2B%2B17-blue.svg?style=flat&logo=c%2B%2B)](https://isocpp.org/)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blueviolet.svg)](https://raw.githubusercontent.com/secure-software-engineering/phasar/master/LICENSE.txt)
 
 Version 2503
 
+## What is PhASAR?
+
+PhASAR is a LLVM-based static analysis framework written in C++. It allows users
+to specify arbitrary data-flow problems which are then solved in a
+fully-automated manner on the specified LLVM IR target code. Computing points-to
+information, call-graph(s), etc. is done by the framework, thus you can focus on
+what matters.
+
+You can find available literature on PhASAR [here](https://github.com/secure-software-engineering/phasar/wiki/Useful-Literature#papers-on-phasar).
+
+### How do I get started with PhASAR?
+
+We have some documentation on PhASAR in our [***Wiki***](https://github.com/secure-software-engineering/phasar/wiki). You probably would like to read
+this README first.
+<!-- and then have a look on the material provided on <https://phasar.org/>
+as well. -->
+Please also have a look on PhASAR's project directory and notice the project directory [examples](./examples/) as well as the custom tool `tools/example-tool/myphasartool.cpp`.
+
+**NEW:** You can find PhASAR's API reference [here](https://secure-software-engineering.github.io/phasar/).
+
+
 ## Secure Software Engineering Group
 
 PhASAR is primarily developed and maintained by the Secure Software Engineering Group at Heinz Nixdorf Institute (University of Paderborn) and Fraunhofer IEM.
@@ -33,155 +54,13 @@ Although phasar currently does not make use of C++-20 features (except for some
 
 PhASAR is currently set up to support LLVM-15.0.*
 
-## What is PhASAR?
-
-PhASAR is a LLVM-based static analysis framework written in C++. It allows users
-to specify arbitrary data-flow problems which are then solved in a
-fully-automated manner on the specified LLVM IR target code. Computing points-to
-information, call-graph(s), etc. is done by the framework, thus you can focus on
-what matters.
-
 ## Breaking Changes
 
 To keep PhASAR in a state that it is well suited for state-of-the-art research in static analysis, as well as for productive use, we have to make breaking changes. Please refer to [Breaking Changes](./BreakingChanges.md) for detailed information on what was broken recently and how to migrate.
 
-## How do I get started with PhASAR?
-
-We have some documentation on PhASAR in our [***Wiki***](https://github.com/secure-software-engineering/phasar/wiki). You probably would like to read
-this README first.
-<!-- and then have a look on the material provided on <https://phasar.org/>
-as well. -->
-Please also have a look on PhASAR's project directory and notice the project directory `examples/` as well as the custom tool `tools/example-tool/myphasartool.cpp`.
-
 ## Building PhASAR
 
-It is recommended to compile PhASAR yourself in order to get the full C++ experience and to have full control over the build mode.
-However, you may also want to try out one of the pre-built versions of PhASAR or the Docker container.
-
-As a shortcut for the very first PhASAR build on your system, you can use our [bootstrap](./bootstrap.sh) script.
-Please note that you must have python installed for the script to work properly.
-
-```bash
-./bootstrap.sh
-```
-
-Note: If you want to do changes within PhASAR, it is recommended to build it in Debug mode:
-
-```bash
-./bootstrap.sh -DCMAKE_BUILD_TYPE=Debug
-```
-
-The bootstrap script may ask for superuser permissions (to install the dependencies); however it is not recommended to start the whole script with `sudo`.
-
-For subsequent builds, see [Compiling PhASAR](#compiling-phasar-if-not-already-done-using-the-installation-scripts).
-
-### Compiling PhASAR (if not already done using the bootstrap script)
-
-Set the system's variables for the C and C++ compiler to clang:
-
-```bash
-export CC=/usr/local/bin/clang
-export CXX=/usr/local/bin/clang++
-```
-
-You may need to adjust the paths according to your system. When you cloned PhASAR from Github you need to initialize PhASAR's submodules before building it:
-
-```bash
-git submodule update --init
-```
-
-If you downloaded PhASAR as a compressed release (e.g. .zip or .tar.gz) you can use the `init-submodules-release.sh` script that manually clones the required submodules:
-
-```bash
-utils/init-submodules-release.sh
-```
-
-Navigate into the PhASAR directory. The following commands will do the job and compile the PhASAR framework:
-
-```bash
-mkdir build
-cd build/
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
-ninja -j $(nproc) # or use a different number of cores to compile it
-sudo ninja install # only if you wish to install PhASAR system wide
-```
-
-When you have used the `bootstrap.sh` script to install PhASAR, the above steps are already done.
-Use them as a reference if you wish to modify PhASAR and recompile it.
-
-After compilation using cmake the following two binaries can be found in the build/tools directory:
-
-+ `phasar-cli` - the PhASAR command-line tool (previously called `phasar-llvm`) that provides access to analyses that are already implemented within PhASAR. Use this if you don't want to build an own tool on top of PhASAR.
-+ `myphasartool` - an example tool that shows how tools can be build on top of PhASAR
-
-Please be careful and check if errors occur during the compilation.
-
-When using CMake to compile PhASAR the following optional parameters can be used:
-
-| Parameter : Type|  Effect |
-|-----------|--------|
-| **BUILD_SHARED_LIBS** : BOOL | Build shared libraries -- Not recommended anymore. You may want to use PHASAR_BUILD_DYNLIB instead (default is OFF) |
-| **PHASAR_BUILD_DYNLIB** : BOOL | Build one fat shared library (default is OFF) |
-| **CMAKE_BUILD_TYPE** : STRING | Build PhASAR in 'Debug', 'RelWithDebInfo' or 'Release' mode (default is 'Debug') |
-| **CMAKE_INSTALL_PREFIX** : PATH | Path where PhASAR will be installed if "ninja install” is invoked or the “install” target is built (default is /usr/local/phasar) |
-| **PHASAR_CUSTOM_CONFIG_INSTALL_DIR** : PATH | If set, customizes the directory, where configuration files for PhASAR are installed (default is /usr/local/.phasar-config)|
-| **PHASAR_ENABLE_DYNAMIC_LOG** : BOOL|Makes it possible to switch the logger on and off at runtime (default is ON)|
-| **PHASAR_BUILD_DOC** : BOOL | Build PhASAR documentation (default is OFF) |
-| **PHASAR_BUILD_UNITTESTS** : BOOL | Build PhASAR unit tests (default is ON) |
-| **PHASAR_BUILD_IR** : BOOL | Build PhASAR IR (required for running the unit tests) (default is ON) |
-| **PHASAR_BUILD_OPENSSL_TS_UNITTESTS** : BOOL | Build PhASAR unit tests that require OpenSSL (default is OFF) |
-| **PHASAR_ENABLE_PAMM** : STRING | Enable the performance measurement mechanism ('Off', 'Core' or 'Full', default is Off) |
-| **PHASAR_ENABLE_PIC** : BOOL | Build Position-Independed Code (default is ON) |
-| **PHASAR_ENABLE_WARNINGS** : BOOL | Enable compiler warnings (default is ON) |
-| **CMAKE_CXX_STANDARD** : INT|Build phasar in C++17 or C++20 mode (default is 17)|
-
-You can use these parameters either directly or modify the installer-script `bootstrap.sh`
-
-#### A Remark on Compile Time
-
-C++'s long compile times are always a pain. As shown in the above, when using cmake the compilation can easily be run in parallel, resulting in shorter compilation times. Make use of it!
-
-### Running a Test Solver
-
-To test if everything works as expected please run the following command:
-
-`$ phasar-cli -m test/llvm_test_code/basic/module_cpp.ll -D ifds-solvertest`
-
-You can find the `phasar-cli` tool in the build-tree under `tools/phasar-cli`.
-
-If you obtain output other than a segmentation fault or an exception terminating the program abnormally everything works as expected.
-
-### Building PhASAR on a MacOS System
-
-Due to unfortunate updates to MacOS and the handling of C++, especially on the newer M1 processors, we can't support native development on Mac.
-The easiest solution to develop PhASAR on a Mac right now is to use [dockers development environments](https://docs.docker.com/desktop/dev-environments/). Clone this repository as described in their documentation. Afterwards, you have to login once manually, as a root user by running `docker exec -it -u root <container name> /bin/bash` to complete the rest of the build process as described in this readme (install submodules, run bootstrap.sh, ...).
-Now you can just attach your docker container to VS Code or any other IDE, which supports remote development.
-
-## Installation
-
-PhASAR can be installed using the installer scripts as explained in the following.
-However, you do not need to install PhASAR in order to use it.
-
-### Installing PhASAR on an Ubuntu System
-
-In the following, we would like to give an complete example of how to install
-PhASAR using an Ubuntu or Unix-like system.
-
-Therefore, we provide an installation script. To install PhASAR, just navigate to the top-level
-directory of PhASAR and use the following command:
-
-```bash
-./bootstrap.sh --install
-```
-
-The bootstrap script may ask for superuser permissions.
-
-Done!
-
-If You have already built phasar, you can just invoke
-```bash
-sudo ninja install
-```
+Please refer to [BUILD.md](./BUILD.md) for instructions on how to build PhASAR.
 
 ## How to use PhASAR?
 
diff --git a/examples/how-to/00-load-llvm-ir/CMakeLists.txt b/examples/how-to/00-load-llvm-ir/CMakeLists.txt
new file mode 100644
index 0000000000..9d572feff4
--- /dev/null
+++ b/examples/how-to/00-load-llvm-ir/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(load-llvm-ir)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(load-llvm-ir main.cpp)
+target_link_libraries(load-llvm-ir PRIVATE phasar::phasar)
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_load_llvm_ir
+    DEPENDS load-llvm-ir
+    COMMAND $<TARGET_FILE:load-llvm-ir> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/simple.ll"
+  )
+
+  add_dependencies(run_sample_programs run_load_llvm_ir)
+endif()
diff --git a/examples/how-to/00-load-llvm-ir/README.md b/examples/how-to/00-load-llvm-ir/README.md
new file mode 100644
index 0000000000..e3cbaa9821
--- /dev/null
+++ b/examples/how-to/00-load-llvm-ir/README.md
@@ -0,0 +1,24 @@
+# Load LLVM IR
+
+Shows, how you can use PhASAR to load and manage a LLVM IR module.
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 00-load-llvm-ir root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 00-load-llvm-ir/build folder:
+./load-llvm-ir ../../../llvm-hello-world/target/simple.ll
+```
diff --git a/examples/how-to/00-load-llvm-ir/main.cpp b/examples/how-to/00-load-llvm-ir/main.cpp
new file mode 100644
index 0000000000..98179ca279
--- /dev/null
+++ b/examples/how-to/00-load-llvm-ir/main.cpp
@@ -0,0 +1,55 @@
+#include "phasar/PhasarLLVM/DB.h"     // For LLVMProjectIRDB
+#include "phasar/PhasarLLVM/Passes.h" // For GeneralStatisticsAnalysis
+#include "phasar/PhasarLLVM/Utils.h"  // For llvmIRToString()
+
+#include "llvm/IR/InstIterator.h" // For llvm::instructions()
+
+static void printIRStats(psr::LLVMProjectIRDB &IRDB);
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: load-llvm-ir <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // The LLVMProjectIRDB loads and manages an LLVM-IR module.
+  // You can load both .ll (human readable) and .bc (smaller, faster load-times)
+  // files.
+  // If you already have an llvm::Module*, you can also pass it here.
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    // If phasar yould not load the IR, we should exit.
+    // Phasar has already printed an error message to the terminal.
+    return 1;
+  }
+
+  // ========
+  // Now, you can work with the module
+
+  printIRStats(IRDB);
+
+  // Inspect the module (see also llvm-hello-world)
+
+  auto *F = IRDB.getFunctionDefinition("main");
+  if (!F) {
+    llvm::errs() << "error: could not find function 'main'\n";
+    return 1;
+  }
+
+  llvm::outs() << "--------------- Instructions of 'main' ---------------\n";
+
+  for (const auto &Inst : llvm::instructions(F)) {
+    // Phasar annotates all instructions (and global variables) with IRDB-wide
+    // unique integer Ids:
+    auto InstId = IRDB.getInstructionId(&Inst);
+
+    llvm::outs() << '#' << InstId << ": " << psr::llvmIRToString(&Inst) << '\n';
+
+    // TODO: Analyze instruction 'Inst' here.
+  }
+}
+
+static void printIRStats(psr::LLVMProjectIRDB &IRDB) {
+  psr::GeneralStatisticsAnalysis Stats;
+  llvm::outs() << Stats.runOnModule(*IRDB.getModule()) << '\n';
+}
diff --git a/examples/how-to/01-build-type-hierarchy/CMakeLists.txt b/examples/how-to/01-build-type-hierarchy/CMakeLists.txt
new file mode 100644
index 0000000000..f6e0303099
--- /dev/null
+++ b/examples/how-to/01-build-type-hierarchy/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(build-type-hierarchy)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(build-type-hierarchy main.cpp)
+target_link_libraries(build-type-hierarchy PRIVATE phasar::phasar)
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_build_type_hierarchy
+    DEPENDS build-type-hierarchy
+    COMMAND $<TARGET_FILE:build-type-hierarchy> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/class_hierarchy.ll"
+  )
+
+  add_dependencies(run_sample_programs run_build_type_hierarchy)
+endif()
diff --git a/examples/how-to/01-build-type-hierarchy/README.md b/examples/how-to/01-build-type-hierarchy/README.md
new file mode 100644
index 0000000000..88ade55b42
--- /dev/null
+++ b/examples/how-to/01-build-type-hierarchy/README.md
@@ -0,0 +1,24 @@
+# Build Type Hierarchy
+
+Shows, how you can use PhASAR to build and use a type hierarchy from a LLVM IR module.
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 01-build-type-hierarchy root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 01-build-type-hierarchy/build folder:
+./build-type-hierarchy ../../../llvm-hello-world/target/class_hierarchy.ll
+```
diff --git a/examples/how-to/01-build-type-hierarchy/main.cpp b/examples/how-to/01-build-type-hierarchy/main.cpp
new file mode 100644
index 0000000000..28412a25ff
--- /dev/null
+++ b/examples/how-to/01-build-type-hierarchy/main.cpp
@@ -0,0 +1,47 @@
+#include "phasar/PhasarLLVM/DB.h"
+#include "phasar/PhasarLLVM/TypeHierarchy.h"
+
+#include "llvm/Demangle/Demangle.h"
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: build-type-hierarchy <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // Build the type hierarchy.
+  // Note that this DIBasedTypeHierarchy requires debug information (DI) to be
+  // embedded into the LLVM IR. You can achieve this by passing -g to clang.
+  psr::DIBasedTypeHierarchy TH(IRDB);
+
+  for (const auto *ClassTy : TH.getAllTypes()) {
+    llvm::outs() << "Found class type " << ClassTy->getName() << " ("
+                 << TH.getTypeName(ClassTy) << ")\n";
+    llvm::outs() << "> demangled name: "
+                 << llvm::demangle(TH.getTypeName(ClassTy).str()) << '\n';
+  }
+  llvm::outs() << '\n';
+
+  // Try to find class 'A'
+  const auto *ClassA = TH.getType("_ZTS1A");
+
+  // If TH does not find, it returns nullptr.
+
+  if (ClassA != nullptr) {
+    // Get the (transitive) sub-types of ClassA
+    for (const auto *ClassTy : TH.subTypesOf(ClassA)) {
+      llvm::outs() << "Class " << ClassTy->getName()
+                   << " is a (transitive) sub-type of A\n";
+
+      // You can also check, whether a type is a (transitive) sub-type of
+      // another type:
+      assert(TH.isSubType(ClassA, ClassTy));
+    }
+  }
+}
diff --git a/examples/how-to/02-build-call-graph/CMakeLists.txt b/examples/how-to/02-build-call-graph/CMakeLists.txt
new file mode 100644
index 0000000000..56d5fc25d8
--- /dev/null
+++ b/examples/how-to/02-build-call-graph/CMakeLists.txt
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(build-call-graph)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(build-llvm-based-icfg build_llvm_based_icfg.cpp)
+target_link_libraries(build-llvm-based-icfg PRIVATE phasar::phasar)
+
+add_executable(build-llvm-based-call-graph build_llvm_based_call_graph.cpp)
+target_link_libraries(build-llvm-based-call-graph PRIVATE phasar::phasar)
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_build_call_graph
+    DEPENDS build-llvm-based-icfg build-llvm-based-call-graph
+    COMMAND $<TARGET_FILE:build-llvm-based-icfg> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/class_hierarchy.ll"
+    COMMAND $<TARGET_FILE:build-llvm-based-call-graph> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/class_hierarchy.ll"
+  )
+
+  add_dependencies(run_sample_programs run_build_call_graph)
+endif()
diff --git a/examples/how-to/02-build-call-graph/README.md b/examples/how-to/02-build-call-graph/README.md
new file mode 100644
index 0000000000..3d9981c109
--- /dev/null
+++ b/examples/how-to/02-build-call-graph/README.md
@@ -0,0 +1,38 @@
+# Build CallGraph
+
+Shows several ways, how you can use PhASAR to build and use a call graph from a LLVM IR module.
+
+You may look at the different C++ source files to see, how you can build a call graph using PhASAR.
+You may want to start with [build_llvm_based_icfg.cpp](./build_llvm_based_icfg.cpp).
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 02-build-call-graph root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 02-build-call-graph/build folder:
+./build-llvm-based-icfg ../../../llvm-hello-world/target/class_hierarchy.ll
+
+./build-llvm-based-call-graph ../../../llvm-hello-world/target/class_hierarchy.ll
+```
+
+### Visualizing the CallGraph
+
+The test programs show, how you can export a call-graph to a dot-graph.
+You can use the `dot` command-line tool (get this by, e.g., invoking `apt install graphviz` or similar).
+
+The call-graph obtained from the example program on the sample `class_hierarchy.ll` should look similar to this:
+
+![Sample Call-Graph](./img/cg.svg)
diff --git a/examples/how-to/02-build-call-graph/build_llvm_based_call_graph.cpp b/examples/how-to/02-build-call-graph/build_llvm_based_call_graph.cpp
new file mode 100644
index 0000000000..5704f31eee
--- /dev/null
+++ b/examples/how-to/02-build-call-graph/build_llvm_based_call_graph.cpp
@@ -0,0 +1,87 @@
+#include "phasar/PhasarLLVM/ControlFlow.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.h"
+#include "phasar/PhasarLLVM/DB.h"
+#include "phasar/PhasarLLVM/TypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils.h"
+
+#include "llvm/Demangle/Demangle.h"
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: build-llvm-based-call-graph <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  if (!IRDB.getFunctionDefinition("main")) {
+    llvm::errs() << "Required function 'main' not found\n";
+    return 1;
+  }
+
+  // We may wish to use type-information for construcing the call-graph
+  psr::DIBasedTypeHierarchy TH(IRDB);
+
+  // Needed to resolve indirect calls to C++ virtual functions
+  psr::LLVMVFTableProvider VTP(IRDB);
+
+  // The resolver defines, how the call-graph construction algorithm resolves
+  // indirect calls.
+  // This comprises calls through a function pointer, as well as virtual
+  // functions. Here, we select the Rapid Type Analysis that requires a
+  // type-hierarchy as input.
+  //
+  // You can also write your own resolver by creating a class that inherits from
+  // the psr::Resolver interface.
+  psr::RTAResolver Resolver(&IRDB, &VTP, &TH);
+
+  // You must specify at least one function as entry-point. The
+  // LLVMBasedICFG will only consider those functions for the call-graph
+  // that are reachable from at least on eof the entry-points.
+  auto CG = psr::buildLLVMBasedCallGraph(IRDB, Resolver, {"main"});
+
+  // Iterate over all call-sites:
+  for (const auto *Call : CG.getAllVertexCallSites()) {
+    if (Call->isDebugOrPseudoInst()) {
+      // We may with to skip the auto-generated debug-intrinsics
+      continue;
+    }
+
+    llvm::outs() << "Found call-site: " << psr::llvmIRToString(Call) << '\n';
+
+    // The probably most important function: getCalleesOfCallAt()
+    for (const auto *CalleeFun : CG.getCalleesOfCallAt(Call)) {
+      llvm::outs() << ">  calling "
+                   << llvm::demangle(CalleeFun->getName().str()) << '\n';
+    }
+    llvm::outs() << '\n';
+  }
+
+  llvm::outs() << "--------------------------\n";
+
+  // You can also go the other way around:
+  for (const auto *Fun : CG.getAllVertexFunctions()) {
+    llvm::outs() << "Found Function: " << llvm::demangle(Fun->getName().str())
+                 << '\n';
+
+    // The probably second-most important function: getCallersOf()
+    for (const auto *CallSite : CG.getCallersOf(Fun)) {
+      llvm::outs() << ">  called from " << psr::llvmIRToString(CallSite)
+                   << '\n';
+    }
+    llvm::outs() << '\n';
+  }
+
+  // You can create an LLVMBasedICFG from an already existing call-graph:
+  psr::LLVMBasedICFG ICFG(std::move(CG), &IRDB);
+
+  llvm::outs() << "--------------------------\n";
+
+  // You can export the call-graph as dot, such that you can display it
+  // using a graphviz viewer:
+  ICFG.print();
+}
diff --git a/examples/how-to/02-build-call-graph/build_llvm_based_icfg.cpp b/examples/how-to/02-build-call-graph/build_llvm_based_icfg.cpp
new file mode 100644
index 0000000000..61a5b438bd
--- /dev/null
+++ b/examples/how-to/02-build-call-graph/build_llvm_based_icfg.cpp
@@ -0,0 +1,81 @@
+#include "phasar/PhasarLLVM/ControlFlow.h"
+#include "phasar/PhasarLLVM/DB.h"
+#include "phasar/PhasarLLVM/TypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils.h"
+
+#include "llvm/Demangle/Demangle.h"
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: build-llvm-based-icfg <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  if (!IRDB.getFunctionDefinition("main")) {
+    llvm::errs() << "Required function 'main' not found\n";
+    return 1;
+  }
+
+  // We may wish to use type-information for construcing the call-graph
+  psr::DIBasedTypeHierarchy TH(IRDB);
+
+  // The easiest way of getting a call graph is by construcing an
+  // inter-procedural control-flow graph (ICFG):
+  //
+  // You can select the call-graph resolver algorithm using the
+  // CallGraphAnalysisType enum. The LLVMBasedICFG will create required
+  // data-structures that you don't explicitly pass in, on demand.
+  // Here, we select the Rapid Type Analysis that requires a type-hierarchy as
+  // input.
+  //
+  // You must specify at least one function as entry-point. The LLVMBasedICFG
+  // will only consider those functions for the call-graph that are
+  // (transitively) reachable from at least on of the entry-points.
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::RTA, {"main"},
+                          &TH);
+  const auto &CG = ICFG.getCallGraph();
+
+  // Iterate over all call-sites:
+  for (const auto *Call : CG.getAllVertexCallSites()) {
+    if (Call->isDebugOrPseudoInst()) {
+      // We may wish to skip the auto-generated debug-intrinsics
+      continue;
+    }
+
+    llvm::outs() << "Found call-site: " << psr::llvmIRToString(Call) << '\n';
+
+    // The probably most important function: getCalleesOfCallAt()
+    for (const auto *CalleeFun : CG.getCalleesOfCallAt(Call)) {
+      llvm::outs() << ">  calling "
+                   << llvm::demangle(CalleeFun->getName().str()) << '\n';
+    }
+    llvm::outs() << '\n';
+  }
+
+  llvm::outs() << "--------------------------\n";
+
+  // You can also go the other way around:
+  for (const auto *Fun : CG.getAllVertexFunctions()) {
+    llvm::outs() << "Found Function: " << llvm::demangle(Fun->getName().str())
+                 << '\n';
+
+    // The probably second-most important function: getCallersOf()
+    for (const auto *CallSite : CG.getCallersOf(Fun)) {
+      llvm::outs() << ">  called from " << psr::llvmIRToString(CallSite)
+                   << '\n';
+    }
+    llvm::outs() << '\n';
+  }
+
+  llvm::outs() << "--------------------------\n";
+
+  // You can also export the call-graph as dot, such that you can display it
+  // using a graphviz viewer:
+  ICFG.print();
+}
diff --git a/examples/how-to/02-build-call-graph/img/cg.svg b/examples/how-to/02-build-call-graph/img/cg.svg
new file mode 100644
index 0000000000..300f05cae6
--- /dev/null
+++ b/examples/how-to/02-build-call-graph/img/cg.svg
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.43.0 (0)
+ -->
+<!-- Title: CallGraph Pages: 1 -->
+<svg width="6758pt" height="407pt"
+ viewBox="0.00 0.00 6757.95 407.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 403)">
+<title>CallGraph</title>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-403 6753.95,-403 6753.95,4 -4,4"/>
+<!-- 0 -->
+<g id="node1" class="node">
+<title>0</title>
+<ellipse fill="none" stroke="black" cx="542.95" cy="-192" rx="67.69" ry="18"/>
+<text text-anchor="middle" x="542.95" y="-188.3" font-family="Times,serif" font-size="14.00">_ZN1BD2Ev</text>
+</g>
+<!-- 3 -->
+<g id="node4" class="node">
+<title>3</title>
+<ellipse fill="none" stroke="black" cx="1203.95" cy="-105" rx="66.89" ry="18"/>
+<text text-anchor="middle" x="1203.95" y="-101.3" font-family="Times,serif" font-size="14.00">_ZN1AD2Ev</text>
+</g>
+<!-- 0&#45;&gt;3 -->
+<g id="edge22" class="edge">
+<title>0&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M548.67,-173.94C553.48,-162.47 561.6,-148.19 573.95,-141 618.93,-114.82 990.05,-126.72 1041.95,-123 1072.1,-120.84 1105.31,-117.52 1133.77,-114.39"/>
+<polygon fill="black" stroke="black" points="1134.48,-117.83 1144.03,-113.24 1133.7,-110.87 1134.48,-117.83"/>
+<text text-anchor="middle" x="884.45" y="-144.8" font-family="Times,serif" font-size="14.00">call void @_ZN1AD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) | ID: 90</text>
+</g>
+<!-- 11 -->
+<g id="node12" class="node">
+<title>11</title>
+<ellipse fill="none" stroke="black" cx="3522.95" cy="-18" rx="88.28" ry="18"/>
+<text text-anchor="middle" x="3522.95" y="-14.3" font-family="Times,serif" font-size="14.00">llvm.dbg.declare</text>
+</g>
+<!-- 0&#45;&gt;11 -->
+<g id="edge27" class="edge">
+<title>0&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M544.87,-173.81C546.6,-163.68 549.86,-150.94 555.95,-141 574.89,-110.14 583.44,-100.69 616.95,-87 882.67,21.56 975.07,-63.56 1261.95,-54 2098.42,-26.14 3109.7,-20.41 3424.57,-19.27"/>
+<polygon fill="black" stroke="black" points="3424.59,-22.77 3434.58,-19.24 3424.57,-15.77 3424.59,-22.77"/>
+<text text-anchor="middle" x="872.45" y="-101.3" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 88</text>
+</g>
+<!-- 1 -->
+<g id="node2" class="node">
+<title>1</title>
+<ellipse fill="none" stroke="black" cx="3697.95" cy="-294" rx="33.6" ry="18"/>
+<text text-anchor="middle" x="3697.95" y="-290.3" font-family="Times,serif" font-size="14.00">main</text>
+</g>
+<!-- 1&#45;&gt;0 -->
+<g id="edge2" class="edge">
+<title>1&#45;&gt;0</title>
+<path fill="none" stroke="black" d="M3664.1,-293.01C3295.53,-293.04 40.99,-292.36 6.95,-258 -2.43,-248.53 -2.16,-237.73 6.95,-228 37.55,-195.34 323.6,-191.98 464.82,-192.34"/>
+<polygon fill="black" stroke="black" points="465.14,-195.84 475.15,-192.38 465.16,-188.84 465.14,-195.84"/>
+<text text-anchor="middle" x="304.45" y="-239.3" font-family="Times,serif" font-size="14.00">call void @_ZN1BD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %b) | ID: 47</text>
+</g>
+<!-- 1&#45;&gt;0 -->
+<g id="edge15" class="edge">
+<title>1&#45;&gt;0</title>
+<path fill="none" stroke="black" d="M3664.15,-292.96C3334.81,-292.48 707.97,-287.76 633.95,-258 615.87,-250.73 617.54,-239.71 601.95,-228 595.33,-223.02 587.94,-218.16 580.7,-213.73"/>
+<polygon fill="black" stroke="black" points="582.05,-210.46 571.67,-208.35 578.48,-216.48 582.05,-210.46"/>
+<text text-anchor="middle" x="931.45" y="-239.3" font-family="Times,serif" font-size="14.00">call void @_ZN1BD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %b) | ID: 32</text>
+</g>
+<!-- 2 -->
+<g id="node3" class="node">
+<title>2</title>
+<ellipse fill="none" stroke="black" cx="2386.95" cy="-192" rx="66.89" ry="18"/>
+<text text-anchor="middle" x="2386.95" y="-188.3" font-family="Times,serif" font-size="14.00">_ZN1BC2Ev</text>
+</g>
+<!-- 1&#45;&gt;2 -->
+<g id="edge17" class="edge">
+<title>1&#45;&gt;2</title>
+<path fill="none" stroke="black" d="M3664.08,-292.69C3473.46,-290.83 2541.07,-280.63 2484.95,-258 2466.57,-250.59 2468.13,-239.45 2451.95,-228 2444.35,-222.62 2435.82,-217.47 2427.51,-212.86"/>
+<polygon fill="black" stroke="black" points="2429.09,-209.73 2418.62,-208.07 2425.77,-215.9 2429.09,-209.73"/>
+<text text-anchor="middle" x="2781.95" y="-239.3" font-family="Times,serif" font-size="14.00">call void @_ZN1BC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %b) | ID: 19</text>
+</g>
+<!-- 4 -->
+<g id="node5" class="node">
+<title>4</title>
+<ellipse fill="none" stroke="black" cx="1549.95" cy="-192" rx="67.69" ry="18"/>
+<text text-anchor="middle" x="1549.95" y="-188.3" font-family="Times,serif" font-size="14.00">_ZN1CD2Ev</text>
+</g>
+<!-- 1&#45;&gt;4 -->
+<g id="edge21" class="edge">
+<title>1&#45;&gt;4</title>
+<path fill="none" stroke="black" d="M3664.01,-292.8C3416.32,-291.29 1895.94,-281.07 1854.95,-258 1841.2,-250.26 1849.29,-236.44 1835.95,-228 1802.24,-206.67 1699.52,-198.34 1626.86,-195.08"/>
+<polygon fill="black" stroke="black" points="1626.96,-191.58 1616.82,-194.65 1626.66,-198.57 1626.96,-191.58"/>
+<text text-anchor="middle" x="2151.45" y="-239.3" font-family="Times,serif" font-size="14.00">call void @_ZN1CD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %c) | ID: 45</text>
+</g>
+<!-- 1&#45;&gt;4 -->
+<g id="edge29" class="edge">
+<title>1&#45;&gt;4</title>
+<path fill="none" stroke="black" d="M3663.99,-292.84C3369.66,-291.44 1261.26,-280.63 1238.95,-258 1229.59,-248.51 1230.07,-237.94 1238.95,-228 1254.34,-210.78 1386.47,-201 1473.48,-196.37"/>
+<polygon fill="black" stroke="black" points="1473.79,-199.85 1483.59,-195.84 1473.43,-192.86 1473.79,-199.85"/>
+<text text-anchor="middle" x="1535.45" y="-239.3" font-family="Times,serif" font-size="14.00">call void @_ZN1CD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %c) | ID: 31</text>
+</g>
+<!-- 5 -->
+<g id="node6" class="node">
+<title>5</title>
+<ellipse fill="none" stroke="black" cx="3090.95" cy="-192" rx="66.89" ry="18"/>
+<text text-anchor="middle" x="3090.95" y="-188.3" font-family="Times,serif" font-size="14.00">_ZN1CC2Ev</text>
+</g>
+<!-- 1&#45;&gt;5 -->
+<g id="edge23" class="edge">
+<title>1&#45;&gt;5</title>
+<path fill="none" stroke="black" d="M3664.04,-292.3C3539.25,-289.58 3111.87,-278.78 3091.95,-258 3082.53,-248.16 3081.77,-233.15 3083.6,-220.03"/>
+<polygon fill="black" stroke="black" points="3087.07,-220.53 3085.51,-210.05 3080.19,-219.21 3087.07,-220.53"/>
+<text text-anchor="middle" x="3387.95" y="-239.3" font-family="Times,serif" font-size="14.00">call void @_ZN1CC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %c) | ID: 22</text>
+</g>
+<!-- 7 -->
+<g id="node8" class="node">
+<title>7</title>
+<ellipse fill="none" stroke="black" cx="4221.95" cy="-192" rx="74.19" ry="18"/>
+<text text-anchor="middle" x="4221.95" y="-188.3" font-family="Times,serif" font-size="14.00">_ZN1B3fooEv</text>
+</g>
+<!-- 1&#45;&gt;7 -->
+<g id="edge18" class="edge">
+<title>1&#45;&gt;7</title>
+<path fill="none" stroke="black" d="M3704.59,-276.07C3711.72,-258.79 3723.22,-233.72 3731.95,-228 3765.02,-206.33 4007.24,-197.69 4138.29,-194.57"/>
+<polygon fill="black" stroke="black" points="4138.39,-198.07 4148.3,-194.34 4138.22,-191.07 4138.39,-198.07"/>
+<text text-anchor="middle" x="4016.95" y="-246.8" font-family="Times,serif" font-size="14.00">invoke void @_ZN1B3fooEv(ptr noundef nonnull align 8 dereferenceable(8) %b)</text>
+<text text-anchor="middle" x="4016.95" y="-231.8" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;to label %invoke.cont unwind label %lpad | ID: 20</text>
+</g>
+<!-- 1&#45;&gt;7 -->
+<g id="edge26" class="edge">
+<title>1&#45;&gt;7</title>
+<path fill="none" stroke="black" d="M3727.29,-285C3741.05,-281.6 3757.73,-277.97 3772.95,-276 3802.12,-272.23 4281.52,-279.14 4301.95,-258 4311.22,-248.41 4309.25,-239.16 4301.95,-228 4297.01,-220.44 4290.03,-214.5 4282.24,-209.85"/>
+<polygon fill="black" stroke="black" points="4283.64,-206.63 4273.16,-205.11 4280.41,-212.84 4283.64,-206.63"/>
+<text text-anchor="middle" x="4548.45" y="-246.8" font-family="Times,serif" font-size="14.00">invoke void %1(ptr noundef nonnull align 8 dereferenceable(8) %0)</text>
+<text text-anchor="middle" x="4548.45" y="-231.8" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;to label %invoke.cont3 unwind label %lpad1 | ID: 30</text>
+</g>
+<!-- 1&#45;&gt;11 -->
+<g id="edge8" class="edge">
+<title>1&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M3694.82,-275.67C3690.15,-243.61 3685.6,-175.22 3723.95,-141 3750.86,-117 4023.18,-149.19 4047.95,-123 4058.95,-111.38 4058.52,-99.02 4047.95,-87 4020,-55.19 3760.12,-33.93 3616.79,-24.53"/>
+<polygon fill="black" stroke="black" points="3616.89,-21.02 3606.68,-23.87 3616.43,-28.01 3616.89,-21.02"/>
+<text text-anchor="middle" x="3951.95" y="-144.8" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %c, metadata | ID: 21</text>
+</g>
+<!-- 1&#45;&gt;11 -->
+<g id="edge9" class="edge">
+<title>1&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M3727.27,-284.82C3741.02,-281.38 3757.7,-277.77 3772.95,-276 3802.13,-272.61 5867.27,-278.86 5887.95,-258 5897.34,-248.53 5895.37,-239.08 5887.95,-228 5796.5,-91.37 5706.55,-122.22 5545.95,-87 5357.27,-45.62 4000.42,-25.16 3621.19,-20.21"/>
+<polygon fill="black" stroke="black" points="3621.11,-16.71 3611.06,-20.08 3621.01,-23.71 3621.11,-16.71"/>
+<text text-anchor="middle" x="6049.45" y="-144.8" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %b, metadata | ID: 18</text>
+</g>
+<!-- 1&#45;&gt;11 -->
+<g id="edge13" class="edge">
+<title>1&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M3727.27,-284.82C3741.02,-281.38 3757.7,-277.77 3772.95,-276 4008.27,-248.66 5670.25,-290.2 5904.95,-258 6078.76,-234.16 6400.49,-270.34 6281.95,-141 6190.29,-40.97 4103.15,-22.45 3621.49,-19.5"/>
+<polygon fill="black" stroke="black" points="3621.46,-16 3611.44,-19.44 3621.42,-23 3621.46,-16"/>
+<text text-anchor="middle" x="6521.45" y="-144.8" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %a, metadata | ID: 24</text>
+</g>
+<!-- 12 -->
+<g id="node13" class="node">
+<title>12</title>
+<ellipse fill="none" stroke="black" cx="4951.95" cy="-192" rx="74.19" ry="18"/>
+<text text-anchor="middle" x="4951.95" y="-188.3" font-family="Times,serif" font-size="14.00">_ZN1C3fooEv</text>
+</g>
+<!-- 1&#45;&gt;12 -->
+<g id="edge25" class="edge">
+<title>1&#45;&gt;12</title>
+<path fill="none" stroke="black" d="M3727.27,-284.89C3741.03,-281.46 3757.71,-277.84 3772.95,-276 3829.22,-269.2 4739.84,-277.76 4792.95,-258 4812.47,-250.74 4810.54,-237.73 4828.95,-228 4846.51,-218.73 4866.8,-211.66 4885.79,-206.39"/>
+<polygon fill="black" stroke="black" points="4886.8,-209.75 4895.57,-203.8 4885.01,-202.98 4886.8,-209.75"/>
+<text text-anchor="middle" x="5069.45" y="-246.8" font-family="Times,serif" font-size="14.00">invoke void %1(ptr noundef nonnull align 8 dereferenceable(8) %0)</text>
+<text text-anchor="middle" x="5069.45" y="-231.8" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;to label %invoke.cont3 unwind label %lpad1 | ID: 30</text>
+</g>
+<!-- 1&#45;&gt;12 -->
+<g id="edge28" class="edge">
+<title>1&#45;&gt;12</title>
+<path fill="none" stroke="black" d="M3727.27,-284.84C3741.02,-281.41 3757.71,-277.8 3772.95,-276 3794.16,-273.5 5294.95,-273.18 5309.95,-258 5319.33,-248.52 5318.91,-237.88 5309.95,-228 5291.85,-208.04 5135.47,-199.09 5035.47,-195.37"/>
+<polygon fill="black" stroke="black" points="5035.49,-191.87 5025.37,-195.01 5035.24,-198.86 5035.49,-191.87"/>
+<text text-anchor="middle" x="5599.95" y="-246.8" font-family="Times,serif" font-size="14.00">invoke void @_ZN1C3fooEv(ptr noundef nonnull align 8 dereferenceable(8) %c)</text>
+<text text-anchor="middle" x="5599.95" y="-231.8" font-family="Times,serif" font-size="14.00"> &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;to label %invoke.cont2 unwind label %lpad1 | ID: 23</text>
+</g>
+<!-- 9 -->
+<g id="node10" class="node">
+<title>9</title>
+<ellipse fill="none" stroke="black" cx="2996.95" cy="-105" rx="66.09" ry="18"/>
+<text text-anchor="middle" x="2996.95" y="-101.3" font-family="Times,serif" font-size="14.00">_ZN1AC2Ev</text>
+</g>
+<!-- 2&#45;&gt;9 -->
+<g id="edge11" class="edge">
+<title>2&#45;&gt;9</title>
+<path fill="none" stroke="black" d="M2384.29,-173.6C2383.68,-162.59 2385.1,-148.98 2393.95,-141 2414.93,-122.09 2873.87,-125.99 2901.95,-123 2912.92,-121.83 2924.54,-120.14 2935.73,-118.27"/>
+<polygon fill="black" stroke="black" points="2936.61,-121.67 2945.87,-116.51 2935.42,-114.77 2936.61,-121.67"/>
+<text text-anchor="middle" x="2703.95" y="-144.8" font-family="Times,serif" font-size="14.00">call void @_ZN1AC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) | ID: 58</text>
+</g>
+<!-- 2&#45;&gt;11 -->
+<g id="edge20" class="edge">
+<title>2&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M2384.03,-173.96C2383.18,-168.27 2382.37,-161.88 2381.95,-156 2379.6,-122.82 2382.94,-104.94 2410.95,-87 2495.14,-33.1 3168.57,-21.91 3424.62,-19.6"/>
+<polygon fill="black" stroke="black" points="3424.69,-23.1 3434.66,-19.51 3424.63,-16.1 3424.69,-23.1"/>
+<text text-anchor="middle" x="2666.45" y="-101.3" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 56</text>
+</g>
+<!-- 3&#45;&gt;11 -->
+<g id="edge5" class="edge">
+<title>3&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M1228.35,-88.21C1248.32,-76.25 1277.77,-60.77 1305.95,-54 1410.06,-28.99 3008.11,-21.01 3424.42,-19.36"/>
+<polygon fill="black" stroke="black" points="3424.63,-22.86 3434.62,-19.32 3424.61,-15.86 3424.63,-22.86"/>
+<text text-anchor="middle" x="1565.95" y="-57.8" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 107</text>
+</g>
+<!-- 4&#45;&gt;3 -->
+<g id="edge3" class="edge">
+<title>4&#45;&gt;3</title>
+<path fill="none" stroke="black" d="M1483.22,-188.91C1388.24,-185.23 1223.42,-176.03 1204.95,-156 1199.41,-149.99 1197.81,-141.63 1198,-133.46"/>
+<polygon fill="black" stroke="black" points="1201.5,-133.72 1199.05,-123.42 1194.53,-133 1201.5,-133.72"/>
+<text text-anchor="middle" x="1515.45" y="-144.8" font-family="Times,serif" font-size="14.00">call void @_ZN1AD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) | ID: 84</text>
+</g>
+<!-- 4&#45;&gt;11 -->
+<g id="edge16" class="edge">
+<title>4&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M1616.75,-189.04C1687.13,-185.85 1792.35,-177.53 1825.95,-156 1856.38,-136.51 1837.86,-105.41 1868.95,-87 1936.09,-47.26 3079.71,-26.01 3425.02,-20.48"/>
+<polygon fill="black" stroke="black" points="3425.3,-23.97 3435.24,-20.31 3425.19,-16.97 3425.3,-23.97"/>
+<text text-anchor="middle" x="2124.45" y="-101.3" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 82</text>
+</g>
+<!-- 5&#45;&gt;9 -->
+<g id="edge12" class="edge">
+<title>5&#45;&gt;9</title>
+<path fill="none" stroke="black" d="M3059.24,-175.98C3049.53,-170.51 3039.24,-163.73 3030.95,-156 3023.51,-149.06 3016.83,-140.2 3011.4,-131.88"/>
+<polygon fill="black" stroke="black" points="3014.26,-129.84 3006.03,-123.17 3008.3,-133.52 3014.26,-129.84"/>
+<text text-anchor="middle" x="3340.95" y="-144.8" font-family="Times,serif" font-size="14.00">call void @_ZN1AC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) | ID: 71</text>
+</g>
+<!-- 5&#45;&gt;11 -->
+<g id="edge10" class="edge">
+<title>5&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M3157.23,-189.26C3301.86,-185.13 3634.28,-173.75 3650.95,-156 3655.52,-151.14 3655.28,-146.07 3650.95,-141 3617.63,-102 3572.81,-159.68 3536.95,-123 3517.41,-103 3516.27,-69.6 3518.49,-46.05"/>
+<polygon fill="black" stroke="black" points="3521.98,-46.36 3519.69,-36.01 3515.03,-45.52 3521.98,-46.36"/>
+<text text-anchor="middle" x="3792.45" y="-101.3" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 69</text>
+</g>
+<!-- 6 -->
+<g id="node7" class="node">
+<title>6</title>
+<ellipse fill="none" stroke="black" cx="3946.95" cy="-294" rx="165.17" ry="18"/>
+<text text-anchor="middle" x="3946.95" y="-290.3" font-family="Times,serif" font-size="14.00">__psrCRuntimeGlobalDtorsModel</text>
+</g>
+<!-- 8 -->
+<g id="node9" class="node">
+<title>8</title>
+<ellipse fill="none" stroke="black" cx="4728.95" cy="-105" rx="31.4" ry="18"/>
+<text text-anchor="middle" x="4728.95" y="-101.3" font-family="Times,serif" font-size="14.00">puts</text>
+</g>
+<!-- 7&#45;&gt;8 -->
+<g id="edge14" class="edge">
+<title>7&#45;&gt;8</title>
+<path fill="none" stroke="black" d="M4248.32,-175C4269.13,-163.26 4299.34,-148.17 4327.95,-141 4481.62,-102.48 4528.87,-155.38 4683.95,-123 4687.69,-122.22 4691.52,-121.18 4695.3,-119.99"/>
+<polygon fill="black" stroke="black" points="4696.78,-123.18 4705.08,-116.59 4694.48,-116.57 4696.78,-123.18"/>
+<text text-anchor="middle" x="4506.45" y="-144.8" font-family="Times,serif" font-size="14.00">%call = call i32 @puts(ptr noundef @.str) | ID: 65</text>
+</g>
+<!-- 7&#45;&gt;11 -->
+<g id="edge24" class="edge">
+<title>7&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M4210.28,-174.09C4188.17,-143.65 4136.88,-80.37 4075.95,-54 4035.38,-36.44 3767.9,-26.05 3620.33,-21.59"/>
+<polygon fill="black" stroke="black" points="3620.02,-18.08 3609.92,-21.28 3619.81,-25.08 3620.02,-18.08"/>
+<text text-anchor="middle" x="4421.45" y="-101.3" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 63</text>
+</g>
+<!-- 9&#45;&gt;11 -->
+<g id="edge7" class="edge">
+<title>9&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M2992.03,-86.97C2990.03,-76.12 2989.8,-62.54 2997.95,-54 3026.67,-23.91 3280.26,-18.92 3424.21,-18.55"/>
+<polygon fill="black" stroke="black" points="3424.39,-22.05 3434.38,-18.53 3424.38,-15.05 3424.39,-22.05"/>
+<text text-anchor="middle" x="3253.45" y="-57.8" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 94</text>
+</g>
+<!-- 10 -->
+<g id="node11" class="node">
+<title>10</title>
+<ellipse fill="none" stroke="black" cx="3821.95" cy="-381" rx="165.17" ry="18"/>
+<text text-anchor="middle" x="3821.95" y="-377.3" font-family="Times,serif" font-size="14.00">__psrCRuntimeGlobalCtorsModel</text>
+</g>
+<!-- 10&#45;&gt;1 -->
+<g id="edge1" class="edge">
+<title>10&#45;&gt;1</title>
+<path fill="none" stroke="black" d="M3725.84,-366.31C3715.44,-361.15 3706.07,-354.23 3698.95,-345 3694.01,-338.59 3692.54,-330.23 3692.66,-322.18"/>
+<polygon fill="black" stroke="black" points="3696.17,-322.24 3693.58,-311.97 3689.2,-321.61 3696.17,-322.24"/>
+<text text-anchor="middle" x="3811.95" y="-333.8" font-family="Times,serif" font-size="14.00">%2 = call i32 @main() | ID: 124</text>
+</g>
+<!-- 10&#45;&gt;6 -->
+<g id="edge4" class="edge">
+<title>10&#45;&gt;6</title>
+<path fill="none" stroke="black" d="M3892.76,-364.7C3904.47,-359.83 3915.77,-353.42 3924.95,-345 3931.69,-338.83 3936.47,-330.22 3939.81,-321.89"/>
+<polygon fill="black" stroke="black" points="3943.14,-322.99 3943.11,-312.39 3936.52,-320.69 3943.14,-322.99"/>
+<text text-anchor="middle" x="4131.45" y="-333.8" font-family="Times,serif" font-size="14.00">call void @__psrCRuntimeGlobalDtorsModel() | ID: 125</text>
+</g>
+<!-- 12&#45;&gt;8 -->
+<g id="edge19" class="edge">
+<title>12&#45;&gt;8</title>
+<path fill="none" stroke="black" d="M4877.84,-191.41C4809.97,-190.02 4716.58,-183.03 4692.95,-156 4684.63,-146.47 4691.68,-135.07 4701.68,-125.57"/>
+<polygon fill="black" stroke="black" points="4703.99,-128.2 4709.3,-119.04 4699.43,-122.89 4703.99,-128.2"/>
+<text text-anchor="middle" x="4877.45" y="-144.8" font-family="Times,serif" font-size="14.00">%call = call i32 @puts(ptr noundef @.str.1) | ID: 78</text>
+</g>
+<!-- 12&#45;&gt;11 -->
+<g id="edge6" class="edge">
+<title>12&#45;&gt;11</title>
+<path fill="none" stroke="black" d="M5015.34,-182.48C5048.96,-175.29 5079.94,-162.6 5061.95,-141 4969.79,-30.3 3947.12,-19.49 3621.74,-18.87"/>
+<polygon fill="black" stroke="black" points="3621.4,-15.37 3611.39,-18.85 3621.39,-22.37 3621.4,-15.37"/>
+<text text-anchor="middle" x="5286.45" y="-101.3" font-family="Times,serif" font-size="14.00">call void @llvm.dbg.declare(metadata ptr %this.addr, metadata | ID: 76</text>
+</g>
+</g>
+</svg>
diff --git a/examples/how-to/03-create-alias-info/CMakeLists.txt b/examples/how-to/03-create-alias-info/CMakeLists.txt
new file mode 100644
index 0000000000..d47aa2d3a2
--- /dev/null
+++ b/examples/how-to/03-create-alias-info/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(create-alias-info)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(create-alias-info main.cpp)
+target_link_libraries(create-alias-info PRIVATE phasar::phasar)
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_create_alias_info
+    DEPENDS create-alias-info
+    COMMAND $<TARGET_FILE:create-alias-info> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/pointers.ll"
+  )
+
+  add_dependencies(run_sample_programs run_create_alias_info)
+endif()
diff --git a/examples/how-to/03-create-alias-info/README.md b/examples/how-to/03-create-alias-info/README.md
new file mode 100644
index 0000000000..e9ef4509fe
--- /dev/null
+++ b/examples/how-to/03-create-alias-info/README.md
@@ -0,0 +1,24 @@
+# Create Alias Information
+
+Shows, how you can use PhASAR to generate alias information from a LLVM IR module.
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 03-create-alias-info root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 03-create-alias-info/build folder:
+./create-alias-info ../../../llvm-hello-world/target/pointers.ll
+```
diff --git a/examples/how-to/03-create-alias-info/main.cpp b/examples/how-to/03-create-alias-info/main.cpp
new file mode 100644
index 0000000000..b45e969418
--- /dev/null
+++ b/examples/how-to/03-create-alias-info/main.cpp
@@ -0,0 +1,84 @@
+#include "phasar/PhasarLLVM/DB.h"
+#include "phasar/PhasarLLVM/Pointer.h"
+#include "phasar/PhasarLLVM/Utils.h"
+
+#include "llvm/IR/InstIterator.h"
+
+#include <cassert>
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: create-alias-info <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // The easiest way of getting alias information is using the LLVMAliasSet:
+  psr::LLVMAliasSet AS(&IRDB, /*UseLazyEvaluation=*/false);
+
+  // PhASAR APIs usually do not care, which alias-info implementation you use.
+  // They take a type-erased reference to any alias-info object.
+  // You can implicitly convert a pointer to any compatible alias-info object to
+  // an LLVMAliasInfoRef.
+  // Since the LLVMAliasInfoRef is a non-owning reference, you must make sure
+  // that the actual LLVMAliasSet object outlives any use of the references to
+  // it.
+  psr::LLVMAliasInfoRef ASRef = &AS;
+
+  // You can print and load alias information from/to JSON:
+  AS.printAsJson();
+
+  const auto *MainF = IRDB.getFunctionDefinition("main");
+  if (!MainF) {
+    llvm::errs() << "Required function 'main' not found\n";
+    return 1;
+  }
+
+  // Manually printing the alias sets:
+
+  for (const auto &Inst : llvm::instructions(MainF)) {
+    if (!Inst.getType()->isPointerTy()) {
+      // For aliasing, we only care about pointers...
+      continue;
+    }
+
+    // Retrieve the aliases of the result of the instruction Inst (first
+    // parameter) at the program location determined by Inst (second parameter).
+    //
+    // Implementations may ignore the second parameter.
+    auto AliasesOfInstAtInst = AS.getAliasSet(&Inst, &Inst);
+
+    llvm::outs() << "For pointer " << psr::llvmIRToString(&Inst) << ":\n";
+    for (const auto *Alias : *AliasesOfInstAtInst) {
+      llvm::outs() << ">  aliasing " << psr::llvmIRToShortString(Alias) << '\n';
+
+      // You can also check, whether two pointers are (potentially) aliasing:
+      assert(AS.alias(&Inst, Alias, &Inst));
+    }
+
+    // Retrieve a filtered alias set only containing allocation-sites for the
+    // aliases of the result of the instruction Inst (first parameter), further
+    // filtered to not contain allocation-sites from other functions (second
+    // parameter), at the program location determined by Inst (third
+    // parameter).
+    //
+    // Implementations may ignore the third parameter.
+    auto ReachableAllocSites =
+        AS.getReachableAllocationSites(&Inst, /*IntraProcOnly=*/true, &Inst);
+    for (const auto *AllocSite : *ReachableAllocSites) {
+      llvm::outs() << ">  reachable alloc-site "
+                   << psr::llvmIRToShortString(AllocSite) << '\n';
+
+      // You can also check, whether a pointer is in the reachable
+      // allocation-sites of another pointer:
+      assert(AS.isInReachableAllocationSites(&Inst, AllocSite,
+                                             /*IntraProcOnly=*/true, &Inst));
+    }
+    llvm::outs() << '\n';
+  }
+}
diff --git a/examples/how-to/04-run-ifds-analysis/CMakeLists.txt b/examples/how-to/04-run-ifds-analysis/CMakeLists.txt
new file mode 100644
index 0000000000..6b8c99365b
--- /dev/null
+++ b/examples/how-to/04-run-ifds-analysis/CMakeLists.txt
@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(run-ifds-analysis)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(run-ifds-analysis-simple simple.cpp)
+target_link_libraries(run-ifds-analysis-simple PRIVATE phasar::phasar)
+
+add_executable(run-ifds-analysis-helper-analyses helper-analyses.cpp)
+target_link_libraries(run-ifds-analysis-helper-analyses PRIVATE phasar::phasar)
+
+add_executable(run-ifds-analysis-otf-reporter otf-reporter.cpp)
+target_link_libraries(run-ifds-analysis-otf-reporter PRIVATE phasar::phasar)
+
+add_executable(run-ifds-analysis-ifds-solver ifds-solver.cpp)
+target_link_libraries(run-ifds-analysis-ifds-solver PRIVATE phasar::phasar)
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_run_ifds_analysis
+    DEPENDS run-ifds-analysis-simple run-ifds-analysis-helper-analyses run-ifds-analysis-otf-reporter run-ifds-analysis-ifds-solver
+    COMMAND $<TARGET_FILE:run-ifds-analysis-simple> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/taint.ll"
+    COMMAND $<TARGET_FILE:run-ifds-analysis-helper-analyses> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/taint.ll"
+    COMMAND $<TARGET_FILE:run-ifds-analysis-otf-reporter> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/taint.ll"
+    COMMAND $<TARGET_FILE:run-ifds-analysis-ifds-solver> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/taint.ll"
+  )
+
+  add_dependencies(run_sample_programs run_run_ifds_analysis)
+endif()
diff --git a/examples/how-to/04-run-ifds-analysis/README.md b/examples/how-to/04-run-ifds-analysis/README.md
new file mode 100644
index 0000000000..d2a6cffa2b
--- /dev/null
+++ b/examples/how-to/04-run-ifds-analysis/README.md
@@ -0,0 +1,34 @@
+# Run an IFDS Analysis
+
+Shows several ways, how you can use PhASAR to run an already existing IFDS analysis on a LLVM IR module.
+For this example, we selected the `IFDSTaintAnalysis`.
+
+You may look at the different C++ source files to see, how you can run an IFDS taint analysis using PhASAR.
+We suggest to start with the simplest examples [simple.cpp](./simple.cpp) and [helper-analyses.cpp](./helper-analyses.cpp).
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 04-run-ifds-analysis root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 04-run-ifds-analysis/build folder:
+./run-ifds-analysis-simple ../../../llvm-hello-world/target/taint.ll
+
+./run-ifds-analysis-helper-analyses ../../../llvm-hello-world/target/taint.ll
+
+./run-ifds-analysis-otf-reporter ../../../llvm-hello-world/target/taint.ll
+
+./run-ifds-analysis-ifds-solver ../../../llvm-hello-world/target/taint.ll
+```
diff --git a/examples/how-to/04-run-ifds-analysis/helper-analyses.cpp b/examples/how-to/04-run-ifds-analysis/helper-analyses.cpp
new file mode 100644
index 0000000000..1469349163
--- /dev/null
+++ b/examples/how-to/04-run-ifds-analysis/helper-analyses.cpp
@@ -0,0 +1,52 @@
+#include "phasar/DataFlow.h"               // For solveIFDSProblem()
+#include "phasar/PhasarLLVM.h"             // For the HelperAnalyses
+#include "phasar/PhasarLLVM/DataFlow.h"    // For the IFDSTaintAnalysis
+#include "phasar/PhasarLLVM/TaintConfig.h" // For the LLVMTaintConfig
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  using namespace std::string_literals;
+  std::vector EntryPoints = {"main"s};
+
+  // Instead of creating all the helper analyses ourselves, we can just use the
+  // HelperAnalyses class. It will create the necessary information on-demand.
+  //
+  // You can customize the underlying algorithms by passing a
+  // HelperAnalysisConfig as third parameter
+  psr::HelperAnalyses HA(Argv[1], EntryPoints);
+  if (!HA.getProjectIRDB()) {
+    return 1;
+  }
+
+  // Create the taint configuration
+  psr::LLVMTaintConfig TC(HA.getProjectIRDB());
+  TC.print();
+  llvm::outs() << "------------------------\n";
+
+  // Create the taint analysis problem:
+  // The utility function createAnalysisProblem() simplifies creating an
+  // analysis problem with a HelperAnalyses object. It automatically passes the
+  // right arguments
+  auto TaintProblem = psr::createAnalysisProblem<psr::IFDSTaintAnalysis>(
+      HA, &TC, EntryPoints, /*TaintMainArgs=*/false);
+
+  // Solving the TaintProblem. This may take some time, depending on the size of
+  // the ICFG
+  psr::solveIFDSProblem(TaintProblem, HA.getICFG());
+
+  // After we have solved the TaintProblem, we can now inspect the detected
+  // leaks:
+  for (const auto &[LeakInst, LeakFacts] : TaintProblem.Leaks) {
+    llvm::outs() << "Detected taint leak at " << psr::llvmIRToString(LeakInst)
+                 << '\n';
+    for (const auto *Fact : LeakFacts) {
+      llvm::outs() << ">  leaking fact " << psr::llvmIRToShortString(Fact)
+                   << '\n';
+    }
+    llvm::outs() << '\n';
+  }
+}
diff --git a/examples/how-to/04-run-ifds-analysis/ifds-solver.cpp b/examples/how-to/04-run-ifds-analysis/ifds-solver.cpp
new file mode 100644
index 0000000000..2ea821d332
--- /dev/null
+++ b/examples/how-to/04-run-ifds-analysis/ifds-solver.cpp
@@ -0,0 +1,73 @@
+#include "phasar/DataFlow.h"               // For the IFDSSolver
+#include "phasar/PhasarLLVM/DB.h"          // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h"    // For the IFDSTaintAnalysis
+#include "phasar/PhasarLLVM/Pointer.h"     // For the LLVMAliasSet
+#include "phasar/PhasarLLVM/TaintConfig.h" // For the LLVMTaintConfig
+
+#include <string_view>
+#include <thread>
+
+static constexpr std::string_view Spinner[] = {"⠙", "⠹", "⠸", "⠼",
+                                               "⠴", "⠦", "⠇", "⠿"};
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-ifds-solver <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // The IFDSTaintAnalysis requires alias information, so create it here
+  psr::LLVMAliasSet AS(&IRDB);
+
+  // Create the taint configuration
+  psr::LLVMTaintConfig TC(IRDB);
+  TC.print();
+  llvm::outs() << "------------------------\n";
+
+  // Create the taint analysis problem
+  psr::IFDSTaintAnalysis TaintProblem(&IRDB, &AS, &TC, {"main"},
+                                      /*TaintMainArgs=*/false);
+
+  // Create the ICFG
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"},
+                          nullptr, &AS);
+
+  // To solve the taint problem, we now create an instance of the IFDSSolver.
+  // The function psr::solveIFDSProblem() uses this solver internally as well.
+  // Having the solver explicitly, allows more control over the solving process:
+  psr::IFDSSolver Solver(&TaintProblem, &ICFG);
+
+  // The simple solution. You don't really need an explicit solver for this:
+  // Solver.solve();
+
+  // Have more control over the solving process:
+  if (Solver.initialize()) {
+    int i = 0;
+
+    // Perform the next 10 analysis steps, while we still have some
+    while (Solver.nextN(10)) {
+      // Perform some intermediate task *during* the solving process.
+      // We could also interrupt the solver at any time and continue later.
+      llvm::outs() << "\b\b" << Spinner[i] << ' ';
+      i = (i + 1) % std::size(Spinner);
+
+      // Wait a bit, such that we have time to see the beautiful animation for
+      // our tiny example target programs:
+      using namespace std::chrono_literals;
+      std::this_thread::sleep_for(100ms);
+    }
+
+    Solver.finalize();
+    llvm::outs() << "\nSolving finished\n";
+  }
+
+  // Here, we could loop over TaintProblem.Leaks. Instead, we will now use
+  // the Solver to dump the whole raw IFDS results:
+  Solver.dumpResults();
+}
diff --git a/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp b/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp
new file mode 100644
index 0000000000..e2e0dda622
--- /dev/null
+++ b/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp
@@ -0,0 +1,65 @@
+#include "phasar/DataFlow.h" // For solveIFDSProblem()
+#include "phasar/Domain/BinaryDomain.h"
+#include "phasar/PhasarLLVM/DB.h"          // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h"    // For the IFDSTaintAnalysis
+#include "phasar/PhasarLLVM/Pointer.h"     // For the LLVMAliasSet
+#include "phasar/PhasarLLVM/TaintConfig.h" // For the LLVMTaintConfig
+
+namespace {
+/// A listener that gets notified, whenever the taint analysis detects a leak
+class LeakReporter
+    : public psr::AnalysisPrinterBase<psr::LLVMIFDSAnalysisDomainDefault> {
+
+  /// This function will be called once for each detected leak, **while the
+  /// analysis is still running**.
+  void doOnResult(const llvm::Instruction *LeakInst,
+                  const llvm::Value *LeakFact,
+                  psr::BinaryDomain /*LatticeElement*/,
+                  psr::DataFlowAnalysisType /*AnalysisType*/) override {
+    llvm::outs() << "Detected taint leak at " << psr::llvmIRToString(LeakInst)
+                 << '\n';
+    llvm::outs() << ">  leaking fact " << psr::llvmIRToShortString(LeakFact)
+                 << "\n\n";
+  }
+};
+} // namespace
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-otf-reporter <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // The IFDSTaintAnalysis requires alias information, so create it here
+  psr::LLVMAliasSet AS(&IRDB);
+
+  // Create the taint configuration
+  psr::LLVMTaintConfig TC(IRDB);
+  TC.print();
+  llvm::outs() << "------------------------\n";
+
+  // Create the taint analysis problem
+  psr::IFDSTaintAnalysis TaintProblem(&IRDB, &AS, &TC, {"main"},
+                                      /*TaintMainArgs=*/false);
+
+  // Create the ICFG
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"},
+                          nullptr, &AS);
+
+  // We want to get notified, whenever the taint analysis detects a leak:
+  LeakReporter Reporter;
+  TaintProblem.setAnalysisPrinter(&Reporter);
+
+  // Solving the TaintProblem. This may take some time, depending on the size of
+  // the ICFG
+  psr::solveIFDSProblem(TaintProblem, ICFG);
+
+  // Don't need to loop over the leaks anymore. We have already intercepted all
+  // incoming leaks with our Reporter
+}
diff --git a/examples/how-to/04-run-ifds-analysis/simple.cpp b/examples/how-to/04-run-ifds-analysis/simple.cpp
new file mode 100644
index 0000000000..f550dd171e
--- /dev/null
+++ b/examples/how-to/04-run-ifds-analysis/simple.cpp
@@ -0,0 +1,71 @@
+#include "phasar/DataFlow.h"               // For solveIFDSProblem()
+#include "phasar/PhasarLLVM/DB.h"          // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h"    // For the IFDSTaintAnalysis
+#include "phasar/PhasarLLVM/Pointer.h"     // For the LLVMAliasSet
+#include "phasar/PhasarLLVM/TaintConfig.h" // For the LLVMTaintConfig
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // The IFDSTaintAnalysis requires alias information, so create it here
+  psr::LLVMAliasSet AS(&IRDB);
+
+  // To tell the IFDSTaintAnalysis, which functions are actually sources, sinks
+  // and sanitizers, we use the LLVMTaintConfig class.
+  //
+  // There are several ways of getting a taint configuration into this class:
+  // - Loading a JSON file
+  // - Specifying call-backs
+  // - Annotating the target code
+  //
+  // For simplicity, we selected the annotated target code here (checkout the
+  // taint.cpp target program in llvm-hello-world/target)
+  psr::LLVMTaintConfig TC(IRDB);
+  TC.print();
+  llvm::outs() << "------------------------\n";
+
+  // Here, we instantiate the taint analysis problem.
+  // We need to pass all information that the taint analysis requires: The IRDB,
+  // alias info, taint config, and the functions where the analysis should
+  // start. The IFDS solver will walk the inter-procedural control-flow graph
+  // (ICFG) to analyze all statements and functions that are reachable from the
+  // entrypoints.
+  psr::IFDSTaintAnalysis TaintProblem(&IRDB, &AS, &TC, {"main"},
+                                      /*TaintMainArgs=*/false);
+
+  // To solve the TaintProblem, we need an ICFG.
+  // Checkout the example 02-build-call-graph for details.
+  // Here, we select the OTF call-graph algorithm, which uses alias information
+  // for indirect call resolution.
+  //
+  // Since we already have computed alias information, it would be wasteful to
+  // let the LLVMBasedICFG compute the alias info again, so we pass the AS here.
+  // The OTF analysis does not require a type-hierarchy.
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"},
+                          nullptr, &AS);
+
+  // Solving the TaintProblem. This may take some time, depending on the size of
+  // the ICFG
+  psr::solveIFDSProblem(TaintProblem, ICFG);
+
+  // After we have solved the TaintProblem, we can now inspect the detected
+  // leaks:
+  for (const auto &[LeakInst, LeakFacts] : TaintProblem.Leaks) {
+    llvm::outs() << "Detected taint leak at " << psr::llvmIRToString(LeakInst)
+                 << '\n';
+    for (const auto *Fact : LeakFacts) {
+      llvm::outs() << ">  leaking fact " << psr::llvmIRToShortString(Fact)
+                   << '\n';
+    }
+    llvm::outs() << '\n';
+  }
+}
diff --git a/examples/how-to/05-run-ide-analysis/CMakeLists.txt b/examples/how-to/05-run-ide-analysis/CMakeLists.txt
new file mode 100644
index 0000000000..cc71bd81a8
--- /dev/null
+++ b/examples/how-to/05-run-ide-analysis/CMakeLists.txt
@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(run-ide-analysis)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(run-ide-analysis-simple simple.cpp)
+target_link_libraries(run-ide-analysis-simple PRIVATE phasar::phasar)
+
+add_executable(run-ide-analysis-helper-analyses helper-analyses.cpp)
+target_link_libraries(run-ide-analysis-helper-analyses PRIVATE phasar::phasar)
+
+add_executable(run-ide-analysis-ide-solver ide-solver.cpp)
+target_link_libraries(run-ide-analysis-ide-solver PRIVATE phasar::phasar)
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_run_ide_analysis
+    DEPENDS run-ide-analysis-simple run-ide-analysis-helper-analyses run-ide-analysis-ide-solver
+    COMMAND $<TARGET_FILE:run-ide-analysis-simple> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/call2.ll"
+    COMMAND $<TARGET_FILE:run-ide-analysis-helper-analyses> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/call2.ll"
+    COMMAND $<TARGET_FILE:run-ide-analysis-ide-solver> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/call2.ll"
+  )
+
+  add_dependencies(run_sample_programs run_run_ide_analysis)
+endif()
diff --git a/examples/how-to/05-run-ide-analysis/README.md b/examples/how-to/05-run-ide-analysis/README.md
new file mode 100644
index 0000000000..c46f5c5bce
--- /dev/null
+++ b/examples/how-to/05-run-ide-analysis/README.md
@@ -0,0 +1,32 @@
+# Run an IDE Analysis
+
+Shows several ways, how you can use PhASAR to run an already existing IDE analysis on a LLVM IR module.
+For this example, we selected the `IDELinearConstantAnalysis`.
+
+You may look at the different C++ source files to see, how you can run an IDE linear constant analysis using PhASAR.
+We suggest to start with the simplest examples [simple.cpp](./simple.cpp) and [helper-analyses.cpp](./helper-analyses.cpp).
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 05-run-ide-analysis root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 05-run-ide-analysis/build folder:
+./run-ide-analysis-simple ../../../llvm-hello-world/target/call2.ll
+
+./run-ide-analysis-helper-analyses ../../../llvm-hello-world/target/call2.ll
+
+./run-ide-analysis-ide-solver ../../../llvm-hello-world/target/call2.ll
+```
diff --git a/examples/how-to/05-run-ide-analysis/helper-analyses.cpp b/examples/how-to/05-run-ide-analysis/helper-analyses.cpp
new file mode 100644
index 0000000000..d2e1229948
--- /dev/null
+++ b/examples/how-to/05-run-ide-analysis/helper-analyses.cpp
@@ -0,0 +1,65 @@
+#include "phasar/DataFlow.h"            // For solveIFDSProblem()
+#include "phasar/PhasarLLVM.h"          // For the HelperAnalyses
+#include "phasar/PhasarLLVM/DB.h"       // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h" // For the IDELinearConstantAnalysis
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Similar to IFDS, you can also use the HelperAnalyses class to reduce some
+  // boilerplate code:
+
+  using namespace std::string_literals;
+  std::vector EntryPoints = {"main"s};
+  // Instead of creating all the helper analyses ourselves, we can just use the
+  // HelperAnalyses class. It will create the necessary information on-demand.
+  //
+  // You can customize the underlying algorithms by passing a
+  // HelperAnalysisConfig as third parameter
+  psr::HelperAnalyses HA(Argv[1], EntryPoints);
+  if (!HA.getProjectIRDB()) {
+    return 1;
+  }
+
+  // Here, we instantiate the linear constant analysis problem.
+  // In contrast to the example in simple.cpp, we only need to pass the
+  // HelperAnalyses and the entry points (this may vary, depending on the
+  // analysis problem to solve)
+  auto LCAProblem = psr::createAnalysisProblem<psr::IDELinearConstantAnalysis>(
+      HA, EntryPoints);
+
+  // Solving the LCAProblem. This may take some time, depending on the size of
+  // the ICFG
+  auto Results = psr::solveIDEProblem(LCAProblem, HA.getICFG());
+
+  // After we have solved the LCAProblem, we can now inspect the detected
+  // constants:
+
+  const auto *MainF = HA.getProjectIRDB().getFunctionDefinition("main");
+  if (!MainF) {
+    llvm::errs() << "Required function 'main' not found\n";
+    return 1;
+  }
+
+  const auto *ExitOfMain = psr::getAllExitPoints(MainF).front();
+
+  // Get the analysis results right **after** main's return statement
+  const auto &AllConstantsAtMainExit = Results.resultsAt(ExitOfMain);
+
+  llvm::outs() << "Detected constants at " << psr::llvmIRToString(ExitOfMain)
+               << ":\n";
+  for (const auto &[LLVMVar, ConstVal] : AllConstantsAtMainExit) {
+    llvm::outs() << "  " << psr::llvmIRToString(LLVMVar) << "\n  --> ";
+    if (ConstVal.isBottom()) {
+      // A "bottom" value here means that the analysis does not know the value
+      // at this point and that any value may be possible.
+
+      llvm::outs() << "<not constant>\n\n";
+    } else {
+      llvm::outs() << ConstVal << "\n\n";
+    }
+  }
+}
diff --git a/examples/how-to/05-run-ide-analysis/ide-solver.cpp b/examples/how-to/05-run-ide-analysis/ide-solver.cpp
new file mode 100644
index 0000000000..62099d4eb0
--- /dev/null
+++ b/examples/how-to/05-run-ide-analysis/ide-solver.cpp
@@ -0,0 +1,73 @@
+#include "phasar/DataFlow.h"            // For the IDESolver
+#include "phasar/PhasarLLVM/DB.h"       // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h" // For the IDELinearConstantAnalysis
+
+#include <string_view>
+#include <thread>
+
+static constexpr std::string_view Spinner[] = {"⠙", "⠹", "⠸", "⠼",
+                                               "⠴", "⠦", "⠇", "⠿"};
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // To solve the LCAProblem, we need an ICFG.
+  // Checkout the example 02-build-call-graph for details.
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"});
+
+  // Here, we instantiate the linear constant analysis problem.
+  // We need to pass all information that the analysis requires: The IRDB,
+  // the ICFG, and the functions where the analysis should start. The IDE
+  // solver will walk the ICFG to analyze all statements and functions that are
+  // reachable from the entrypoints.
+  psr::IDELinearConstantAnalysis LCAProblem(&IRDB, &ICFG, {"main"});
+
+  // To solve the linear constant analysis problem, we now create an instance of
+  // the IDESolver. The function psr::solveIDEProblem() uses this solver
+  // internally as well. Having the solver explicitly, allows more control over
+  // the solving process:
+  psr::IDESolver Solver(&LCAProblem, &ICFG);
+
+  // The simple solution. You don't really need an explicit solver for this:
+  // Solver.solve();
+
+  // Have more control over the solving process:
+  if (Solver.initialize()) {
+    int i = 0;
+
+    // Perform the next 10 analysis steps, while we still have some
+    while (Solver.nextN(10)) {
+      // Perform some intermediate task *during* the solving process.
+      // We could also interrupt the solver at any time and continue later.
+      llvm::outs() << "\b\b" << Spinner[i] << ' ';
+      i = (i + 1) % std::size(Spinner);
+
+      // Wait a bit, such that we have time to see the beautiful animation for
+      // our tiny example target programs:
+      using namespace std::chrono_literals;
+      std::this_thread::sleep_for(100ms);
+    }
+
+    // In contrast to the IFDSSolver, finalize may take some time with IDE.
+    // It will still be significantly faster than the above loop.
+    Solver.finalize();
+    llvm::outs() << "\nSolving finished\n";
+  }
+
+  // Accessing the results:
+  auto Results = Solver.getSolverResults();
+
+  // After we have solved the LCAProblem, we can now inspect the detected
+  // constants. Instead of manually looping, will now use
+  // the Solver to dump the whole raw IDE results:
+  Solver.dumpResults();
+}
diff --git a/examples/how-to/05-run-ide-analysis/simple.cpp b/examples/how-to/05-run-ide-analysis/simple.cpp
new file mode 100644
index 0000000000..98a78e658c
--- /dev/null
+++ b/examples/how-to/05-run-ide-analysis/simple.cpp
@@ -0,0 +1,59 @@
+#include "phasar/DataFlow.h"            // For solveIFDSProblem()
+#include "phasar/PhasarLLVM/DB.h"       // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h" // For the IDELinearConstantAnalysis
+
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: run-ifds-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  // To solve the LCAProblem, we need an ICFG.
+  // Checkout the example 02-build-call-graph for details.
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"});
+
+  // Here, we instantiate the linear constant analysis problem.
+  // We need to pass all information that the analysis requires: The IRDB,
+  // the ICFG, and the functions where the analysis should start. The IDE
+  // solver will walk the ICFG to analyze all statements and functions that are
+  // reachable from the entrypoints.
+  psr::IDELinearConstantAnalysis LCAProblem(&IRDB, &ICFG, {"main"});
+
+  // Solving the LCAProblem. This may take some time, depending on the size of
+  // the ICFG
+  auto Results = psr::solveIDEProblem(LCAProblem, ICFG);
+
+  // After we have solved the LCAProblem, we can now inspect the detected
+  // constants:
+
+  const auto *MainF = IRDB.getFunctionDefinition("main");
+  if (!MainF) {
+    llvm::errs() << "Required function 'main' not found\n";
+    return 1;
+  }
+
+  const auto *ExitOfMain = psr::getAllExitPoints(MainF).front();
+
+  // Get the analysis results right **after** main's return statement
+  const auto &AllConstantsAtMainExit = Results.resultsAt(ExitOfMain);
+
+  llvm::outs() << "Detected constants at " << psr::llvmIRToString(ExitOfMain)
+               << ":\n";
+  for (const auto &[LLVMVar, ConstVal] : AllConstantsAtMainExit) {
+    llvm::outs() << "  " << psr::llvmIRToString(LLVMVar) << "\n  --> ";
+    if (ConstVal.isBottom()) {
+      // A "bottom" value here means that the analysis does not know the value
+      // at this point and that any value may be possible.
+
+      llvm::outs() << "<not constant>\n\n";
+    } else {
+      llvm::outs() << ConstVal << "\n\n";
+    }
+  }
+}
diff --git a/examples/how-to/07-write-ifds-analysis/CMakeLists.txt b/examples/how-to/07-write-ifds-analysis/CMakeLists.txt
new file mode 100644
index 0000000000..fe1839e072
--- /dev/null
+++ b/examples/how-to/07-write-ifds-analysis/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(write-ifds-analysis)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(write-ifds-analysis-simple simple.cpp)
+target_link_libraries(write-ifds-analysis-simple PRIVATE phasar::phasar)
+
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_write_ifds_analysis
+    DEPENDS write-ifds-analysis-simple
+    COMMAND $<TARGET_FILE:write-ifds-analysis-simple> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/taint.ll"
+  )
+
+  add_dependencies(run_sample_programs run_write_ifds_analysis)
+endif()
diff --git a/examples/how-to/07-write-ifds-analysis/README.md b/examples/how-to/07-write-ifds-analysis/README.md
new file mode 100644
index 0000000000..f99548f5d1
--- /dev/null
+++ b/examples/how-to/07-write-ifds-analysis/README.md
@@ -0,0 +1,28 @@
+# Write an IFDS Analysis
+
+Shows, how you can use PhASAR to write an IFDS analysis to analyze LLVM IR.
+For this example, we selected the versatile *taint analysis* as problem to implement.
+
+For more information, we suggest taking a look into PhASAR's Wiki: [Writing an IFDS Analysis](https://github.com/secure-software-engineering/phasar/wiki/Writing-an-IFDS-analysis).
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 07-write-ifds-analysis root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 07-write-ifds-analysis/build folder:
+./write-ifds-analysis-simple ../../../llvm-hello-world/target/taint.ll
+
+```
diff --git a/examples/how-to/07-write-ifds-analysis/simple.cpp b/examples/how-to/07-write-ifds-analysis/simple.cpp
new file mode 100644
index 0000000000..0a87764e9d
--- /dev/null
+++ b/examples/how-to/07-write-ifds-analysis/simple.cpp
@@ -0,0 +1,146 @@
+#include "phasar/DataFlow.h"               // For solveIFDSProblem()
+#include "phasar/PhasarLLVM/ControlFlow.h" // For the LLVMBasedICFG
+#include "phasar/PhasarLLVM/DB.h"          // For the LLVMProjectIRDB
+#include "phasar/PhasarLLVM/DataFlow.h" // For DefaultAliasAwareIFDSProblem, etc.
+#include "phasar/PhasarLLVM/Pointer.h"  // For the LLVMAliasSet
+#include "phasar/PhasarLLVM/TaintConfig.h" // For the LLVMTaintConfig
+
+namespace {
+
+void populateWithMayAliases(psr::LLVMAliasInfoRef AS,
+                            std::set<const llvm::Value *> &Facts);
+
+/// To create a custom IFDS analysis, we must create a subclass of the
+/// IFDSTabulationProblem.
+/// The utility class DefaultAliasAwareIFDSProblem implements
+/// IFDSTabulationProblem and already provides some default flow-functions and
+/// handles aliasing, so that we can focus on the specifica of our analysis.
+class ExampleTaintAnalysis : public psr::DefaultAliasAwareIFDSProblem {
+public:
+  /// Constructor of the taint-analysis problem. Just forward all parameters to
+  /// the base-class and initialize the taint-config.
+  ///
+  /// The last parameter of the base-ctor denotes the special zero-value of the
+  /// IFDS problem. We use LLVMZeroValue for this.
+  explicit ExampleTaintAnalysis(const psr::LLVMProjectIRDB *IRDB,
+                                psr::LLVMAliasInfoRef AS,
+                                const psr::LLVMTaintConfig *Config,
+                                std::vector<std::string> EntryPoints)
+      : psr::DefaultAliasAwareIFDSProblem(IRDB, AS, std::move(EntryPoints),
+                                          psr::LLVMZeroValue::getInstance()),
+        Config(&psr::assertNotNull(Config)) {}
+
+  /// Provides the initial seeds, i.e., the <stmt, fact> pairs that are assumed
+  /// to hold un-conditionally at the beginning of the analysis.
+  /// This is the start state that the IFDS solver will use to start with.
+  [[nodiscard]] psr::InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
+    psr::InitialSeeds<n_t, d_t, l_t> Seeds;
+
+    psr::LLVMBasedCFG CFG;
+    // Here, we just say that for all entry-functions in the EntryPoints, the
+    // zero-value should hold at the very first statement.
+    addSeedsForStartingPoints(EntryPoints, IRDB, CFG, Seeds, getZeroValue());
+
+    return Seeds;
+  };
+
+  /// Here, we define special semantics of function-calls that are specified
+  /// outside of the target program. In the case of taint analysis, we need to
+  /// handle sources, sinks and sanitizers here:
+  [[nodiscard]] FlowFunctionPtrType
+  getSummaryFlowFunction(n_t CallSite, f_t DestFun) override {
+    const auto *CS = llvm::cast<llvm::CallBase>(CallSite);
+
+    // Process the effects of source or sink functions that are called
+    auto Gen = psr::getGeneratedFacts<container_type>(*Config, CS, DestFun);
+    auto Leak = psr::getLeakedFacts<container_type>(*Config, CS, DestFun);
+    auto Kill = psr::getSanitizedFacts<container_type>(*Config, CS, DestFun);
+
+    if (Gen.empty() && Leak.empty() && Kill.empty()) {
+      // This CallSite apparently is not calling a special source/sink/sanitizer
+      // function. Fallback to the default-behavior.
+      return DefaultAliasAwareIFDSProblem::getSummaryFlowFunction(CS, DestFun);
+    }
+
+    // Since our analysis is alias-aware, we must handle aliasing here:
+    populateWithMayAliases(getAliasInfo(), Gen);
+    populateWithMayAliases(getAliasInfo(), Leak);
+
+    // We have special behavior to communicate to the analysis solver, so create
+    // a flow-function that captures this behavior:
+    return lambdaFlow([this, CS, Gen{std::move(Gen)}, Leak{std::move(Leak)},
+                       Kill{std::move(Kill)}](d_t Source) -> container_type {
+      if (isZeroValue(Source)) {
+        // In case of a source, we generate the new taints from zero (Source).
+        return Gen;
+      }
+
+      if (Leak.count(Source)) {
+        // In case of a sink, we create a leak if one of the leaking parameters
+        // (Leak) is tainted (Source).
+        Leaks.insert(CS);
+      }
+
+      if (Kill.count(Source)) {
+        // In case of a sanitizer, we kill tainted values (Source) that flow
+        // into the sanitizied parameters (Kill).
+        return {};
+      }
+
+      // Otherwise, the taint is unaffected from the source/sink/sanitizer, so
+      // propagate it as identity
+      return {Source};
+    });
+  }
+
+  // We collect the leaking sink-calls here
+  llvm::DenseSet<n_t> Leaks{};
+
+private:
+  const psr::LLVMTaintConfig *Config{};
+};
+
+// For all given facts, we add their aliases:
+void populateWithMayAliases(psr::LLVMAliasInfoRef AS,
+                            std::set<const llvm::Value *> &Facts) {
+  auto Tmp = Facts;
+  for (const auto *Fact : Facts) {
+    auto Aliases = AS.getAliasSet(Fact);
+    Tmp.insert(Aliases->begin(), Aliases->end());
+  }
+
+  Facts = std::move(Tmp);
+}
+
+} // namespace
+
+// Invoke the analysis the same way as explained in 04-run-ifds-analysis:
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: write-ifds-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  // Load the IR
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  psr::LLVMAliasSet AS(&IRDB);
+  psr::LLVMTaintConfig TC(IRDB);
+  TC.print();
+  llvm::outs() << "------------------------\n";
+
+  ExampleTaintAnalysis TaintProblem(&IRDB, &AS, &TC, {"main"});
+
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"},
+                          nullptr, &AS);
+
+  psr::solveIFDSProblem(TaintProblem, ICFG);
+
+  for (const auto *LeakInst : TaintProblem.Leaks) {
+    llvm::outs() << "Detected taint leak at " << psr::llvmIRToString(LeakInst)
+                 << '\n';
+  }
+}
diff --git a/examples/how-to/08-write-ide-analysis/CMakeLists.txt b/examples/how-to/08-write-ide-analysis/CMakeLists.txt
new file mode 100644
index 0000000000..25d4088d49
--- /dev/null
+++ b/examples/how-to/08-write-ide-analysis/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(write-ide-analysis)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(phasar REQUIRED CONFIG)
+
+add_executable(write-ide-analysis-simple simple.cpp)
+target_link_libraries(write-ide-analysis-simple PRIVATE phasar::phasar)
+
+
+if (TARGET run_sample_programs)
+  add_custom_target(run_write_ide_analysis
+    DEPENDS write-ide-analysis-simple
+    COMMAND $<TARGET_FILE:write-ide-analysis-simple> "${CMAKE_CURRENT_LIST_DIR}/../../llvm-hello-world/target/taint.ll"
+  )
+
+  add_dependencies(run_sample_programs run_write_ide_analysis)
+endif()
diff --git a/examples/how-to/08-write-ide-analysis/README.md b/examples/how-to/08-write-ide-analysis/README.md
new file mode 100644
index 0000000000..bf67bf15e6
--- /dev/null
+++ b/examples/how-to/08-write-ide-analysis/README.md
@@ -0,0 +1,29 @@
+# Write an IDE Analysis
+
+Shows, how you can use PhASAR to write an IDE analysis to analyze LLVM IR.
+For this example, we selected the linear constant analysis as problem to implement.
+
+The code example exactly matches the example from our Wiki: [Writing an IDE Analysis](https://github.com/secure-software-engineering/phasar/wiki/Writing-an-IDE-analysis).
+So, we highly recommend taking a look there first.
+
+## Build
+
+This example program can be built using cmake.
+It assumes, that you have installed PhASAR on your system. If you did not install PhASAR to a default location, you can specify `-Dphasar_ROOT=your/path/to/phasar` when invoking `cmake`, replacing "your/path/to/phasar" by the actual path where you have installed PhASAR.
+
+```bash
+# Invoked from the 08-write-ide-analysis root folder:
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+## Test
+
+You can test the example program on the target programs from [llvm-hello-world/target](../../llvm-hello-world/target/).
+
+```bash
+# Invoked from the 08-write-ide-analysis/build folder:
+./write-ide-analysis-simple ../../../llvm-hello-world/target/call2.ll
+
+```
diff --git a/examples/how-to/08-write-ide-analysis/simple.cpp b/examples/how-to/08-write-ide-analysis/simple.cpp
new file mode 100644
index 0000000000..45443ced08
--- /dev/null
+++ b/examples/how-to/08-write-ide-analysis/simple.cpp
@@ -0,0 +1,484 @@
+#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
+#include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/Domain/LatticeDomain.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
+#include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/IR/Argument.h"
+#include "llvm/IR/Constants.h"
+#include "llvm/IR/InstrTypes.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/raw_ostream.h"
+
+namespace {
+
+/// The domain for our analysis. We specialize the edge-value type l_t, i.e.,
+/// the type of constant values that are assigned to constant integer
+/// variables.
+struct ExampleIDELinearConstantAnalysisDomain : psr::LLVMAnalysisDomainDefault {
+  // We want to propagate constant integers. To make this domain a lattice, we
+  // wrap it into psr::LatticeDomain, adding special values for TOP and BOTTOM.
+  using l_t = psr::LatticeDomain<int64_t>;
+};
+
+/// To create a custom IDE analysis, we must create a subclass of the
+/// IDETabulationProblem.
+/// The utility class DefaultNoAliasIDEProblem implements
+/// IDETabulationProblem and already provides some default flow-functions, so
+/// that we can focus on the specifica of our analysis.
+///
+/// \note For simplicity, we don't handle aliasing in this example; however, you
+/// can use DefaultAliasAwareIDEProblem to handle aliasing in most cases.
+class ExampleLinearConstantAnalysis
+    : public psr::DefaultNoAliasIDEProblem<
+          ExampleIDELinearConstantAnalysisDomain> {
+public:
+  /// Constructor of the constant-analysis problem. Just forward all parameters
+  /// to the base-class.
+  ///
+  /// The last parameter of the base-ctor denotes the special zero-value, aka.
+  /// Λ, of the IDE problem. We use LLVMZeroValue for this.
+  explicit ExampleLinearConstantAnalysis(const psr::LLVMProjectIRDB *IRDB,
+                                         std::vector<std::string> EntryPoints)
+      : DefaultNoAliasIDEProblem(IRDB, std::move(EntryPoints),
+                                 psr::LLVMZeroValue::getInstance()) {}
+
+  /// Provides the initial seeds, i.e., the <stmt, fact> pairs that are assumed
+  /// to hold un-conditionally at the beginning of the analysis.
+  /// Similar to IFDS, this is the start state that the IDE solver will use to
+  /// start with.
+  [[nodiscard]] psr::InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
+    psr::InitialSeeds<n_t, d_t, l_t> Seeds;
+
+    psr::LLVMBasedCFG CFG;
+    // Here, we just say that for all entry-functions in the EntryPoints, the
+    // zero-value should hold at the very first statement.
+    addSeedsForStartingPoints(EntryPoints, IRDB, CFG, Seeds, getZeroValue(),
+                              bottomElement());
+
+    return Seeds;
+  };
+
+  FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override {
+    if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(Curr)) {
+      // Freshly allocated variables hold no constant value
+
+      auto *AT = Alloca->getAllocatedType();
+      if (AT->isIntegerTy() || psr::isIntegerLikeType(AT)) {
+        return generateFromZero(Alloca);
+      }
+    }
+
+    if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
+      // Storing a constant integer.
+      if (llvm::isa<llvm::ConstantInt>(Store->getValueOperand())) {
+        return psr::strongUpdateStore(Store,
+                                      psr::LLVMZeroValue::isLLVMZeroValue);
+      }
+    }
+
+    // Leave everything else defaulted
+    return this->DefaultNoAliasIDEProblem::getNormalFlowFunction(Curr, Succ);
+  }
+
+  FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFun) override {
+    // We definitely want to re-use as much as possible from the default
+    // call-flow-function
+    auto DefaultFn =
+        this->DefaultNoAliasIDEProblem::getCallFlowFunction(CallSite, DestFun);
+
+    // If a constant int is passed as parameter, we need to generate the
+    // parameter inside the callee from zero
+
+    const auto *Call = llvm::cast<llvm::CallBase>(CallSite);
+    container_type Gen;
+    for (const auto &[Arg, Param] : llvm::zip(Call->args(), DestFun->args())) {
+      if (llvm::isa<llvm::ConstantInt>(Arg)) {
+        Gen.insert(&Param);
+      }
+    }
+
+    if (Gen.empty()) {
+      // Nothing special, we can directly use the default call-FF
+      return DefaultFn;
+    }
+
+    // Here, we combine both flow-functions:
+
+    auto GenFn =
+        generateManyFlowsAndKillAllOthers(std::move(Gen), getZeroValue());
+    return unionFlows(std::move(DefaultFn), std::move(GenFn));
+  }
+
+  FlowFunctionPtrType getRetFlowFunction(n_t CallSite, f_t CalleeFun,
+                                         n_t ExitInst, n_t RetSite) override {
+
+    auto DefaultFn = this->DefaultNoAliasIDEProblem::getRetFlowFunction(
+        CallSite, CalleeFun, ExitInst, RetSite);
+
+    const auto *RetInst = llvm::dyn_cast<llvm::ReturnInst>(ExitInst);
+    if (RetInst &&
+        llvm::isa_and_present<llvm::ConstantInt>(RetInst->getReturnValue())) {
+      // If we return a literal constant int, we must generate the corresponding
+      // value at the call-site from zero, i.e., the CallSite itself in case of
+      // LLVM's SSA form
+
+      auto RetFn = generateFlowAndKillAllOthers(CallSite, getZeroValue());
+      return unionFlows(std::move(DefaultFn), std::move(RetFn));
+    }
+
+    return DefaultFn;
+  }
+
+  // Fallback edge-function that models two composed edge-functions. We try to
+  // use this as little as possible for performance reasons.
+  struct LCAEdgeFunctionComposer : psr::EdgeFunctionComposer<l_t> {
+    static psr::EdgeFunction<l_t>
+    join(psr::EdgeFunctionRef<LCAEdgeFunctionComposer> This,
+         const psr::EdgeFunction<l_t> &OtherFunction) {
+      // Just use the default join.
+
+      if (auto Default = defaultJoinOrNull(This, OtherFunction)) {
+        return Default;
+      }
+      return psr::AllBottom<l_t>{};
+    }
+  };
+
+  // The custom edge-function for binary operations
+  struct BinOp {
+    using l_t = ExampleIDELinearConstantAnalysisDomain::l_t;
+
+    unsigned OpCode{};
+    const llvm::ConstantInt *LeftConst{};
+    const llvm::ConstantInt *RightConst{};
+
+    // Utility function to make implementing computeTarget() easier
+    [[nodiscard]] l_t executeBinOperation(l_t LVal, l_t RVal) const {
+      auto *LopPtr = LVal.getValueOrNull();
+      auto *RopPtr = RVal.getValueOrNull();
+
+      if (!LopPtr || !RopPtr) {
+        return psr::Bottom{};
+      }
+
+      auto Lop = *LopPtr;
+      auto Rop = *RopPtr;
+
+      // default initialize with BOTTOM (all information)
+      int64_t Res;
+      switch (OpCode) {
+      case llvm::Instruction::Add:
+        if (llvm::AddOverflow(Lop, Rop, Res)) {
+          return psr::Bottom{};
+        }
+        return Res;
+
+      case llvm::Instruction::Sub:
+        if (llvm::SubOverflow(Lop, Rop, Res)) {
+          return psr::Bottom{};
+        }
+        return Res;
+
+      case llvm::Instruction::Mul:
+        if (llvm::MulOverflow(Lop, Rop, Res)) {
+          return psr::Bottom{};
+        }
+        return Res;
+
+      case llvm::Instruction::UDiv:
+      case llvm::Instruction::SDiv:
+        if (Lop == std::numeric_limits<int64_t>::min() &&
+            Rop == -1) { // Would produce and overflow, as the complement of min
+                         // is not representable in a signed type.
+          return psr::Bottom{};
+        }
+        if (Rop == 0) { // Division by zero is UB, so we return Bot
+          return psr::Bottom{};
+        }
+        return Lop / Rop;
+
+      case llvm::Instruction::URem:
+      case llvm::Instruction::SRem:
+        if (Rop == 0) { // Division by zero is UB, so we return Bot
+          return psr::Bottom{};
+        }
+        return Lop % Rop;
+
+      case llvm::Instruction::And:
+        return Lop & Rop;
+      case llvm::Instruction::Or:
+        return Lop | Rop;
+      case llvm::Instruction::Xor:
+        return Lop ^ Rop;
+      default:
+        PHASAR_LOG_LEVEL(DEBUG, "Operation not supported by "
+                                "IDELinearConstantAnalysis::"
+                                "executeBinOperation()");
+        return psr::Bottom{};
+      }
+    }
+
+    // Utility function to aid the printing operator<<
+    static char opToChar(const unsigned Op) {
+      switch (Op) {
+      case llvm::Instruction::Add:
+        return '+';
+      case llvm::Instruction::Sub:
+        return '-';
+      case llvm::Instruction::Mul:
+        return '*';
+      case llvm::Instruction::UDiv:
+      case llvm::Instruction::SDiv:
+        return '/';
+      case llvm::Instruction::URem:
+      case llvm::Instruction::SRem:
+        return '%';
+      case llvm::Instruction::And:
+        return '&';
+      case llvm::Instruction::Or:
+        return '|';
+      case llvm::Instruction::Xor:
+        return '^';
+      default:
+        return ' ';
+      }
+    }
+
+    // Required function that invokes the edge-function with an incoming value
+    // that is substituted with the non-constant operand of the modeled binary
+    // operation.
+    [[nodiscard]] l_t computeTarget(l_t Source) const {
+      if (LeftConst && RightConst) { // Simple constant-folding
+        return executeBinOperation(LeftConst->getSExtValue(),
+                                   RightConst->getSExtValue());
+      }
+      if (Source == psr::Bottom{}) {
+        // Bottom is the top-value of our lattice. Whatever we do to it, it will
+        // always stay Bottom
+        return Source;
+      }
+
+      // Now, perform the linear arithmetic.
+      // First, we have to check, which of the both operands is the literal
+      if (RightConst) {
+        // The right operand is the literal, so we plug in the incoming value as
+        // left operand
+        return executeBinOperation(Source, RightConst->getSExtValue());
+      }
+      if (LeftConst) {
+        // The left operand is the literal, so we plug in the incoming value as
+        // right operand
+        return executeBinOperation(LeftConst->getSExtValue(), Source);
+      }
+
+      llvm::report_fatal_error(
+          "Only linear constant propagation can be specified!");
+    }
+
+    // Optional function to expose the constant-ness of this edge-function for
+    // optimization purposes
+    [[nodiscard]] constexpr bool isConstant() const noexcept {
+      // If both operands of this binary operation are literal constant, this
+      // edge function always computes the same value
+      return LeftConst && RightConst;
+    }
+
+    // Compose This edge-function with a different SecondFunction
+    static psr::EdgeFunction<l_t>
+    compose(psr::EdgeFunctionRef<BinOp> This,
+            const psr::EdgeFunction<l_t> &SecondFunction) {
+      // Trivial compositions can be defaulted:
+      if (auto Default = defaultComposeOrNull(This, SecondFunction)) {
+        return Default;
+      }
+
+      // Here, we could for example add transformations like:
+      // compose(BinOp{Add, ..., Const1}, BinOp{Add, ..., Const2}) -->
+      // BinOp{Add, ..., Const1 + Const2}
+
+      // Fallback for when we don't know better:
+      return LCAEdgeFunctionComposer{This, SecondFunction};
+    }
+
+    // Join This edge-function dith a different OtherFunction, going in the
+    // EF-lattice towards AllBottom.
+    static psr::EdgeFunction<l_t>
+    join(psr::EdgeFunctionRef<BinOp> This,
+         const psr::EdgeFunction<l_t> &OtherFunction) {
+      // Trivial joins can be defaulted:
+      if (auto Default = defaultJoinOrNull(This, OtherFunction)) {
+        return Default;
+      }
+
+      // Here we could, e.g., check whether the two edge functions are
+      // semantically equivalent, althouth different and then return one of them
+
+      // Sound fallback in case, we don't know better
+      return psr::AllBottom<l_t>{};
+    }
+
+    constexpr bool operator==(const BinOp &Other) const noexcept {
+      return OpCode == Other.OpCode && LeftConst == Other.LeftConst &&
+             RightConst == Other.RightConst;
+    }
+
+    // Printing. optional
+    friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                         const BinOp &Bop) {
+      OS << "BinOp[";
+      if (Bop.LeftConst) {
+        OS << *Bop.LeftConst;
+      } else {
+        OS << 'x';
+      }
+
+      OS << ' ' << opToChar(Bop.OpCode) << ' ';
+      if (Bop.LeftConst) {
+        OS << *Bop.LeftConst;
+      } else {
+        OS << 'x';
+      }
+
+      return OS;
+    }
+  };
+
+  psr::EdgeFunction<l_t> getNormalEdgeFunction(n_t Curr, d_t CurrNode,
+                                               n_t /*Succ*/,
+                                               d_t SuccNode) override {
+    if (isZeroValue(CurrNode) && !isZeroValue(SuccNode)) {
+      // Handle the two cases, where we generate facts from zero:
+
+      if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(Curr)) {
+        // Freshly allocated variables hold no constant value
+        return psr::AllBottom<l_t>{};
+      }
+
+      if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
+
+        // Storing a constant integer.
+        const auto *ConstOperand =
+            llvm::cast<llvm::ConstantInt>(Store->getValueOperand());
+        return psr::ConstantEdgeFunction<l_t>{ConstOperand->getSExtValue()};
+      }
+    }
+
+    // Handle binary operations. The corresponding flow-function is defaulted.
+    if (llvm::isa<llvm::BinaryOperator>(Curr) && SuccNode == Curr &&
+        CurrNode != SuccNode) {
+      unsigned Op = Curr->getOpcode();
+      auto *Lop = Curr->getOperand(0);
+      auto *Rop = Curr->getOperand(1);
+      // For non linear constant computation we propagate bottom
+      if ((CurrNode == Lop && !llvm::isa<llvm::ConstantInt>(Rop)) ||
+          (CurrNode == Rop && !llvm::isa<llvm::ConstantInt>(Lop))) {
+        return psr::AllBottom<l_t>{};
+      }
+
+      // Attach the arithmetic transformer to this edge
+      return BinOp{Op, llvm::dyn_cast<llvm::ConstantInt>(Lop),
+                   llvm::dyn_cast<llvm::ConstantInt>(Rop)};
+    }
+
+    // Pass everything else as identity
+    return psr::EdgeIdentity<l_t>{};
+  }
+
+  psr::EdgeFunction<l_t> getCallEdgeFunction(n_t CallSite, d_t SrcNode,
+                                             f_t /*DestinationFunction*/,
+                                             d_t DestNode) override {
+    if (isZeroValue(SrcNode) && !isZeroValue(DestNode)) {
+      // If a constant int is passed as parameter, we need to generate the
+      // parameter inside the callee from zero
+      const auto *DestParam = llvm::cast<llvm::Argument>(DestNode);
+      const auto *ConstOperand = llvm::cast<llvm::ConstantInt>(
+          CallSite->getOperand(DestParam->getArgNo()));
+      return psr::ConstantEdgeFunction<l_t>{ConstOperand->getSExtValue()};
+    }
+
+    // Pass everything else as identity
+    return psr::EdgeIdentity<l_t>{};
+  }
+
+  psr::EdgeFunction<l_t>
+  getReturnEdgeFunction(n_t CallSite, f_t /*CalleeFunction*/, n_t ExitStmt,
+                        d_t ExitNode, n_t /*RetSite*/, d_t RetNode) override {
+    if (isZeroValue(ExitNode) && RetNode == CallSite) {
+      // If we return a literal constant int, we must generate the corresponding
+      // value at the call-site from zero, i.e., the CallSite itself in case of
+      // LLVM's SSA form
+      const auto *RetVal =
+          llvm::cast<llvm::ReturnInst>(ExitStmt)->getReturnValue();
+      return psr::ConstantEdgeFunction<l_t>{
+          llvm::cast<llvm::ConstantInt>(RetVal)->getSExtValue()};
+    }
+
+    // Pass everything else as identity
+    return psr::EdgeIdentity<l_t>{};
+  }
+
+  psr::EdgeFunction<l_t>
+  getCallToRetEdgeFunction(n_t /*CallSite*/, d_t /*CallNode*/, n_t /*RetSite*/,
+                           d_t /*RetSiteNode*/,
+                           llvm::ArrayRef<f_t> /*Callees*/) override {
+    // The call-to-return edge-function handles facts that are not affected by
+    // the call. This is usually the identity function.
+    return psr::EdgeIdentity<l_t>{};
+  }
+};
+} // namespace
+
+// Invoke the analysis the same way as explained in 05-run-ide-analysis:
+int main(int Argc, char *Argv[]) {
+  if (Argc < 2) {
+    llvm::errs() << "USAGE: write-ide-analysis-simple <LLVM-IR file>\n";
+    return 1;
+  }
+
+  psr::LLVMProjectIRDB IRDB(Argv[1]);
+  if (!IRDB) {
+    return 1;
+  }
+
+  psr::LLVMBasedICFG ICFG(&IRDB, psr::CallGraphAnalysisType::OTF, {"main"});
+
+  ExampleLinearConstantAnalysis LCAProblem(&IRDB, {"main"});
+
+  auto Results = psr::solveIDEProblem(LCAProblem, ICFG);
+
+  // After we have solved the LCAProblem, we can now inspect the detected
+  // constants:
+
+  const auto *MainF = IRDB.getFunctionDefinition("main");
+  if (!MainF) {
+    llvm::errs() << "Required function 'main' not found\n";
+    return 1;
+  }
+
+  const auto *ExitOfMain = psr::getAllExitPoints(MainF).front();
+
+  // Get the analysis results right **after** main's return statement
+  const auto &AllConstantsAtMainExit = Results.resultsAt(ExitOfMain);
+
+  llvm::outs() << "Detected constants at " << psr::llvmIRToString(ExitOfMain)
+               << ":\n";
+  for (const auto &[LLVMVar, ConstVal] : AllConstantsAtMainExit) {
+    llvm::outs() << "  " << psr::llvmIRToString(LLVMVar) << "\n  --> ";
+    if (ConstVal.isBottom()) {
+      // A "bottom" value here means that the analysis does not know the value
+      // at this point and that any value may be possible.
+
+      llvm::outs() << "<not constant>\n\n";
+    } else {
+      llvm::outs() << ConstVal << "\n\n";
+    }
+  }
+}
diff --git a/examples/how-to/CMakeLists.txt b/examples/how-to/CMakeLists.txt
new file mode 100644
index 0000000000..5a1ae5b094
--- /dev/null
+++ b/examples/how-to/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(phasar-how-tos)
+
+file(GLOB children RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*)
+
+add_custom_target(run_sample_programs)
+
+foreach(child ${children})
+  if(IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/${child} AND NOT "${child}" STREQUAL "build")
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/${child})
+  endif()
+endforeach()
diff --git a/examples/how-to/README.md b/examples/how-to/README.md
new file mode 100644
index 0000000000..b84875a609
--- /dev/null
+++ b/examples/how-to/README.md
@@ -0,0 +1,13 @@
+# How To ...
+
+This folder contains various examples on how to use certain features of PhASAR.
+
+Currently supporting:
+- [x] Working with the IR ([here](./00-load-llvm-ir/README.md))
+- [x] Build a type-hierarchy ([here](./01-build-type-hierarchy/README.md))
+- [x] Build a call-graph ([here](./02-build-call-graph/README.md))
+- [x] Create alias-information ([here](./03-create-alias-info/README.md))
+- [x] Run an IFDS analysis ([here](./04-run-ifds-analysis/README.md))
+- [x] Run an IDE analysis ([here](./05-run-ide-analysis/README.md))
+- [x] Write an IFDS analysis ([here](./07-write-ifds-analysis/README.md))
+- [x] Write an IDE analysis ([here](./08-write-ide-analysis/))
diff --git a/examples/llvm-hello-world/CMakeLists.txt b/examples/llvm-hello-world/CMakeLists.txt
new file mode 100644
index 0000000000..8ed9e80124
--- /dev/null
+++ b/examples/llvm-hello-world/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.14...3.28)
+
+project(llvm-hello-world)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+find_package(LLVM 15 REQUIRED CONFIG)
+
+add_executable(main main.cpp)
+target_link_libraries(main PRIVATE LLVMCore LLVMIRReader)
+target_include_directories(main PRIVATE ${LLVM_INCLUDE_DIRS})
+
+add_subdirectory(target)
diff --git a/examples/llvm-hello-world/README.md b/examples/llvm-hello-world/README.md
new file mode 100644
index 0000000000..23a1eb7854
--- /dev/null
+++ b/examples/llvm-hello-world/README.md
@@ -0,0 +1,30 @@
+# LLVM Hello World
+
+The "Hello, World!" program can be compiled using:
+
+```bash
+$ make
+```
+
+However, we recommend using cmake:
+
+```bash
+$ mkdir -p build && cd build
+$ cmake ..
+$ cmake --build .
+```
+
+"Hello, World!" reads a LLVM IR file (.ll or .bc) specified by the first
+command-line argument. It then looks for the main function, iterates all of its
+instructions and prints them to the command-line using an LLVM output stream.
+Have a look at the comments within the source code in main.cpp.
+
+Example use:
+
+```bash
+# Invoked from the llvm-hello-world root folder if compiled with make:
+./main ./target/simple.ll
+
+# Invoked from the llvm-hello-world/build folder if compiled with cmake:
+./main ./target/simple_cpp_dbg.ll
+```
diff --git a/examples/llvm-hello-world/README.txt b/examples/llvm-hello-world/README.txt
deleted file mode 100644
index 51b3fcedf6..0000000000
--- a/examples/llvm-hello-world/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-The "Hello, World!" program can be compiled using:
-
-	$ make
-
-The auto-generated files can be removed using:
-
-	$ make clean
-
-"Hello, World!" reads a LLVM IR file (.ll or .bc) specified by the first
-command-line argument. It then looks for the main function, iterates all of its
-instructions and prints them to the command-line using an LLVM output stream.
-Have a look at the comments within the source code in main.cpp.
diff --git a/examples/llvm-hello-world/main.cpp b/examples/llvm-hello-world/main.cpp
index 3cb439b218..ce435a7de2 100644
--- a/examples/llvm-hello-world/main.cpp
+++ b/examples/llvm-hello-world/main.cpp
@@ -2,18 +2,14 @@
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/IRReader/IRReader.h"
-#include "llvm/Support/ManagedStatic.h"
-#include "llvm/Support/SMLoc.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include <memory>
-#include <string>
 
 int main(int argc, char **argv) {
   if (argc != 2) {
diff --git a/examples/llvm-hello-world/target/CMakeLists.txt b/examples/llvm-hello-world/target/CMakeLists.txt
new file mode 100644
index 0000000000..f8f25bef38
--- /dev/null
+++ b/examples/llvm-hello-world/target/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_custom_target(LLFileGeneration ALL)
+
+# Use phasar's capabilities to automate the LLVM-IR file generation
+
+include(../../../cmake/phasar_macros.cmake)
+set(PHASAR_LLVM_VERSION 15)
+
+file(GLOB target_files RELATIVE ${CMAKE_CURRENT_LIST_DIR} *.cpp)
+
+foreach(target_file ${target_files})
+  generate_ll_file(FILE ${target_file} DEBUG)
+endforeach()
diff --git a/examples/llvm-hello-world/target/branching.ll b/examples/llvm-hello-world/target/branching.ll
index cc4c36efa6..098eee04f0 100644
--- a/examples/llvm-hello-world/target/branching.ll
+++ b/examples/llvm-hello-world/target/branching.ll
@@ -1,43 +1,89 @@
 ; ModuleID = 'branching.cpp'
 source_filename = "branching.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i32, align 4
-  %7 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  store i32 10, i32* %6, align 4
-  %8 = load i32, i32* %4, align 4
-  %9 = sub nsw i32 %8, 1
-  %10 = icmp ne i32 %9, 0
-  br i1 %10, label %11, label %12
-
-; <label>:11:                                     ; preds = %2
-  store i32 20, i32* %6, align 4
-  br label %13
-
-; <label>:12:                                     ; preds = %2
-  store i32 30, i32* %6, align 4
-  br label %13
-
-; <label>:13:                                     ; preds = %12, %11
-  %14 = load i32, i32* %6, align 4
-  %15 = add nsw i32 %14, 42
-  store i32 %15, i32* %7, align 4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %a = alloca i32, align 4
+  %b = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  call void @llvm.dbg.declare(metadata ptr %a, metadata !22, metadata !DIExpression()), !dbg !23
+  store i32 10, ptr %a, align 4, !dbg !23
+  %0 = load i32, ptr %argc.addr, align 4, !dbg !24
+  %sub = sub nsw i32 %0, 1, !dbg !26
+  %tobool = icmp ne i32 %sub, 0, !dbg !24
+  br i1 %tobool, label %if.then, label %if.else, !dbg !27
+
+if.then:                                          ; preds = %entry
+  store i32 20, ptr %a, align 4, !dbg !28
+  br label %if.end, !dbg !30
+
+if.else:                                          ; preds = %entry
+  store i32 30, ptr %a, align 4, !dbg !31
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  call void @llvm.dbg.declare(metadata ptr %b, metadata !33, metadata !DIExpression()), !dbg !34
+  %1 = load i32, ptr %a, align 4, !dbg !35
+  %add = add nsw i32 %1, 42, !dbg !36
+  store i32 %add, ptr %b, align 4, !dbg !34
+  ret i32 0, !dbg !37
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "branching.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "fd5b041f6944dd754d55aaf6584848fc")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !17)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!17 = !{}
+!18 = !DILocalVariable(name: "argc", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!19 = !DILocation(line: 1, column: 14, scope: !10)
+!20 = !DILocalVariable(name: "argv", arg: 2, scope: !10, file: !1, line: 1, type: !14)
+!21 = !DILocation(line: 1, column: 27, scope: !10)
+!22 = !DILocalVariable(name: "a", scope: !10, file: !1, line: 2, type: !13)
+!23 = !DILocation(line: 2, column: 7, scope: !10)
+!24 = !DILocation(line: 3, column: 7, scope: !25)
+!25 = distinct !DILexicalBlock(scope: !10, file: !1, line: 3, column: 7)
+!26 = !DILocation(line: 3, column: 12, scope: !25)
+!27 = !DILocation(line: 3, column: 7, scope: !10)
+!28 = !DILocation(line: 4, column: 7, scope: !29)
+!29 = distinct !DILexicalBlock(scope: !25, file: !1, line: 3, column: 17)
+!30 = !DILocation(line: 5, column: 3, scope: !29)
+!31 = !DILocation(line: 6, column: 7, scope: !32)
+!32 = distinct !DILexicalBlock(scope: !25, file: !1, line: 5, column: 10)
+!33 = !DILocalVariable(name: "b", scope: !10, file: !1, line: 8, type: !13)
+!34 = !DILocation(line: 8, column: 7, scope: !10)
+!35 = !DILocation(line: 8, column: 11, scope: !10)
+!36 = !DILocation(line: 8, column: 13, scope: !10)
+!37 = !DILocation(line: 9, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/branching2.ll b/examples/llvm-hello-world/target/branching2.ll
index 2a201678e9..862b8d1307 100644
--- a/examples/llvm-hello-world/target/branching2.ll
+++ b/examples/llvm-hello-world/target/branching2.ll
@@ -1,45 +1,93 @@
 ; ModuleID = 'branching2.cpp'
 source_filename = "branching2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i32, align 4
-  %7 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  store i32 10, i32* %6, align 4
-  store i32 100, i32* %7, align 4
-  %8 = load i32, i32* %4, align 4
-  %9 = sub nsw i32 %8, 1
-  %10 = icmp ne i32 %9, 0
-  br i1 %10, label %11, label %12
-
-; <label>:11:                                     ; preds = %2
-  store i32 20, i32* %6, align 4
-  br label %13
-
-; <label>:12:                                     ; preds = %2
-  store i32 30, i32* %6, align 4
-  store i32 300, i32* %7, align 4
-  br label %13
-
-; <label>:13:                                     ; preds = %12, %11
-  %14 = load i32, i32* %6, align 4
-  %15 = load i32, i32* %7, align 4
-  %16 = add nsw i32 %14, %15
-  ret i32 %16
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %a = alloca i32, align 4
+  %b = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  call void @llvm.dbg.declare(metadata ptr %a, metadata !22, metadata !DIExpression()), !dbg !23
+  store i32 10, ptr %a, align 4, !dbg !23
+  call void @llvm.dbg.declare(metadata ptr %b, metadata !24, metadata !DIExpression()), !dbg !25
+  store i32 100, ptr %b, align 4, !dbg !25
+  %0 = load i32, ptr %argc.addr, align 4, !dbg !26
+  %sub = sub nsw i32 %0, 1, !dbg !28
+  %tobool = icmp ne i32 %sub, 0, !dbg !26
+  br i1 %tobool, label %if.then, label %if.else, !dbg !29
+
+if.then:                                          ; preds = %entry
+  store i32 20, ptr %a, align 4, !dbg !30
+  br label %if.end, !dbg !32
+
+if.else:                                          ; preds = %entry
+  store i32 30, ptr %a, align 4, !dbg !33
+  store i32 300, ptr %b, align 4, !dbg !35
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  %1 = load i32, ptr %a, align 4, !dbg !36
+  %2 = load i32, ptr %b, align 4, !dbg !37
+  %add = add nsw i32 %1, %2, !dbg !38
+  ret i32 %add, !dbg !39
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "branching2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "b690af5943eccd7364b9a6fb57366d39")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !17)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!17 = !{}
+!18 = !DILocalVariable(name: "argc", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!19 = !DILocation(line: 1, column: 14, scope: !10)
+!20 = !DILocalVariable(name: "argv", arg: 2, scope: !10, file: !1, line: 1, type: !14)
+!21 = !DILocation(line: 1, column: 27, scope: !10)
+!22 = !DILocalVariable(name: "a", scope: !10, file: !1, line: 2, type: !13)
+!23 = !DILocation(line: 2, column: 7, scope: !10)
+!24 = !DILocalVariable(name: "b", scope: !10, file: !1, line: 3, type: !13)
+!25 = !DILocation(line: 3, column: 7, scope: !10)
+!26 = !DILocation(line: 4, column: 7, scope: !27)
+!27 = distinct !DILexicalBlock(scope: !10, file: !1, line: 4, column: 7)
+!28 = !DILocation(line: 4, column: 12, scope: !27)
+!29 = !DILocation(line: 4, column: 7, scope: !10)
+!30 = !DILocation(line: 5, column: 7, scope: !31)
+!31 = distinct !DILexicalBlock(scope: !27, file: !1, line: 4, column: 17)
+!32 = !DILocation(line: 6, column: 3, scope: !31)
+!33 = !DILocation(line: 7, column: 7, scope: !34)
+!34 = distinct !DILexicalBlock(scope: !27, file: !1, line: 6, column: 10)
+!35 = !DILocation(line: 8, column: 7, scope: !34)
+!36 = !DILocation(line: 10, column: 10, scope: !10)
+!37 = !DILocation(line: 10, column: 14, scope: !10)
+!38 = !DILocation(line: 10, column: 12, scope: !10)
+!39 = !DILocation(line: 10, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/call.ll b/examples/llvm-hello-world/target/call.ll
index 2ea6f43011..57bb2d81c7 100644
--- a/examples/llvm-hello-world/target/call.ll
+++ b/examples/llvm-hello-world/target/call.ll
@@ -1,32 +1,58 @@
 ; ModuleID = 'call.cpp'
 source_filename = "call.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline nounwind optnone uwtable
-define void @_Z3barv() #0 {
-  ret void
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3barv() #0 !dbg !10 {
+entry:
+  ret void, !dbg !14
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define void @_Z3foov() #0 {
-  call void @_Z3barv()
-  ret void
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3foov() #0 !dbg !15 {
+entry:
+  call void @_Z3barv(), !dbg !16
+  ret void, !dbg !17
 }
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main() #1 {
-  %1 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  call void @_Z3foov()
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main() #1 !dbg !18 {
+entry:
+  %retval = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @_Z3foov(), !dbg !22
+  ret i32 0, !dbg !23
 }
 
-attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "call.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "3185a64bdf0434eebc40567d89393d85")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "bar", linkageName: "_Z3barv", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !13)
+!11 = !DISubroutineType(types: !12)
+!12 = !{null}
+!13 = !{}
+!14 = !DILocation(line: 1, column: 13, scope: !10)
+!15 = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: !1, file: !1, line: 3, type: !11, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !13)
+!16 = !DILocation(line: 3, column: 14, scope: !15)
+!17 = !DILocation(line: 3, column: 21, scope: !15)
+!18 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 5, type: !19, scopeLine: 5, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !13)
+!19 = !DISubroutineType(types: !20)
+!20 = !{!21}
+!21 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!22 = !DILocation(line: 6, column: 3, scope: !18)
+!23 = !DILocation(line: 7, column: 3, scope: !18)
diff --git a/examples/llvm-hello-world/target/call2.ll b/examples/llvm-hello-world/target/call2.ll
index 086c36fe6b..704a05fa39 100644
--- a/examples/llvm-hello-world/target/call2.ll
+++ b/examples/llvm-hello-world/target/call2.ll
@@ -1,65 +1,133 @@
 ; ModuleID = 'call2.cpp'
 source_filename = "call2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @_Z2idi(i32) #0 {
-  %2 = alloca i32, align 4
-  store i32 %0, i32* %2, align 4
-  %3 = load i32, i32* %2, align 4
-  ret i32 %3
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z2idi(i32 noundef %i) #0 !dbg !10 {
+entry:
+  %i.addr = alloca i32, align 4
+  store i32 %i, ptr %i.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %i.addr, metadata !15, metadata !DIExpression()), !dbg !16
+  %0 = load i32, ptr %i.addr, align 4, !dbg !17
+  ret i32 %0, !dbg !18
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @_Z3inci(i32) #0 {
-  %2 = alloca i32, align 4
-  store i32 %0, i32* %2, align 4
-  %3 = load i32, i32* %2, align 4
-  %4 = add nsw i32 %3, 1
-  store i32 %4, i32* %2, align 4
-  ret i32 %4
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z3inci(i32 noundef %i) #0 !dbg !19 {
+entry:
+  %i.addr = alloca i32, align 4
+  store i32 %i, ptr %i.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %i.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  %0 = load i32, ptr %i.addr, align 4, !dbg !22
+  %inc = add nsw i32 %0, 1, !dbg !22
+  store i32 %inc, ptr %i.addr, align 4, !dbg !22
+  ret i32 %inc, !dbg !23
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @_Z3addii(i32, i32) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  store i32 %0, i32* %3, align 4
-  store i32 %1, i32* %4, align 4
-  %5 = load i32, i32* %3, align 4
-  %6 = load i32, i32* %4, align 4
-  %7 = add nsw i32 %5, %6
-  ret i32 %7
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z3addii(i32 noundef %i, i32 noundef %j) #0 !dbg !24 {
+entry:
+  %i.addr = alloca i32, align 4
+  %j.addr = alloca i32, align 4
+  store i32 %i, ptr %i.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %i.addr, metadata !27, metadata !DIExpression()), !dbg !28
+  store i32 %j, ptr %j.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %j.addr, metadata !29, metadata !DIExpression()), !dbg !30
+  %0 = load i32, ptr %i.addr, align 4, !dbg !31
+  %1 = load i32, ptr %j.addr, align 4, !dbg !32
+  %add = add nsw i32 %0, %1, !dbg !33
+  ret i32 %add, !dbg !34
 }
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main() #1 {
-  %1 = alloca i32, align 4
-  %2 = alloca i32, align 4
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  store i32 0, i32* %2, align 4
-  store i32 1, i32* %3, align 4
-  %5 = load i32, i32* %2, align 4
-  %6 = call i32 @_Z3inci(i32 %5)
-  store i32 %6, i32* %2, align 4
-  %7 = load i32, i32* %3, align 4
-  %8 = call i32 @_Z2idi(i32 %7)
-  store i32 %8, i32* %3, align 4
-  %9 = load i32, i32* %2, align 4
-  %10 = load i32, i32* %3, align 4
-  %11 = call i32 @_Z3addii(i32 %9, i32 %10)
-  store i32 %11, i32* %4, align 4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main() #2 !dbg !35 {
+entry:
+  %retval = alloca i32, align 4
+  %a = alloca i32, align 4
+  %b = alloca i32, align 4
+  %c = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %a, metadata !38, metadata !DIExpression()), !dbg !39
+  store i32 0, ptr %a, align 4, !dbg !39
+  call void @llvm.dbg.declare(metadata ptr %b, metadata !40, metadata !DIExpression()), !dbg !41
+  store i32 1, ptr %b, align 4, !dbg !41
+  %0 = load i32, ptr %a, align 4, !dbg !42
+  %call = call noundef i32 @_Z3inci(i32 noundef %0), !dbg !43
+  store i32 %call, ptr %a, align 4, !dbg !44
+  %1 = load i32, ptr %b, align 4, !dbg !45
+  %call1 = call noundef i32 @_Z2idi(i32 noundef %1), !dbg !46
+  store i32 %call1, ptr %b, align 4, !dbg !47
+  call void @llvm.dbg.declare(metadata ptr %c, metadata !48, metadata !DIExpression()), !dbg !49
+  %2 = load i32, ptr %a, align 4, !dbg !50
+  %3 = load i32, ptr %b, align 4, !dbg !51
+  %call2 = call noundef i32 @_Z3addii(i32 noundef %2, i32 noundef %3), !dbg !52
+  store i32 %call2, ptr %c, align 4, !dbg !49
+  ret i32 0, !dbg !53
 }
 
-attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "call2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "3183ac742a48f0a0d62574e2366f9a9f")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "id", linkageName: "_Z2idi", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !{}
+!15 = !DILocalVariable(name: "i", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!16 = !DILocation(line: 1, column: 12, scope: !10)
+!17 = !DILocation(line: 1, column: 24, scope: !10)
+!18 = !DILocation(line: 1, column: 17, scope: !10)
+!19 = distinct !DISubprogram(name: "inc", linkageName: "_Z3inci", scope: !1, file: !1, line: 3, type: !11, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!20 = !DILocalVariable(name: "i", arg: 1, scope: !19, file: !1, line: 3, type: !13)
+!21 = !DILocation(line: 3, column: 13, scope: !19)
+!22 = !DILocation(line: 3, column: 25, scope: !19)
+!23 = !DILocation(line: 3, column: 18, scope: !19)
+!24 = distinct !DISubprogram(name: "add", linkageName: "_Z3addii", scope: !1, file: !1, line: 5, type: !25, scopeLine: 5, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!25 = !DISubroutineType(types: !26)
+!26 = !{!13, !13, !13}
+!27 = !DILocalVariable(name: "i", arg: 1, scope: !24, file: !1, line: 5, type: !13)
+!28 = !DILocation(line: 5, column: 13, scope: !24)
+!29 = !DILocalVariable(name: "j", arg: 2, scope: !24, file: !1, line: 5, type: !13)
+!30 = !DILocation(line: 5, column: 20, scope: !24)
+!31 = !DILocation(line: 5, column: 32, scope: !24)
+!32 = !DILocation(line: 5, column: 36, scope: !24)
+!33 = !DILocation(line: 5, column: 34, scope: !24)
+!34 = !DILocation(line: 5, column: 25, scope: !24)
+!35 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 7, type: !36, scopeLine: 7, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!36 = !DISubroutineType(types: !37)
+!37 = !{!13}
+!38 = !DILocalVariable(name: "a", scope: !35, file: !1, line: 8, type: !13)
+!39 = !DILocation(line: 8, column: 7, scope: !35)
+!40 = !DILocalVariable(name: "b", scope: !35, file: !1, line: 9, type: !13)
+!41 = !DILocation(line: 9, column: 7, scope: !35)
+!42 = !DILocation(line: 10, column: 11, scope: !35)
+!43 = !DILocation(line: 10, column: 7, scope: !35)
+!44 = !DILocation(line: 10, column: 5, scope: !35)
+!45 = !DILocation(line: 11, column: 10, scope: !35)
+!46 = !DILocation(line: 11, column: 7, scope: !35)
+!47 = !DILocation(line: 11, column: 5, scope: !35)
+!48 = !DILocalVariable(name: "c", scope: !35, file: !1, line: 12, type: !13)
+!49 = !DILocation(line: 12, column: 7, scope: !35)
+!50 = !DILocation(line: 12, column: 15, scope: !35)
+!51 = !DILocation(line: 12, column: 18, scope: !35)
+!52 = !DILocation(line: 12, column: 11, scope: !35)
+!53 = !DILocation(line: 13, column: 3, scope: !35)
diff --git a/examples/llvm-hello-world/target/class_hierarchy.cpp b/examples/llvm-hello-world/target/class_hierarchy.cpp
new file mode 100644
index 0000000000..86e8032d5d
--- /dev/null
+++ b/examples/llvm-hello-world/target/class_hierarchy.cpp
@@ -0,0 +1,33 @@
+#include <cstdio>
+
+class A {
+public:
+  virtual ~A() = default;
+
+  virtual void foo() = 0;
+};
+
+class B : public A {
+public:
+  virtual void foo() override { //
+    puts("Calling B::foo()");
+  }
+};
+
+class C : public A {
+public:
+  virtual void foo() override { //
+    puts("Calling C::foo()");
+  }
+};
+
+int main() {
+  B b;
+  b.foo();
+
+  C c;
+  c.foo();
+
+  A &a = b;
+  a.foo();
+}
diff --git a/examples/llvm-hello-world/target/class_hierarchy.ll b/examples/llvm-hello-world/target/class_hierarchy.ll
new file mode 100644
index 0000000000..1e00aeac75
--- /dev/null
+++ b/examples/llvm-hello-world/target/class_hierarchy.ll
@@ -0,0 +1,596 @@
+; ModuleID = 'class_hierarchy.cpp'
+source_filename = "class_hierarchy.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+%class.B = type { %class.A }
+%class.A = type { ptr }
+%class.C = type { %class.A }
+
+$_ZN1BC2Ev = comdat any
+
+$_ZN1B3fooEv = comdat any
+
+$_ZN1CC2Ev = comdat any
+
+$_ZN1C3fooEv = comdat any
+
+$_ZN1CD2Ev = comdat any
+
+$_ZN1BD2Ev = comdat any
+
+$_ZN1AC2Ev = comdat any
+
+$_ZN1BD0Ev = comdat any
+
+$_ZN1AD2Ev = comdat any
+
+$_ZN1AD0Ev = comdat any
+
+$_ZN1CD0Ev = comdat any
+
+$_ZTV1B = comdat any
+
+$_ZTS1B = comdat any
+
+$_ZTS1A = comdat any
+
+$_ZTI1A = comdat any
+
+$_ZTI1B = comdat any
+
+$_ZTV1A = comdat any
+
+$_ZTV1C = comdat any
+
+$_ZTS1C = comdat any
+
+$_ZTI1C = comdat any
+
+@_ZTV1B = linkonce_odr dso_local unnamed_addr constant { [5 x ptr] } { [5 x ptr] [ptr null, ptr @_ZTI1B, ptr @_ZN1BD2Ev, ptr @_ZN1BD0Ev, ptr @_ZN1B3fooEv] }, comdat, align 8
+@_ZTVN10__cxxabiv120__si_class_type_infoE = external global ptr
+@_ZTS1B = linkonce_odr dso_local constant [3 x i8] c"1B\00", comdat, align 1
+@_ZTVN10__cxxabiv117__class_type_infoE = external global ptr
+@_ZTS1A = linkonce_odr dso_local constant [3 x i8] c"1A\00", comdat, align 1
+@_ZTI1A = linkonce_odr dso_local constant { ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv117__class_type_infoE, i64 2), ptr @_ZTS1A }, comdat, align 8
+@_ZTI1B = linkonce_odr dso_local constant { ptr, ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2), ptr @_ZTS1B, ptr @_ZTI1A }, comdat, align 8
+@_ZTV1A = linkonce_odr dso_local unnamed_addr constant { [5 x ptr] } { [5 x ptr] [ptr null, ptr @_ZTI1A, ptr @_ZN1AD2Ev, ptr @_ZN1AD0Ev, ptr @__cxa_pure_virtual] }, comdat, align 8
+@.str = private unnamed_addr constant [17 x i8] c"Calling B::foo()\00", align 1, !dbg !0
+@_ZTV1C = linkonce_odr dso_local unnamed_addr constant { [5 x ptr] } { [5 x ptr] [ptr null, ptr @_ZTI1C, ptr @_ZN1CD2Ev, ptr @_ZN1CD0Ev, ptr @_ZN1C3fooEv] }, comdat, align 8
+@_ZTS1C = linkonce_odr dso_local constant [3 x i8] c"1C\00", comdat, align 1
+@_ZTI1C = linkonce_odr dso_local constant { ptr, ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2), ptr @_ZTS1C, ptr @_ZTI1A }, comdat, align 8
+@.str.1 = private unnamed_addr constant [17 x i8] c"Calling C::foo()\00", align 1, !dbg !8
+
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main() #0 personality ptr @__gxx_personality_v0 !dbg !242 {
+entry:
+  %b = alloca %class.B, align 8
+  %exn.slot = alloca ptr, align 8
+  %ehselector.slot = alloca i32, align 4
+  %c = alloca %class.C, align 8
+  %a = alloca ptr, align 8
+  call void @llvm.dbg.declare(metadata ptr %b, metadata !244, metadata !DIExpression()), !dbg !245
+  call void @_ZN1BC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %b) #7, !dbg !245
+  invoke void @_ZN1B3fooEv(ptr noundef nonnull align 8 dereferenceable(8) %b)
+          to label %invoke.cont unwind label %lpad, !dbg !246
+
+invoke.cont:                                      ; preds = %entry
+  call void @llvm.dbg.declare(metadata ptr %c, metadata !247, metadata !DIExpression()), !dbg !248
+  call void @_ZN1CC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %c) #7, !dbg !248
+  invoke void @_ZN1C3fooEv(ptr noundef nonnull align 8 dereferenceable(8) %c)
+          to label %invoke.cont2 unwind label %lpad1, !dbg !249
+
+invoke.cont2:                                     ; preds = %invoke.cont
+  call void @llvm.dbg.declare(metadata ptr %a, metadata !250, metadata !DIExpression()), !dbg !252
+  store ptr %b, ptr %a, align 8, !dbg !252
+  %0 = load ptr, ptr %a, align 8, !dbg !253
+  %vtable = load ptr, ptr %0, align 8, !dbg !254
+  %vfn = getelementptr inbounds ptr, ptr %vtable, i64 2, !dbg !254
+  %1 = load ptr, ptr %vfn, align 8, !dbg !254
+  invoke void %1(ptr noundef nonnull align 8 dereferenceable(8) %0)
+          to label %invoke.cont3 unwind label %lpad1, !dbg !254
+
+invoke.cont3:                                     ; preds = %invoke.cont2
+  call void @_ZN1CD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %c) #7, !dbg !255
+  call void @_ZN1BD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %b) #7, !dbg !255
+  ret i32 0, !dbg !255
+
+lpad:                                             ; preds = %entry
+  %2 = landingpad { ptr, i32 }
+          cleanup, !dbg !255
+  %3 = extractvalue { ptr, i32 } %2, 0, !dbg !255
+  store ptr %3, ptr %exn.slot, align 8, !dbg !255
+  %4 = extractvalue { ptr, i32 } %2, 1, !dbg !255
+  store i32 %4, ptr %ehselector.slot, align 4, !dbg !255
+  br label %ehcleanup, !dbg !255
+
+lpad1:                                            ; preds = %invoke.cont2, %invoke.cont
+  %5 = landingpad { ptr, i32 }
+          cleanup, !dbg !255
+  %6 = extractvalue { ptr, i32 } %5, 0, !dbg !255
+  store ptr %6, ptr %exn.slot, align 8, !dbg !255
+  %7 = extractvalue { ptr, i32 } %5, 1, !dbg !255
+  store i32 %7, ptr %ehselector.slot, align 4, !dbg !255
+  call void @_ZN1CD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %c) #7, !dbg !255
+  br label %ehcleanup, !dbg !255
+
+ehcleanup:                                        ; preds = %lpad1, %lpad
+  call void @_ZN1BD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %b) #7, !dbg !255
+  br label %eh.resume, !dbg !255
+
+eh.resume:                                        ; preds = %ehcleanup
+  %exn = load ptr, ptr %exn.slot, align 8, !dbg !255
+  %sel = load i32, ptr %ehselector.slot, align 4, !dbg !255
+  %lpad.val = insertvalue { ptr, i32 } undef, ptr %exn, 0, !dbg !255
+  %lpad.val4 = insertvalue { ptr, i32 } %lpad.val, i32 %sel, 1, !dbg !255
+  resume { ptr, i32 } %lpad.val4, !dbg !255
+}
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1BC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !256 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !258, metadata !DIExpression()), !dbg !260
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN1AC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #7, !dbg !261
+  store ptr getelementptr inbounds ({ [5 x ptr] }, ptr @_ZTV1B, i32 0, inrange i32 0, i32 2), ptr %this1, align 8, !dbg !261
+  ret void, !dbg !261
+}
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define linkonce_odr dso_local void @_ZN1B3fooEv(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #3 comdat align 2 !dbg !262 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !263, metadata !DIExpression()), !dbg !264
+  %this1 = load ptr, ptr %this.addr, align 8
+  %call = call i32 @puts(ptr noundef @.str), !dbg !265
+  ret void, !dbg !266
+}
+
+declare i32 @__gxx_personality_v0(...)
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1CC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !267 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !269, metadata !DIExpression()), !dbg !271
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN1AC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #7, !dbg !272
+  store ptr getelementptr inbounds ({ [5 x ptr] }, ptr @_ZTV1C, i32 0, inrange i32 0, i32 2), ptr %this1, align 8, !dbg !272
+  ret void, !dbg !272
+}
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define linkonce_odr dso_local void @_ZN1C3fooEv(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #3 comdat align 2 !dbg !273 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !274, metadata !DIExpression()), !dbg !275
+  %this1 = load ptr, ptr %this.addr, align 8
+  %call = call i32 @puts(ptr noundef @.str.1), !dbg !276
+  ret void, !dbg !277
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1CD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !278 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !280, metadata !DIExpression()), !dbg !281
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN1AD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #7, !dbg !282
+  ret void, !dbg !284
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1BD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !285 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !287, metadata !DIExpression()), !dbg !288
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN1AD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #7, !dbg !289
+  ret void, !dbg !291
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1AC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !292 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !294, metadata !DIExpression()), !dbg !296
+  %this1 = load ptr, ptr %this.addr, align 8
+  store ptr getelementptr inbounds ({ [5 x ptr] }, ptr @_ZTV1A, i32 0, inrange i32 0, i32 2), ptr %this1, align 8, !dbg !297
+  ret void, !dbg !297
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1BD0Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !298 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !299, metadata !DIExpression()), !dbg !300
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN1BD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #7, !dbg !301
+  call void @_ZdlPv(ptr noundef %this1) #8, !dbg !301
+  ret void, !dbg !301
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1AD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !302 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !303, metadata !DIExpression()), !dbg !304
+  %this1 = load ptr, ptr %this.addr, align 8
+  ret void, !dbg !305
+}
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1AD0Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !306 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !307, metadata !DIExpression()), !dbg !308
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @llvm.trap() #9, !dbg !309
+  unreachable, !dbg !309
+}
+
+declare void @__cxa_pure_virtual() unnamed_addr
+
+; Function Attrs: cold noreturn nounwind
+declare void @llvm.trap() #4
+
+; Function Attrs: nobuiltin nounwind
+declare void @_ZdlPv(ptr noundef) #5
+
+declare i32 @puts(ptr noundef) #6
+
+; Function Attrs: noinline nounwind optnone uwtable
+define linkonce_odr dso_local void @_ZN1CD0Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !310 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !311, metadata !DIExpression()), !dbg !312
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN1CD2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #7, !dbg !313
+  call void @_ZdlPv(ptr noundef %this1) #8, !dbg !313
+  ret void, !dbg !313
+}
+
+attributes #0 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { mustprogress noinline optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { cold noreturn nounwind }
+attributes #5 = { nobuiltin nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #6 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #7 = { nounwind }
+attributes #8 = { builtin nounwind }
+attributes #9 = { noreturn nounwind }
+
+!llvm.dbg.cu = !{!10}
+!llvm.module.flags = !{!234, !235, !236, !237, !238, !239, !240}
+!llvm.ident = !{!241}
+
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(scope: null, file: !2, line: 12, type: !3, isLocal: true, isDefinition: true)
+!2 = !DIFile(filename: "class_hierarchy.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "1c279c8f3da97407dfe236d9171aa011")
+!3 = !DICompositeType(tag: DW_TAG_array_type, baseType: !4, size: 136, elements: !6)
+!4 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !5)
+!5 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!6 = !{!7}
+!7 = !DISubrange(count: 17)
+!8 = !DIGlobalVariableExpression(var: !9, expr: !DIExpression())
+!9 = distinct !DIGlobalVariable(scope: null, file: !2, line: 19, type: !3, isLocal: true, isDefinition: true)
+!10 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !2, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !11, globals: !39, imports: !40, splitDebugInlining: false, nameTableKind: None)
+!11 = !{!12, !15, !32}
+!12 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "B", file: !2, line: 9, size: 64, flags: DIFlagTypePassByReference | DIFlagNonTrivial, elements: !13, vtableHolder: !15, identifier: "_ZTS1B")
+!13 = !{!14, !28}
+!14 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !12, baseType: !15, flags: DIFlagPublic, extraData: i32 0)
+!15 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "A", file: !2, line: 2, size: 64, flags: DIFlagTypePassByReference | DIFlagNonTrivial, elements: !16, vtableHolder: !15, identifier: "_ZTS1A")
+!16 = !{!17, !23, !27}
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "_vptr$A", scope: !2, file: !2, baseType: !18, size: 64, flags: DIFlagArtificial)
+!18 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64)
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "__vtbl_ptr_type", baseType: !20, size: 64)
+!20 = !DISubroutineType(types: !21)
+!21 = !{!22}
+!22 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!23 = !DISubprogram(name: "~A", scope: !15, file: !2, line: 4, type: !24, scopeLine: 4, containingType: !15, virtualIndex: 0, flags: DIFlagPublic | DIFlagPrototyped, spFlags: DISPFlagVirtual)
+!24 = !DISubroutineType(types: !25)
+!25 = !{null, !26}
+!26 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!27 = !DISubprogram(name: "foo", linkageName: "_ZN1A3fooEv", scope: !15, file: !2, line: 6, type: !24, scopeLine: 6, containingType: !15, virtualIndex: 2, flags: DIFlagPublic | DIFlagPrototyped, spFlags: DISPFlagPureVirtual)
+!28 = !DISubprogram(name: "foo", linkageName: "_ZN1B3fooEv", scope: !12, file: !2, line: 11, type: !29, scopeLine: 11, containingType: !12, virtualIndex: 2, flags: DIFlagPublic | DIFlagPrototyped, spFlags: DISPFlagVirtual)
+!29 = !DISubroutineType(types: !30)
+!30 = !{null, !31}
+!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!32 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "C", file: !2, line: 16, size: 64, flags: DIFlagTypePassByReference | DIFlagNonTrivial, elements: !33, vtableHolder: !15, identifier: "_ZTS1C")
+!33 = !{!34, !35}
+!34 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !32, baseType: !15, flags: DIFlagPublic, extraData: i32 0)
+!35 = !DISubprogram(name: "foo", linkageName: "_ZN1C3fooEv", scope: !32, file: !2, line: 18, type: !36, scopeLine: 18, containingType: !32, virtualIndex: 2, flags: DIFlagPublic | DIFlagPrototyped, spFlags: DISPFlagVirtual)
+!36 = !DISubroutineType(types: !37)
+!37 = !{null, !38}
+!38 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!39 = !{!0, !8}
+!40 = !{!41, !48, !54, !59, !63, !65, !67, !69, !71, !78, !84, !90, !94, !98, !102, !111, !115, !117, !122, !128, !132, !139, !141, !143, !147, !151, !153, !157, !161, !163, !167, !169, !171, !175, !179, !183, !187, !191, !195, !197, !204, !208, !212, !217, !219, !221, !225, !229, !230, !231, !232, !233}
+!41 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !43, file: !47, line: 98)
+!42 = !DINamespace(name: "std", scope: null)
+!43 = !DIDerivedType(tag: DW_TAG_typedef, name: "FILE", file: !44, line: 7, baseType: !45)
+!44 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/FILE.h", directory: "", checksumkind: CSK_MD5, checksum: "571f9fb6223c42439075fdde11a0de5d")
+!45 = !DICompositeType(tag: DW_TAG_structure_type, name: "_IO_FILE", file: !46, line: 49, size: 1728, flags: DIFlagFwdDecl, identifier: "_ZTS8_IO_FILE")
+!46 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h", directory: "", checksumkind: CSK_MD5, checksum: "7a6d4a00a37ee6b9a40cd04bd01f5d00")
+!47 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdio", directory: "")
+!48 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !49, file: !47, line: 99)
+!49 = !DIDerivedType(tag: DW_TAG_typedef, name: "fpos_t", file: !50, line: 85, baseType: !51)
+!50 = !DIFile(filename: "/usr/include/stdio.h", directory: "", checksumkind: CSK_MD5, checksum: "1e435c46987a169d9f9186f63a512303")
+!51 = !DIDerivedType(tag: DW_TAG_typedef, name: "__fpos_t", file: !52, line: 14, baseType: !53)
+!52 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/__fpos_t.h", directory: "", checksumkind: CSK_MD5, checksum: "32de8bdaf3551a6c0a9394f9af4389ce")
+!53 = !DICompositeType(tag: DW_TAG_structure_type, name: "_G_fpos_t", file: !52, line: 10, size: 128, flags: DIFlagFwdDecl, identifier: "_ZTS9_G_fpos_t")
+!54 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !55, file: !47, line: 101)
+!55 = !DISubprogram(name: "clearerr", scope: !50, file: !50, line: 860, type: !56, flags: DIFlagPrototyped, spFlags: 0)
+!56 = !DISubroutineType(types: !57)
+!57 = !{null, !58}
+!58 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !43, size: 64)
+!59 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !60, file: !47, line: 102)
+!60 = !DISubprogram(name: "fclose", scope: !50, file: !50, line: 184, type: !61, flags: DIFlagPrototyped, spFlags: 0)
+!61 = !DISubroutineType(types: !62)
+!62 = !{!22, !58}
+!63 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !64, file: !47, line: 103)
+!64 = !DISubprogram(name: "feof", scope: !50, file: !50, line: 862, type: !61, flags: DIFlagPrototyped, spFlags: 0)
+!65 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !66, file: !47, line: 104)
+!66 = !DISubprogram(name: "ferror", scope: !50, file: !50, line: 864, type: !61, flags: DIFlagPrototyped, spFlags: 0)
+!67 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !68, file: !47, line: 105)
+!68 = !DISubprogram(name: "fflush", scope: !50, file: !50, line: 236, type: !61, flags: DIFlagPrototyped, spFlags: 0)
+!69 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !70, file: !47, line: 106)
+!70 = !DISubprogram(name: "fgetc", scope: !50, file: !50, line: 575, type: !61, flags: DIFlagPrototyped, spFlags: 0)
+!71 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !72, file: !47, line: 107)
+!72 = !DISubprogram(name: "fgetpos", scope: !50, file: !50, line: 829, type: !73, flags: DIFlagPrototyped, spFlags: 0)
+!73 = !DISubroutineType(types: !74)
+!74 = !{!22, !75, !76}
+!75 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !58)
+!76 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !77)
+!77 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !49, size: 64)
+!78 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !79, file: !47, line: 108)
+!79 = !DISubprogram(name: "fgets", scope: !50, file: !50, line: 654, type: !80, flags: DIFlagPrototyped, spFlags: 0)
+!80 = !DISubroutineType(types: !81)
+!81 = !{!82, !83, !22, !75}
+!82 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!83 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !82)
+!84 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !85, file: !47, line: 109)
+!85 = !DISubprogram(name: "fopen", scope: !50, file: !50, line: 264, type: !86, flags: DIFlagPrototyped, spFlags: 0)
+!86 = !DISubroutineType(types: !87)
+!87 = !{!58, !88, !88}
+!88 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !89)
+!89 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!90 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !91, file: !47, line: 110)
+!91 = !DISubprogram(name: "fprintf", scope: !50, file: !50, line: 357, type: !92, flags: DIFlagPrototyped, spFlags: 0)
+!92 = !DISubroutineType(types: !93)
+!93 = !{!22, !75, !88, null}
+!94 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !95, file: !47, line: 111)
+!95 = !DISubprogram(name: "fputc", scope: !50, file: !50, line: 611, type: !96, flags: DIFlagPrototyped, spFlags: 0)
+!96 = !DISubroutineType(types: !97)
+!97 = !{!22, !22, !58}
+!98 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !99, file: !47, line: 112)
+!99 = !DISubprogram(name: "fputs", scope: !50, file: !50, line: 717, type: !100, flags: DIFlagPrototyped, spFlags: 0)
+!100 = !DISubroutineType(types: !101)
+!101 = !{!22, !88, !75}
+!102 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !103, file: !47, line: 113)
+!103 = !DISubprogram(name: "fread", scope: !50, file: !50, line: 738, type: !104, flags: DIFlagPrototyped, spFlags: 0)
+!104 = !DISubroutineType(types: !105)
+!105 = !{!106, !109, !106, !106, !75}
+!106 = !DIDerivedType(tag: DW_TAG_typedef, name: "size_t", file: !107, line: 46, baseType: !108)
+!107 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/stddef.h", directory: "", checksumkind: CSK_MD5, checksum: "b76978376d35d5cd171876ac58ac1256")
+!108 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!109 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !110)
+!110 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!111 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !112, file: !47, line: 114)
+!112 = !DISubprogram(name: "freopen", scope: !50, file: !50, line: 271, type: !113, flags: DIFlagPrototyped, spFlags: 0)
+!113 = !DISubroutineType(types: !114)
+!114 = !{!58, !88, !88, !75}
+!115 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !116, file: !47, line: 115)
+!116 = !DISubprogram(name: "fscanf", linkageName: "__isoc23_fscanf", scope: !50, file: !50, line: 442, type: !92, flags: DIFlagPrototyped, spFlags: 0)
+!117 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !118, file: !47, line: 116)
+!118 = !DISubprogram(name: "fseek", scope: !50, file: !50, line: 779, type: !119, flags: DIFlagPrototyped, spFlags: 0)
+!119 = !DISubroutineType(types: !120)
+!120 = !{!22, !58, !121, !22}
+!121 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
+!122 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !123, file: !47, line: 117)
+!123 = !DISubprogram(name: "fsetpos", scope: !50, file: !50, line: 835, type: !124, flags: DIFlagPrototyped, spFlags: 0)
+!124 = !DISubroutineType(types: !125)
+!125 = !{!22, !58, !126}
+!126 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !127, size: 64)
+!127 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !49)
+!128 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !129, file: !47, line: 118)
+!129 = !DISubprogram(name: "ftell", scope: !50, file: !50, line: 785, type: !130, flags: DIFlagPrototyped, spFlags: 0)
+!130 = !DISubroutineType(types: !131)
+!131 = !{!121, !58}
+!132 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !133, file: !47, line: 119)
+!133 = !DISubprogram(name: "fwrite", scope: !50, file: !50, line: 745, type: !134, flags: DIFlagPrototyped, spFlags: 0)
+!134 = !DISubroutineType(types: !135)
+!135 = !{!106, !136, !106, !106, !75}
+!136 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !137)
+!137 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !138, size: 64)
+!138 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!139 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !140, file: !47, line: 120)
+!140 = !DISubprogram(name: "getc", scope: !50, file: !50, line: 576, type: !61, flags: DIFlagPrototyped, spFlags: 0)
+!141 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !142, file: !47, line: 121)
+!142 = !DISubprogram(name: "getchar", scope: !50, file: !50, line: 582, type: !20, flags: DIFlagPrototyped, spFlags: 0)
+!143 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !144, file: !47, line: 126)
+!144 = !DISubprogram(name: "perror", scope: !50, file: !50, line: 878, type: !145, flags: DIFlagPrototyped, spFlags: 0)
+!145 = !DISubroutineType(types: !146)
+!146 = !{null, !89}
+!147 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !148, file: !47, line: 127)
+!148 = !DISubprogram(name: "printf", scope: !50, file: !50, line: 363, type: !149, flags: DIFlagPrototyped, spFlags: 0)
+!149 = !DISubroutineType(types: !150)
+!150 = !{!22, !88, null}
+!151 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !152, file: !47, line: 128)
+!152 = !DISubprogram(name: "putc", scope: !50, file: !50, line: 612, type: !96, flags: DIFlagPrototyped, spFlags: 0)
+!153 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !154, file: !47, line: 129)
+!154 = !DISubprogram(name: "putchar", scope: !50, file: !50, line: 618, type: !155, flags: DIFlagPrototyped, spFlags: 0)
+!155 = !DISubroutineType(types: !156)
+!156 = !{!22, !22}
+!157 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !158, file: !47, line: 130)
+!158 = !DISubprogram(name: "puts", scope: !50, file: !50, line: 724, type: !159, flags: DIFlagPrototyped, spFlags: 0)
+!159 = !DISubroutineType(types: !160)
+!160 = !{!22, !89}
+!161 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !162, file: !47, line: 131)
+!162 = !DISubprogram(name: "remove", scope: !50, file: !50, line: 158, type: !159, flags: DIFlagPrototyped, spFlags: 0)
+!163 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !164, file: !47, line: 132)
+!164 = !DISubprogram(name: "rename", scope: !50, file: !50, line: 160, type: !165, flags: DIFlagPrototyped, spFlags: 0)
+!165 = !DISubroutineType(types: !166)
+!166 = !{!22, !89, !89}
+!167 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !168, file: !47, line: 133)
+!168 = !DISubprogram(name: "rewind", scope: !50, file: !50, line: 790, type: !56, flags: DIFlagPrototyped, spFlags: 0)
+!169 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !170, file: !47, line: 134)
+!170 = !DISubprogram(name: "scanf", linkageName: "__isoc23_scanf", scope: !50, file: !50, line: 445, type: !149, flags: DIFlagPrototyped, spFlags: 0)
+!171 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !172, file: !47, line: 135)
+!172 = !DISubprogram(name: "setbuf", scope: !50, file: !50, line: 334, type: !173, flags: DIFlagPrototyped, spFlags: 0)
+!173 = !DISubroutineType(types: !174)
+!174 = !{null, !75, !83}
+!175 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !176, file: !47, line: 136)
+!176 = !DISubprogram(name: "setvbuf", scope: !50, file: !50, line: 339, type: !177, flags: DIFlagPrototyped, spFlags: 0)
+!177 = !DISubroutineType(types: !178)
+!178 = !{!22, !75, !83, !22, !106}
+!179 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !180, file: !47, line: 137)
+!180 = !DISubprogram(name: "sprintf", scope: !50, file: !50, line: 365, type: !181, flags: DIFlagPrototyped, spFlags: 0)
+!181 = !DISubroutineType(types: !182)
+!182 = !{!22, !83, !88, null}
+!183 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !184, file: !47, line: 138)
+!184 = !DISubprogram(name: "sscanf", linkageName: "__isoc23_sscanf", scope: !50, file: !50, line: 447, type: !185, flags: DIFlagPrototyped, spFlags: 0)
+!185 = !DISubroutineType(types: !186)
+!186 = !{!22, !88, !88, null}
+!187 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !188, file: !47, line: 139)
+!188 = !DISubprogram(name: "tmpfile", scope: !50, file: !50, line: 194, type: !189, flags: DIFlagPrototyped, spFlags: 0)
+!189 = !DISubroutineType(types: !190)
+!190 = !{!58}
+!191 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !192, file: !47, line: 141)
+!192 = !DISubprogram(name: "tmpnam", scope: !50, file: !50, line: 211, type: !193, flags: DIFlagPrototyped, spFlags: 0)
+!193 = !DISubroutineType(types: !194)
+!194 = !{!82, !82}
+!195 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !196, file: !47, line: 143)
+!196 = !DISubprogram(name: "ungetc", scope: !50, file: !50, line: 731, type: !96, flags: DIFlagPrototyped, spFlags: 0)
+!197 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !198, file: !47, line: 144)
+!198 = !DISubprogram(name: "vfprintf", scope: !50, file: !50, line: 372, type: !199, flags: DIFlagPrototyped, spFlags: 0)
+!199 = !DISubroutineType(types: !200)
+!200 = !{!22, !75, !88, !201}
+!201 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !202, size: 64)
+!202 = !DICompositeType(tag: DW_TAG_structure_type, name: "__va_list_tag", file: !203, size: 192, flags: DIFlagFwdDecl, identifier: "_ZTS13__va_list_tag")
+!203 = !DIFile(filename: "class_hierarchy.cpp", directory: "phasar/examples/llvm-hello-world/target")
+!204 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !205, file: !47, line: 145)
+!205 = !DISubprogram(name: "vprintf", scope: !50, file: !50, line: 378, type: !206, flags: DIFlagPrototyped, spFlags: 0)
+!206 = !DISubroutineType(types: !207)
+!207 = !{!22, !88, !201}
+!208 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !209, file: !47, line: 146)
+!209 = !DISubprogram(name: "vsprintf", scope: !50, file: !50, line: 380, type: !210, flags: DIFlagPrototyped, spFlags: 0)
+!210 = !DISubroutineType(types: !211)
+!211 = !{!22, !83, !88, !201}
+!212 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !213, entity: !214, file: !47, line: 175)
+!213 = !DINamespace(name: "__gnu_cxx", scope: null)
+!214 = !DISubprogram(name: "snprintf", scope: !50, file: !50, line: 385, type: !215, flags: DIFlagPrototyped, spFlags: 0)
+!215 = !DISubroutineType(types: !216)
+!216 = !{!22, !83, !106, !88, null}
+!217 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !213, entity: !218, file: !47, line: 176)
+!218 = !DISubprogram(name: "vfscanf", linkageName: "__isoc23_vfscanf", scope: !50, file: !50, line: 511, type: !199, flags: DIFlagPrototyped, spFlags: 0)
+!219 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !213, entity: !220, file: !47, line: 177)
+!220 = !DISubprogram(name: "vscanf", linkageName: "__isoc23_vscanf", scope: !50, file: !50, line: 516, type: !206, flags: DIFlagPrototyped, spFlags: 0)
+!221 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !213, entity: !222, file: !47, line: 178)
+!222 = !DISubprogram(name: "vsnprintf", scope: !50, file: !50, line: 389, type: !223, flags: DIFlagPrototyped, spFlags: 0)
+!223 = !DISubroutineType(types: !224)
+!224 = !{!22, !83, !106, !88, !201}
+!225 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !213, entity: !226, file: !47, line: 179)
+!226 = !DISubprogram(name: "vsscanf", linkageName: "__isoc23_vsscanf", scope: !50, file: !50, line: 519, type: !227, flags: DIFlagPrototyped, spFlags: 0)
+!227 = !DISubroutineType(types: !228)
+!228 = !{!22, !88, !88, !201}
+!229 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !214, file: !47, line: 185)
+!230 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !218, file: !47, line: 186)
+!231 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !220, file: !47, line: 187)
+!232 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !222, file: !47, line: 188)
+!233 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !42, entity: !226, file: !47, line: 189)
+!234 = !{i32 7, !"Dwarf Version", i32 5}
+!235 = !{i32 2, !"Debug Info Version", i32 3}
+!236 = !{i32 1, !"wchar_size", i32 4}
+!237 = !{i32 7, !"PIC Level", i32 2}
+!238 = !{i32 7, !"PIE Level", i32 2}
+!239 = !{i32 7, !"uwtable", i32 2}
+!240 = !{i32 7, !"frame-pointer", i32 2}
+!241 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!242 = distinct !DISubprogram(name: "main", scope: !2, file: !2, line: 23, type: !20, scopeLine: 23, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, retainedNodes: !243)
+!243 = !{}
+!244 = !DILocalVariable(name: "b", scope: !242, file: !2, line: 24, type: !12)
+!245 = !DILocation(line: 24, column: 5, scope: !242)
+!246 = !DILocation(line: 25, column: 5, scope: !242)
+!247 = !DILocalVariable(name: "c", scope: !242, file: !2, line: 27, type: !32)
+!248 = !DILocation(line: 27, column: 5, scope: !242)
+!249 = !DILocation(line: 28, column: 5, scope: !242)
+!250 = !DILocalVariable(name: "a", scope: !242, file: !2, line: 30, type: !251)
+!251 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !15, size: 64)
+!252 = !DILocation(line: 30, column: 6, scope: !242)
+!253 = !DILocation(line: 31, column: 3, scope: !242)
+!254 = !DILocation(line: 31, column: 5, scope: !242)
+!255 = !DILocation(line: 32, column: 1, scope: !242)
+!256 = distinct !DISubprogram(name: "B", linkageName: "_ZN1BC2Ev", scope: !12, file: !2, line: 9, type: !29, scopeLine: 9, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !257, retainedNodes: !243)
+!257 = !DISubprogram(name: "B", scope: !12, type: !29, flags: DIFlagPublic | DIFlagArtificial | DIFlagPrototyped, spFlags: 0)
+!258 = !DILocalVariable(name: "this", arg: 1, scope: !256, type: !259, flags: DIFlagArtificial | DIFlagObjectPointer)
+!259 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!260 = !DILocation(line: 0, scope: !256)
+!261 = !DILocation(line: 9, column: 7, scope: !256)
+!262 = distinct !DISubprogram(name: "foo", linkageName: "_ZN1B3fooEv", scope: !12, file: !2, line: 11, type: !29, scopeLine: 11, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !28, retainedNodes: !243)
+!263 = !DILocalVariable(name: "this", arg: 1, scope: !262, type: !259, flags: DIFlagArtificial | DIFlagObjectPointer)
+!264 = !DILocation(line: 0, scope: !262)
+!265 = !DILocation(line: 12, column: 5, scope: !262)
+!266 = !DILocation(line: 13, column: 3, scope: !262)
+!267 = distinct !DISubprogram(name: "C", linkageName: "_ZN1CC2Ev", scope: !32, file: !2, line: 16, type: !36, scopeLine: 16, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !268, retainedNodes: !243)
+!268 = !DISubprogram(name: "C", scope: !32, type: !36, flags: DIFlagPublic | DIFlagArtificial | DIFlagPrototyped, spFlags: 0)
+!269 = !DILocalVariable(name: "this", arg: 1, scope: !267, type: !270, flags: DIFlagArtificial | DIFlagObjectPointer)
+!270 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !32, size: 64)
+!271 = !DILocation(line: 0, scope: !267)
+!272 = !DILocation(line: 16, column: 7, scope: !267)
+!273 = distinct !DISubprogram(name: "foo", linkageName: "_ZN1C3fooEv", scope: !32, file: !2, line: 18, type: !36, scopeLine: 18, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !35, retainedNodes: !243)
+!274 = !DILocalVariable(name: "this", arg: 1, scope: !273, type: !270, flags: DIFlagArtificial | DIFlagObjectPointer)
+!275 = !DILocation(line: 0, scope: !273)
+!276 = !DILocation(line: 19, column: 5, scope: !273)
+!277 = !DILocation(line: 20, column: 3, scope: !273)
+!278 = distinct !DISubprogram(name: "~C", linkageName: "_ZN1CD2Ev", scope: !32, file: !2, line: 16, type: !36, scopeLine: 16, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !279, retainedNodes: !243)
+!279 = !DISubprogram(name: "~C", scope: !32, type: !36, containingType: !32, virtualIndex: 0, flags: DIFlagPublic | DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagVirtual)
+!280 = !DILocalVariable(name: "this", arg: 1, scope: !278, type: !270, flags: DIFlagArtificial | DIFlagObjectPointer)
+!281 = !DILocation(line: 0, scope: !278)
+!282 = !DILocation(line: 16, column: 7, scope: !283)
+!283 = distinct !DILexicalBlock(scope: !278, file: !2, line: 16, column: 7)
+!284 = !DILocation(line: 16, column: 7, scope: !278)
+!285 = distinct !DISubprogram(name: "~B", linkageName: "_ZN1BD2Ev", scope: !12, file: !2, line: 9, type: !29, scopeLine: 9, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !286, retainedNodes: !243)
+!286 = !DISubprogram(name: "~B", scope: !12, type: !29, containingType: !12, virtualIndex: 0, flags: DIFlagPublic | DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagVirtual)
+!287 = !DILocalVariable(name: "this", arg: 1, scope: !285, type: !259, flags: DIFlagArtificial | DIFlagObjectPointer)
+!288 = !DILocation(line: 0, scope: !285)
+!289 = !DILocation(line: 9, column: 7, scope: !290)
+!290 = distinct !DILexicalBlock(scope: !285, file: !2, line: 9, column: 7)
+!291 = !DILocation(line: 9, column: 7, scope: !285)
+!292 = distinct !DISubprogram(name: "A", linkageName: "_ZN1AC2Ev", scope: !15, file: !2, line: 2, type: !24, scopeLine: 2, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !293, retainedNodes: !243)
+!293 = !DISubprogram(name: "A", scope: !15, type: !24, flags: DIFlagPublic | DIFlagArtificial | DIFlagPrototyped, spFlags: 0)
+!294 = !DILocalVariable(name: "this", arg: 1, scope: !292, type: !295, flags: DIFlagArtificial | DIFlagObjectPointer)
+!295 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!296 = !DILocation(line: 0, scope: !292)
+!297 = !DILocation(line: 2, column: 7, scope: !292)
+!298 = distinct !DISubprogram(name: "~B", linkageName: "_ZN1BD0Ev", scope: !12, file: !2, line: 9, type: !29, scopeLine: 9, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !286, retainedNodes: !243)
+!299 = !DILocalVariable(name: "this", arg: 1, scope: !298, type: !259, flags: DIFlagArtificial | DIFlagObjectPointer)
+!300 = !DILocation(line: 0, scope: !298)
+!301 = !DILocation(line: 9, column: 7, scope: !298)
+!302 = distinct !DISubprogram(name: "~A", linkageName: "_ZN1AD2Ev", scope: !15, file: !2, line: 4, type: !24, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !23, retainedNodes: !243)
+!303 = !DILocalVariable(name: "this", arg: 1, scope: !302, type: !295, flags: DIFlagArtificial | DIFlagObjectPointer)
+!304 = !DILocation(line: 0, scope: !302)
+!305 = !DILocation(line: 4, column: 24, scope: !302)
+!306 = distinct !DISubprogram(name: "~A", linkageName: "_ZN1AD0Ev", scope: !15, file: !2, line: 4, type: !24, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !23, retainedNodes: !243)
+!307 = !DILocalVariable(name: "this", arg: 1, scope: !306, type: !295, flags: DIFlagArtificial | DIFlagObjectPointer)
+!308 = !DILocation(line: 0, scope: !306)
+!309 = !DILocation(line: 4, column: 24, scope: !306)
+!310 = distinct !DISubprogram(name: "~C", linkageName: "_ZN1CD0Ev", scope: !32, file: !2, line: 16, type: !36, scopeLine: 16, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !10, declaration: !279, retainedNodes: !243)
+!311 = !DILocalVariable(name: "this", arg: 1, scope: !310, type: !270, flags: DIFlagArtificial | DIFlagObjectPointer)
+!312 = !DILocation(line: 0, scope: !310)
+!313 = !DILocation(line: 16, column: 7, scope: !310)
diff --git a/examples/llvm-hello-world/target/exception.ll b/examples/llvm-hello-world/target/exception.ll
index c373ec8ed9..2ab1e969e7 100644
--- a/examples/llvm-hello-world/target/exception.ll
+++ b/examples/llvm-hello-world/target/exception.ll
@@ -1,145 +1,909 @@
 ; ModuleID = 'exception.cpp'
 source_filename = "exception.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-%"class.std::runtime_error" = type { %"class.std::exception", %"struct.std::__cow_string" }
-%"class.std::exception" = type { i32 (...)** }
-%"struct.std::__cow_string" = type { %union.anon }
-%union.anon = type { i8* }
-
-@.str = private unnamed_addr constant [6 x i8] c"error\00", align 1
-@_ZTISt13runtime_error = external constant i8*
-
-; Function Attrs: noinline optnone uwtable
-define void @_Z9may_throwi(i32) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
-  %2 = alloca i32, align 4
-  %3 = alloca i8*
-  %4 = alloca i32
-  store i32 %0, i32* %2, align 4
-  %5 = load i32, i32* %2, align 4
-  %6 = icmp eq i32 %5, 1
-  br i1 %6, label %7, label %15
-
-; <label>:7:                                      ; preds = %1
-  %8 = call i8* @__cxa_allocate_exception(i64 16) #5
-  %9 = bitcast i8* %8 to %"class.std::runtime_error"*
-  invoke void @_ZNSt13runtime_errorC1EPKc(%"class.std::runtime_error"* %9, i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0))
-          to label %10 unwind label %11
-
-; <label>:10:                                     ; preds = %7
-  call void @__cxa_throw(i8* %8, i8* bitcast (i8** @_ZTISt13runtime_error to i8*), i8* bitcast (void (%"class.std::runtime_error"*)* @_ZNSt13runtime_errorD1Ev to i8*)) #6
-  unreachable
-
-; <label>:11:                                     ; preds = %7
-  %12 = landingpad { i8*, i32 }
-          cleanup
-  %13 = extractvalue { i8*, i32 } %12, 0
-  store i8* %13, i8** %3, align 8
-  %14 = extractvalue { i8*, i32 } %12, 1
-  store i32 %14, i32* %4, align 4
-  call void @__cxa_free_exception(i8* %8) #5
-  br label %16
-
-; <label>:15:                                     ; preds = %1
-  ret void
-
-; <label>:16:                                     ; preds = %11
-  %17 = load i8*, i8** %3, align 8
-  %18 = load i32, i32* %4, align 4
-  %19 = insertvalue { i8*, i32 } undef, i8* %17, 0
-  %20 = insertvalue { i8*, i32 } %19, i32 %18, 1
-  resume { i8*, i32 } %20
+@.str = private unnamed_addr constant [6 x i8] c"error\00", align 1, !dbg !0
+@_ZTISt13runtime_error = external constant ptr
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define dso_local void @_Z9may_throwi(i32 noundef %i) #0 personality ptr @__gxx_personality_v0 !dbg !725 {
+entry:
+  %i.addr = alloca i32, align 4
+  %exn.slot = alloca ptr, align 8
+  %ehselector.slot = alloca i32, align 4
+  store i32 %i, ptr %i.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %i.addr, metadata !727, metadata !DIExpression()), !dbg !728
+  %0 = load i32, ptr %i.addr, align 4, !dbg !729
+  %cmp = icmp eq i32 %0, 1, !dbg !731
+  br i1 %cmp, label %if.then, label %if.end, !dbg !732
+
+if.then:                                          ; preds = %entry
+  %exception = call ptr @__cxa_allocate_exception(i64 16) #6, !dbg !733
+  invoke void @_ZNSt13runtime_errorC1EPKc(ptr noundef nonnull align 8 dereferenceable(16) %exception, ptr noundef @.str)
+          to label %invoke.cont unwind label %lpad, !dbg !735
+
+invoke.cont:                                      ; preds = %if.then
+  call void @__cxa_throw(ptr %exception, ptr @_ZTISt13runtime_error, ptr @_ZNSt13runtime_errorD1Ev) #7, !dbg !733
+  unreachable, !dbg !733
+
+lpad:                                             ; preds = %if.then
+  %1 = landingpad { ptr, i32 }
+          cleanup, !dbg !736
+  %2 = extractvalue { ptr, i32 } %1, 0, !dbg !736
+  store ptr %2, ptr %exn.slot, align 8, !dbg !736
+  %3 = extractvalue { ptr, i32 } %1, 1, !dbg !736
+  store i32 %3, ptr %ehselector.slot, align 4, !dbg !736
+  call void @__cxa_free_exception(ptr %exception) #6, !dbg !733
+  br label %eh.resume, !dbg !733
+
+if.end:                                           ; preds = %entry
+  ret void, !dbg !737
+
+eh.resume:                                        ; preds = %lpad
+  %exn = load ptr, ptr %exn.slot, align 8, !dbg !733
+  %sel = load i32, ptr %ehselector.slot, align 4, !dbg !733
+  %lpad.val = insertvalue { ptr, i32 } undef, ptr %exn, 0, !dbg !733
+  %lpad.val1 = insertvalue { ptr, i32 } %lpad.val, i32 %sel, 1, !dbg !733
+  resume { ptr, i32 } %lpad.val1, !dbg !733
 }
 
-declare i8* @__cxa_allocate_exception(i64)
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-declare void @_ZNSt13runtime_errorC1EPKc(%"class.std::runtime_error"*, i8*) unnamed_addr #1
+declare ptr @__cxa_allocate_exception(i64)
+
+declare void @_ZNSt13runtime_errorC1EPKc(ptr noundef nonnull align 8 dereferenceable(16), ptr noundef) unnamed_addr #2
 
 declare i32 @__gxx_personality_v0(...)
 
-declare void @__cxa_free_exception(i8*)
+declare void @__cxa_free_exception(ptr)
 
 ; Function Attrs: nounwind
-declare void @_ZNSt13runtime_errorD1Ev(%"class.std::runtime_error"*) unnamed_addr #2
-
-declare void @__cxa_throw(i8*, i8*, i8*)
-
-; Function Attrs: noinline norecurse optnone uwtable
-define i32 @main(i32, i8**) #3 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i8, align 1
-  %7 = alloca i8*
-  %8 = alloca i32
-  %9 = alloca %"class.std::runtime_error"*, align 8
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  store i8 0, i8* %6, align 1
-  %10 = load i32, i32* %4, align 4
-  invoke void @_Z9may_throwi(i32 %10)
-          to label %11 unwind label %12
-
-; <label>:11:                                     ; preds = %2
-  br label %24
-
-; <label>:12:                                     ; preds = %2
-  %13 = landingpad { i8*, i32 }
-          catch i8* bitcast (i8** @_ZTISt13runtime_error to i8*)
-  %14 = extractvalue { i8*, i32 } %13, 0
-  store i8* %14, i8** %7, align 8
-  %15 = extractvalue { i8*, i32 } %13, 1
-  store i32 %15, i32* %8, align 4
-  br label %16
-
-; <label>:16:                                     ; preds = %12
-  %17 = load i32, i32* %8, align 4
-  %18 = call i32 @llvm.eh.typeid.for(i8* bitcast (i8** @_ZTISt13runtime_error to i8*)) #5
-  %19 = icmp eq i32 %17, %18
-  br i1 %19, label %20, label %28
-
-; <label>:20:                                     ; preds = %16
-  %21 = load i8*, i8** %7, align 8
-  %22 = call i8* @__cxa_begin_catch(i8* %21) #5
-  %23 = bitcast i8* %22 to %"class.std::runtime_error"*
-  store %"class.std::runtime_error"* %23, %"class.std::runtime_error"** %9, align 8
-  store i8 1, i8* %6, align 1
-  call void @__cxa_end_catch()
-  br label %24
-
-; <label>:24:                                     ; preds = %20, %11
-  %25 = load i8, i8* %6, align 1
-  %26 = trunc i8 %25 to i1
-  %27 = zext i1 %26 to i32
-  ret i32 %27
-
-; <label>:28:                                     ; preds = %16
-  %29 = load i8*, i8** %7, align 8
-  %30 = load i32, i32* %8, align 4
-  %31 = insertvalue { i8*, i32 } undef, i8* %29, 0
-  %32 = insertvalue { i8*, i32 } %31, i32 %30, 1
-  resume { i8*, i32 } %32
+declare void @_ZNSt13runtime_errorD1Ev(ptr noundef nonnull align 8 dereferenceable(16)) unnamed_addr #3
+
+declare void @__cxa_throw(ptr, ptr, ptr)
+
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #4 personality ptr @__gxx_personality_v0 !dbg !738 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %has_thrown = alloca i8, align 1
+  %exn.slot = alloca ptr, align 8
+  %ehselector.slot = alloca i32, align 4
+  %e = alloca ptr, align 8
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !741, metadata !DIExpression()), !dbg !742
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !743, metadata !DIExpression()), !dbg !744
+  call void @llvm.dbg.declare(metadata ptr %has_thrown, metadata !745, metadata !DIExpression()), !dbg !747
+  store i8 0, ptr %has_thrown, align 1, !dbg !747
+  %0 = load i32, ptr %argc.addr, align 4, !dbg !748
+  invoke void @_Z9may_throwi(i32 noundef %0)
+          to label %invoke.cont unwind label %lpad, !dbg !750
+
+invoke.cont:                                      ; preds = %entry
+  br label %try.cont, !dbg !751
+
+lpad:                                             ; preds = %entry
+  %1 = landingpad { ptr, i32 }
+          catch ptr @_ZTISt13runtime_error, !dbg !752
+  %2 = extractvalue { ptr, i32 } %1, 0, !dbg !752
+  store ptr %2, ptr %exn.slot, align 8, !dbg !752
+  %3 = extractvalue { ptr, i32 } %1, 1, !dbg !752
+  store i32 %3, ptr %ehselector.slot, align 4, !dbg !752
+  br label %catch.dispatch, !dbg !752
+
+catch.dispatch:                                   ; preds = %lpad
+  %sel = load i32, ptr %ehselector.slot, align 4, !dbg !751
+  %4 = call i32 @llvm.eh.typeid.for(ptr @_ZTISt13runtime_error) #6, !dbg !751
+  %matches = icmp eq i32 %sel, %4, !dbg !751
+  br i1 %matches, label %catch, label %eh.resume, !dbg !751
+
+catch:                                            ; preds = %catch.dispatch
+  call void @llvm.dbg.declare(metadata ptr %e, metadata !753, metadata !DIExpression()), !dbg !755
+  %exn = load ptr, ptr %exn.slot, align 8, !dbg !751
+  %5 = call ptr @__cxa_begin_catch(ptr %exn) #6, !dbg !751
+  store ptr %5, ptr %e, align 8, !dbg !751
+  store i8 1, ptr %has_thrown, align 1, !dbg !756
+  call void @__cxa_end_catch(), !dbg !758
+  br label %try.cont, !dbg !758
+
+try.cont:                                         ; preds = %catch, %invoke.cont
+  %6 = load i8, ptr %has_thrown, align 1, !dbg !759
+  %tobool = trunc i8 %6 to i1, !dbg !759
+  %conv = zext i1 %tobool to i32, !dbg !759
+  ret i32 %conv, !dbg !760
+
+eh.resume:                                        ; preds = %catch.dispatch
+  %exn1 = load ptr, ptr %exn.slot, align 8, !dbg !751
+  %sel2 = load i32, ptr %ehselector.slot, align 4, !dbg !751
+  %lpad.val = insertvalue { ptr, i32 } undef, ptr %exn1, 0, !dbg !751
+  %lpad.val3 = insertvalue { ptr, i32 } %lpad.val, i32 %sel2, 1, !dbg !751
+  resume { ptr, i32 } %lpad.val3, !dbg !751
 }
 
 ; Function Attrs: nounwind readnone
-declare i32 @llvm.eh.typeid.for(i8*) #4
+declare i32 @llvm.eh.typeid.for(ptr) #5
 
-declare i8* @__cxa_begin_catch(i8*)
+declare ptr @__cxa_begin_catch(ptr)
 
 declare void @__cxa_end_catch()
 
-attributes #0 = { noinline optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { noinline norecurse optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #4 = { nounwind readnone }
-attributes #5 = { nounwind }
-attributes #6 = { noreturn }
+attributes #0 = { mustprogress noinline optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #5 = { nounwind readnone }
+attributes #6 = { nounwind }
+attributes #7 = { noreturn }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!8}
+!llvm.module.flags = !{!717, !718, !719, !720, !721, !722, !723}
+!llvm.ident = !{!724}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(scope: null, file: !2, line: 5, type: !3, isLocal: true, isDefinition: true)
+!2 = !DIFile(filename: "exception.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "caa05e70041dc5829f2bfa4a7fa7aa4c")
+!3 = !DICompositeType(tag: DW_TAG_array_type, baseType: !4, size: 48, elements: !6)
+!4 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !5)
+!5 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!6 = !{!7}
+!7 = !DISubrange(count: 6)
+!8 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !2, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !9, globals: !13, imports: !14, splitDebugInlining: false, nameTableKind: None)
+!9 = !{!10}
+!10 = !DICompositeType(tag: DW_TAG_class_type, name: "runtime_error", scope: !12, file: !11, line: 219, size: 128, flags: DIFlagFwdDecl | DIFlagNonTrivial)
+!11 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/stdexcept", directory: "")
+!12 = !DINamespace(name: "std", scope: null)
+!13 = !{!0}
+!14 = !{!15, !19, !23, !28, !47, !50, !55, !63, !71, !75, !82, !86, !90, !92, !94, !98, !109, !113, !119, !125, !127, !131, !135, !139, !143, !156, !158, !162, !166, !170, !172, !178, !182, !186, !188, !190, !194, !202, !206, !210, !214, !216, !222, !224, !231, !236, !240, !245, !249, !253, !257, !259, !261, !265, !269, !273, !275, !279, !283, !285, !287, !291, !297, !302, !307, !308, !309, !310, !311, !312, !313, !314, !315, !316, !317, !321, !325, !330, !336, !338, !340, !342, !344, !346, !348, !350, !352, !354, !356, !358, !360, !362, !366, !370, !374, !380, !384, !389, !391, !395, !399, !403, !413, !417, !421, !425, !429, !433, !437, !441, !445, !449, !453, !457, !461, !463, !467, !471, !475, !481, !485, !489, !491, !495, !499, !505, !507, !511, !515, !519, !523, !527, !531, !535, !536, !537, !538, !540, !541, !542, !543, !544, !545, !546, !550, !556, !561, !565, !567, !569, !571, !573, !580, !584, !588, !592, !596, !600, !605, !609, !611, !615, !621, !625, !630, !632, !634, !638, !642, !644, !646, !648, !650, !654, !656, !658, !662, !666, !670, !674, !678, !682, !684, !688, !692, !696, !700, !702, !704, !708, !712, !713, !714, !715, !716}
+!15 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !16, file: !17, line: 66)
+!16 = !DICompositeType(tag: DW_TAG_class_type, name: "exception_ptr", scope: !18, file: !17, line: 97, size: 64, flags: DIFlagFwdDecl | DIFlagNonTrivial, identifier: "_ZTSNSt15__exception_ptr13exception_ptrE")
+!17 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/exception_ptr.h", directory: "", checksumkind: CSK_MD5, checksum: "314ad14748ccb9ff85c65d17ebb0828b")
+!18 = !DINamespace(name: "__exception_ptr", scope: !12)
+!19 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !18, entity: !20, file: !17, line: 85)
+!20 = !DISubprogram(name: "rethrow_exception", linkageName: "_ZSt17rethrow_exceptionNSt15__exception_ptr13exception_ptrE", scope: !12, file: !17, line: 81, type: !21, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!21 = !DISubroutineType(types: !22)
+!22 = !{null, !16}
+!23 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !24, file: !17, line: 243)
+!24 = !DISubprogram(name: "swap", linkageName: "_ZNSt15__exception_ptr4swapERNS_13exception_ptrES1_", scope: !18, file: !17, line: 230, type: !25, flags: DIFlagPrototyped, spFlags: 0)
+!25 = !DISubroutineType(types: !26)
+!26 = !{null, !27, !27}
+!27 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !16, size: 64)
+!28 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !29, file: !46, line: 64)
+!29 = !DIDerivedType(tag: DW_TAG_typedef, name: "mbstate_t", file: !30, line: 6, baseType: !31)
+!30 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/mbstate_t.h", directory: "", checksumkind: CSK_MD5, checksum: "ba8742313715e20e434cf6ccb2db98e3")
+!31 = !DIDerivedType(tag: DW_TAG_typedef, name: "__mbstate_t", file: !32, line: 21, baseType: !33)
+!32 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h", directory: "", checksumkind: CSK_MD5, checksum: "82911a3e689448e3691ded3e0b471a55")
+!33 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !32, line: 13, size: 64, flags: DIFlagTypePassByValue, elements: !34, identifier: "_ZTS11__mbstate_t")
+!34 = !{!35, !37}
+!35 = !DIDerivedType(tag: DW_TAG_member, name: "__count", scope: !33, file: !32, line: 15, baseType: !36, size: 32)
+!36 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!37 = !DIDerivedType(tag: DW_TAG_member, name: "__value", scope: !33, file: !32, line: 20, baseType: !38, size: 32, offset: 32)
+!38 = distinct !DICompositeType(tag: DW_TAG_union_type, scope: !33, file: !32, line: 16, size: 32, flags: DIFlagTypePassByValue, elements: !39, identifier: "_ZTSN11__mbstate_tUt_E")
+!39 = !{!40, !42}
+!40 = !DIDerivedType(tag: DW_TAG_member, name: "__wch", scope: !38, file: !32, line: 18, baseType: !41, size: 32)
+!41 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!42 = !DIDerivedType(tag: DW_TAG_member, name: "__wchb", scope: !38, file: !32, line: 19, baseType: !43, size: 32)
+!43 = !DICompositeType(tag: DW_TAG_array_type, baseType: !5, size: 32, elements: !44)
+!44 = !{!45}
+!45 = !DISubrange(count: 4)
+!46 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cwchar", directory: "")
+!47 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !48, file: !46, line: 141)
+!48 = !DIDerivedType(tag: DW_TAG_typedef, name: "wint_t", file: !49, line: 20, baseType: !41)
+!49 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/wint_t.h", directory: "", checksumkind: CSK_MD5, checksum: "aa31b53ef28dc23152ceb41e2763ded3")
+!50 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !51, file: !46, line: 143)
+!51 = !DISubprogram(name: "btowc", scope: !52, file: !52, line: 309, type: !53, flags: DIFlagPrototyped, spFlags: 0)
+!52 = !DIFile(filename: "/usr/include/wchar.h", directory: "", checksumkind: CSK_MD5, checksum: "889114206ea781a9a9a0b33e52589e47")
+!53 = !DISubroutineType(types: !54)
+!54 = !{!48, !36}
+!55 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !56, file: !46, line: 144)
+!56 = !DISubprogram(name: "fgetwc", scope: !52, file: !52, line: 935, type: !57, flags: DIFlagPrototyped, spFlags: 0)
+!57 = !DISubroutineType(types: !58)
+!58 = !{!48, !59}
+!59 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !60, size: 64)
+!60 = !DIDerivedType(tag: DW_TAG_typedef, name: "__FILE", file: !61, line: 5, baseType: !62)
+!61 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/__FILE.h", directory: "", checksumkind: CSK_MD5, checksum: "72a8fe90981f484acae7c6f3dfc5c2b7")
+!62 = !DICompositeType(tag: DW_TAG_structure_type, name: "_IO_FILE", file: !61, line: 4, flags: DIFlagFwdDecl | DIFlagNonTrivial, identifier: "_ZTS8_IO_FILE")
+!63 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !64, file: !46, line: 145)
+!64 = !DISubprogram(name: "fgetws", scope: !52, file: !52, line: 964, type: !65, flags: DIFlagPrototyped, spFlags: 0)
+!65 = !DISubroutineType(types: !66)
+!66 = !{!67, !69, !36, !70}
+!67 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !68, size: 64)
+!68 = !DIBasicType(name: "wchar_t", size: 32, encoding: DW_ATE_signed)
+!69 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !67)
+!70 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !59)
+!71 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !72, file: !46, line: 146)
+!72 = !DISubprogram(name: "fputwc", scope: !52, file: !52, line: 949, type: !73, flags: DIFlagPrototyped, spFlags: 0)
+!73 = !DISubroutineType(types: !74)
+!74 = !{!48, !68, !59}
+!75 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !76, file: !46, line: 147)
+!76 = !DISubprogram(name: "fputws", scope: !52, file: !52, line: 971, type: !77, flags: DIFlagPrototyped, spFlags: 0)
+!77 = !DISubroutineType(types: !78)
+!78 = !{!36, !79, !70}
+!79 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !80)
+!80 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !81, size: 64)
+!81 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !68)
+!82 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !83, file: !46, line: 148)
+!83 = !DISubprogram(name: "fwide", scope: !52, file: !52, line: 725, type: !84, flags: DIFlagPrototyped, spFlags: 0)
+!84 = !DISubroutineType(types: !85)
+!85 = !{!36, !59, !36}
+!86 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !87, file: !46, line: 149)
+!87 = !DISubprogram(name: "fwprintf", scope: !52, file: !52, line: 732, type: !88, flags: DIFlagPrototyped, spFlags: 0)
+!88 = !DISubroutineType(types: !89)
+!89 = !{!36, !70, !79, null}
+!90 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !91, file: !46, line: 150)
+!91 = !DISubprogram(name: "fwscanf", linkageName: "__isoc23_fwscanf", scope: !52, file: !52, line: 795, type: !88, flags: DIFlagPrototyped, spFlags: 0)
+!92 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !93, file: !46, line: 151)
+!93 = !DISubprogram(name: "getwc", scope: !52, file: !52, line: 936, type: !57, flags: DIFlagPrototyped, spFlags: 0)
+!94 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !95, file: !46, line: 152)
+!95 = !DISubprogram(name: "getwchar", scope: !52, file: !52, line: 942, type: !96, flags: DIFlagPrototyped, spFlags: 0)
+!96 = !DISubroutineType(types: !97)
+!97 = !{!48}
+!98 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !99, file: !46, line: 153)
+!99 = !DISubprogram(name: "mbrlen", scope: !52, file: !52, line: 332, type: !100, flags: DIFlagPrototyped, spFlags: 0)
+!100 = !DISubroutineType(types: !101)
+!101 = !{!102, !105, !102, !107}
+!102 = !DIDerivedType(tag: DW_TAG_typedef, name: "size_t", file: !103, line: 46, baseType: !104)
+!103 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/stddef.h", directory: "", checksumkind: CSK_MD5, checksum: "b76978376d35d5cd171876ac58ac1256")
+!104 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!105 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !106)
+!106 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!107 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !108)
+!108 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !29, size: 64)
+!109 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !110, file: !46, line: 154)
+!110 = !DISubprogram(name: "mbrtowc", scope: !52, file: !52, line: 321, type: !111, flags: DIFlagPrototyped, spFlags: 0)
+!111 = !DISubroutineType(types: !112)
+!112 = !{!102, !69, !105, !102, !107}
+!113 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !114, file: !46, line: 155)
+!114 = !DISubprogram(name: "mbsinit", scope: !52, file: !52, line: 317, type: !115, flags: DIFlagPrototyped, spFlags: 0)
+!115 = !DISubroutineType(types: !116)
+!116 = !{!36, !117}
+!117 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !118, size: 64)
+!118 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !29)
+!119 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !120, file: !46, line: 156)
+!120 = !DISubprogram(name: "mbsrtowcs", scope: !52, file: !52, line: 362, type: !121, flags: DIFlagPrototyped, spFlags: 0)
+!121 = !DISubroutineType(types: !122)
+!122 = !{!102, !69, !123, !102, !107}
+!123 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !124)
+!124 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !106, size: 64)
+!125 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !126, file: !46, line: 157)
+!126 = !DISubprogram(name: "putwc", scope: !52, file: !52, line: 950, type: !73, flags: DIFlagPrototyped, spFlags: 0)
+!127 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !128, file: !46, line: 158)
+!128 = !DISubprogram(name: "putwchar", scope: !52, file: !52, line: 956, type: !129, flags: DIFlagPrototyped, spFlags: 0)
+!129 = !DISubroutineType(types: !130)
+!130 = !{!48, !68}
+!131 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !132, file: !46, line: 160)
+!132 = !DISubprogram(name: "swprintf", scope: !52, file: !52, line: 742, type: !133, flags: DIFlagPrototyped, spFlags: 0)
+!133 = !DISubroutineType(types: !134)
+!134 = !{!36, !69, !102, !79, null}
+!135 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !136, file: !46, line: 162)
+!136 = !DISubprogram(name: "swscanf", linkageName: "__isoc23_swscanf", scope: !52, file: !52, line: 802, type: !137, flags: DIFlagPrototyped, spFlags: 0)
+!137 = !DISubroutineType(types: !138)
+!138 = !{!36, !79, !79, null}
+!139 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !140, file: !46, line: 163)
+!140 = !DISubprogram(name: "ungetwc", scope: !52, file: !52, line: 979, type: !141, flags: DIFlagPrototyped, spFlags: 0)
+!141 = !DISubroutineType(types: !142)
+!142 = !{!48, !48, !59}
+!143 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !144, file: !46, line: 164)
+!144 = !DISubprogram(name: "vfwprintf", scope: !52, file: !52, line: 750, type: !145, flags: DIFlagPrototyped, spFlags: 0)
+!145 = !DISubroutineType(types: !146)
+!146 = !{!36, !70, !79, !147}
+!147 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !148, size: 64)
+!148 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "__va_list_tag", size: 192, flags: DIFlagTypePassByValue, elements: !149, identifier: "_ZTS13__va_list_tag")
+!149 = !{!150, !152, !153, !155}
+!150 = !DIDerivedType(tag: DW_TAG_member, name: "gp_offset", scope: !148, file: !151, baseType: !41, size: 32)
+!151 = !DIFile(filename: "exception.cpp", directory: "phasar/examples/llvm-hello-world/target")
+!152 = !DIDerivedType(tag: DW_TAG_member, name: "fp_offset", scope: !148, file: !151, baseType: !41, size: 32, offset: 32)
+!153 = !DIDerivedType(tag: DW_TAG_member, name: "overflow_arg_area", scope: !148, file: !151, baseType: !154, size: 64, offset: 64)
+!154 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!155 = !DIDerivedType(tag: DW_TAG_member, name: "reg_save_area", scope: !148, file: !151, baseType: !154, size: 64, offset: 128)
+!156 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !157, file: !46, line: 166)
+!157 = !DISubprogram(name: "vfwscanf", linkageName: "__isoc23_vfwscanf", scope: !52, file: !52, line: 875, type: !145, flags: DIFlagPrototyped, spFlags: 0)
+!158 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !159, file: !46, line: 169)
+!159 = !DISubprogram(name: "vswprintf", scope: !52, file: !52, line: 763, type: !160, flags: DIFlagPrototyped, spFlags: 0)
+!160 = !DISubroutineType(types: !161)
+!161 = !{!36, !69, !102, !79, !147}
+!162 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !163, file: !46, line: 172)
+!163 = !DISubprogram(name: "vswscanf", linkageName: "__isoc23_vswscanf", scope: !52, file: !52, line: 882, type: !164, flags: DIFlagPrototyped, spFlags: 0)
+!164 = !DISubroutineType(types: !165)
+!165 = !{!36, !79, !79, !147}
+!166 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !167, file: !46, line: 174)
+!167 = !DISubprogram(name: "vwprintf", scope: !52, file: !52, line: 758, type: !168, flags: DIFlagPrototyped, spFlags: 0)
+!168 = !DISubroutineType(types: !169)
+!169 = !{!36, !79, !147}
+!170 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !171, file: !46, line: 176)
+!171 = !DISubprogram(name: "vwscanf", linkageName: "__isoc23_vwscanf", scope: !52, file: !52, line: 879, type: !168, flags: DIFlagPrototyped, spFlags: 0)
+!172 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !173, file: !46, line: 178)
+!173 = !DISubprogram(name: "wcrtomb", scope: !52, file: !52, line: 326, type: !174, flags: DIFlagPrototyped, spFlags: 0)
+!174 = !DISubroutineType(types: !175)
+!175 = !{!102, !176, !68, !107}
+!176 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !177)
+!177 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!178 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !179, file: !46, line: 179)
+!179 = !DISubprogram(name: "wcscat", scope: !52, file: !52, line: 121, type: !180, flags: DIFlagPrototyped, spFlags: 0)
+!180 = !DISubroutineType(types: !181)
+!181 = !{!67, !69, !79}
+!182 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !183, file: !46, line: 180)
+!183 = !DISubprogram(name: "wcscmp", scope: !52, file: !52, line: 130, type: !184, flags: DIFlagPrototyped, spFlags: 0)
+!184 = !DISubroutineType(types: !185)
+!185 = !{!36, !80, !80}
+!186 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !187, file: !46, line: 181)
+!187 = !DISubprogram(name: "wcscoll", scope: !52, file: !52, line: 155, type: !184, flags: DIFlagPrototyped, spFlags: 0)
+!188 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !189, file: !46, line: 182)
+!189 = !DISubprogram(name: "wcscpy", scope: !52, file: !52, line: 98, type: !180, flags: DIFlagPrototyped, spFlags: 0)
+!190 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !191, file: !46, line: 183)
+!191 = !DISubprogram(name: "wcscspn", scope: !52, file: !52, line: 212, type: !192, flags: DIFlagPrototyped, spFlags: 0)
+!192 = !DISubroutineType(types: !193)
+!193 = !{!102, !80, !80}
+!194 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !195, file: !46, line: 184)
+!195 = !DISubprogram(name: "wcsftime", scope: !52, file: !52, line: 1043, type: !196, flags: DIFlagPrototyped, spFlags: 0)
+!196 = !DISubroutineType(types: !197)
+!197 = !{!102, !69, !102, !79, !198}
+!198 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !199)
+!199 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !200, size: 64)
+!200 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !201)
+!201 = !DICompositeType(tag: DW_TAG_structure_type, name: "tm", file: !52, line: 94, flags: DIFlagFwdDecl | DIFlagNonTrivial, identifier: "_ZTS2tm")
+!202 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !203, file: !46, line: 185)
+!203 = !DISubprogram(name: "wcslen", scope: !52, file: !52, line: 247, type: !204, flags: DIFlagPrototyped, spFlags: 0)
+!204 = !DISubroutineType(types: !205)
+!205 = !{!102, !80}
+!206 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !207, file: !46, line: 186)
+!207 = !DISubprogram(name: "wcsncat", scope: !52, file: !52, line: 125, type: !208, flags: DIFlagPrototyped, spFlags: 0)
+!208 = !DISubroutineType(types: !209)
+!209 = !{!67, !69, !79, !102}
+!210 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !211, file: !46, line: 187)
+!211 = !DISubprogram(name: "wcsncmp", scope: !52, file: !52, line: 133, type: !212, flags: DIFlagPrototyped, spFlags: 0)
+!212 = !DISubroutineType(types: !213)
+!213 = !{!36, !80, !80, !102}
+!214 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !215, file: !46, line: 188)
+!215 = !DISubprogram(name: "wcsncpy", scope: !52, file: !52, line: 103, type: !208, flags: DIFlagPrototyped, spFlags: 0)
+!216 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !217, file: !46, line: 189)
+!217 = !DISubprogram(name: "wcsrtombs", scope: !52, file: !52, line: 368, type: !218, flags: DIFlagPrototyped, spFlags: 0)
+!218 = !DISubroutineType(types: !219)
+!219 = !{!102, !176, !220, !102, !107}
+!220 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !221)
+!221 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !80, size: 64)
+!222 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !223, file: !46, line: 190)
+!223 = !DISubprogram(name: "wcsspn", scope: !52, file: !52, line: 216, type: !192, flags: DIFlagPrototyped, spFlags: 0)
+!224 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !225, file: !46, line: 191)
+!225 = !DISubprogram(name: "wcstod", scope: !52, file: !52, line: 402, type: !226, flags: DIFlagPrototyped, spFlags: 0)
+!226 = !DISubroutineType(types: !227)
+!227 = !{!228, !79, !229}
+!228 = !DIBasicType(name: "double", size: 64, encoding: DW_ATE_float)
+!229 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !230)
+!230 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !67, size: 64)
+!231 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !232, file: !46, line: 193)
+!232 = !DISubprogram(name: "wcstof", scope: !52, file: !52, line: 407, type: !233, flags: DIFlagPrototyped, spFlags: 0)
+!233 = !DISubroutineType(types: !234)
+!234 = !{!235, !79, !229}
+!235 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
+!236 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !237, file: !46, line: 195)
+!237 = !DISubprogram(name: "wcstok", scope: !52, file: !52, line: 242, type: !238, flags: DIFlagPrototyped, spFlags: 0)
+!238 = !DISubroutineType(types: !239)
+!239 = !{!67, !69, !79, !229}
+!240 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !241, file: !46, line: 196)
+!241 = !DISubprogram(name: "wcstol", linkageName: "__isoc23_wcstol", scope: !52, file: !52, line: 500, type: !242, flags: DIFlagPrototyped, spFlags: 0)
+!242 = !DISubroutineType(types: !243)
+!243 = !{!244, !79, !229, !36}
+!244 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
+!245 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !246, file: !46, line: 197)
+!246 = !DISubprogram(name: "wcstoul", linkageName: "__isoc23_wcstoul", scope: !52, file: !52, line: 503, type: !247, flags: DIFlagPrototyped, spFlags: 0)
+!247 = !DISubroutineType(types: !248)
+!248 = !{!104, !79, !229, !36}
+!249 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !250, file: !46, line: 198)
+!250 = !DISubprogram(name: "wcsxfrm", scope: !52, file: !52, line: 159, type: !251, flags: DIFlagPrototyped, spFlags: 0)
+!251 = !DISubroutineType(types: !252)
+!252 = !{!102, !69, !79, !102}
+!253 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !254, file: !46, line: 199)
+!254 = !DISubprogram(name: "wctob", scope: !52, file: !52, line: 313, type: !255, flags: DIFlagPrototyped, spFlags: 0)
+!255 = !DISubroutineType(types: !256)
+!256 = !{!36, !48}
+!257 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !258, file: !46, line: 200)
+!258 = !DISubprogram(name: "wmemcmp", scope: !52, file: !52, line: 283, type: !212, flags: DIFlagPrototyped, spFlags: 0)
+!259 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !260, file: !46, line: 201)
+!260 = !DISubprogram(name: "wmemcpy", scope: !52, file: !52, line: 287, type: !208, flags: DIFlagPrototyped, spFlags: 0)
+!261 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !262, file: !46, line: 202)
+!262 = !DISubprogram(name: "wmemmove", scope: !52, file: !52, line: 292, type: !263, flags: DIFlagPrototyped, spFlags: 0)
+!263 = !DISubroutineType(types: !264)
+!264 = !{!67, !67, !80, !102}
+!265 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !266, file: !46, line: 203)
+!266 = !DISubprogram(name: "wmemset", scope: !52, file: !52, line: 296, type: !267, flags: DIFlagPrototyped, spFlags: 0)
+!267 = !DISubroutineType(types: !268)
+!268 = !{!67, !67, !68, !102}
+!269 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !270, file: !46, line: 204)
+!270 = !DISubprogram(name: "wprintf", scope: !52, file: !52, line: 739, type: !271, flags: DIFlagPrototyped, spFlags: 0)
+!271 = !DISubroutineType(types: !272)
+!272 = !{!36, !79, null}
+!273 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !274, file: !46, line: 205)
+!274 = !DISubprogram(name: "wscanf", linkageName: "__isoc23_wscanf", scope: !52, file: !52, line: 799, type: !271, flags: DIFlagPrototyped, spFlags: 0)
+!275 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !276, file: !46, line: 206)
+!276 = !DISubprogram(name: "wcschr", scope: !52, file: !52, line: 189, type: !277, flags: DIFlagPrototyped, spFlags: 0)
+!277 = !DISubroutineType(types: !278)
+!278 = !{!67, !80, !68}
+!279 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !280, file: !46, line: 207)
+!280 = !DISubprogram(name: "wcspbrk", scope: !52, file: !52, line: 226, type: !281, flags: DIFlagPrototyped, spFlags: 0)
+!281 = !DISubroutineType(types: !282)
+!282 = !{!67, !80, !80}
+!283 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !284, file: !46, line: 208)
+!284 = !DISubprogram(name: "wcsrchr", scope: !52, file: !52, line: 199, type: !277, flags: DIFlagPrototyped, spFlags: 0)
+!285 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !286, file: !46, line: 209)
+!286 = !DISubprogram(name: "wcsstr", scope: !52, file: !52, line: 237, type: !281, flags: DIFlagPrototyped, spFlags: 0)
+!287 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !288, file: !46, line: 210)
+!288 = !DISubprogram(name: "wmemchr", scope: !52, file: !52, line: 278, type: !289, flags: DIFlagPrototyped, spFlags: 0)
+!289 = !DISubroutineType(types: !290)
+!290 = !{!67, !80, !68, !102}
+!291 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !293, file: !46, line: 251)
+!292 = !DINamespace(name: "__gnu_cxx", scope: null)
+!293 = !DISubprogram(name: "wcstold", scope: !52, file: !52, line: 409, type: !294, flags: DIFlagPrototyped, spFlags: 0)
+!294 = !DISubroutineType(types: !295)
+!295 = !{!296, !79, !229}
+!296 = !DIBasicType(name: "long double", size: 128, encoding: DW_ATE_float)
+!297 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !298, file: !46, line: 260)
+!298 = !DISubprogram(name: "wcstoll", linkageName: "__isoc23_wcstoll", scope: !52, file: !52, line: 508, type: !299, flags: DIFlagPrototyped, spFlags: 0)
+!299 = !DISubroutineType(types: !300)
+!300 = !{!301, !79, !229, !36}
+!301 = !DIBasicType(name: "long long", size: 64, encoding: DW_ATE_signed)
+!302 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !303, file: !46, line: 261)
+!303 = !DISubprogram(name: "wcstoull", linkageName: "__isoc23_wcstoull", scope: !52, file: !52, line: 513, type: !304, flags: DIFlagPrototyped, spFlags: 0)
+!304 = !DISubroutineType(types: !305)
+!305 = !{!306, !79, !229, !36}
+!306 = !DIBasicType(name: "unsigned long long", size: 64, encoding: DW_ATE_unsigned)
+!307 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !293, file: !46, line: 267)
+!308 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !298, file: !46, line: 268)
+!309 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !303, file: !46, line: 269)
+!310 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !232, file: !46, line: 283)
+!311 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !157, file: !46, line: 286)
+!312 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !163, file: !46, line: 289)
+!313 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !171, file: !46, line: 292)
+!314 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !293, file: !46, line: 296)
+!315 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !298, file: !46, line: 297)
+!316 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !303, file: !46, line: 298)
+!317 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !318, file: !320, line: 53)
+!318 = !DICompositeType(tag: DW_TAG_structure_type, name: "lconv", file: !319, line: 51, size: 768, flags: DIFlagFwdDecl, identifier: "_ZTS5lconv")
+!319 = !DIFile(filename: "/usr/include/locale.h", directory: "", checksumkind: CSK_MD5, checksum: "23ebf40dea0ab9a74daf64a0eaa99518")
+!320 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/clocale", directory: "")
+!321 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !322, file: !320, line: 54)
+!322 = !DISubprogram(name: "setlocale", scope: !319, file: !319, line: 122, type: !323, flags: DIFlagPrototyped, spFlags: 0)
+!323 = !DISubroutineType(types: !324)
+!324 = !{!177, !36, !106}
+!325 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !326, file: !320, line: 55)
+!326 = !DISubprogram(name: "localeconv", scope: !319, file: !319, line: 125, type: !327, flags: DIFlagPrototyped, spFlags: 0)
+!327 = !DISubroutineType(types: !328)
+!328 = !{!329}
+!329 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !318, size: 64)
+!330 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !331, file: !335, line: 64)
+!331 = !DISubprogram(name: "isalnum", scope: !332, file: !332, line: 108, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!332 = !DIFile(filename: "/usr/include/ctype.h", directory: "", checksumkind: CSK_MD5, checksum: "43fd45dcf96e8fb7d8f14700096497c7")
+!333 = !DISubroutineType(types: !334)
+!334 = !{!36, !36}
+!335 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cctype", directory: "")
+!336 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !337, file: !335, line: 65)
+!337 = !DISubprogram(name: "isalpha", scope: !332, file: !332, line: 109, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!338 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !339, file: !335, line: 66)
+!339 = !DISubprogram(name: "iscntrl", scope: !332, file: !332, line: 110, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!340 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !341, file: !335, line: 67)
+!341 = !DISubprogram(name: "isdigit", scope: !332, file: !332, line: 111, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!342 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !343, file: !335, line: 68)
+!343 = !DISubprogram(name: "isgraph", scope: !332, file: !332, line: 113, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!344 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !345, file: !335, line: 69)
+!345 = !DISubprogram(name: "islower", scope: !332, file: !332, line: 112, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!346 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !347, file: !335, line: 70)
+!347 = !DISubprogram(name: "isprint", scope: !332, file: !332, line: 114, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!348 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !349, file: !335, line: 71)
+!349 = !DISubprogram(name: "ispunct", scope: !332, file: !332, line: 115, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!350 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !351, file: !335, line: 72)
+!351 = !DISubprogram(name: "isspace", scope: !332, file: !332, line: 116, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!352 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !353, file: !335, line: 73)
+!353 = !DISubprogram(name: "isupper", scope: !332, file: !332, line: 117, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!354 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !355, file: !335, line: 74)
+!355 = !DISubprogram(name: "isxdigit", scope: !332, file: !332, line: 118, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!356 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !357, file: !335, line: 75)
+!357 = !DISubprogram(name: "tolower", scope: !332, file: !332, line: 122, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!358 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !359, file: !335, line: 76)
+!359 = !DISubprogram(name: "toupper", scope: !332, file: !332, line: 125, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!360 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !361, file: !335, line: 87)
+!361 = !DISubprogram(name: "isblank", scope: !332, file: !332, line: 130, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!362 = !DIImportedEntity(tag: DW_TAG_imported_module, scope: !363, entity: !364, file: !365, line: 58)
+!363 = !DINamespace(name: "__gnu_debug", scope: null)
+!364 = !DINamespace(name: "__debug", scope: !12)
+!365 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/debug/debug.h", directory: "", checksumkind: CSK_MD5, checksum: "752210a319f5f5d356cc29cd1ce3cdc7")
+!366 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !367, file: !369, line: 52)
+!367 = !DISubprogram(name: "abs", scope: !368, file: !368, line: 980, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!368 = !DIFile(filename: "/usr/include/stdlib.h", directory: "", checksumkind: CSK_MD5, checksum: "7fa2ecb2348a66f8b44ab9a15abd0b72")
+!369 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_abs.h", directory: "")
+!370 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !371, file: !373, line: 131)
+!371 = !DIDerivedType(tag: DW_TAG_typedef, name: "div_t", file: !368, line: 63, baseType: !372)
+!372 = !DICompositeType(tag: DW_TAG_structure_type, file: !368, line: 59, size: 64, flags: DIFlagFwdDecl, identifier: "_ZTS5div_t")
+!373 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdlib", directory: "")
+!374 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !375, file: !373, line: 132)
+!375 = !DIDerivedType(tag: DW_TAG_typedef, name: "ldiv_t", file: !368, line: 71, baseType: !376)
+!376 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !368, line: 67, size: 128, flags: DIFlagTypePassByValue, elements: !377, identifier: "_ZTS6ldiv_t")
+!377 = !{!378, !379}
+!378 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !376, file: !368, line: 69, baseType: !244, size: 64)
+!379 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !376, file: !368, line: 70, baseType: !244, size: 64, offset: 64)
+!380 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !381, file: !373, line: 134)
+!381 = !DISubprogram(name: "abort", scope: !368, file: !368, line: 730, type: !382, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!382 = !DISubroutineType(types: !383)
+!383 = !{null}
+!384 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !385, file: !373, line: 138)
+!385 = !DISubprogram(name: "atexit", scope: !368, file: !368, line: 734, type: !386, flags: DIFlagPrototyped, spFlags: 0)
+!386 = !DISubroutineType(types: !387)
+!387 = !{!36, !388}
+!388 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !382, size: 64)
+!389 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !390, file: !373, line: 141)
+!390 = !DISubprogram(name: "at_quick_exit", scope: !368, file: !368, line: 739, type: !386, flags: DIFlagPrototyped, spFlags: 0)
+!391 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !392, file: !373, line: 144)
+!392 = !DISubprogram(name: "atof", scope: !368, file: !368, line: 102, type: !393, flags: DIFlagPrototyped, spFlags: 0)
+!393 = !DISubroutineType(types: !394)
+!394 = !{!228, !106}
+!395 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !396, file: !373, line: 145)
+!396 = !DISubprogram(name: "atoi", scope: !368, file: !368, line: 105, type: !397, flags: DIFlagPrototyped, spFlags: 0)
+!397 = !DISubroutineType(types: !398)
+!398 = !{!36, !106}
+!399 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !400, file: !373, line: 146)
+!400 = !DISubprogram(name: "atol", scope: !368, file: !368, line: 108, type: !401, flags: DIFlagPrototyped, spFlags: 0)
+!401 = !DISubroutineType(types: !402)
+!402 = !{!244, !106}
+!403 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !404, file: !373, line: 147)
+!404 = !DISubprogram(name: "bsearch", scope: !368, file: !368, line: 960, type: !405, flags: DIFlagPrototyped, spFlags: 0)
+!405 = !DISubroutineType(types: !406)
+!406 = !{!154, !407, !407, !102, !102, !409}
+!407 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !408, size: 64)
+!408 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!409 = !DIDerivedType(tag: DW_TAG_typedef, name: "__compar_fn_t", file: !368, line: 948, baseType: !410)
+!410 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !411, size: 64)
+!411 = !DISubroutineType(types: !412)
+!412 = !{!36, !407, !407}
+!413 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !414, file: !373, line: 148)
+!414 = !DISubprogram(name: "calloc", scope: !368, file: !368, line: 675, type: !415, flags: DIFlagPrototyped, spFlags: 0)
+!415 = !DISubroutineType(types: !416)
+!416 = !{!154, !102, !102}
+!417 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !418, file: !373, line: 149)
+!418 = !DISubprogram(name: "div", scope: !368, file: !368, line: 992, type: !419, flags: DIFlagPrototyped, spFlags: 0)
+!419 = !DISubroutineType(types: !420)
+!420 = !{!371, !36, !36}
+!421 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !422, file: !373, line: 150)
+!422 = !DISubprogram(name: "exit", scope: !368, file: !368, line: 756, type: !423, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!423 = !DISubroutineType(types: !424)
+!424 = !{null, !36}
+!425 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !426, file: !373, line: 151)
+!426 = !DISubprogram(name: "free", scope: !368, file: !368, line: 687, type: !427, flags: DIFlagPrototyped, spFlags: 0)
+!427 = !DISubroutineType(types: !428)
+!428 = !{null, !154}
+!429 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !430, file: !373, line: 152)
+!430 = !DISubprogram(name: "getenv", scope: !368, file: !368, line: 773, type: !431, flags: DIFlagPrototyped, spFlags: 0)
+!431 = !DISubroutineType(types: !432)
+!432 = !{!177, !106}
+!433 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !434, file: !373, line: 153)
+!434 = !DISubprogram(name: "labs", scope: !368, file: !368, line: 981, type: !435, flags: DIFlagPrototyped, spFlags: 0)
+!435 = !DISubroutineType(types: !436)
+!436 = !{!244, !244}
+!437 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !438, file: !373, line: 154)
+!438 = !DISubprogram(name: "ldiv", scope: !368, file: !368, line: 994, type: !439, flags: DIFlagPrototyped, spFlags: 0)
+!439 = !DISubroutineType(types: !440)
+!440 = !{!375, !244, !244}
+!441 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !442, file: !373, line: 155)
+!442 = !DISubprogram(name: "malloc", scope: !368, file: !368, line: 672, type: !443, flags: DIFlagPrototyped, spFlags: 0)
+!443 = !DISubroutineType(types: !444)
+!444 = !{!154, !102}
+!445 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !446, file: !373, line: 157)
+!446 = !DISubprogram(name: "mblen", scope: !368, file: !368, line: 1062, type: !447, flags: DIFlagPrototyped, spFlags: 0)
+!447 = !DISubroutineType(types: !448)
+!448 = !{!36, !106, !102}
+!449 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !450, file: !373, line: 158)
+!450 = !DISubprogram(name: "mbstowcs", scope: !368, file: !368, line: 1073, type: !451, flags: DIFlagPrototyped, spFlags: 0)
+!451 = !DISubroutineType(types: !452)
+!452 = !{!102, !69, !105, !102}
+!453 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !454, file: !373, line: 159)
+!454 = !DISubprogram(name: "mbtowc", scope: !368, file: !368, line: 1065, type: !455, flags: DIFlagPrototyped, spFlags: 0)
+!455 = !DISubroutineType(types: !456)
+!456 = !{!36, !69, !105, !102}
+!457 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !458, file: !373, line: 161)
+!458 = !DISubprogram(name: "qsort", scope: !368, file: !368, line: 970, type: !459, flags: DIFlagPrototyped, spFlags: 0)
+!459 = !DISubroutineType(types: !460)
+!460 = !{null, !154, !102, !102, !409}
+!461 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !462, file: !373, line: 164)
+!462 = !DISubprogram(name: "quick_exit", scope: !368, file: !368, line: 762, type: !423, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!463 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !464, file: !373, line: 167)
+!464 = !DISubprogram(name: "rand", scope: !368, file: !368, line: 573, type: !465, flags: DIFlagPrototyped, spFlags: 0)
+!465 = !DISubroutineType(types: !466)
+!466 = !{!36}
+!467 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !468, file: !373, line: 168)
+!468 = !DISubprogram(name: "realloc", scope: !368, file: !368, line: 683, type: !469, flags: DIFlagPrototyped, spFlags: 0)
+!469 = !DISubroutineType(types: !470)
+!470 = !{!154, !154, !102}
+!471 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !472, file: !373, line: 169)
+!472 = !DISubprogram(name: "srand", scope: !368, file: !368, line: 575, type: !473, flags: DIFlagPrototyped, spFlags: 0)
+!473 = !DISubroutineType(types: !474)
+!474 = !{null, !41}
+!475 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !476, file: !373, line: 170)
+!476 = !DISubprogram(name: "strtod", scope: !368, file: !368, line: 118, type: !477, flags: DIFlagPrototyped, spFlags: 0)
+!477 = !DISubroutineType(types: !478)
+!478 = !{!228, !105, !479}
+!479 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !480)
+!480 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !177, size: 64)
+!481 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !482, file: !373, line: 171)
+!482 = !DISubprogram(name: "strtol", linkageName: "__isoc23_strtol", scope: !368, file: !368, line: 215, type: !483, flags: DIFlagPrototyped, spFlags: 0)
+!483 = !DISubroutineType(types: !484)
+!484 = !{!244, !105, !479, !36}
+!485 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !486, file: !373, line: 172)
+!486 = !DISubprogram(name: "strtoul", linkageName: "__isoc23_strtoul", scope: !368, file: !368, line: 219, type: !487, flags: DIFlagPrototyped, spFlags: 0)
+!487 = !DISubroutineType(types: !488)
+!488 = !{!104, !105, !479, !36}
+!489 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !490, file: !373, line: 173)
+!490 = !DISubprogram(name: "system", scope: !368, file: !368, line: 923, type: !397, flags: DIFlagPrototyped, spFlags: 0)
+!491 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !492, file: !373, line: 175)
+!492 = !DISubprogram(name: "wcstombs", scope: !368, file: !368, line: 1077, type: !493, flags: DIFlagPrototyped, spFlags: 0)
+!493 = !DISubroutineType(types: !494)
+!494 = !{!102, !176, !79, !102}
+!495 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !496, file: !373, line: 176)
+!496 = !DISubprogram(name: "wctomb", scope: !368, file: !368, line: 1069, type: !497, flags: DIFlagPrototyped, spFlags: 0)
+!497 = !DISubroutineType(types: !498)
+!498 = !{!36, !177, !68}
+!499 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !500, file: !373, line: 204)
+!500 = !DIDerivedType(tag: DW_TAG_typedef, name: "lldiv_t", file: !368, line: 81, baseType: !501)
+!501 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !368, line: 77, size: 128, flags: DIFlagTypePassByValue, elements: !502, identifier: "_ZTS7lldiv_t")
+!502 = !{!503, !504}
+!503 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !501, file: !368, line: 79, baseType: !301, size: 64)
+!504 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !501, file: !368, line: 80, baseType: !301, size: 64, offset: 64)
+!505 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !506, file: !373, line: 210)
+!506 = !DISubprogram(name: "_Exit", scope: !368, file: !368, line: 768, type: !423, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!507 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !508, file: !373, line: 214)
+!508 = !DISubprogram(name: "llabs", scope: !368, file: !368, line: 984, type: !509, flags: DIFlagPrototyped, spFlags: 0)
+!509 = !DISubroutineType(types: !510)
+!510 = !{!301, !301}
+!511 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !512, file: !373, line: 220)
+!512 = !DISubprogram(name: "lldiv", scope: !368, file: !368, line: 998, type: !513, flags: DIFlagPrototyped, spFlags: 0)
+!513 = !DISubroutineType(types: !514)
+!514 = !{!500, !301, !301}
+!515 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !516, file: !373, line: 231)
+!516 = !DISubprogram(name: "atoll", scope: !368, file: !368, line: 113, type: !517, flags: DIFlagPrototyped, spFlags: 0)
+!517 = !DISubroutineType(types: !518)
+!518 = !{!301, !106}
+!519 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !520, file: !373, line: 232)
+!520 = !DISubprogram(name: "strtoll", linkageName: "__isoc23_strtoll", scope: !368, file: !368, line: 238, type: !521, flags: DIFlagPrototyped, spFlags: 0)
+!521 = !DISubroutineType(types: !522)
+!522 = !{!301, !105, !479, !36}
+!523 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !524, file: !373, line: 233)
+!524 = !DISubprogram(name: "strtoull", linkageName: "__isoc23_strtoull", scope: !368, file: !368, line: 243, type: !525, flags: DIFlagPrototyped, spFlags: 0)
+!525 = !DISubroutineType(types: !526)
+!526 = !{!306, !105, !479, !36}
+!527 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !528, file: !373, line: 235)
+!528 = !DISubprogram(name: "strtof", scope: !368, file: !368, line: 124, type: !529, flags: DIFlagPrototyped, spFlags: 0)
+!529 = !DISubroutineType(types: !530)
+!530 = !{!235, !105, !479}
+!531 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !532, file: !373, line: 236)
+!532 = !DISubprogram(name: "strtold", scope: !368, file: !368, line: 127, type: !533, flags: DIFlagPrototyped, spFlags: 0)
+!533 = !DISubroutineType(types: !534)
+!534 = !{!296, !105, !479}
+!535 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !500, file: !373, line: 244)
+!536 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !506, file: !373, line: 246)
+!537 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !508, file: !373, line: 248)
+!538 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !539, file: !373, line: 249)
+!539 = !DISubprogram(name: "div", linkageName: "_ZN9__gnu_cxx3divExx", scope: !292, file: !373, line: 217, type: !513, flags: DIFlagPrototyped, spFlags: 0)
+!540 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !512, file: !373, line: 250)
+!541 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !516, file: !373, line: 252)
+!542 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !528, file: !373, line: 253)
+!543 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !520, file: !373, line: 254)
+!544 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !524, file: !373, line: 255)
+!545 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !532, file: !373, line: 256)
+!546 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !547, file: !549, line: 98)
+!547 = !DIDerivedType(tag: DW_TAG_typedef, name: "FILE", file: !548, line: 7, baseType: !62)
+!548 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/FILE.h", directory: "", checksumkind: CSK_MD5, checksum: "571f9fb6223c42439075fdde11a0de5d")
+!549 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdio", directory: "")
+!550 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !551, file: !549, line: 99)
+!551 = !DIDerivedType(tag: DW_TAG_typedef, name: "fpos_t", file: !552, line: 85, baseType: !553)
+!552 = !DIFile(filename: "/usr/include/stdio.h", directory: "", checksumkind: CSK_MD5, checksum: "1e435c46987a169d9f9186f63a512303")
+!553 = !DIDerivedType(tag: DW_TAG_typedef, name: "__fpos_t", file: !554, line: 14, baseType: !555)
+!554 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/__fpos_t.h", directory: "", checksumkind: CSK_MD5, checksum: "32de8bdaf3551a6c0a9394f9af4389ce")
+!555 = !DICompositeType(tag: DW_TAG_structure_type, name: "_G_fpos_t", file: !554, line: 10, size: 128, flags: DIFlagFwdDecl, identifier: "_ZTS9_G_fpos_t")
+!556 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !557, file: !549, line: 101)
+!557 = !DISubprogram(name: "clearerr", scope: !552, file: !552, line: 860, type: !558, flags: DIFlagPrototyped, spFlags: 0)
+!558 = !DISubroutineType(types: !559)
+!559 = !{null, !560}
+!560 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !547, size: 64)
+!561 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !562, file: !549, line: 102)
+!562 = !DISubprogram(name: "fclose", scope: !552, file: !552, line: 184, type: !563, flags: DIFlagPrototyped, spFlags: 0)
+!563 = !DISubroutineType(types: !564)
+!564 = !{!36, !560}
+!565 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !566, file: !549, line: 103)
+!566 = !DISubprogram(name: "feof", scope: !552, file: !552, line: 862, type: !563, flags: DIFlagPrototyped, spFlags: 0)
+!567 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !568, file: !549, line: 104)
+!568 = !DISubprogram(name: "ferror", scope: !552, file: !552, line: 864, type: !563, flags: DIFlagPrototyped, spFlags: 0)
+!569 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !570, file: !549, line: 105)
+!570 = !DISubprogram(name: "fflush", scope: !552, file: !552, line: 236, type: !563, flags: DIFlagPrototyped, spFlags: 0)
+!571 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !572, file: !549, line: 106)
+!572 = !DISubprogram(name: "fgetc", scope: !552, file: !552, line: 575, type: !563, flags: DIFlagPrototyped, spFlags: 0)
+!573 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !574, file: !549, line: 107)
+!574 = !DISubprogram(name: "fgetpos", scope: !552, file: !552, line: 829, type: !575, flags: DIFlagPrototyped, spFlags: 0)
+!575 = !DISubroutineType(types: !576)
+!576 = !{!36, !577, !578}
+!577 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !560)
+!578 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !579)
+!579 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !551, size: 64)
+!580 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !581, file: !549, line: 108)
+!581 = !DISubprogram(name: "fgets", scope: !552, file: !552, line: 654, type: !582, flags: DIFlagPrototyped, spFlags: 0)
+!582 = !DISubroutineType(types: !583)
+!583 = !{!177, !176, !36, !577}
+!584 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !585, file: !549, line: 109)
+!585 = !DISubprogram(name: "fopen", scope: !552, file: !552, line: 264, type: !586, flags: DIFlagPrototyped, spFlags: 0)
+!586 = !DISubroutineType(types: !587)
+!587 = !{!560, !105, !105}
+!588 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !589, file: !549, line: 110)
+!589 = !DISubprogram(name: "fprintf", scope: !552, file: !552, line: 357, type: !590, flags: DIFlagPrototyped, spFlags: 0)
+!590 = !DISubroutineType(types: !591)
+!591 = !{!36, !577, !105, null}
+!592 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !593, file: !549, line: 111)
+!593 = !DISubprogram(name: "fputc", scope: !552, file: !552, line: 611, type: !594, flags: DIFlagPrototyped, spFlags: 0)
+!594 = !DISubroutineType(types: !595)
+!595 = !{!36, !36, !560}
+!596 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !597, file: !549, line: 112)
+!597 = !DISubprogram(name: "fputs", scope: !552, file: !552, line: 717, type: !598, flags: DIFlagPrototyped, spFlags: 0)
+!598 = !DISubroutineType(types: !599)
+!599 = !{!36, !105, !577}
+!600 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !601, file: !549, line: 113)
+!601 = !DISubprogram(name: "fread", scope: !552, file: !552, line: 738, type: !602, flags: DIFlagPrototyped, spFlags: 0)
+!602 = !DISubroutineType(types: !603)
+!603 = !{!102, !604, !102, !102, !577}
+!604 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !154)
+!605 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !606, file: !549, line: 114)
+!606 = !DISubprogram(name: "freopen", scope: !552, file: !552, line: 271, type: !607, flags: DIFlagPrototyped, spFlags: 0)
+!607 = !DISubroutineType(types: !608)
+!608 = !{!560, !105, !105, !577}
+!609 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !610, file: !549, line: 115)
+!610 = !DISubprogram(name: "fscanf", linkageName: "__isoc23_fscanf", scope: !552, file: !552, line: 442, type: !590, flags: DIFlagPrototyped, spFlags: 0)
+!611 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !612, file: !549, line: 116)
+!612 = !DISubprogram(name: "fseek", scope: !552, file: !552, line: 779, type: !613, flags: DIFlagPrototyped, spFlags: 0)
+!613 = !DISubroutineType(types: !614)
+!614 = !{!36, !560, !244, !36}
+!615 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !616, file: !549, line: 117)
+!616 = !DISubprogram(name: "fsetpos", scope: !552, file: !552, line: 835, type: !617, flags: DIFlagPrototyped, spFlags: 0)
+!617 = !DISubroutineType(types: !618)
+!618 = !{!36, !560, !619}
+!619 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !620, size: 64)
+!620 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !551)
+!621 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !622, file: !549, line: 118)
+!622 = !DISubprogram(name: "ftell", scope: !552, file: !552, line: 785, type: !623, flags: DIFlagPrototyped, spFlags: 0)
+!623 = !DISubroutineType(types: !624)
+!624 = !{!244, !560}
+!625 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !626, file: !549, line: 119)
+!626 = !DISubprogram(name: "fwrite", scope: !552, file: !552, line: 745, type: !627, flags: DIFlagPrototyped, spFlags: 0)
+!627 = !DISubroutineType(types: !628)
+!628 = !{!102, !629, !102, !102, !577}
+!629 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !407)
+!630 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !631, file: !549, line: 120)
+!631 = !DISubprogram(name: "getc", scope: !552, file: !552, line: 576, type: !563, flags: DIFlagPrototyped, spFlags: 0)
+!632 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !633, file: !549, line: 121)
+!633 = !DISubprogram(name: "getchar", scope: !552, file: !552, line: 582, type: !465, flags: DIFlagPrototyped, spFlags: 0)
+!634 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !635, file: !549, line: 126)
+!635 = !DISubprogram(name: "perror", scope: !552, file: !552, line: 878, type: !636, flags: DIFlagPrototyped, spFlags: 0)
+!636 = !DISubroutineType(types: !637)
+!637 = !{null, !106}
+!638 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !639, file: !549, line: 127)
+!639 = !DISubprogram(name: "printf", scope: !552, file: !552, line: 363, type: !640, flags: DIFlagPrototyped, spFlags: 0)
+!640 = !DISubroutineType(types: !641)
+!641 = !{!36, !105, null}
+!642 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !643, file: !549, line: 128)
+!643 = !DISubprogram(name: "putc", scope: !552, file: !552, line: 612, type: !594, flags: DIFlagPrototyped, spFlags: 0)
+!644 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !645, file: !549, line: 129)
+!645 = !DISubprogram(name: "putchar", scope: !552, file: !552, line: 618, type: !333, flags: DIFlagPrototyped, spFlags: 0)
+!646 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !647, file: !549, line: 130)
+!647 = !DISubprogram(name: "puts", scope: !552, file: !552, line: 724, type: !397, flags: DIFlagPrototyped, spFlags: 0)
+!648 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !649, file: !549, line: 131)
+!649 = !DISubprogram(name: "remove", scope: !552, file: !552, line: 158, type: !397, flags: DIFlagPrototyped, spFlags: 0)
+!650 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !651, file: !549, line: 132)
+!651 = !DISubprogram(name: "rename", scope: !552, file: !552, line: 160, type: !652, flags: DIFlagPrototyped, spFlags: 0)
+!652 = !DISubroutineType(types: !653)
+!653 = !{!36, !106, !106}
+!654 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !655, file: !549, line: 133)
+!655 = !DISubprogram(name: "rewind", scope: !552, file: !552, line: 790, type: !558, flags: DIFlagPrototyped, spFlags: 0)
+!656 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !657, file: !549, line: 134)
+!657 = !DISubprogram(name: "scanf", linkageName: "__isoc23_scanf", scope: !552, file: !552, line: 445, type: !640, flags: DIFlagPrototyped, spFlags: 0)
+!658 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !659, file: !549, line: 135)
+!659 = !DISubprogram(name: "setbuf", scope: !552, file: !552, line: 334, type: !660, flags: DIFlagPrototyped, spFlags: 0)
+!660 = !DISubroutineType(types: !661)
+!661 = !{null, !577, !176}
+!662 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !663, file: !549, line: 136)
+!663 = !DISubprogram(name: "setvbuf", scope: !552, file: !552, line: 339, type: !664, flags: DIFlagPrototyped, spFlags: 0)
+!664 = !DISubroutineType(types: !665)
+!665 = !{!36, !577, !176, !36, !102}
+!666 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !667, file: !549, line: 137)
+!667 = !DISubprogram(name: "sprintf", scope: !552, file: !552, line: 365, type: !668, flags: DIFlagPrototyped, spFlags: 0)
+!668 = !DISubroutineType(types: !669)
+!669 = !{!36, !176, !105, null}
+!670 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !671, file: !549, line: 138)
+!671 = !DISubprogram(name: "sscanf", linkageName: "__isoc23_sscanf", scope: !552, file: !552, line: 447, type: !672, flags: DIFlagPrototyped, spFlags: 0)
+!672 = !DISubroutineType(types: !673)
+!673 = !{!36, !105, !105, null}
+!674 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !675, file: !549, line: 139)
+!675 = !DISubprogram(name: "tmpfile", scope: !552, file: !552, line: 194, type: !676, flags: DIFlagPrototyped, spFlags: 0)
+!676 = !DISubroutineType(types: !677)
+!677 = !{!560}
+!678 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !679, file: !549, line: 141)
+!679 = !DISubprogram(name: "tmpnam", scope: !552, file: !552, line: 211, type: !680, flags: DIFlagPrototyped, spFlags: 0)
+!680 = !DISubroutineType(types: !681)
+!681 = !{!177, !177}
+!682 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !683, file: !549, line: 143)
+!683 = !DISubprogram(name: "ungetc", scope: !552, file: !552, line: 731, type: !594, flags: DIFlagPrototyped, spFlags: 0)
+!684 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !685, file: !549, line: 144)
+!685 = !DISubprogram(name: "vfprintf", scope: !552, file: !552, line: 372, type: !686, flags: DIFlagPrototyped, spFlags: 0)
+!686 = !DISubroutineType(types: !687)
+!687 = !{!36, !577, !105, !147}
+!688 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !689, file: !549, line: 145)
+!689 = !DISubprogram(name: "vprintf", scope: !552, file: !552, line: 378, type: !690, flags: DIFlagPrototyped, spFlags: 0)
+!690 = !DISubroutineType(types: !691)
+!691 = !{!36, !105, !147}
+!692 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !693, file: !549, line: 146)
+!693 = !DISubprogram(name: "vsprintf", scope: !552, file: !552, line: 380, type: !694, flags: DIFlagPrototyped, spFlags: 0)
+!694 = !DISubroutineType(types: !695)
+!695 = !{!36, !176, !105, !147}
+!696 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !697, file: !549, line: 175)
+!697 = !DISubprogram(name: "snprintf", scope: !552, file: !552, line: 385, type: !698, flags: DIFlagPrototyped, spFlags: 0)
+!698 = !DISubroutineType(types: !699)
+!699 = !{!36, !176, !102, !105, null}
+!700 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !701, file: !549, line: 176)
+!701 = !DISubprogram(name: "vfscanf", linkageName: "__isoc23_vfscanf", scope: !552, file: !552, line: 511, type: !686, flags: DIFlagPrototyped, spFlags: 0)
+!702 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !703, file: !549, line: 177)
+!703 = !DISubprogram(name: "vscanf", linkageName: "__isoc23_vscanf", scope: !552, file: !552, line: 516, type: !690, flags: DIFlagPrototyped, spFlags: 0)
+!704 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !705, file: !549, line: 178)
+!705 = !DISubprogram(name: "vsnprintf", scope: !552, file: !552, line: 389, type: !706, flags: DIFlagPrototyped, spFlags: 0)
+!706 = !DISubroutineType(types: !707)
+!707 = !{!36, !176, !102, !105, !147}
+!708 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !292, entity: !709, file: !549, line: 179)
+!709 = !DISubprogram(name: "vsscanf", linkageName: "__isoc23_vsscanf", scope: !552, file: !552, line: 519, type: !710, flags: DIFlagPrototyped, spFlags: 0)
+!710 = !DISubroutineType(types: !711)
+!711 = !{!36, !105, !105, !147}
+!712 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !697, file: !549, line: 185)
+!713 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !701, file: !549, line: 186)
+!714 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !703, file: !549, line: 187)
+!715 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !705, file: !549, line: 188)
+!716 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !12, entity: !709, file: !549, line: 189)
+!717 = !{i32 7, !"Dwarf Version", i32 5}
+!718 = !{i32 2, !"Debug Info Version", i32 3}
+!719 = !{i32 1, !"wchar_size", i32 4}
+!720 = !{i32 7, !"PIC Level", i32 2}
+!721 = !{i32 7, !"PIE Level", i32 2}
+!722 = !{i32 7, !"uwtable", i32 2}
+!723 = !{i32 7, !"frame-pointer", i32 2}
+!724 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!725 = distinct !DISubprogram(name: "may_throw", linkageName: "_Z9may_throwi", scope: !2, file: !2, line: 3, type: !423, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !8, retainedNodes: !726)
+!726 = !{}
+!727 = !DILocalVariable(name: "i", arg: 1, scope: !725, file: !2, line: 3, type: !36)
+!728 = !DILocation(line: 3, column: 20, scope: !725)
+!729 = !DILocation(line: 4, column: 7, scope: !730)
+!730 = distinct !DILexicalBlock(scope: !725, file: !2, line: 4, column: 7)
+!731 = !DILocation(line: 4, column: 9, scope: !730)
+!732 = !DILocation(line: 4, column: 7, scope: !725)
+!733 = !DILocation(line: 5, column: 5, scope: !734)
+!734 = distinct !DILexicalBlock(scope: !730, file: !2, line: 4, column: 15)
+!735 = !DILocation(line: 5, column: 11, scope: !734)
+!736 = !DILocation(line: 7, column: 1, scope: !734)
+!737 = !DILocation(line: 7, column: 1, scope: !725)
+!738 = distinct !DISubprogram(name: "main", scope: !2, file: !2, line: 9, type: !739, scopeLine: 9, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !8, retainedNodes: !726)
+!739 = !DISubroutineType(types: !740)
+!740 = !{!36, !36, !480}
+!741 = !DILocalVariable(name: "argc", arg: 1, scope: !738, file: !2, line: 9, type: !36)
+!742 = !DILocation(line: 9, column: 14, scope: !738)
+!743 = !DILocalVariable(name: "argv", arg: 2, scope: !738, file: !2, line: 9, type: !480)
+!744 = !DILocation(line: 9, column: 27, scope: !738)
+!745 = !DILocalVariable(name: "has_thrown", scope: !738, file: !2, line: 10, type: !746)
+!746 = !DIBasicType(name: "bool", size: 8, encoding: DW_ATE_boolean)
+!747 = !DILocation(line: 10, column: 8, scope: !738)
+!748 = !DILocation(line: 12, column: 15, scope: !749)
+!749 = distinct !DILexicalBlock(scope: !738, file: !2, line: 11, column: 7)
+!750 = !DILocation(line: 12, column: 5, scope: !749)
+!751 = !DILocation(line: 13, column: 3, scope: !749)
+!752 = !DILocation(line: 17, column: 1, scope: !749)
+!753 = !DILocalVariable(name: "e", scope: !738, file: !2, line: 13, type: !754)
+!754 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !10, size: 64)
+!755 = !DILocation(line: 13, column: 32, scope: !738)
+!756 = !DILocation(line: 14, column: 16, scope: !757)
+!757 = distinct !DILexicalBlock(scope: !738, file: !2, line: 13, column: 35)
+!758 = !DILocation(line: 15, column: 3, scope: !757)
+!759 = !DILocation(line: 16, column: 10, scope: !738)
+!760 = !DILocation(line: 16, column: 3, scope: !738)
diff --git a/examples/llvm-hello-world/target/functions.ll b/examples/llvm-hello-world/target/functions.ll
index b7ede3f0a7..80e662b6b1 100644
--- a/examples/llvm-hello-world/target/functions.ll
+++ b/examples/llvm-hello-world/target/functions.ll
@@ -1,57 +1,124 @@
 ; ModuleID = 'functions.cpp'
 source_filename = "functions.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @_Z3addii(i32, i32) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  store i32 %0, i32* %3, align 4
-  store i32 %1, i32* %4, align 4
-  %5 = load i32, i32* %3, align 4
-  %6 = load i32, i32* %4, align 4
-  %7 = add nsw i32 %5, %6
-  ret i32 %7
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z3addii(i32 noundef %a, i32 noundef %b) #0 !dbg !10 {
+entry:
+  %a.addr = alloca i32, align 4
+  %b.addr = alloca i32, align 4
+  store i32 %a, ptr %a.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %a.addr, metadata !15, metadata !DIExpression()), !dbg !16
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !17, metadata !DIExpression()), !dbg !18
+  %0 = load i32, ptr %a.addr, align 4, !dbg !19
+  %1 = load i32, ptr %b.addr, align 4, !dbg !20
+  %add = add nsw i32 %0, %1, !dbg !21
+  ret i32 %add, !dbg !22
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define void @_Z3incRi(i32* dereferenceable(4)) #0 {
-  %2 = alloca i32*, align 8
-  store i32* %0, i32** %2, align 8
-  %3 = load i32*, i32** %2, align 8
-  %4 = load i32, i32* %3, align 4
-  %5 = add nsw i32 %4, 1
-  store i32 %5, i32* %3, align 4
-  ret void
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local void @_Z3incRi(ptr noundef nonnull align 4 dereferenceable(4) %i) #0 !dbg !23 {
+entry:
+  %i.addr = alloca ptr, align 8
+  store ptr %i, ptr %i.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %i.addr, metadata !27, metadata !DIExpression()), !dbg !28
+  %0 = load ptr, ptr %i.addr, align 8, !dbg !29
+  %1 = load i32, ptr %0, align 4, !dbg !30
+  %inc = add nsw i32 %1, 1, !dbg !30
+  store i32 %inc, ptr %0, align 4, !dbg !30
+  ret void, !dbg !31
 }
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #1 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i32, align 4
-  %7 = alloca i32, align 4
-  %8 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  store i32 10, i32* %6, align 4
-  %9 = load i32, i32* %6, align 4
-  %10 = call i32 @_Z3addii(i32 %9, i32 42)
-  store i32 %10, i32* %7, align 4
-  call void @_Z3incRi(i32* dereferenceable(4) %7)
-  %11 = load i32, i32* %7, align 4
-  store i32 %11, i32* %8, align 4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #2 !dbg !32 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %a = alloca i32, align 4
+  %b = alloca i32, align 4
+  %c = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !38, metadata !DIExpression()), !dbg !39
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !40, metadata !DIExpression()), !dbg !41
+  call void @llvm.dbg.declare(metadata ptr %a, metadata !42, metadata !DIExpression()), !dbg !43
+  store i32 10, ptr %a, align 4, !dbg !43
+  call void @llvm.dbg.declare(metadata ptr %b, metadata !44, metadata !DIExpression()), !dbg !45
+  %0 = load i32, ptr %a, align 4, !dbg !46
+  %call = call noundef i32 @_Z3addii(i32 noundef %0, i32 noundef 42), !dbg !47
+  store i32 %call, ptr %b, align 4, !dbg !45
+  call void @_Z3incRi(ptr noundef nonnull align 4 dereferenceable(4) %b), !dbg !48
+  call void @llvm.dbg.declare(metadata ptr %c, metadata !49, metadata !DIExpression()), !dbg !50
+  %1 = load i32, ptr %b, align 4, !dbg !51
+  store i32 %1, ptr %c, align 4, !dbg !50
+  ret i32 0, !dbg !52
 }
 
-attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "functions.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "8f8ca1df314e426af2fde812f819fac4")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "add", linkageName: "_Z3addii", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !13}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !{}
+!15 = !DILocalVariable(name: "a", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!16 = !DILocation(line: 1, column: 13, scope: !10)
+!17 = !DILocalVariable(name: "b", arg: 2, scope: !10, file: !1, line: 1, type: !13)
+!18 = !DILocation(line: 1, column: 20, scope: !10)
+!19 = !DILocation(line: 1, column: 32, scope: !10)
+!20 = !DILocation(line: 1, column: 36, scope: !10)
+!21 = !DILocation(line: 1, column: 34, scope: !10)
+!22 = !DILocation(line: 1, column: 25, scope: !10)
+!23 = distinct !DISubprogram(name: "inc", linkageName: "_Z3incRi", scope: !1, file: !1, line: 3, type: !24, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!24 = !DISubroutineType(types: !25)
+!25 = !{null, !26}
+!26 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !13, size: 64)
+!27 = !DILocalVariable(name: "i", arg: 1, scope: !23, file: !1, line: 3, type: !26)
+!28 = !DILocation(line: 3, column: 15, scope: !23)
+!29 = !DILocation(line: 3, column: 22, scope: !23)
+!30 = !DILocation(line: 3, column: 20, scope: !23)
+!31 = !DILocation(line: 3, column: 25, scope: !23)
+!32 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 5, type: !33, scopeLine: 5, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!33 = !DISubroutineType(types: !34)
+!34 = !{!13, !13, !35}
+!35 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !36, size: 64)
+!36 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !37, size: 64)
+!37 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!38 = !DILocalVariable(name: "argc", arg: 1, scope: !32, file: !1, line: 5, type: !13)
+!39 = !DILocation(line: 5, column: 14, scope: !32)
+!40 = !DILocalVariable(name: "argv", arg: 2, scope: !32, file: !1, line: 5, type: !35)
+!41 = !DILocation(line: 5, column: 27, scope: !32)
+!42 = !DILocalVariable(name: "a", scope: !32, file: !1, line: 6, type: !13)
+!43 = !DILocation(line: 6, column: 7, scope: !32)
+!44 = !DILocalVariable(name: "b", scope: !32, file: !1, line: 7, type: !13)
+!45 = !DILocation(line: 7, column: 7, scope: !32)
+!46 = !DILocation(line: 7, column: 15, scope: !32)
+!47 = !DILocation(line: 7, column: 11, scope: !32)
+!48 = !DILocation(line: 8, column: 3, scope: !32)
+!49 = !DILocalVariable(name: "c", scope: !32, file: !1, line: 9, type: !13)
+!50 = !DILocation(line: 9, column: 7, scope: !32)
+!51 = !DILocation(line: 9, column: 11, scope: !32)
+!52 = !DILocation(line: 10, column: 3, scope: !32)
diff --git a/examples/llvm-hello-world/target/functions2.ll b/examples/llvm-hello-world/target/functions2.ll
index 3895131b11..2827633705 100644
--- a/examples/llvm-hello-world/target/functions2.ll
+++ b/examples/llvm-hello-world/target/functions2.ll
@@ -1,10 +1,8 @@
 ; ModuleID = 'functions2.cpp'
 source_filename = "functions2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-%struct.Adder = type { i32 (...)** }
-%struct.S = type { %struct.Adder }
 %struct.R = type { i8 }
 
 $_ZN1SC2Ev = comdat any
@@ -27,171 +25,320 @@ $_ZTI1S = comdat any
 
 $_ZTV5Adder = comdat any
 
-@F = global i32 (i32, i32)* @_Z3addii, align 8
-@A = global %struct.Adder* null, align 8
-@M = global { i64, i64 } { i64 ptrtoint (i32 (%struct.R*, i32, i32)* @_ZN1R4multEii to i64), i64 0 }, align 8
-@_ZTV1S = linkonce_odr unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTI1S to i8*), i8* bitcast (i32 (%struct.S*, i32, i32)* @_ZN1S3addEii to i8*)] }, comdat, align 8
-@_ZTVN10__cxxabiv120__si_class_type_infoE = external global i8*
-@_ZTS1S = linkonce_odr constant [3 x i8] c"1S\00", comdat
-@_ZTVN10__cxxabiv117__class_type_infoE = external global i8*
-@_ZTS5Adder = linkonce_odr constant [7 x i8] c"5Adder\00", comdat
-@_ZTI5Adder = linkonce_odr constant { i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv117__class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([7 x i8], [7 x i8]* @_ZTS5Adder, i32 0, i32 0) }, comdat
-@_ZTI1S = linkonce_odr constant { i8*, i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([3 x i8], [3 x i8]* @_ZTS1S, i32 0, i32 0), i8* bitcast ({ i8*, i8* }* @_ZTI5Adder to i8*) }, comdat
-@_ZTV5Adder = linkonce_odr unnamed_addr constant { [3 x i8*] } { [3 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI5Adder to i8*), i8* bitcast (void ()* @__cxa_pure_virtual to i8*)] }, comdat, align 8
-@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_functions2.cpp, i8* null }]
-
-; Function Attrs: noinline optnone uwtable
-define %struct.Adder* @_Z9makeAdderv() #0 {
-  %1 = call i8* @_Znwm(i64 8) #5
-  %2 = bitcast i8* %1 to %struct.S*
-  call void @_ZN1SC2Ev(%struct.S* %2) #6
-  %3 = bitcast %struct.S* %2 to %struct.Adder*
-  ret %struct.Adder* %3
+@F = dso_local global ptr @_Z3addii, align 8, !dbg !0
+@A = dso_local global ptr null, align 8, !dbg !26
+@M = dso_local global { i64, i64 } { i64 ptrtoint (ptr @_ZN1R4multEii to i64), i64 0 }, align 8, !dbg !29
+@_ZTV1S = linkonce_odr dso_local unnamed_addr constant { [3 x ptr] } { [3 x ptr] [ptr null, ptr @_ZTI1S, ptr @_ZN1S3addEii] }, comdat, align 8
+@_ZTVN10__cxxabiv120__si_class_type_infoE = external global ptr
+@_ZTS1S = linkonce_odr dso_local constant [3 x i8] c"1S\00", comdat, align 1
+@_ZTVN10__cxxabiv117__class_type_infoE = external global ptr
+@_ZTS5Adder = linkonce_odr dso_local constant [7 x i8] c"5Adder\00", comdat, align 1
+@_ZTI5Adder = linkonce_odr dso_local constant { ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv117__class_type_infoE, i64 2), ptr @_ZTS5Adder }, comdat, align 8
+@_ZTI1S = linkonce_odr dso_local constant { ptr, ptr, ptr } { ptr getelementptr inbounds (ptr, ptr @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2), ptr @_ZTS1S, ptr @_ZTI5Adder }, comdat, align 8
+@_ZTV5Adder = linkonce_odr dso_local unnamed_addr constant { [3 x ptr] } { [3 x ptr] [ptr null, ptr @_ZTI5Adder, ptr @__cxa_pure_virtual] }, comdat, align 8
+@llvm.global_ctors = appending global [1 x { i32, ptr, ptr }] [{ i32, ptr, ptr } { i32 65535, ptr @_GLOBAL__sub_I_functions2.cpp, ptr null }]
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define dso_local noundef ptr @_Z9makeAdderv() #0 !dbg !49 {
+entry:
+  %call = call noalias noundef nonnull ptr @_Znwm(i64 noundef 8) #7, !dbg !53, !heapallocsite !5
+  call void @_ZN1SC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %call) #8, !dbg !54
+  ret ptr %call, !dbg !55
 }
 
-; Function Attrs: nobuiltin
-declare noalias i8* @_Znwm(i64) #1
+; Function Attrs: nobuiltin allocsize(0)
+declare noundef nonnull ptr @_Znwm(i64 noundef) #1
 
 ; Function Attrs: noinline nounwind optnone uwtable
-define linkonce_odr void @_ZN1SC2Ev(%struct.S*) unnamed_addr #2 comdat align 2 {
-  %2 = alloca %struct.S*, align 8
-  store %struct.S* %0, %struct.S** %2, align 8
-  %3 = load %struct.S*, %struct.S** %2, align 8
-  %4 = bitcast %struct.S* %3 to %struct.Adder*
-  call void @_ZN5AdderC2Ev(%struct.Adder* %4) #6
-  %5 = bitcast %struct.S* %3 to i32 (...)***
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV1S, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %5, align 8
-  ret void
+define linkonce_odr dso_local void @_ZN1SC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !56 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !60, metadata !DIExpression()), !dbg !62
+  %this1 = load ptr, ptr %this.addr, align 8
+  call void @_ZN5AdderC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this1) #8, !dbg !63
+  store ptr getelementptr inbounds ({ [3 x ptr] }, ptr @_ZTV1S, i32 0, inrange i32 0, i32 2), ptr %this1, align 8, !dbg !63
+  ret void, !dbg !63
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @_Z3addii(i32, i32) #2 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  store i32 %0, i32* %3, align 4
-  store i32 %1, i32* %4, align 4
-  %5 = load i32, i32* %3, align 4
-  %6 = load i32, i32* %4, align 4
-  %7 = add nsw i32 %5, %6
-  ret i32 %7
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z3addii(i32 noundef %a, i32 noundef %b) #3 !dbg !64 {
+entry:
+  %a.addr = alloca i32, align 4
+  %b.addr = alloca i32, align 4
+  store i32 %a, ptr %a.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %a.addr, metadata !65, metadata !DIExpression()), !dbg !66
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !67, metadata !DIExpression()), !dbg !68
+  %0 = load i32, ptr %a.addr, align 4, !dbg !69
+  %1 = load i32, ptr %b.addr, align 4, !dbg !70
+  %add = add nsw i32 %0, %1, !dbg !71
+  ret i32 %add, !dbg !72
 }
 
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #4
+
 ; Function Attrs: noinline uwtable
-define internal void @__cxx_global_var_init() #3 section ".text.startup" {
-  %1 = call %struct.Adder* @_Z9makeAdderv()
-  store %struct.Adder* %1, %struct.Adder** @A, align 8
-  ret void
+define internal void @__cxx_global_var_init() #5 section ".text.startup" !dbg !73 {
+entry:
+  %call = call noundef ptr @_Z9makeAdderv(), !dbg !77
+  store ptr %call, ptr @A, align 8, !dbg !79
+  ret void, !dbg !77
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define linkonce_odr i32 @_ZN1R4multEii(%struct.R*, i32, i32) #2 comdat align 2 {
-  %4 = alloca %struct.R*, align 8
-  %5 = alloca i32, align 4
-  %6 = alloca i32, align 4
-  store %struct.R* %0, %struct.R** %4, align 8
-  store i32 %1, i32* %5, align 4
-  store i32 %2, i32* %6, align 4
-  %7 = load %struct.R*, %struct.R** %4, align 8
-  %8 = load i32, i32* %5, align 4
-  %9 = load i32, i32* %6, align 4
-  %10 = mul nsw i32 %8, %9
-  ret i32 %10
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define linkonce_odr dso_local noundef i32 @_ZN1R4multEii(ptr noundef nonnull align 1 dereferenceable(1) %this, i32 noundef %a, i32 noundef %b) #3 comdat align 2 !dbg !80 {
+entry:
+  %this.addr = alloca ptr, align 8
+  %a.addr = alloca i32, align 4
+  %b.addr = alloca i32, align 4
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !81, metadata !DIExpression()), !dbg !83
+  store i32 %a, ptr %a.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %a.addr, metadata !84, metadata !DIExpression()), !dbg !85
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !86, metadata !DIExpression()), !dbg !87
+  %this1 = load ptr, ptr %this.addr, align 8
+  %0 = load i32, ptr %a.addr, align 4, !dbg !88
+  %1 = load i32, ptr %b.addr, align 4, !dbg !89
+  %mul = mul nsw i32 %0, %1, !dbg !90
+  ret i32 %mul, !dbg !91
 }
 
-; Function Attrs: noinline norecurse optnone uwtable
-define i32 @main() #4 {
-  %1 = alloca i32, align 4
-  %2 = alloca i32, align 4
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca %struct.R, align 1
-  %6 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  %7 = call i32 @_Z3addii(i32 4, i32 5)
-  store i32 %7, i32* %2, align 4
-  %8 = load %struct.Adder*, %struct.Adder** @A, align 8
-  %9 = bitcast %struct.Adder* %8 to i32 (%struct.Adder*, i32, i32)***
-  %10 = load i32 (%struct.Adder*, i32, i32)**, i32 (%struct.Adder*, i32, i32)*** %9, align 8
-  %11 = getelementptr inbounds i32 (%struct.Adder*, i32, i32)*, i32 (%struct.Adder*, i32, i32)** %10, i64 0
-  %12 = load i32 (%struct.Adder*, i32, i32)*, i32 (%struct.Adder*, i32, i32)** %11, align 8
-  %13 = call i32 %12(%struct.Adder* %8, i32 1, i32 2)
-  store i32 %13, i32* %3, align 4
-  %14 = load i32 (i32, i32)*, i32 (i32, i32)** @F, align 8
-  %15 = call i32 %14(i32 1, i32 2)
-  store i32 %15, i32* %4, align 4
-  %16 = load { i64, i64 }, { i64, i64 }* @M, align 8
-  %17 = extractvalue { i64, i64 } %16, 1
-  %18 = bitcast %struct.R* %5 to i8*
-  %19 = getelementptr inbounds i8, i8* %18, i64 %17
-  %20 = bitcast i8* %19 to %struct.R*
-  %21 = extractvalue { i64, i64 } %16, 0
-  %22 = and i64 %21, 1
-  %23 = icmp ne i64 %22, 0
-  br i1 %23, label %24, label %31
-
-; <label>:24:                                     ; preds = %0
-  %25 = bitcast %struct.R* %20 to i8**
-  %26 = load i8*, i8** %25, align 8
-  %27 = sub i64 %21, 1
-  %28 = getelementptr i8, i8* %26, i64 %27
-  %29 = bitcast i8* %28 to i32 (%struct.R*, i32, i32)**
-  %30 = load i32 (%struct.R*, i32, i32)*, i32 (%struct.R*, i32, i32)** %29, align 8
-  br label %33
-
-; <label>:31:                                     ; preds = %0
-  %32 = inttoptr i64 %21 to i32 (%struct.R*, i32, i32)*
-  br label %33
-
-; <label>:33:                                     ; preds = %31, %24
-  %34 = phi i32 (%struct.R*, i32, i32)* [ %30, %24 ], [ %32, %31 ]
-  %35 = call i32 %34(%struct.R* %20, i32 2, i32 3)
-  store i32 %35, i32* %6, align 4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main() #6 !dbg !92 {
+entry:
+  %retval = alloca i32, align 4
+  %a = alloca i32, align 4
+  %x = alloca i32, align 4
+  %y = alloca i32, align 4
+  %r = alloca %struct.R, align 1
+  %z = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %a, metadata !93, metadata !DIExpression()), !dbg !94
+  %call = call noundef i32 @_Z3addii(i32 noundef 4, i32 noundef 5), !dbg !95
+  store i32 %call, ptr %a, align 4, !dbg !94
+  call void @llvm.dbg.declare(metadata ptr %x, metadata !96, metadata !DIExpression()), !dbg !97
+  %0 = load ptr, ptr @A, align 8, !dbg !98
+  %vtable = load ptr, ptr %0, align 8, !dbg !99
+  %vfn = getelementptr inbounds ptr, ptr %vtable, i64 0, !dbg !99
+  %1 = load ptr, ptr %vfn, align 8, !dbg !99
+  %call1 = call noundef i32 %1(ptr noundef nonnull align 8 dereferenceable(8) %0, i32 noundef 1, i32 noundef 2), !dbg !99
+  store i32 %call1, ptr %x, align 4, !dbg !97
+  call void @llvm.dbg.declare(metadata ptr %y, metadata !100, metadata !DIExpression()), !dbg !101
+  %2 = load ptr, ptr @F, align 8, !dbg !102
+  %call2 = call noundef i32 %2(i32 noundef 1, i32 noundef 2), !dbg !102
+  store i32 %call2, ptr %y, align 4, !dbg !101
+  call void @llvm.dbg.declare(metadata ptr %r, metadata !103, metadata !DIExpression()), !dbg !104
+  call void @llvm.dbg.declare(metadata ptr %z, metadata !105, metadata !DIExpression()), !dbg !106
+  %3 = load { i64, i64 }, ptr @M, align 8, !dbg !107
+  %memptr.adj = extractvalue { i64, i64 } %3, 1, !dbg !108
+  %4 = getelementptr inbounds i8, ptr %r, i64 %memptr.adj, !dbg !108
+  %memptr.ptr = extractvalue { i64, i64 } %3, 0, !dbg !108
+  %5 = and i64 %memptr.ptr, 1, !dbg !108
+  %memptr.isvirtual = icmp ne i64 %5, 0, !dbg !108
+  br i1 %memptr.isvirtual, label %memptr.virtual, label %memptr.nonvirtual, !dbg !108
+
+memptr.virtual:                                   ; preds = %entry
+  %vtable3 = load ptr, ptr %4, align 8, !dbg !108
+  %6 = sub i64 %memptr.ptr, 1, !dbg !108
+  %7 = getelementptr i8, ptr %vtable3, i64 %6, !dbg !108, !nosanitize !52
+  %memptr.virtualfn = load ptr, ptr %7, align 8, !dbg !108, !nosanitize !52
+  br label %memptr.end, !dbg !108
+
+memptr.nonvirtual:                                ; preds = %entry
+  %memptr.nonvirtualfn = inttoptr i64 %memptr.ptr to ptr, !dbg !108
+  br label %memptr.end, !dbg !108
+
+memptr.end:                                       ; preds = %memptr.nonvirtual, %memptr.virtual
+  %8 = phi ptr [ %memptr.virtualfn, %memptr.virtual ], [ %memptr.nonvirtualfn, %memptr.nonvirtual ], !dbg !108
+  %call4 = call noundef i32 %8(ptr noundef nonnull align 1 dereferenceable(1) %4, i32 noundef 2, i32 noundef 3), !dbg !108
+  store i32 %call4, ptr %z, align 4, !dbg !106
+  ret i32 0, !dbg !109
 }
 
 ; Function Attrs: noinline nounwind optnone uwtable
-define linkonce_odr void @_ZN5AdderC2Ev(%struct.Adder*) unnamed_addr #2 comdat align 2 {
-  %2 = alloca %struct.Adder*, align 8
-  store %struct.Adder* %0, %struct.Adder** %2, align 8
-  %3 = load %struct.Adder*, %struct.Adder** %2, align 8
-  %4 = bitcast %struct.Adder* %3 to i32 (...)***
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [3 x i8*] }, { [3 x i8*] }* @_ZTV5Adder, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %4, align 8
-  ret void
+define linkonce_odr dso_local void @_ZN5AdderC2Ev(ptr noundef nonnull align 8 dereferenceable(8) %this) unnamed_addr #2 comdat align 2 !dbg !110 {
+entry:
+  %this.addr = alloca ptr, align 8
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !114, metadata !DIExpression()), !dbg !115
+  %this1 = load ptr, ptr %this.addr, align 8
+  store ptr getelementptr inbounds ({ [3 x ptr] }, ptr @_ZTV5Adder, i32 0, inrange i32 0, i32 2), ptr %this1, align 8, !dbg !116
+  ret void, !dbg !116
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define linkonce_odr i32 @_ZN1S3addEii(%struct.S*, i32, i32) unnamed_addr #2 comdat align 2 {
-  %4 = alloca %struct.S*, align 8
-  %5 = alloca i32, align 4
-  %6 = alloca i32, align 4
-  store %struct.S* %0, %struct.S** %4, align 8
-  store i32 %1, i32* %5, align 4
-  store i32 %2, i32* %6, align 4
-  %7 = load %struct.S*, %struct.S** %4, align 8
-  %8 = load i32, i32* %5, align 4
-  %9 = load i32, i32* %6, align 4
-  %10 = add nsw i32 %8, %9
-  ret i32 %10
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define linkonce_odr dso_local noundef i32 @_ZN1S3addEii(ptr noundef nonnull align 8 dereferenceable(8) %this, i32 noundef %a, i32 noundef %b) unnamed_addr #3 comdat align 2 !dbg !117 {
+entry:
+  %this.addr = alloca ptr, align 8
+  %a.addr = alloca i32, align 4
+  %b.addr = alloca i32, align 4
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !118, metadata !DIExpression()), !dbg !119
+  store i32 %a, ptr %a.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %a.addr, metadata !120, metadata !DIExpression()), !dbg !121
+  store i32 %b, ptr %b.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %b.addr, metadata !122, metadata !DIExpression()), !dbg !123
+  %this1 = load ptr, ptr %this.addr, align 8
+  %0 = load i32, ptr %a.addr, align 4, !dbg !124
+  %1 = load i32, ptr %b.addr, align 4, !dbg !125
+  %add = add nsw i32 %0, %1, !dbg !126
+  ret i32 %add, !dbg !127
 }
 
 declare void @__cxa_pure_virtual() unnamed_addr
 
 ; Function Attrs: noinline uwtable
-define internal void @_GLOBAL__sub_I_functions2.cpp() #3 section ".text.startup" {
-  call void @__cxx_global_var_init()
+define internal void @_GLOBAL__sub_I_functions2.cpp() #5 section ".text.startup" !dbg !128 {
+entry:
+  call void @__cxx_global_var_init(), !dbg !130
   ret void
 }
 
-attributes #0 = { noinline optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { nobuiltin "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { noinline uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #4 = { noinline norecurse optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #5 = { builtin }
-attributes #6 = { nounwind }
+attributes #0 = { mustprogress noinline optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nobuiltin allocsize(0) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #2 = { noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #5 = { noinline uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #6 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #7 = { builtin allocsize(0) }
+attributes #8 = { nounwind }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!2}
+!llvm.module.flags = !{!41, !42, !43, !44, !45, !46, !47}
+!llvm.ident = !{!48}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
+!1 = distinct !DIGlobalVariable(name: "F", scope: !2, file: !3, line: 22, type: !38, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !4, globals: !25, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "functions2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "5b2c3959cc2795e7d87a9b2bbe339351")
+!4 = !{!5, !8}
+!5 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !3, line: 9, size: 64, flags: DIFlagTypePassByReference | DIFlagNonTrivial, elements: !6, vtableHolder: !8, identifier: "_ZTS1S")
+!6 = !{!7, !20, !24}
+!7 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !5, baseType: !8, extraData: i32 0)
+!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Adder", file: !3, line: 1, size: 64, flags: DIFlagTypePassByReference | DIFlagNonTrivial, elements: !9, vtableHolder: !8, identifier: "_ZTS5Adder")
+!9 = !{!10, !16}
+!10 = !DIDerivedType(tag: DW_TAG_member, name: "_vptr$Adder", scope: !3, file: !3, baseType: !11, size: 64, flags: DIFlagArtificial)
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !12, size: 64)
+!12 = !DIDerivedType(tag: DW_TAG_pointer_type, name: "__vtbl_ptr_type", baseType: !13, size: 64)
+!13 = !DISubroutineType(types: !14)
+!14 = !{!15}
+!15 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!16 = !DISubprogram(name: "add", linkageName: "_ZN5Adder3addEii", scope: !8, file: !3, line: 2, type: !17, scopeLine: 2, containingType: !8, virtualIndex: 0, flags: DIFlagPrototyped, spFlags: DISPFlagPureVirtual)
+!17 = !DISubroutineType(types: !18)
+!18 = !{!15, !19, !15, !15}
+!19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!20 = !DISubprogram(name: "add", linkageName: "_ZN1S3addEii", scope: !5, file: !3, line: 10, type: !21, scopeLine: 10, containingType: !5, virtualIndex: 0, flags: DIFlagPrototyped, spFlags: DISPFlagVirtual)
+!21 = !DISubroutineType(types: !22)
+!22 = !{!15, !23, !15, !15}
+!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!24 = !DISubprogram(name: "sub", linkageName: "_ZN1S3subEii", scope: !5, file: !3, line: 11, type: !21, scopeLine: 11, flags: DIFlagPrototyped, spFlags: 0)
+!25 = !{!0, !26, !29}
+!26 = !DIGlobalVariableExpression(var: !27, expr: !DIExpression())
+!27 = distinct !DIGlobalVariable(name: "A", scope: !2, file: !3, line: 24, type: !28, isLocal: false, isDefinition: true)
+!28 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64)
+!29 = !DIGlobalVariableExpression(var: !30, expr: !DIExpression())
+!30 = distinct !DIGlobalVariable(name: "M", scope: !2, file: !3, line: 26, type: !31, isLocal: false, isDefinition: true)
+!31 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !32, size: 128, extraData: !35)
+!32 = !DISubroutineType(types: !33)
+!33 = !{!15, !34, !15, !15}
+!34 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !35, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!35 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "R", file: !3, line: 5, size: 8, flags: DIFlagTypePassByValue, elements: !36, identifier: "_ZTS1R")
+!36 = !{!37}
+!37 = !DISubprogram(name: "mult", linkageName: "_ZN1R4multEii", scope: !35, file: !3, line: 6, type: !32, scopeLine: 6, flags: DIFlagPrototyped, spFlags: 0)
+!38 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !39, size: 64)
+!39 = !DISubroutineType(types: !40)
+!40 = !{!15, !15, !15}
+!41 = !{i32 7, !"Dwarf Version", i32 5}
+!42 = !{i32 2, !"Debug Info Version", i32 3}
+!43 = !{i32 1, !"wchar_size", i32 4}
+!44 = !{i32 7, !"PIC Level", i32 2}
+!45 = !{i32 7, !"PIE Level", i32 2}
+!46 = !{i32 7, !"uwtable", i32 2}
+!47 = !{i32 7, !"frame-pointer", i32 2}
+!48 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!49 = distinct !DISubprogram(name: "makeAdder", linkageName: "_Z9makeAdderv", scope: !3, file: !3, line: 18, type: !50, scopeLine: 18, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !52)
+!50 = !DISubroutineType(types: !51)
+!51 = !{!28}
+!52 = !{}
+!53 = !DILocation(line: 18, column: 29, scope: !49)
+!54 = !DILocation(line: 18, column: 33, scope: !49)
+!55 = !DILocation(line: 18, column: 22, scope: !49)
+!56 = distinct !DISubprogram(name: "S", linkageName: "_ZN1SC2Ev", scope: !5, file: !3, line: 9, type: !57, scopeLine: 9, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, declaration: !59, retainedNodes: !52)
+!57 = !DISubroutineType(types: !58)
+!58 = !{null, !23}
+!59 = !DISubprogram(name: "S", scope: !5, type: !57, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: 0)
+!60 = !DILocalVariable(name: "this", arg: 1, scope: !56, type: !61, flags: DIFlagArtificial | DIFlagObjectPointer)
+!61 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !5, size: 64)
+!62 = !DILocation(line: 0, scope: !56)
+!63 = !DILocation(line: 9, column: 8, scope: !56)
+!64 = distinct !DISubprogram(name: "add", linkageName: "_Z3addii", scope: !3, file: !3, line: 20, type: !39, scopeLine: 20, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !52)
+!65 = !DILocalVariable(name: "a", arg: 1, scope: !64, file: !3, line: 20, type: !15)
+!66 = !DILocation(line: 20, column: 13, scope: !64)
+!67 = !DILocalVariable(name: "b", arg: 2, scope: !64, file: !3, line: 20, type: !15)
+!68 = !DILocation(line: 20, column: 20, scope: !64)
+!69 = !DILocation(line: 20, column: 32, scope: !64)
+!70 = !DILocation(line: 20, column: 36, scope: !64)
+!71 = !DILocation(line: 20, column: 34, scope: !64)
+!72 = !DILocation(line: 20, column: 25, scope: !64)
+!73 = distinct !DISubprogram(name: "__cxx_global_var_init", scope: !74, file: !74, type: !75, flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition, unit: !2, retainedNodes: !52)
+!74 = !DIFile(filename: "functions2.cpp", directory: "phasar/examples/llvm-hello-world/target")
+!75 = !DISubroutineType(types: !76)
+!76 = !{null}
+!77 = !DILocation(line: 24, column: 12, scope: !78)
+!78 = !DILexicalBlockFile(scope: !73, file: !3, discriminator: 0)
+!79 = !DILocation(line: 0, scope: !73)
+!80 = distinct !DISubprogram(name: "mult", linkageName: "_ZN1R4multEii", scope: !35, file: !3, line: 6, type: !32, scopeLine: 6, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, declaration: !37, retainedNodes: !52)
+!81 = !DILocalVariable(name: "this", arg: 1, scope: !80, type: !82, flags: DIFlagArtificial | DIFlagObjectPointer)
+!82 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !35, size: 64)
+!83 = !DILocation(line: 0, scope: !80)
+!84 = !DILocalVariable(name: "a", arg: 2, scope: !80, file: !3, line: 6, type: !15)
+!85 = !DILocation(line: 6, column: 16, scope: !80)
+!86 = !DILocalVariable(name: "b", arg: 3, scope: !80, file: !3, line: 6, type: !15)
+!87 = !DILocation(line: 6, column: 23, scope: !80)
+!88 = !DILocation(line: 6, column: 35, scope: !80)
+!89 = !DILocation(line: 6, column: 39, scope: !80)
+!90 = !DILocation(line: 6, column: 37, scope: !80)
+!91 = !DILocation(line: 6, column: 28, scope: !80)
+!92 = distinct !DISubprogram(name: "main", scope: !3, file: !3, line: 28, type: !13, scopeLine: 28, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !52)
+!93 = !DILocalVariable(name: "a", scope: !92, file: !3, line: 29, type: !15)
+!94 = !DILocation(line: 29, column: 7, scope: !92)
+!95 = !DILocation(line: 29, column: 11, scope: !92)
+!96 = !DILocalVariable(name: "x", scope: !92, file: !3, line: 30, type: !15)
+!97 = !DILocation(line: 30, column: 7, scope: !92)
+!98 = !DILocation(line: 30, column: 11, scope: !92)
+!99 = !DILocation(line: 30, column: 14, scope: !92)
+!100 = !DILocalVariable(name: "y", scope: !92, file: !3, line: 31, type: !15)
+!101 = !DILocation(line: 31, column: 7, scope: !92)
+!102 = !DILocation(line: 31, column: 11, scope: !92)
+!103 = !DILocalVariable(name: "r", scope: !92, file: !3, line: 32, type: !35)
+!104 = !DILocation(line: 32, column: 5, scope: !92)
+!105 = !DILocalVariable(name: "z", scope: !92, file: !3, line: 33, type: !15)
+!106 = !DILocation(line: 33, column: 7, scope: !92)
+!107 = !DILocation(line: 33, column: 15, scope: !92)
+!108 = !DILocation(line: 33, column: 11, scope: !92)
+!109 = !DILocation(line: 34, column: 3, scope: !92)
+!110 = distinct !DISubprogram(name: "Adder", linkageName: "_ZN5AdderC2Ev", scope: !8, file: !3, line: 1, type: !111, scopeLine: 1, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, declaration: !113, retainedNodes: !52)
+!111 = !DISubroutineType(types: !112)
+!112 = !{null, !19}
+!113 = !DISubprogram(name: "Adder", scope: !8, type: !111, flags: DIFlagArtificial | DIFlagPrototyped, spFlags: 0)
+!114 = !DILocalVariable(name: "this", arg: 1, scope: !110, type: !28, flags: DIFlagArtificial | DIFlagObjectPointer)
+!115 = !DILocation(line: 0, scope: !110)
+!116 = !DILocation(line: 1, column: 8, scope: !110)
+!117 = distinct !DISubprogram(name: "add", linkageName: "_ZN1S3addEii", scope: !5, file: !3, line: 10, type: !21, scopeLine: 10, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, declaration: !20, retainedNodes: !52)
+!118 = !DILocalVariable(name: "this", arg: 1, scope: !117, type: !61, flags: DIFlagArtificial | DIFlagObjectPointer)
+!119 = !DILocation(line: 0, scope: !117)
+!120 = !DILocalVariable(name: "a", arg: 2, scope: !117, file: !3, line: 10, type: !15)
+!121 = !DILocation(line: 10, column: 23, scope: !117)
+!122 = !DILocalVariable(name: "b", arg: 3, scope: !117, file: !3, line: 10, type: !15)
+!123 = !DILocation(line: 10, column: 30, scope: !117)
+!124 = !DILocation(line: 10, column: 51, scope: !117)
+!125 = !DILocation(line: 10, column: 55, scope: !117)
+!126 = !DILocation(line: 10, column: 53, scope: !117)
+!127 = !DILocation(line: 10, column: 44, scope: !117)
+!128 = distinct !DISubprogram(linkageName: "_GLOBAL__sub_I_functions2.cpp", scope: !74, file: !74, type: !129, flags: DIFlagArtificial, spFlags: DISPFlagLocalToUnit | DISPFlagDefinition, unit: !2, retainedNodes: !52)
+!129 = !DISubroutineType(types: !52)
+!130 = !DILocation(line: 0, scope: !128)
diff --git a/examples/llvm-hello-world/target/llvm_intrinsic_functions.ll b/examples/llvm-hello-world/target/llvm_intrinsic_functions.ll
index 1f540a342c..dc53e9d00b 100644
--- a/examples/llvm-hello-world/target/llvm_intrinsic_functions.ll
+++ b/examples/llvm-hello-world/target/llvm_intrinsic_functions.ll
@@ -1,32 +1,156 @@
 ; ModuleID = 'llvm_intrinsic_functions.cpp'
 source_filename = "llvm_intrinsic_functions.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main() #0 {
-  %1 = alloca i32, align 4
-  %2 = alloca [10 x i8], align 1
-  %3 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  %4 = getelementptr inbounds [10 x i8], [10 x i8]* %2, i32 0, i32 0
-  call void @llvm.memset.p0i8.i64(i8* %4, i8 0, i64 10, i32 1, i1 false)
-  %5 = getelementptr inbounds [10 x i8], [10 x i8]* %2, i64 0, i64 3
-  %6 = load i8, i8* %5, align 1
-  %7 = sext i8 %6 to i32
-  %8 = add nsw i32 %7, 42
-  store i32 %8, i32* %3, align 4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main() #0 !dbg !103 {
+entry:
+  %retval = alloca i32, align 4
+  %buffer = alloca [10 x i8], align 1
+  %i = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %buffer, metadata !107, metadata !DIExpression()), !dbg !111
+  %arraydecay = getelementptr inbounds [10 x i8], ptr %buffer, i64 0, i64 0, !dbg !112
+  call void @llvm.memset.p0.i64(ptr align 1 %arraydecay, i8 0, i64 10, i1 false), !dbg !112
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !113, metadata !DIExpression()), !dbg !114
+  %arrayidx = getelementptr inbounds [10 x i8], ptr %buffer, i64 0, i64 3, !dbg !115
+  %0 = load i8, ptr %arrayidx, align 1, !dbg !115
+  %conv = sext i8 %0 to i32, !dbg !115
+  %add = add nsw i32 %conv, 42, !dbg !116
+  store i32 %add, ptr %i, align 4, !dbg !114
+  ret i32 0, !dbg !117
 }
 
-; Function Attrs: argmemonly nounwind
-declare void @llvm.memset.p0i8.i64(i8* nocapture writeonly, i8, i64, i32, i1) #1
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind }
+; Function Attrs: argmemonly nocallback nofree nounwind willreturn writeonly
+declare void @llvm.memset.p0.i64(ptr nocapture writeonly, i8, i64, i1 immarg) #2
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { argmemonly nocallback nofree nounwind willreturn writeonly }
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!95, !96, !97, !98, !99, !100, !101}
+!llvm.ident = !{!102}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, imports: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "llvm_intrinsic_functions.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "1251fce58a000c10750f957d831af1d6")
+!2 = !{!3, !16, !20, !27, !31, !35, !45, !49, !51, !53, !57, !61, !65, !69, !73, !75, !77, !79, !83, !87, !91, !93}
+!3 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !5, file: !15, line: 77)
+!4 = !DINamespace(name: "std", scope: null)
+!5 = !DISubprogram(name: "memchr", scope: !6, file: !6, line: 89, type: !7, flags: DIFlagPrototyped, spFlags: 0)
+!6 = !DIFile(filename: "/usr/include/string.h", directory: "", checksumkind: CSK_MD5, checksum: "165db1185644f68894fa9e0d17055d70")
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9, !9, !11, !12}
+!9 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!10 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!12 = !DIDerivedType(tag: DW_TAG_typedef, name: "size_t", file: !13, line: 46, baseType: !14)
+!13 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/stddef.h", directory: "", checksumkind: CSK_MD5, checksum: "b76978376d35d5cd171876ac58ac1256")
+!14 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!15 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstring", directory: "")
+!16 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !17, file: !15, line: 78)
+!17 = !DISubprogram(name: "memcmp", scope: !6, file: !6, line: 64, type: !18, flags: DIFlagPrototyped, spFlags: 0)
+!18 = !DISubroutineType(types: !19)
+!19 = !{!11, !9, !9, !12}
+!20 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !21, file: !15, line: 79)
+!21 = !DISubprogram(name: "memcpy", scope: !6, file: !6, line: 43, type: !22, flags: DIFlagPrototyped, spFlags: 0)
+!22 = !DISubroutineType(types: !23)
+!23 = !{!24, !25, !26, !12}
+!24 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!25 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !24)
+!26 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !9)
+!27 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !28, file: !15, line: 80)
+!28 = !DISubprogram(name: "memmove", scope: !6, file: !6, line: 47, type: !29, flags: DIFlagPrototyped, spFlags: 0)
+!29 = !DISubroutineType(types: !30)
+!30 = !{!24, !24, !9, !12}
+!31 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !32, file: !15, line: 81)
+!32 = !DISubprogram(name: "memset", scope: !6, file: !6, line: 61, type: !33, flags: DIFlagPrototyped, spFlags: 0)
+!33 = !DISubroutineType(types: !34)
+!34 = !{!24, !24, !11, !12}
+!35 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !36, file: !15, line: 82)
+!36 = !DISubprogram(name: "strcat", scope: !6, file: !6, line: 149, type: !37, flags: DIFlagPrototyped, spFlags: 0)
+!37 = !DISubroutineType(types: !38)
+!38 = !{!39, !41, !42}
+!39 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !40, size: 64)
+!40 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!41 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !39)
+!42 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !43)
+!43 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !44, size: 64)
+!44 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !40)
+!45 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !46, file: !15, line: 83)
+!46 = !DISubprogram(name: "strcmp", scope: !6, file: !6, line: 156, type: !47, flags: DIFlagPrototyped, spFlags: 0)
+!47 = !DISubroutineType(types: !48)
+!48 = !{!11, !43, !43}
+!49 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !50, file: !15, line: 84)
+!50 = !DISubprogram(name: "strcoll", scope: !6, file: !6, line: 163, type: !47, flags: DIFlagPrototyped, spFlags: 0)
+!51 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !52, file: !15, line: 85)
+!52 = !DISubprogram(name: "strcpy", scope: !6, file: !6, line: 141, type: !37, flags: DIFlagPrototyped, spFlags: 0)
+!53 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !54, file: !15, line: 86)
+!54 = !DISubprogram(name: "strcspn", scope: !6, file: !6, line: 293, type: !55, flags: DIFlagPrototyped, spFlags: 0)
+!55 = !DISubroutineType(types: !56)
+!56 = !{!12, !43, !43}
+!57 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !58, file: !15, line: 87)
+!58 = !DISubprogram(name: "strerror", scope: !6, file: !6, line: 419, type: !59, flags: DIFlagPrototyped, spFlags: 0)
+!59 = !DISubroutineType(types: !60)
+!60 = !{!39, !11}
+!61 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !62, file: !15, line: 88)
+!62 = !DISubprogram(name: "strlen", scope: !6, file: !6, line: 407, type: !63, flags: DIFlagPrototyped, spFlags: 0)
+!63 = !DISubroutineType(types: !64)
+!64 = !{!12, !43}
+!65 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !66, file: !15, line: 89)
+!66 = !DISubprogram(name: "strncat", scope: !6, file: !6, line: 152, type: !67, flags: DIFlagPrototyped, spFlags: 0)
+!67 = !DISubroutineType(types: !68)
+!68 = !{!39, !41, !42, !12}
+!69 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !70, file: !15, line: 90)
+!70 = !DISubprogram(name: "strncmp", scope: !6, file: !6, line: 159, type: !71, flags: DIFlagPrototyped, spFlags: 0)
+!71 = !DISubroutineType(types: !72)
+!72 = !{!11, !43, !43, !12}
+!73 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !74, file: !15, line: 91)
+!74 = !DISubprogram(name: "strncpy", scope: !6, file: !6, line: 144, type: !67, flags: DIFlagPrototyped, spFlags: 0)
+!75 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !76, file: !15, line: 92)
+!76 = !DISubprogram(name: "strspn", scope: !6, file: !6, line: 297, type: !55, flags: DIFlagPrototyped, spFlags: 0)
+!77 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !78, file: !15, line: 93)
+!78 = !DISubprogram(name: "strtok", scope: !6, file: !6, line: 356, type: !37, flags: DIFlagPrototyped, spFlags: 0)
+!79 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !80, file: !15, line: 94)
+!80 = !DISubprogram(name: "strxfrm", scope: !6, file: !6, line: 166, type: !81, flags: DIFlagPrototyped, spFlags: 0)
+!81 = !DISubroutineType(types: !82)
+!82 = !{!12, !41, !42, !12}
+!83 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !84, file: !15, line: 95)
+!84 = !DISubprogram(name: "strchr", scope: !6, file: !6, line: 228, type: !85, flags: DIFlagPrototyped, spFlags: 0)
+!85 = !DISubroutineType(types: !86)
+!86 = !{!43, !43, !11}
+!87 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !88, file: !15, line: 96)
+!88 = !DISubprogram(name: "strpbrk", scope: !6, file: !6, line: 305, type: !89, flags: DIFlagPrototyped, spFlags: 0)
+!89 = !DISubroutineType(types: !90)
+!90 = !{!43, !43, !43}
+!91 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !92, file: !15, line: 97)
+!92 = !DISubprogram(name: "strrchr", scope: !6, file: !6, line: 255, type: !85, flags: DIFlagPrototyped, spFlags: 0)
+!93 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !94, file: !15, line: 98)
+!94 = !DISubprogram(name: "strstr", scope: !6, file: !6, line: 332, type: !89, flags: DIFlagPrototyped, spFlags: 0)
+!95 = !{i32 7, !"Dwarf Version", i32 5}
+!96 = !{i32 2, !"Debug Info Version", i32 3}
+!97 = !{i32 1, !"wchar_size", i32 4}
+!98 = !{i32 7, !"PIC Level", i32 2}
+!99 = !{i32 7, !"PIE Level", i32 2}
+!100 = !{i32 7, !"uwtable", i32 2}
+!101 = !{i32 7, !"frame-pointer", i32 2}
+!102 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!103 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 3, type: !104, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !106)
+!104 = !DISubroutineType(types: !105)
+!105 = !{!11}
+!106 = !{}
+!107 = !DILocalVariable(name: "buffer", scope: !103, file: !1, line: 4, type: !108)
+!108 = !DICompositeType(tag: DW_TAG_array_type, baseType: !40, size: 80, elements: !109)
+!109 = !{!110}
+!110 = !DISubrange(count: 10)
+!111 = !DILocation(line: 4, column: 8, scope: !103)
+!112 = !DILocation(line: 5, column: 3, scope: !103)
+!113 = !DILocalVariable(name: "i", scope: !103, file: !1, line: 6, type: !11)
+!114 = !DILocation(line: 6, column: 7, scope: !103)
+!115 = !DILocation(line: 6, column: 11, scope: !103)
+!116 = !DILocation(line: 6, column: 21, scope: !103)
+!117 = !DILocation(line: 7, column: 3, scope: !103)
diff --git a/examples/llvm-hello-world/target/llvm_intrinsic_functions2.ll b/examples/llvm-hello-world/target/llvm_intrinsic_functions2.ll
index 0a6199c5de..28a3efafbd 100644
--- a/examples/llvm-hello-world/target/llvm_intrinsic_functions2.ll
+++ b/examples/llvm-hello-world/target/llvm_intrinsic_functions2.ll
@@ -1,75 +1,398 @@
 ; ModuleID = 'llvm_intrinsic_functions2.cpp'
 source_filename = "llvm_intrinsic_functions2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline nounwind optnone uwtable
-define i32 @_Z3foov() #0 {
-  ret i32 42
+; Function Attrs: mustprogress noinline nounwind optnone uwtable
+define dso_local noundef i32 @_Z3foov() #0 !dbg !299 {
+entry:
+  ret i32 42, !dbg !301
 }
 
-; Function Attrs: noinline norecurse optnone uwtable
-define i32 @main() #1 {
-  %1 = alloca i32, align 4
-  %2 = alloca i32*, align 8
-  %3 = alloca i32*, align 8
-  store i32 0, i32* %1, align 4
-  %4 = call noalias i8* @malloc(i64 40) #6
-  %5 = bitcast i8* %4 to i32*
-  store i32* %5, i32** %2, align 8
-  %6 = load i32*, i32** %2, align 8
-  %7 = bitcast i32* %6 to i8*
-  call void @llvm.memset.p0i8.i64(i8* %7, i8 0, i64 40, i32 4, i1 false)
-  %8 = load i32*, i32** %2, align 8
-  %9 = bitcast i32* %8 to i8*
-  call void @free(i8* %9) #6
-  %10 = call i8* @_Znwm(i64 4) #7
-  %11 = bitcast i8* %10 to i32*
-  store i32 13, i32* %11, align 4
-  store i32* %11, i32** %3, align 8
-  %12 = call i32 @_Z3foov()
-  %13 = load i32*, i32** %3, align 8
-  store i32 %12, i32* %13, align 4
-  %14 = load i32*, i32** %3, align 8
-  %15 = icmp eq i32* %14, null
-  br i1 %15, label %18, label %16
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main() #1 !dbg !302 {
+entry:
+  %retval = alloca i32, align 4
+  %i = alloca ptr, align 8
+  %j = alloca ptr, align 8
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !303, metadata !DIExpression()), !dbg !304
+  %call = call noalias ptr @malloc(i64 noundef 40) #8, !dbg !305
+  store ptr %call, ptr %i, align 8, !dbg !304
+  %0 = load ptr, ptr %i, align 8, !dbg !306
+  call void @llvm.memset.p0.i64(ptr align 4 %0, i8 0, i64 40, i1 false), !dbg !307
+  %1 = load ptr, ptr %i, align 8, !dbg !308
+  call void @free(ptr noundef %1) #9, !dbg !309
+  call void @llvm.dbg.declare(metadata ptr %j, metadata !310, metadata !DIExpression()), !dbg !311
+  %call1 = call noalias noundef nonnull ptr @_Znwm(i64 noundef 4) #10, !dbg !312, !heapallocsite !4
+  store i32 13, ptr %call1, align 4, !dbg !312
+  store ptr %call1, ptr %j, align 8, !dbg !311
+  %call2 = call noundef i32 @_Z3foov(), !dbg !313
+  %2 = load ptr, ptr %j, align 8, !dbg !314
+  store i32 %call2, ptr %2, align 4, !dbg !315
+  %3 = load ptr, ptr %j, align 8, !dbg !316
+  %isnull = icmp eq ptr %3, null, !dbg !317
+  br i1 %isnull, label %delete.end, label %delete.notnull, !dbg !317
 
-; <label>:16:                                     ; preds = %0
-  %17 = bitcast i32* %14 to i8*
-  call void @_ZdlPv(i8* %17) #8
-  br label %18
+delete.notnull:                                   ; preds = %entry
+  call void @_ZdlPv(ptr noundef %3) #11, !dbg !317
+  br label %delete.end, !dbg !317
 
-; <label>:18:                                     ; preds = %16, %0
-  ret i32 0
+delete.end:                                       ; preds = %delete.notnull, %entry
+  ret i32 0, !dbg !318
 }
 
-; Function Attrs: nounwind
-declare noalias i8* @malloc(i64) #2
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #2
+
+; Function Attrs: nounwind allocsize(0)
+declare noalias ptr @malloc(i64 noundef) #3
 
-; Function Attrs: argmemonly nounwind
-declare void @llvm.memset.p0i8.i64(i8* nocapture writeonly, i8, i64, i32, i1) #3
+; Function Attrs: argmemonly nocallback nofree nounwind willreturn writeonly
+declare void @llvm.memset.p0.i64(ptr nocapture writeonly, i8, i64, i1 immarg) #4
 
 ; Function Attrs: nounwind
-declare void @free(i8*) #2
+declare void @free(ptr noundef) #5
 
-; Function Attrs: nobuiltin
-declare noalias i8* @_Znwm(i64) #4
+; Function Attrs: nobuiltin allocsize(0)
+declare noundef nonnull ptr @_Znwm(i64 noundef) #6
 
 ; Function Attrs: nobuiltin nounwind
-declare void @_ZdlPv(i8*) #5
+declare void @_ZdlPv(ptr noundef) #7
 
-attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { noinline norecurse optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { argmemonly nounwind }
-attributes #4 = { nobuiltin "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #5 = { nobuiltin nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #6 = { nounwind }
-attributes #7 = { builtin }
-attributes #8 = { builtin nounwind }
+attributes #0 = { mustprogress noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #2 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #3 = { nounwind allocsize(0) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { argmemonly nocallback nofree nounwind willreturn writeonly }
+attributes #5 = { nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #6 = { nobuiltin allocsize(0) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #7 = { nobuiltin nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #8 = { nounwind allocsize(0) }
+attributes #9 = { nounwind }
+attributes #10 = { builtin allocsize(0) }
+attributes #11 = { builtin nounwind }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!291, !292, !293, !294, !295, !296, !297}
+!llvm.ident = !{!298}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !2, imports: !5, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "llvm_intrinsic_functions2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "1e77ed792913c2be191abc6888725e26")
+!2 = !{!3}
+!3 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!4 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!5 = !{!6, !13, !17, !24, !28, !33, !35, !43, !47, !51, !65, !69, !73, !77, !81, !86, !90, !94, !98, !102, !110, !114, !118, !120, !124, !128, !133, !139, !143, !147, !149, !157, !161, !169, !171, !175, !179, !183, !187, !192, !197, !202, !203, !204, !205, !207, !208, !209, !210, !211, !212, !213, !219, !223, !229, !233, !237, !241, !245, !247, !249, !253, !257, !261, !265, !269, !271, !273, !275, !279, !283, !287, !289}
+!6 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !8, file: !12, line: 52)
+!7 = !DINamespace(name: "std", scope: null)
+!8 = !DISubprogram(name: "abs", scope: !9, file: !9, line: 980, type: !10, flags: DIFlagPrototyped, spFlags: 0)
+!9 = !DIFile(filename: "/usr/include/stdlib.h", directory: "", checksumkind: CSK_MD5, checksum: "7fa2ecb2348a66f8b44ab9a15abd0b72")
+!10 = !DISubroutineType(types: !11)
+!11 = !{!4, !4}
+!12 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_abs.h", directory: "")
+!13 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !14, file: !16, line: 131)
+!14 = !DIDerivedType(tag: DW_TAG_typedef, name: "div_t", file: !9, line: 63, baseType: !15)
+!15 = !DICompositeType(tag: DW_TAG_structure_type, file: !9, line: 59, size: 64, flags: DIFlagFwdDecl, identifier: "_ZTS5div_t")
+!16 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdlib", directory: "")
+!17 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !18, file: !16, line: 132)
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "ldiv_t", file: !9, line: 71, baseType: !19)
+!19 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !9, line: 67, size: 128, flags: DIFlagTypePassByValue, elements: !20, identifier: "_ZTS6ldiv_t")
+!20 = !{!21, !23}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !19, file: !9, line: 69, baseType: !22, size: 64)
+!22 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !19, file: !9, line: 70, baseType: !22, size: 64, offset: 64)
+!24 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !25, file: !16, line: 134)
+!25 = !DISubprogram(name: "abort", scope: !9, file: !9, line: 730, type: !26, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!26 = !DISubroutineType(types: !27)
+!27 = !{null}
+!28 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !29, file: !16, line: 138)
+!29 = !DISubprogram(name: "atexit", scope: !9, file: !9, line: 734, type: !30, flags: DIFlagPrototyped, spFlags: 0)
+!30 = !DISubroutineType(types: !31)
+!31 = !{!4, !32}
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !26, size: 64)
+!33 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !34, file: !16, line: 141)
+!34 = !DISubprogram(name: "at_quick_exit", scope: !9, file: !9, line: 739, type: !30, flags: DIFlagPrototyped, spFlags: 0)
+!35 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !36, file: !16, line: 144)
+!36 = !DISubprogram(name: "atof", scope: !9, file: !9, line: 102, type: !37, flags: DIFlagPrototyped, spFlags: 0)
+!37 = !DISubroutineType(types: !38)
+!38 = !{!39, !40}
+!39 = !DIBasicType(name: "double", size: 64, encoding: DW_ATE_float)
+!40 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !41, size: 64)
+!41 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !42)
+!42 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!43 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !44, file: !16, line: 145)
+!44 = !DISubprogram(name: "atoi", scope: !9, file: !9, line: 105, type: !45, flags: DIFlagPrototyped, spFlags: 0)
+!45 = !DISubroutineType(types: !46)
+!46 = !{!4, !40}
+!47 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !48, file: !16, line: 146)
+!48 = !DISubprogram(name: "atol", scope: !9, file: !9, line: 108, type: !49, flags: DIFlagPrototyped, spFlags: 0)
+!49 = !DISubroutineType(types: !50)
+!50 = !{!22, !40}
+!51 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !52, file: !16, line: 147)
+!52 = !DISubprogram(name: "bsearch", scope: !9, file: !9, line: 960, type: !53, flags: DIFlagPrototyped, spFlags: 0)
+!53 = !DISubroutineType(types: !54)
+!54 = !{!55, !56, !56, !58, !58, !61}
+!55 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!56 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !57, size: 64)
+!57 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!58 = !DIDerivedType(tag: DW_TAG_typedef, name: "size_t", file: !59, line: 46, baseType: !60)
+!59 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/stddef.h", directory: "", checksumkind: CSK_MD5, checksum: "b76978376d35d5cd171876ac58ac1256")
+!60 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!61 = !DIDerivedType(tag: DW_TAG_typedef, name: "__compar_fn_t", file: !9, line: 948, baseType: !62)
+!62 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !63, size: 64)
+!63 = !DISubroutineType(types: !64)
+!64 = !{!4, !56, !56}
+!65 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !66, file: !16, line: 148)
+!66 = !DISubprogram(name: "calloc", scope: !9, file: !9, line: 675, type: !67, flags: DIFlagPrototyped, spFlags: 0)
+!67 = !DISubroutineType(types: !68)
+!68 = !{!55, !58, !58}
+!69 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !70, file: !16, line: 149)
+!70 = !DISubprogram(name: "div", scope: !9, file: !9, line: 992, type: !71, flags: DIFlagPrototyped, spFlags: 0)
+!71 = !DISubroutineType(types: !72)
+!72 = !{!14, !4, !4}
+!73 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !74, file: !16, line: 150)
+!74 = !DISubprogram(name: "exit", scope: !9, file: !9, line: 756, type: !75, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!75 = !DISubroutineType(types: !76)
+!76 = !{null, !4}
+!77 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !78, file: !16, line: 151)
+!78 = !DISubprogram(name: "free", scope: !9, file: !9, line: 687, type: !79, flags: DIFlagPrototyped, spFlags: 0)
+!79 = !DISubroutineType(types: !80)
+!80 = !{null, !55}
+!81 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !82, file: !16, line: 152)
+!82 = !DISubprogram(name: "getenv", scope: !9, file: !9, line: 773, type: !83, flags: DIFlagPrototyped, spFlags: 0)
+!83 = !DISubroutineType(types: !84)
+!84 = !{!85, !40}
+!85 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !42, size: 64)
+!86 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !87, file: !16, line: 153)
+!87 = !DISubprogram(name: "labs", scope: !9, file: !9, line: 981, type: !88, flags: DIFlagPrototyped, spFlags: 0)
+!88 = !DISubroutineType(types: !89)
+!89 = !{!22, !22}
+!90 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !91, file: !16, line: 154)
+!91 = !DISubprogram(name: "ldiv", scope: !9, file: !9, line: 994, type: !92, flags: DIFlagPrototyped, spFlags: 0)
+!92 = !DISubroutineType(types: !93)
+!93 = !{!18, !22, !22}
+!94 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !95, file: !16, line: 155)
+!95 = !DISubprogram(name: "malloc", scope: !9, file: !9, line: 672, type: !96, flags: DIFlagPrototyped, spFlags: 0)
+!96 = !DISubroutineType(types: !97)
+!97 = !{!55, !58}
+!98 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !99, file: !16, line: 157)
+!99 = !DISubprogram(name: "mblen", scope: !9, file: !9, line: 1062, type: !100, flags: DIFlagPrototyped, spFlags: 0)
+!100 = !DISubroutineType(types: !101)
+!101 = !{!4, !40, !58}
+!102 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !103, file: !16, line: 158)
+!103 = !DISubprogram(name: "mbstowcs", scope: !9, file: !9, line: 1073, type: !104, flags: DIFlagPrototyped, spFlags: 0)
+!104 = !DISubroutineType(types: !105)
+!105 = !{!58, !106, !109, !58}
+!106 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !107)
+!107 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !108, size: 64)
+!108 = !DIBasicType(name: "wchar_t", size: 32, encoding: DW_ATE_signed)
+!109 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !40)
+!110 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !111, file: !16, line: 159)
+!111 = !DISubprogram(name: "mbtowc", scope: !9, file: !9, line: 1065, type: !112, flags: DIFlagPrototyped, spFlags: 0)
+!112 = !DISubroutineType(types: !113)
+!113 = !{!4, !106, !109, !58}
+!114 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !115, file: !16, line: 161)
+!115 = !DISubprogram(name: "qsort", scope: !9, file: !9, line: 970, type: !116, flags: DIFlagPrototyped, spFlags: 0)
+!116 = !DISubroutineType(types: !117)
+!117 = !{null, !55, !58, !58, !61}
+!118 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !119, file: !16, line: 164)
+!119 = !DISubprogram(name: "quick_exit", scope: !9, file: !9, line: 762, type: !75, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!120 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !121, file: !16, line: 167)
+!121 = !DISubprogram(name: "rand", scope: !9, file: !9, line: 573, type: !122, flags: DIFlagPrototyped, spFlags: 0)
+!122 = !DISubroutineType(types: !123)
+!123 = !{!4}
+!124 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !125, file: !16, line: 168)
+!125 = !DISubprogram(name: "realloc", scope: !9, file: !9, line: 683, type: !126, flags: DIFlagPrototyped, spFlags: 0)
+!126 = !DISubroutineType(types: !127)
+!127 = !{!55, !55, !58}
+!128 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !129, file: !16, line: 169)
+!129 = !DISubprogram(name: "srand", scope: !9, file: !9, line: 575, type: !130, flags: DIFlagPrototyped, spFlags: 0)
+!130 = !DISubroutineType(types: !131)
+!131 = !{null, !132}
+!132 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!133 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !134, file: !16, line: 170)
+!134 = !DISubprogram(name: "strtod", scope: !9, file: !9, line: 118, type: !135, flags: DIFlagPrototyped, spFlags: 0)
+!135 = !DISubroutineType(types: !136)
+!136 = !{!39, !109, !137}
+!137 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !138)
+!138 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !85, size: 64)
+!139 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !140, file: !16, line: 171)
+!140 = !DISubprogram(name: "strtol", linkageName: "__isoc23_strtol", scope: !9, file: !9, line: 215, type: !141, flags: DIFlagPrototyped, spFlags: 0)
+!141 = !DISubroutineType(types: !142)
+!142 = !{!22, !109, !137, !4}
+!143 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !144, file: !16, line: 172)
+!144 = !DISubprogram(name: "strtoul", linkageName: "__isoc23_strtoul", scope: !9, file: !9, line: 219, type: !145, flags: DIFlagPrototyped, spFlags: 0)
+!145 = !DISubroutineType(types: !146)
+!146 = !{!60, !109, !137, !4}
+!147 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !148, file: !16, line: 173)
+!148 = !DISubprogram(name: "system", scope: !9, file: !9, line: 923, type: !45, flags: DIFlagPrototyped, spFlags: 0)
+!149 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !150, file: !16, line: 175)
+!150 = !DISubprogram(name: "wcstombs", scope: !9, file: !9, line: 1077, type: !151, flags: DIFlagPrototyped, spFlags: 0)
+!151 = !DISubroutineType(types: !152)
+!152 = !{!58, !153, !154, !58}
+!153 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !85)
+!154 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !155)
+!155 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !156, size: 64)
+!156 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !108)
+!157 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !158, file: !16, line: 176)
+!158 = !DISubprogram(name: "wctomb", scope: !9, file: !9, line: 1069, type: !159, flags: DIFlagPrototyped, spFlags: 0)
+!159 = !DISubroutineType(types: !160)
+!160 = !{!4, !85, !108}
+!161 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !163, file: !16, line: 204)
+!162 = !DINamespace(name: "__gnu_cxx", scope: null)
+!163 = !DIDerivedType(tag: DW_TAG_typedef, name: "lldiv_t", file: !9, line: 81, baseType: !164)
+!164 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !9, line: 77, size: 128, flags: DIFlagTypePassByValue, elements: !165, identifier: "_ZTS7lldiv_t")
+!165 = !{!166, !168}
+!166 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !164, file: !9, line: 79, baseType: !167, size: 64)
+!167 = !DIBasicType(name: "long long", size: 64, encoding: DW_ATE_signed)
+!168 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !164, file: !9, line: 80, baseType: !167, size: 64, offset: 64)
+!169 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !170, file: !16, line: 210)
+!170 = !DISubprogram(name: "_Exit", scope: !9, file: !9, line: 768, type: !75, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!171 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !172, file: !16, line: 214)
+!172 = !DISubprogram(name: "llabs", scope: !9, file: !9, line: 984, type: !173, flags: DIFlagPrototyped, spFlags: 0)
+!173 = !DISubroutineType(types: !174)
+!174 = !{!167, !167}
+!175 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !176, file: !16, line: 220)
+!176 = !DISubprogram(name: "lldiv", scope: !9, file: !9, line: 998, type: !177, flags: DIFlagPrototyped, spFlags: 0)
+!177 = !DISubroutineType(types: !178)
+!178 = !{!163, !167, !167}
+!179 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !180, file: !16, line: 231)
+!180 = !DISubprogram(name: "atoll", scope: !9, file: !9, line: 113, type: !181, flags: DIFlagPrototyped, spFlags: 0)
+!181 = !DISubroutineType(types: !182)
+!182 = !{!167, !40}
+!183 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !184, file: !16, line: 232)
+!184 = !DISubprogram(name: "strtoll", linkageName: "__isoc23_strtoll", scope: !9, file: !9, line: 238, type: !185, flags: DIFlagPrototyped, spFlags: 0)
+!185 = !DISubroutineType(types: !186)
+!186 = !{!167, !109, !137, !4}
+!187 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !188, file: !16, line: 233)
+!188 = !DISubprogram(name: "strtoull", linkageName: "__isoc23_strtoull", scope: !9, file: !9, line: 243, type: !189, flags: DIFlagPrototyped, spFlags: 0)
+!189 = !DISubroutineType(types: !190)
+!190 = !{!191, !109, !137, !4}
+!191 = !DIBasicType(name: "unsigned long long", size: 64, encoding: DW_ATE_unsigned)
+!192 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !193, file: !16, line: 235)
+!193 = !DISubprogram(name: "strtof", scope: !9, file: !9, line: 124, type: !194, flags: DIFlagPrototyped, spFlags: 0)
+!194 = !DISubroutineType(types: !195)
+!195 = !{!196, !109, !137}
+!196 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
+!197 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !198, file: !16, line: 236)
+!198 = !DISubprogram(name: "strtold", scope: !9, file: !9, line: 127, type: !199, flags: DIFlagPrototyped, spFlags: 0)
+!199 = !DISubroutineType(types: !200)
+!200 = !{!201, !109, !137}
+!201 = !DIBasicType(name: "long double", size: 128, encoding: DW_ATE_float)
+!202 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !163, file: !16, line: 244)
+!203 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !170, file: !16, line: 246)
+!204 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !172, file: !16, line: 248)
+!205 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !206, file: !16, line: 249)
+!206 = !DISubprogram(name: "div", linkageName: "_ZN9__gnu_cxx3divExx", scope: !162, file: !16, line: 217, type: !177, flags: DIFlagPrototyped, spFlags: 0)
+!207 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !176, file: !16, line: 250)
+!208 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !180, file: !16, line: 252)
+!209 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !193, file: !16, line: 253)
+!210 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !184, file: !16, line: 254)
+!211 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !188, file: !16, line: 255)
+!212 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !198, file: !16, line: 256)
+!213 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !214, file: !218, line: 77)
+!214 = !DISubprogram(name: "memchr", scope: !215, file: !215, line: 89, type: !216, flags: DIFlagPrototyped, spFlags: 0)
+!215 = !DIFile(filename: "/usr/include/string.h", directory: "", checksumkind: CSK_MD5, checksum: "165db1185644f68894fa9e0d17055d70")
+!216 = !DISubroutineType(types: !217)
+!217 = !{!56, !56, !4, !58}
+!218 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstring", directory: "")
+!219 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !220, file: !218, line: 78)
+!220 = !DISubprogram(name: "memcmp", scope: !215, file: !215, line: 64, type: !221, flags: DIFlagPrototyped, spFlags: 0)
+!221 = !DISubroutineType(types: !222)
+!222 = !{!4, !56, !56, !58}
+!223 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !224, file: !218, line: 79)
+!224 = !DISubprogram(name: "memcpy", scope: !215, file: !215, line: 43, type: !225, flags: DIFlagPrototyped, spFlags: 0)
+!225 = !DISubroutineType(types: !226)
+!226 = !{!55, !227, !228, !58}
+!227 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !55)
+!228 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !56)
+!229 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !230, file: !218, line: 80)
+!230 = !DISubprogram(name: "memmove", scope: !215, file: !215, line: 47, type: !231, flags: DIFlagPrototyped, spFlags: 0)
+!231 = !DISubroutineType(types: !232)
+!232 = !{!55, !55, !56, !58}
+!233 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !234, file: !218, line: 81)
+!234 = !DISubprogram(name: "memset", scope: !215, file: !215, line: 61, type: !235, flags: DIFlagPrototyped, spFlags: 0)
+!235 = !DISubroutineType(types: !236)
+!236 = !{!55, !55, !4, !58}
+!237 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !238, file: !218, line: 82)
+!238 = !DISubprogram(name: "strcat", scope: !215, file: !215, line: 149, type: !239, flags: DIFlagPrototyped, spFlags: 0)
+!239 = !DISubroutineType(types: !240)
+!240 = !{!85, !153, !109}
+!241 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !242, file: !218, line: 83)
+!242 = !DISubprogram(name: "strcmp", scope: !215, file: !215, line: 156, type: !243, flags: DIFlagPrototyped, spFlags: 0)
+!243 = !DISubroutineType(types: !244)
+!244 = !{!4, !40, !40}
+!245 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !246, file: !218, line: 84)
+!246 = !DISubprogram(name: "strcoll", scope: !215, file: !215, line: 163, type: !243, flags: DIFlagPrototyped, spFlags: 0)
+!247 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !248, file: !218, line: 85)
+!248 = !DISubprogram(name: "strcpy", scope: !215, file: !215, line: 141, type: !239, flags: DIFlagPrototyped, spFlags: 0)
+!249 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !250, file: !218, line: 86)
+!250 = !DISubprogram(name: "strcspn", scope: !215, file: !215, line: 293, type: !251, flags: DIFlagPrototyped, spFlags: 0)
+!251 = !DISubroutineType(types: !252)
+!252 = !{!58, !40, !40}
+!253 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !254, file: !218, line: 87)
+!254 = !DISubprogram(name: "strerror", scope: !215, file: !215, line: 419, type: !255, flags: DIFlagPrototyped, spFlags: 0)
+!255 = !DISubroutineType(types: !256)
+!256 = !{!85, !4}
+!257 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !258, file: !218, line: 88)
+!258 = !DISubprogram(name: "strlen", scope: !215, file: !215, line: 407, type: !259, flags: DIFlagPrototyped, spFlags: 0)
+!259 = !DISubroutineType(types: !260)
+!260 = !{!58, !40}
+!261 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !262, file: !218, line: 89)
+!262 = !DISubprogram(name: "strncat", scope: !215, file: !215, line: 152, type: !263, flags: DIFlagPrototyped, spFlags: 0)
+!263 = !DISubroutineType(types: !264)
+!264 = !{!85, !153, !109, !58}
+!265 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !266, file: !218, line: 90)
+!266 = !DISubprogram(name: "strncmp", scope: !215, file: !215, line: 159, type: !267, flags: DIFlagPrototyped, spFlags: 0)
+!267 = !DISubroutineType(types: !268)
+!268 = !{!4, !40, !40, !58}
+!269 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !270, file: !218, line: 91)
+!270 = !DISubprogram(name: "strncpy", scope: !215, file: !215, line: 144, type: !263, flags: DIFlagPrototyped, spFlags: 0)
+!271 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !272, file: !218, line: 92)
+!272 = !DISubprogram(name: "strspn", scope: !215, file: !215, line: 297, type: !251, flags: DIFlagPrototyped, spFlags: 0)
+!273 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !274, file: !218, line: 93)
+!274 = !DISubprogram(name: "strtok", scope: !215, file: !215, line: 356, type: !239, flags: DIFlagPrototyped, spFlags: 0)
+!275 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !276, file: !218, line: 94)
+!276 = !DISubprogram(name: "strxfrm", scope: !215, file: !215, line: 166, type: !277, flags: DIFlagPrototyped, spFlags: 0)
+!277 = !DISubroutineType(types: !278)
+!278 = !{!58, !153, !109, !58}
+!279 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !280, file: !218, line: 95)
+!280 = !DISubprogram(name: "strchr", scope: !215, file: !215, line: 228, type: !281, flags: DIFlagPrototyped, spFlags: 0)
+!281 = !DISubroutineType(types: !282)
+!282 = !{!40, !40, !4}
+!283 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !284, file: !218, line: 96)
+!284 = !DISubprogram(name: "strpbrk", scope: !215, file: !215, line: 305, type: !285, flags: DIFlagPrototyped, spFlags: 0)
+!285 = !DISubroutineType(types: !286)
+!286 = !{!40, !40, !40}
+!287 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !288, file: !218, line: 97)
+!288 = !DISubprogram(name: "strrchr", scope: !215, file: !215, line: 255, type: !281, flags: DIFlagPrototyped, spFlags: 0)
+!289 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !290, file: !218, line: 98)
+!290 = !DISubprogram(name: "strstr", scope: !215, file: !215, line: 332, type: !285, flags: DIFlagPrototyped, spFlags: 0)
+!291 = !{i32 7, !"Dwarf Version", i32 5}
+!292 = !{i32 2, !"Debug Info Version", i32 3}
+!293 = !{i32 1, !"wchar_size", i32 4}
+!294 = !{i32 7, !"PIC Level", i32 2}
+!295 = !{i32 7, !"PIE Level", i32 2}
+!296 = !{i32 7, !"uwtable", i32 2}
+!297 = !{i32 7, !"frame-pointer", i32 2}
+!298 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!299 = distinct !DISubprogram(name: "foo", linkageName: "_Z3foov", scope: !1, file: !1, line: 4, type: !122, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !300)
+!300 = !{}
+!301 = !DILocation(line: 4, column: 13, scope: !299)
+!302 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 6, type: !122, scopeLine: 6, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !300)
+!303 = !DILocalVariable(name: "i", scope: !302, file: !1, line: 7, type: !3)
+!304 = !DILocation(line: 7, column: 8, scope: !302)
+!305 = !DILocation(line: 7, column: 31, scope: !302)
+!306 = !DILocation(line: 8, column: 10, scope: !302)
+!307 = !DILocation(line: 8, column: 3, scope: !302)
+!308 = !DILocation(line: 9, column: 8, scope: !302)
+!309 = !DILocation(line: 9, column: 3, scope: !302)
+!310 = !DILocalVariable(name: "j", scope: !302, file: !1, line: 10, type: !3)
+!311 = !DILocation(line: 10, column: 8, scope: !302)
+!312 = !DILocation(line: 10, column: 12, scope: !302)
+!313 = !DILocation(line: 11, column: 8, scope: !302)
+!314 = !DILocation(line: 11, column: 4, scope: !302)
+!315 = !DILocation(line: 11, column: 6, scope: !302)
+!316 = !DILocation(line: 12, column: 10, scope: !302)
+!317 = !DILocation(line: 12, column: 3, scope: !302)
+!318 = !DILocation(line: 13, column: 3, scope: !302)
diff --git a/examples/llvm-hello-world/target/loop.ll b/examples/llvm-hello-world/target/loop.ll
index b62d7aac74..23d290eab9 100644
--- a/examples/llvm-hello-world/target/loop.ll
+++ b/examples/llvm-hello-world/target/loop.ll
@@ -1,50 +1,102 @@
 ; ModuleID = 'loop.cpp'
 source_filename = "loop.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i32, align 4
-  %7 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  store i32 0, i32* %6, align 4
-  store i32 1, i32* %7, align 4
-  br label %8
-
-; <label>:8:                                      ; preds = %16, %2
-  %9 = load i32, i32* %7, align 4
-  %10 = load i32, i32* %4, align 4
-  %11 = icmp sle i32 %9, %10
-  br i1 %11, label %12, label %19
-
-; <label>:12:                                     ; preds = %8
-  %13 = load i32, i32* %7, align 4
-  %14 = load i32, i32* %6, align 4
-  %15 = add nsw i32 %14, %13
-  store i32 %15, i32* %6, align 4
-  br label %16
-
-; <label>:16:                                     ; preds = %12
-  %17 = load i32, i32* %7, align 4
-  %18 = add nsw i32 %17, 1
-  store i32 %18, i32* %7, align 4
-  br label %8
-
-; <label>:19:                                     ; preds = %8
-  %20 = load i32, i32* %6, align 4
-  ret i32 %20
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %sum = alloca i32, align 4
+  %i = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  call void @llvm.dbg.declare(metadata ptr %sum, metadata !22, metadata !DIExpression()), !dbg !23
+  store i32 0, ptr %sum, align 4, !dbg !23
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !24, metadata !DIExpression()), !dbg !26
+  store i32 1, ptr %i, align 4, !dbg !26
+  br label %for.cond, !dbg !27
+
+for.cond:                                         ; preds = %for.inc, %entry
+  %0 = load i32, ptr %i, align 4, !dbg !28
+  %1 = load i32, ptr %argc.addr, align 4, !dbg !30
+  %cmp = icmp sle i32 %0, %1, !dbg !31
+  br i1 %cmp, label %for.body, label %for.end, !dbg !32
+
+for.body:                                         ; preds = %for.cond
+  %2 = load i32, ptr %i, align 4, !dbg !33
+  %3 = load i32, ptr %sum, align 4, !dbg !35
+  %add = add nsw i32 %3, %2, !dbg !35
+  store i32 %add, ptr %sum, align 4, !dbg !35
+  br label %for.inc, !dbg !36
+
+for.inc:                                          ; preds = %for.body
+  %4 = load i32, ptr %i, align 4, !dbg !37
+  %inc = add nsw i32 %4, 1, !dbg !37
+  store i32 %inc, ptr %i, align 4, !dbg !37
+  br label %for.cond, !dbg !38, !llvm.loop !39
+
+for.end:                                          ; preds = %for.cond
+  %5 = load i32, ptr %sum, align 4, !dbg !42
+  ret i32 %5, !dbg !43
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "loop.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "219542ae59c4f1b61395041dd8064ea0")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !17)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!17 = !{}
+!18 = !DILocalVariable(name: "argc", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!19 = !DILocation(line: 1, column: 14, scope: !10)
+!20 = !DILocalVariable(name: "argv", arg: 2, scope: !10, file: !1, line: 1, type: !14)
+!21 = !DILocation(line: 1, column: 27, scope: !10)
+!22 = !DILocalVariable(name: "sum", scope: !10, file: !1, line: 2, type: !13)
+!23 = !DILocation(line: 2, column: 7, scope: !10)
+!24 = !DILocalVariable(name: "i", scope: !25, file: !1, line: 3, type: !13)
+!25 = distinct !DILexicalBlock(scope: !10, file: !1, line: 3, column: 3)
+!26 = !DILocation(line: 3, column: 12, scope: !25)
+!27 = !DILocation(line: 3, column: 8, scope: !25)
+!28 = !DILocation(line: 3, column: 19, scope: !29)
+!29 = distinct !DILexicalBlock(scope: !25, file: !1, line: 3, column: 3)
+!30 = !DILocation(line: 3, column: 24, scope: !29)
+!31 = !DILocation(line: 3, column: 21, scope: !29)
+!32 = !DILocation(line: 3, column: 3, scope: !25)
+!33 = !DILocation(line: 4, column: 12, scope: !34)
+!34 = distinct !DILexicalBlock(scope: !29, file: !1, line: 3, column: 35)
+!35 = !DILocation(line: 4, column: 9, scope: !34)
+!36 = !DILocation(line: 5, column: 3, scope: !34)
+!37 = !DILocation(line: 3, column: 30, scope: !29)
+!38 = !DILocation(line: 3, column: 3, scope: !29)
+!39 = distinct !{!39, !32, !40, !41}
+!40 = !DILocation(line: 5, column: 3, scope: !25)
+!41 = !{!"llvm.loop.mustprogress"}
+!42 = !DILocation(line: 6, column: 10, scope: !10)
+!43 = !DILocation(line: 6, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/loop2.ll b/examples/llvm-hello-world/target/loop2.ll
index 6857b2715b..39fba704b1 100644
--- a/examples/llvm-hello-world/target/loop2.ll
+++ b/examples/llvm-hello-world/target/loop2.ll
@@ -1,40 +1,75 @@
 ; ModuleID = 'loop2.cpp'
 source_filename = "loop2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main() #0 {
-  %1 = alloca i32, align 4
-  %2 = alloca i32, align 4
-  %3 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  store i32 10, i32* %2, align 4
-  store i32 0, i32* %3, align 4
-  br label %4
-
-; <label>:4:                                      ; preds = %8, %0
-  %5 = load i32, i32* %2, align 4
-  %6 = add nsw i32 %5, -1
-  store i32 %6, i32* %2, align 4
-  %7 = icmp sgt i32 %5, 0
-  br i1 %7, label %8, label %12
-
-; <label>:8:                                      ; preds = %4
-  %9 = load i32, i32* %2, align 4
-  %10 = load i32, i32* %3, align 4
-  %11 = add nsw i32 %10, %9
-  store i32 %11, i32* %3, align 4
-  br label %4
-
-; <label>:12:                                     ; preds = %4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main() #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %n = alloca i32, align 4
+  %sum = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %n, metadata !15, metadata !DIExpression()), !dbg !16
+  store i32 10, ptr %n, align 4, !dbg !16
+  call void @llvm.dbg.declare(metadata ptr %sum, metadata !17, metadata !DIExpression()), !dbg !18
+  store i32 0, ptr %sum, align 4, !dbg !18
+  br label %while.cond, !dbg !19
+
+while.cond:                                       ; preds = %while.body, %entry
+  %0 = load i32, ptr %n, align 4, !dbg !20
+  %dec = add nsw i32 %0, -1, !dbg !20
+  store i32 %dec, ptr %n, align 4, !dbg !20
+  %cmp = icmp sgt i32 %0, 0, !dbg !21
+  br i1 %cmp, label %while.body, label %while.end, !dbg !19
+
+while.body:                                       ; preds = %while.cond
+  %1 = load i32, ptr %n, align 4, !dbg !22
+  %2 = load i32, ptr %sum, align 4, !dbg !24
+  %add = add nsw i32 %2, %1, !dbg !24
+  store i32 %add, ptr %sum, align 4, !dbg !24
+  br label %while.cond, !dbg !19, !llvm.loop !25
+
+while.end:                                        ; preds = %while.cond
+  ret i32 0, !dbg !28
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "loop2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "44995f900f3acf1838287c2cf9c6a7cd")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !{}
+!15 = !DILocalVariable(name: "n", scope: !10, file: !1, line: 2, type: !13)
+!16 = !DILocation(line: 2, column: 7, scope: !10)
+!17 = !DILocalVariable(name: "sum", scope: !10, file: !1, line: 3, type: !13)
+!18 = !DILocation(line: 3, column: 7, scope: !10)
+!19 = !DILocation(line: 4, column: 3, scope: !10)
+!20 = !DILocation(line: 4, column: 11, scope: !10)
+!21 = !DILocation(line: 4, column: 14, scope: !10)
+!22 = !DILocation(line: 5, column: 12, scope: !23)
+!23 = distinct !DILexicalBlock(scope: !10, file: !1, line: 4, column: 19)
+!24 = !DILocation(line: 5, column: 9, scope: !23)
+!25 = distinct !{!25, !19, !26, !27}
+!26 = !DILocation(line: 6, column: 3, scope: !10)
+!27 = !{!"llvm.loop.mustprogress"}
+!28 = !DILocation(line: 7, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/pointers.ll b/examples/llvm-hello-world/target/pointers.ll
index 328f2dc872..0305aec274 100644
--- a/examples/llvm-hello-world/target/pointers.ll
+++ b/examples/llvm-hello-world/target/pointers.ll
@@ -1,37 +1,80 @@
 ; ModuleID = 'pointers.cpp'
 source_filename = "pointers.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i8*, align 8
-  %7 = alloca i32, align 4
-  %8 = alloca i32*, align 8
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  %9 = load i8**, i8*** %5, align 8
-  %10 = getelementptr inbounds i8*, i8** %9, i64 0
-  %11 = load i8*, i8** %10, align 8
-  store i8* %11, i8** %6, align 8
-  store i32 42, i32* %7, align 4
-  store i32* %7, i32** %8, align 8
-  %12 = load i32*, i32** %8, align 8
-  %13 = load i32, i32* %12, align 4
-  %14 = add nsw i32 %13, 13
-  store i32 %14, i32* %12, align 4
-  %15 = load i32, i32* %7, align 4
-  ret i32 %15
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %p = alloca ptr, align 8
+  %i = alloca i32, align 4
+  %j = alloca ptr, align 8
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  call void @llvm.dbg.declare(metadata ptr %p, metadata !22, metadata !DIExpression()), !dbg !23
+  %0 = load ptr, ptr %argv.addr, align 8, !dbg !24
+  %arrayidx = getelementptr inbounds ptr, ptr %0, i64 0, !dbg !24
+  %1 = load ptr, ptr %arrayidx, align 8, !dbg !24
+  store ptr %1, ptr %p, align 8, !dbg !23
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !25, metadata !DIExpression()), !dbg !26
+  store i32 42, ptr %i, align 4, !dbg !26
+  call void @llvm.dbg.declare(metadata ptr %j, metadata !27, metadata !DIExpression()), !dbg !29
+  store ptr %i, ptr %j, align 8, !dbg !29
+  %2 = load ptr, ptr %j, align 8, !dbg !30
+  %3 = load i32, ptr %2, align 4, !dbg !31
+  %add = add nsw i32 %3, 13, !dbg !31
+  store i32 %add, ptr %2, align 4, !dbg !31
+  %4 = load i32, ptr %i, align 4, !dbg !32
+  ret i32 %4, !dbg !33
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "pointers.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "c18fec392d76cd372065fb31e5a32029")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !17)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!17 = !{}
+!18 = !DILocalVariable(name: "argc", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!19 = !DILocation(line: 1, column: 14, scope: !10)
+!20 = !DILocalVariable(name: "argv", arg: 2, scope: !10, file: !1, line: 1, type: !14)
+!21 = !DILocation(line: 1, column: 27, scope: !10)
+!22 = !DILocalVariable(name: "p", scope: !10, file: !1, line: 2, type: !15)
+!23 = !DILocation(line: 2, column: 9, scope: !10)
+!24 = !DILocation(line: 2, column: 13, scope: !10)
+!25 = !DILocalVariable(name: "i", scope: !10, file: !1, line: 3, type: !13)
+!26 = !DILocation(line: 3, column: 7, scope: !10)
+!27 = !DILocalVariable(name: "j", scope: !10, file: !1, line: 4, type: !28)
+!28 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64)
+!29 = !DILocation(line: 4, column: 8, scope: !10)
+!30 = !DILocation(line: 5, column: 4, scope: !10)
+!31 = !DILocation(line: 5, column: 6, scope: !10)
+!32 = !DILocation(line: 6, column: 10, scope: !10)
+!33 = !DILocation(line: 6, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/pointers2.ll b/examples/llvm-hello-world/target/pointers2.ll
index fd254e9649..f9c11c0700 100644
--- a/examples/llvm-hello-world/target/pointers2.ll
+++ b/examples/llvm-hello-world/target/pointers2.ll
@@ -1,64 +1,329 @@
 ; ModuleID = 'pointers2.cpp'
 source_filename = "pointers2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i32, align 4
-  %7 = alloca i32*, align 8
-  %8 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  store i32 10, i32* %6, align 4
-  %9 = call noalias i8* @malloc(i64 40) #2
-  %10 = bitcast i8* %9 to i32*
-  store i32* %10, i32** %7, align 8
-  store i32 0, i32* %8, align 4
-  br label %11
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !221 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %N = alloca i32, align 4
+  %mem = alloca ptr, align 8
+  %i = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !225, metadata !DIExpression()), !dbg !226
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !227, metadata !DIExpression()), !dbg !228
+  call void @llvm.dbg.declare(metadata ptr %N, metadata !229, metadata !DIExpression()), !dbg !231
+  store i32 10, ptr %N, align 4, !dbg !231
+  call void @llvm.dbg.declare(metadata ptr %mem, metadata !232, metadata !DIExpression()), !dbg !233
+  %call = call noalias ptr @malloc(i64 noundef 40) #4, !dbg !234
+  store ptr %call, ptr %mem, align 8, !dbg !233
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !235, metadata !DIExpression()), !dbg !237
+  store i32 0, ptr %i, align 4, !dbg !237
+  br label %for.cond, !dbg !238
 
-; <label>:11:                                     ; preds = %19, %2
-  %12 = load i32, i32* %8, align 4
-  %13 = icmp slt i32 %12, 10
-  br i1 %13, label %14, label %22
+for.cond:                                         ; preds = %for.inc, %entry
+  %0 = load i32, ptr %i, align 4, !dbg !239
+  %cmp = icmp slt i32 %0, 10, !dbg !241
+  br i1 %cmp, label %for.body, label %for.end, !dbg !242
 
-; <label>:14:                                     ; preds = %11
-  %15 = load i32*, i32** %7, align 8
-  %16 = load i32, i32* %8, align 4
-  %17 = sext i32 %16 to i64
-  %18 = getelementptr inbounds i32, i32* %15, i64 %17
-  store i32 42, i32* %18, align 4
-  br label %19
+for.body:                                         ; preds = %for.cond
+  %1 = load ptr, ptr %mem, align 8, !dbg !243
+  %2 = load i32, ptr %i, align 4, !dbg !245
+  %idxprom = sext i32 %2 to i64, !dbg !243
+  %arrayidx = getelementptr inbounds i32, ptr %1, i64 %idxprom, !dbg !243
+  store i32 42, ptr %arrayidx, align 4, !dbg !246
+  br label %for.inc, !dbg !247
 
-; <label>:19:                                     ; preds = %14
-  %20 = load i32, i32* %8, align 4
-  %21 = add nsw i32 %20, 1
-  store i32 %21, i32* %8, align 4
-  br label %11
+for.inc:                                          ; preds = %for.body
+  %3 = load i32, ptr %i, align 4, !dbg !248
+  %inc = add nsw i32 %3, 1, !dbg !248
+  store i32 %inc, ptr %i, align 4, !dbg !248
+  br label %for.cond, !dbg !249, !llvm.loop !250
 
-; <label>:22:                                     ; preds = %11
-  %23 = load i32*, i32** %7, align 8
-  %24 = bitcast i32* %23 to i8*
-  call void @free(i8* %24) #2
-  ret i32 0
+for.end:                                          ; preds = %for.cond
+  %4 = load ptr, ptr %mem, align 8, !dbg !253
+  call void @free(ptr noundef %4) #5, !dbg !254
+  ret i32 0, !dbg !255
 }
 
-; Function Attrs: nounwind
-declare noalias i8* @malloc(i64) #1
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nounwind allocsize(0)
+declare noalias ptr @malloc(i64 noundef) #2
 
 ; Function Attrs: nounwind
-declare void @free(i8*) #1
+declare void @free(ptr noundef) #3
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { nounwind }
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { nounwind allocsize(0) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { nounwind allocsize(0) }
+attributes #5 = { nounwind }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!213, !214, !215, !216, !217, !218, !219}
+!llvm.ident = !{!220}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !2, imports: !5, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "pointers2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "3ee743f33646636730f5f8306d67e3e6")
+!2 = !{!3}
+!3 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4, size: 64)
+!4 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!5 = !{!6, !13, !17, !24, !28, !33, !35, !43, !47, !51, !65, !69, !73, !77, !81, !86, !90, !94, !98, !102, !110, !114, !118, !120, !124, !128, !133, !139, !143, !147, !149, !157, !161, !169, !171, !175, !179, !183, !187, !192, !197, !202, !203, !204, !205, !207, !208, !209, !210, !211, !212}
+!6 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !8, file: !12, line: 52)
+!7 = !DINamespace(name: "std", scope: null)
+!8 = !DISubprogram(name: "abs", scope: !9, file: !9, line: 980, type: !10, flags: DIFlagPrototyped, spFlags: 0)
+!9 = !DIFile(filename: "/usr/include/stdlib.h", directory: "", checksumkind: CSK_MD5, checksum: "7fa2ecb2348a66f8b44ab9a15abd0b72")
+!10 = !DISubroutineType(types: !11)
+!11 = !{!4, !4}
+!12 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_abs.h", directory: "")
+!13 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !14, file: !16, line: 131)
+!14 = !DIDerivedType(tag: DW_TAG_typedef, name: "div_t", file: !9, line: 63, baseType: !15)
+!15 = !DICompositeType(tag: DW_TAG_structure_type, file: !9, line: 59, size: 64, flags: DIFlagFwdDecl, identifier: "_ZTS5div_t")
+!16 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdlib", directory: "")
+!17 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !18, file: !16, line: 132)
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "ldiv_t", file: !9, line: 71, baseType: !19)
+!19 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !9, line: 67, size: 128, flags: DIFlagTypePassByValue, elements: !20, identifier: "_ZTS6ldiv_t")
+!20 = !{!21, !23}
+!21 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !19, file: !9, line: 69, baseType: !22, size: 64)
+!22 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
+!23 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !19, file: !9, line: 70, baseType: !22, size: 64, offset: 64)
+!24 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !25, file: !16, line: 134)
+!25 = !DISubprogram(name: "abort", scope: !9, file: !9, line: 730, type: !26, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!26 = !DISubroutineType(types: !27)
+!27 = !{null}
+!28 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !29, file: !16, line: 138)
+!29 = !DISubprogram(name: "atexit", scope: !9, file: !9, line: 734, type: !30, flags: DIFlagPrototyped, spFlags: 0)
+!30 = !DISubroutineType(types: !31)
+!31 = !{!4, !32}
+!32 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !26, size: 64)
+!33 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !34, file: !16, line: 141)
+!34 = !DISubprogram(name: "at_quick_exit", scope: !9, file: !9, line: 739, type: !30, flags: DIFlagPrototyped, spFlags: 0)
+!35 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !36, file: !16, line: 144)
+!36 = !DISubprogram(name: "atof", scope: !9, file: !9, line: 102, type: !37, flags: DIFlagPrototyped, spFlags: 0)
+!37 = !DISubroutineType(types: !38)
+!38 = !{!39, !40}
+!39 = !DIBasicType(name: "double", size: 64, encoding: DW_ATE_float)
+!40 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !41, size: 64)
+!41 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !42)
+!42 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!43 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !44, file: !16, line: 145)
+!44 = !DISubprogram(name: "atoi", scope: !9, file: !9, line: 105, type: !45, flags: DIFlagPrototyped, spFlags: 0)
+!45 = !DISubroutineType(types: !46)
+!46 = !{!4, !40}
+!47 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !48, file: !16, line: 146)
+!48 = !DISubprogram(name: "atol", scope: !9, file: !9, line: 108, type: !49, flags: DIFlagPrototyped, spFlags: 0)
+!49 = !DISubroutineType(types: !50)
+!50 = !{!22, !40}
+!51 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !52, file: !16, line: 147)
+!52 = !DISubprogram(name: "bsearch", scope: !9, file: !9, line: 960, type: !53, flags: DIFlagPrototyped, spFlags: 0)
+!53 = !DISubroutineType(types: !54)
+!54 = !{!55, !56, !56, !58, !58, !61}
+!55 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!56 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !57, size: 64)
+!57 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!58 = !DIDerivedType(tag: DW_TAG_typedef, name: "size_t", file: !59, line: 46, baseType: !60)
+!59 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/stddef.h", directory: "", checksumkind: CSK_MD5, checksum: "b76978376d35d5cd171876ac58ac1256")
+!60 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!61 = !DIDerivedType(tag: DW_TAG_typedef, name: "__compar_fn_t", file: !9, line: 948, baseType: !62)
+!62 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !63, size: 64)
+!63 = !DISubroutineType(types: !64)
+!64 = !{!4, !56, !56}
+!65 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !66, file: !16, line: 148)
+!66 = !DISubprogram(name: "calloc", scope: !9, file: !9, line: 675, type: !67, flags: DIFlagPrototyped, spFlags: 0)
+!67 = !DISubroutineType(types: !68)
+!68 = !{!55, !58, !58}
+!69 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !70, file: !16, line: 149)
+!70 = !DISubprogram(name: "div", scope: !9, file: !9, line: 992, type: !71, flags: DIFlagPrototyped, spFlags: 0)
+!71 = !DISubroutineType(types: !72)
+!72 = !{!14, !4, !4}
+!73 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !74, file: !16, line: 150)
+!74 = !DISubprogram(name: "exit", scope: !9, file: !9, line: 756, type: !75, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!75 = !DISubroutineType(types: !76)
+!76 = !{null, !4}
+!77 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !78, file: !16, line: 151)
+!78 = !DISubprogram(name: "free", scope: !9, file: !9, line: 687, type: !79, flags: DIFlagPrototyped, spFlags: 0)
+!79 = !DISubroutineType(types: !80)
+!80 = !{null, !55}
+!81 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !82, file: !16, line: 152)
+!82 = !DISubprogram(name: "getenv", scope: !9, file: !9, line: 773, type: !83, flags: DIFlagPrototyped, spFlags: 0)
+!83 = !DISubroutineType(types: !84)
+!84 = !{!85, !40}
+!85 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !42, size: 64)
+!86 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !87, file: !16, line: 153)
+!87 = !DISubprogram(name: "labs", scope: !9, file: !9, line: 981, type: !88, flags: DIFlagPrototyped, spFlags: 0)
+!88 = !DISubroutineType(types: !89)
+!89 = !{!22, !22}
+!90 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !91, file: !16, line: 154)
+!91 = !DISubprogram(name: "ldiv", scope: !9, file: !9, line: 994, type: !92, flags: DIFlagPrototyped, spFlags: 0)
+!92 = !DISubroutineType(types: !93)
+!93 = !{!18, !22, !22}
+!94 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !95, file: !16, line: 155)
+!95 = !DISubprogram(name: "malloc", scope: !9, file: !9, line: 672, type: !96, flags: DIFlagPrototyped, spFlags: 0)
+!96 = !DISubroutineType(types: !97)
+!97 = !{!55, !58}
+!98 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !99, file: !16, line: 157)
+!99 = !DISubprogram(name: "mblen", scope: !9, file: !9, line: 1062, type: !100, flags: DIFlagPrototyped, spFlags: 0)
+!100 = !DISubroutineType(types: !101)
+!101 = !{!4, !40, !58}
+!102 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !103, file: !16, line: 158)
+!103 = !DISubprogram(name: "mbstowcs", scope: !9, file: !9, line: 1073, type: !104, flags: DIFlagPrototyped, spFlags: 0)
+!104 = !DISubroutineType(types: !105)
+!105 = !{!58, !106, !109, !58}
+!106 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !107)
+!107 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !108, size: 64)
+!108 = !DIBasicType(name: "wchar_t", size: 32, encoding: DW_ATE_signed)
+!109 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !40)
+!110 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !111, file: !16, line: 159)
+!111 = !DISubprogram(name: "mbtowc", scope: !9, file: !9, line: 1065, type: !112, flags: DIFlagPrototyped, spFlags: 0)
+!112 = !DISubroutineType(types: !113)
+!113 = !{!4, !106, !109, !58}
+!114 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !115, file: !16, line: 161)
+!115 = !DISubprogram(name: "qsort", scope: !9, file: !9, line: 970, type: !116, flags: DIFlagPrototyped, spFlags: 0)
+!116 = !DISubroutineType(types: !117)
+!117 = !{null, !55, !58, !58, !61}
+!118 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !119, file: !16, line: 164)
+!119 = !DISubprogram(name: "quick_exit", scope: !9, file: !9, line: 762, type: !75, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!120 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !121, file: !16, line: 167)
+!121 = !DISubprogram(name: "rand", scope: !9, file: !9, line: 573, type: !122, flags: DIFlagPrototyped, spFlags: 0)
+!122 = !DISubroutineType(types: !123)
+!123 = !{!4}
+!124 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !125, file: !16, line: 168)
+!125 = !DISubprogram(name: "realloc", scope: !9, file: !9, line: 683, type: !126, flags: DIFlagPrototyped, spFlags: 0)
+!126 = !DISubroutineType(types: !127)
+!127 = !{!55, !55, !58}
+!128 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !129, file: !16, line: 169)
+!129 = !DISubprogram(name: "srand", scope: !9, file: !9, line: 575, type: !130, flags: DIFlagPrototyped, spFlags: 0)
+!130 = !DISubroutineType(types: !131)
+!131 = !{null, !132}
+!132 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!133 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !134, file: !16, line: 170)
+!134 = !DISubprogram(name: "strtod", scope: !9, file: !9, line: 118, type: !135, flags: DIFlagPrototyped, spFlags: 0)
+!135 = !DISubroutineType(types: !136)
+!136 = !{!39, !109, !137}
+!137 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !138)
+!138 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !85, size: 64)
+!139 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !140, file: !16, line: 171)
+!140 = !DISubprogram(name: "strtol", linkageName: "__isoc23_strtol", scope: !9, file: !9, line: 215, type: !141, flags: DIFlagPrototyped, spFlags: 0)
+!141 = !DISubroutineType(types: !142)
+!142 = !{!22, !109, !137, !4}
+!143 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !144, file: !16, line: 172)
+!144 = !DISubprogram(name: "strtoul", linkageName: "__isoc23_strtoul", scope: !9, file: !9, line: 219, type: !145, flags: DIFlagPrototyped, spFlags: 0)
+!145 = !DISubroutineType(types: !146)
+!146 = !{!60, !109, !137, !4}
+!147 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !148, file: !16, line: 173)
+!148 = !DISubprogram(name: "system", scope: !9, file: !9, line: 923, type: !45, flags: DIFlagPrototyped, spFlags: 0)
+!149 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !150, file: !16, line: 175)
+!150 = !DISubprogram(name: "wcstombs", scope: !9, file: !9, line: 1077, type: !151, flags: DIFlagPrototyped, spFlags: 0)
+!151 = !DISubroutineType(types: !152)
+!152 = !{!58, !153, !154, !58}
+!153 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !85)
+!154 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !155)
+!155 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !156, size: 64)
+!156 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !108)
+!157 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !158, file: !16, line: 176)
+!158 = !DISubprogram(name: "wctomb", scope: !9, file: !9, line: 1069, type: !159, flags: DIFlagPrototyped, spFlags: 0)
+!159 = !DISubroutineType(types: !160)
+!160 = !{!4, !85, !108}
+!161 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !163, file: !16, line: 204)
+!162 = !DINamespace(name: "__gnu_cxx", scope: null)
+!163 = !DIDerivedType(tag: DW_TAG_typedef, name: "lldiv_t", file: !9, line: 81, baseType: !164)
+!164 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !9, line: 77, size: 128, flags: DIFlagTypePassByValue, elements: !165, identifier: "_ZTS7lldiv_t")
+!165 = !{!166, !168}
+!166 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !164, file: !9, line: 79, baseType: !167, size: 64)
+!167 = !DIBasicType(name: "long long", size: 64, encoding: DW_ATE_signed)
+!168 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !164, file: !9, line: 80, baseType: !167, size: 64, offset: 64)
+!169 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !170, file: !16, line: 210)
+!170 = !DISubprogram(name: "_Exit", scope: !9, file: !9, line: 768, type: !75, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!171 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !172, file: !16, line: 214)
+!172 = !DISubprogram(name: "llabs", scope: !9, file: !9, line: 984, type: !173, flags: DIFlagPrototyped, spFlags: 0)
+!173 = !DISubroutineType(types: !174)
+!174 = !{!167, !167}
+!175 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !176, file: !16, line: 220)
+!176 = !DISubprogram(name: "lldiv", scope: !9, file: !9, line: 998, type: !177, flags: DIFlagPrototyped, spFlags: 0)
+!177 = !DISubroutineType(types: !178)
+!178 = !{!163, !167, !167}
+!179 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !180, file: !16, line: 231)
+!180 = !DISubprogram(name: "atoll", scope: !9, file: !9, line: 113, type: !181, flags: DIFlagPrototyped, spFlags: 0)
+!181 = !DISubroutineType(types: !182)
+!182 = !{!167, !40}
+!183 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !184, file: !16, line: 232)
+!184 = !DISubprogram(name: "strtoll", linkageName: "__isoc23_strtoll", scope: !9, file: !9, line: 238, type: !185, flags: DIFlagPrototyped, spFlags: 0)
+!185 = !DISubroutineType(types: !186)
+!186 = !{!167, !109, !137, !4}
+!187 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !188, file: !16, line: 233)
+!188 = !DISubprogram(name: "strtoull", linkageName: "__isoc23_strtoull", scope: !9, file: !9, line: 243, type: !189, flags: DIFlagPrototyped, spFlags: 0)
+!189 = !DISubroutineType(types: !190)
+!190 = !{!191, !109, !137, !4}
+!191 = !DIBasicType(name: "unsigned long long", size: 64, encoding: DW_ATE_unsigned)
+!192 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !193, file: !16, line: 235)
+!193 = !DISubprogram(name: "strtof", scope: !9, file: !9, line: 124, type: !194, flags: DIFlagPrototyped, spFlags: 0)
+!194 = !DISubroutineType(types: !195)
+!195 = !{!196, !109, !137}
+!196 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
+!197 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !162, entity: !198, file: !16, line: 236)
+!198 = !DISubprogram(name: "strtold", scope: !9, file: !9, line: 127, type: !199, flags: DIFlagPrototyped, spFlags: 0)
+!199 = !DISubroutineType(types: !200)
+!200 = !{!201, !109, !137}
+!201 = !DIBasicType(name: "long double", size: 128, encoding: DW_ATE_float)
+!202 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !163, file: !16, line: 244)
+!203 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !170, file: !16, line: 246)
+!204 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !172, file: !16, line: 248)
+!205 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !206, file: !16, line: 249)
+!206 = !DISubprogram(name: "div", linkageName: "_ZN9__gnu_cxx3divExx", scope: !162, file: !16, line: 217, type: !177, flags: DIFlagPrototyped, spFlags: 0)
+!207 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !176, file: !16, line: 250)
+!208 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !180, file: !16, line: 252)
+!209 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !193, file: !16, line: 253)
+!210 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !184, file: !16, line: 254)
+!211 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !188, file: !16, line: 255)
+!212 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !7, entity: !198, file: !16, line: 256)
+!213 = !{i32 7, !"Dwarf Version", i32 5}
+!214 = !{i32 2, !"Debug Info Version", i32 3}
+!215 = !{i32 1, !"wchar_size", i32 4}
+!216 = !{i32 7, !"PIC Level", i32 2}
+!217 = !{i32 7, !"PIE Level", i32 2}
+!218 = !{i32 7, !"uwtable", i32 2}
+!219 = !{i32 7, !"frame-pointer", i32 2}
+!220 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!221 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 3, type: !222, scopeLine: 3, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !224)
+!222 = !DISubroutineType(types: !223)
+!223 = !{!4, !4, !138}
+!224 = !{}
+!225 = !DILocalVariable(name: "argc", arg: 1, scope: !221, file: !1, line: 3, type: !4)
+!226 = !DILocation(line: 3, column: 14, scope: !221)
+!227 = !DILocalVariable(name: "argv", arg: 2, scope: !221, file: !1, line: 3, type: !138)
+!228 = !DILocation(line: 3, column: 27, scope: !221)
+!229 = !DILocalVariable(name: "N", scope: !221, file: !1, line: 4, type: !230)
+!230 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !4)
+!231 = !DILocation(line: 4, column: 17, scope: !221)
+!232 = !DILocalVariable(name: "mem", scope: !221, file: !1, line: 5, type: !3)
+!233 = !DILocation(line: 5, column: 8, scope: !221)
+!234 = !DILocation(line: 5, column: 33, scope: !221)
+!235 = !DILocalVariable(name: "i", scope: !236, file: !1, line: 6, type: !4)
+!236 = distinct !DILexicalBlock(scope: !221, file: !1, line: 6, column: 3)
+!237 = !DILocation(line: 6, column: 12, scope: !236)
+!238 = !DILocation(line: 6, column: 8, scope: !236)
+!239 = !DILocation(line: 6, column: 19, scope: !240)
+!240 = distinct !DILexicalBlock(scope: !236, file: !1, line: 6, column: 3)
+!241 = !DILocation(line: 6, column: 21, scope: !240)
+!242 = !DILocation(line: 6, column: 3, scope: !236)
+!243 = !DILocation(line: 7, column: 5, scope: !244)
+!244 = distinct !DILexicalBlock(scope: !240, file: !1, line: 6, column: 31)
+!245 = !DILocation(line: 7, column: 9, scope: !244)
+!246 = !DILocation(line: 7, column: 12, scope: !244)
+!247 = !DILocation(line: 8, column: 3, scope: !244)
+!248 = !DILocation(line: 6, column: 26, scope: !240)
+!249 = !DILocation(line: 6, column: 3, scope: !240)
+!250 = distinct !{!250, !242, !251, !252}
+!251 = !DILocation(line: 8, column: 3, scope: !236)
+!252 = !{!"llvm.loop.mustprogress"}
+!253 = !DILocation(line: 9, column: 8, scope: !221)
+!254 = !DILocation(line: 9, column: 3, scope: !221)
+!255 = !DILocation(line: 10, column: 3, scope: !221)
diff --git a/examples/llvm-hello-world/target/simple.ll b/examples/llvm-hello-world/target/simple.ll
index a2d7e504ca..0132746712 100644
--- a/examples/llvm-hello-world/target/simple.ll
+++ b/examples/llvm-hello-world/target/simple.ll
@@ -1,28 +1,60 @@
 ; ModuleID = 'simple.cpp'
 source_filename = "simple.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main() #0 {
-  %1 = alloca i32, align 4
-  %2 = alloca i32, align 4
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  store i32 4, i32* %2, align 4
-  store i32 5, i32* %3, align 4
-  %5 = load i32, i32* %2, align 4
-  %6 = load i32, i32* %3, align 4
-  %7 = add nsw i32 %5, %6
-  store i32 %7, i32* %4, align 4
-  ret i32 0
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main() #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %i = alloca i32, align 4
+  %j = alloca i32, align 4
+  %k = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !15, metadata !DIExpression()), !dbg !16
+  store i32 4, ptr %i, align 4, !dbg !16
+  call void @llvm.dbg.declare(metadata ptr %j, metadata !17, metadata !DIExpression()), !dbg !18
+  store i32 5, ptr %j, align 4, !dbg !18
+  call void @llvm.dbg.declare(metadata ptr %k, metadata !19, metadata !DIExpression()), !dbg !20
+  %0 = load i32, ptr %i, align 4, !dbg !21
+  %1 = load i32, ptr %j, align 4, !dbg !22
+  %add = add nsw i32 %0, %1, !dbg !23
+  store i32 %add, ptr %k, align 4, !dbg !20
+  ret i32 0, !dbg !24
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "simple.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "f3ec19a83a491acfe890973b78dd6bfb")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !{}
+!15 = !DILocalVariable(name: "i", scope: !10, file: !1, line: 2, type: !13)
+!16 = !DILocation(line: 2, column: 7, scope: !10)
+!17 = !DILocalVariable(name: "j", scope: !10, file: !1, line: 3, type: !13)
+!18 = !DILocation(line: 3, column: 7, scope: !10)
+!19 = !DILocalVariable(name: "k", scope: !10, file: !1, line: 4, type: !13)
+!20 = !DILocation(line: 4, column: 7, scope: !10)
+!21 = !DILocation(line: 4, column: 11, scope: !10)
+!22 = !DILocation(line: 4, column: 15, scope: !10)
+!23 = !DILocation(line: 4, column: 13, scope: !10)
+!24 = !DILocation(line: 5, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/simple2.ll b/examples/llvm-hello-world/target/simple2.ll
index 7ae25b6a27..96709855d9 100644
--- a/examples/llvm-hello-world/target/simple2.ll
+++ b/examples/llvm-hello-world/target/simple2.ll
@@ -1,42 +1,94 @@
 ; ModuleID = 'simple2.cpp'
 source_filename = "simple2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca i32, align 4
-  %7 = alloca i32, align 4
-  %8 = alloca i32, align 4
-  %9 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  %10 = load i32, i32* %4, align 4
-  store i32 %10, i32* %6, align 4
-  %11 = load i32, i32* %6, align 4
-  %12 = load i32, i32* %6, align 4
-  %13 = add nsw i32 %11, %12
-  store i32 %13, i32* %7, align 4
-  %14 = load i32, i32* %7, align 4
-  %15 = load i32, i32* %6, align 4
-  %16 = mul nsw i32 %14, %15
-  store i32 %16, i32* %8, align 4
-  %17 = load i32, i32* %8, align 4
-  %18 = load i32, i32* %8, align 4
-  %19 = mul nsw i32 %17, %18
-  store i32 %19, i32* %9, align 4
-  %20 = load i32, i32* %9, align 4
-  ret i32 %20
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %i = alloca i32, align 4
+  %j = alloca i32, align 4
+  %k = alloca i32, align 4
+  %l = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  call void @llvm.dbg.declare(metadata ptr %i, metadata !22, metadata !DIExpression()), !dbg !23
+  %0 = load i32, ptr %argc.addr, align 4, !dbg !24
+  store i32 %0, ptr %i, align 4, !dbg !23
+  call void @llvm.dbg.declare(metadata ptr %j, metadata !25, metadata !DIExpression()), !dbg !26
+  %1 = load i32, ptr %i, align 4, !dbg !27
+  %2 = load i32, ptr %i, align 4, !dbg !28
+  %add = add nsw i32 %1, %2, !dbg !29
+  store i32 %add, ptr %j, align 4, !dbg !26
+  call void @llvm.dbg.declare(metadata ptr %k, metadata !30, metadata !DIExpression()), !dbg !31
+  %3 = load i32, ptr %j, align 4, !dbg !32
+  %4 = load i32, ptr %i, align 4, !dbg !33
+  %mul = mul nsw i32 %3, %4, !dbg !34
+  store i32 %mul, ptr %k, align 4, !dbg !31
+  call void @llvm.dbg.declare(metadata ptr %l, metadata !35, metadata !DIExpression()), !dbg !36
+  %5 = load i32, ptr %k, align 4, !dbg !37
+  %6 = load i32, ptr %k, align 4, !dbg !38
+  %mul1 = mul nsw i32 %5, %6, !dbg !39
+  store i32 %mul1, ptr %l, align 4, !dbg !36
+  %7 = load i32, ptr %l, align 4, !dbg !40
+  ret i32 %7, !dbg !41
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "simple2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "294839b63e3725308d0713950e5b12b1")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !11, scopeLine: 1, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !17)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!17 = !{}
+!18 = !DILocalVariable(name: "argc", arg: 1, scope: !10, file: !1, line: 1, type: !13)
+!19 = !DILocation(line: 1, column: 14, scope: !10)
+!20 = !DILocalVariable(name: "argv", arg: 2, scope: !10, file: !1, line: 1, type: !14)
+!21 = !DILocation(line: 1, column: 27, scope: !10)
+!22 = !DILocalVariable(name: "i", scope: !10, file: !1, line: 2, type: !13)
+!23 = !DILocation(line: 2, column: 7, scope: !10)
+!24 = !DILocation(line: 2, column: 11, scope: !10)
+!25 = !DILocalVariable(name: "j", scope: !10, file: !1, line: 3, type: !13)
+!26 = !DILocation(line: 3, column: 7, scope: !10)
+!27 = !DILocation(line: 3, column: 11, scope: !10)
+!28 = !DILocation(line: 3, column: 15, scope: !10)
+!29 = !DILocation(line: 3, column: 13, scope: !10)
+!30 = !DILocalVariable(name: "k", scope: !10, file: !1, line: 4, type: !13)
+!31 = !DILocation(line: 4, column: 7, scope: !10)
+!32 = !DILocation(line: 4, column: 11, scope: !10)
+!33 = !DILocation(line: 4, column: 15, scope: !10)
+!34 = !DILocation(line: 4, column: 13, scope: !10)
+!35 = !DILocalVariable(name: "l", scope: !10, file: !1, line: 5, type: !13)
+!36 = !DILocation(line: 5, column: 7, scope: !10)
+!37 = !DILocation(line: 5, column: 11, scope: !10)
+!38 = !DILocation(line: 5, column: 15, scope: !10)
+!39 = !DILocation(line: 5, column: 13, scope: !10)
+!40 = !DILocation(line: 6, column: 10, scope: !10)
+!41 = !DILocation(line: 6, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/struct.ll b/examples/llvm-hello-world/target/struct.ll
index d5fd8e489a..95b0646e30 100644
--- a/examples/llvm-hello-world/target/struct.ll
+++ b/examples/llvm-hello-world/target/struct.ll
@@ -1,36 +1,75 @@
 ; ModuleID = 'struct.cpp'
 source_filename = "struct.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 %struct.S = type { i32, i32, i32 }
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main() #0 {
-  %1 = alloca i32, align 4
-  %2 = alloca %struct.S, align 4
-  store i32 0, i32* %1, align 4
-  %3 = getelementptr inbounds %struct.S, %struct.S* %2, i32 0, i32 0
-  store i32 1, i32* %3, align 4
-  %4 = getelementptr inbounds %struct.S, %struct.S* %2, i32 0, i32 1
-  store i32 2, i32* %4, align 4
-  %5 = getelementptr inbounds %struct.S, %struct.S* %2, i32 0, i32 2
-  store i32 3, i32* %5, align 4
-  %6 = getelementptr inbounds %struct.S, %struct.S* %2, i32 0, i32 0
-  %7 = load i32, i32* %6, align 4
-  %8 = getelementptr inbounds %struct.S, %struct.S* %2, i32 0, i32 1
-  %9 = load i32, i32* %8, align 4
-  %10 = add nsw i32 %7, %9
-  %11 = getelementptr inbounds %struct.S, %struct.S* %2, i32 0, i32 2
-  %12 = load i32, i32* %11, align 4
-  %13 = add nsw i32 %10, %12
-  ret i32 %13
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main() #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %s = alloca %struct.S, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %s, metadata !15, metadata !DIExpression()), !dbg !21
+  %i = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 0, !dbg !22
+  store i32 1, ptr %i, align 4, !dbg !23
+  %j = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 1, !dbg !24
+  store i32 2, ptr %j, align 4, !dbg !25
+  %k = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 2, !dbg !26
+  store i32 3, ptr %k, align 4, !dbg !27
+  %i1 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 0, !dbg !28
+  %0 = load i32, ptr %i1, align 4, !dbg !28
+  %j2 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 1, !dbg !29
+  %1 = load i32, ptr %j2, align 4, !dbg !29
+  %add = add nsw i32 %0, %1, !dbg !30
+  %k3 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 2, !dbg !31
+  %2 = load i32, ptr %k3, align 4, !dbg !31
+  %add4 = add nsw i32 %add, %2, !dbg !32
+  ret i32 %add4, !dbg !33
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "struct.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "29f5ab36c820666cfae36d31b65e1b2d")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 5, type: !11, scopeLine: 5, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !14)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !{}
+!15 = !DILocalVariable(name: "s", scope: !10, file: !1, line: 6, type: !16)
+!16 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !1, line: 1, size: 96, flags: DIFlagTypePassByValue, elements: !17, identifier: "_ZTS1S")
+!17 = !{!18, !19, !20}
+!18 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !16, file: !1, line: 2, baseType: !13, size: 32)
+!19 = !DIDerivedType(tag: DW_TAG_member, name: "j", scope: !16, file: !1, line: 2, baseType: !13, size: 32, offset: 32)
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "k", scope: !16, file: !1, line: 2, baseType: !13, size: 32, offset: 64)
+!21 = !DILocation(line: 6, column: 5, scope: !10)
+!22 = !DILocation(line: 7, column: 5, scope: !10)
+!23 = !DILocation(line: 7, column: 7, scope: !10)
+!24 = !DILocation(line: 8, column: 5, scope: !10)
+!25 = !DILocation(line: 8, column: 7, scope: !10)
+!26 = !DILocation(line: 9, column: 5, scope: !10)
+!27 = !DILocation(line: 9, column: 7, scope: !10)
+!28 = !DILocation(line: 10, column: 12, scope: !10)
+!29 = !DILocation(line: 10, column: 18, scope: !10)
+!30 = !DILocation(line: 10, column: 14, scope: !10)
+!31 = !DILocation(line: 10, column: 24, scope: !10)
+!32 = !DILocation(line: 10, column: 20, scope: !10)
+!33 = !DILocation(line: 10, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/struct2.ll b/examples/llvm-hello-world/target/struct2.ll
index 3f1271ad9e..5c74528bd4 100644
--- a/examples/llvm-hello-world/target/struct2.ll
+++ b/examples/llvm-hello-world/target/struct2.ll
@@ -1,54 +1,112 @@
 ; ModuleID = 'struct2.cpp'
 source_filename = "struct2.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 %struct.S = type { i32, i32 }
 
-; Function Attrs: noinline norecurse nounwind optnone uwtable
-define i32 @main(i32, i8**) #0 {
-  %3 = alloca i32, align 4
-  %4 = alloca i32, align 4
-  %5 = alloca i8**, align 8
-  %6 = alloca %struct.S, align 4
-  %7 = alloca i32, align 4
-  store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4
-  store i8** %1, i8*** %5, align 8
-  %8 = load i32, i32* %4, align 4
-  %9 = sub nsw i32 %8, 1
-  %10 = icmp ne i32 %9, 0
-  br i1 %10, label %11, label %14
-
-; <label>:11:                                     ; preds = %2
-  %12 = getelementptr inbounds %struct.S, %struct.S* %6, i32 0, i32 0
-  store i32 4, i32* %12, align 4
-  %13 = getelementptr inbounds %struct.S, %struct.S* %6, i32 0, i32 1
-  store i32 5, i32* %13, align 4
-  br label %17
-
-; <label>:14:                                     ; preds = %2
-  %15 = getelementptr inbounds %struct.S, %struct.S* %6, i32 0, i32 0
-  store i32 40, i32* %15, align 4
-  %16 = getelementptr inbounds %struct.S, %struct.S* %6, i32 0, i32 1
-  store i32 50, i32* %16, align 4
-  br label %17
-
-; <label>:17:                                     ; preds = %14, %11
-  %18 = getelementptr inbounds %struct.S, %struct.S* %6, i32 0, i32 0
-  %19 = load i32, i32* %18, align 4
-  %20 = getelementptr inbounds %struct.S, %struct.S* %6, i32 0, i32 1
-  %21 = load i32, i32* %20, align 4
-  %22 = add nsw i32 %19, %21
-  store i32 %22, i32* %7, align 4
-  %23 = load i32, i32* %7, align 4
-  ret i32 %23
+; Function Attrs: mustprogress noinline norecurse nounwind optnone uwtable
+define dso_local noundef i32 @main(i32 noundef %argc, ptr noundef %argv) #0 !dbg !10 {
+entry:
+  %retval = alloca i32, align 4
+  %argc.addr = alloca i32, align 4
+  %argv.addr = alloca ptr, align 8
+  %s = alloca %struct.S, align 4
+  %z = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  store i32 %argc, ptr %argc.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %argc.addr, metadata !18, metadata !DIExpression()), !dbg !19
+  store ptr %argv, ptr %argv.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %argv.addr, metadata !20, metadata !DIExpression()), !dbg !21
+  call void @llvm.dbg.declare(metadata ptr %s, metadata !22, metadata !DIExpression()), !dbg !27
+  %0 = load i32, ptr %argc.addr, align 4, !dbg !28
+  %sub = sub nsw i32 %0, 1, !dbg !30
+  %tobool = icmp ne i32 %sub, 0, !dbg !28
+  br i1 %tobool, label %if.then, label %if.else, !dbg !31
+
+if.then:                                          ; preds = %entry
+  %x = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 0, !dbg !32
+  store i32 4, ptr %x, align 4, !dbg !34
+  %y = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 1, !dbg !35
+  store i32 5, ptr %y, align 4, !dbg !36
+  br label %if.end, !dbg !37
+
+if.else:                                          ; preds = %entry
+  %x1 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 0, !dbg !38
+  store i32 40, ptr %x1, align 4, !dbg !40
+  %y2 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 1, !dbg !41
+  store i32 50, ptr %y2, align 4, !dbg !42
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  call void @llvm.dbg.declare(metadata ptr %z, metadata !43, metadata !DIExpression()), !dbg !44
+  %x3 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 0, !dbg !45
+  %1 = load i32, ptr %x3, align 4, !dbg !45
+  %y4 = getelementptr inbounds %struct.S, ptr %s, i32 0, i32 1, !dbg !46
+  %2 = load i32, ptr %y4, align 4, !dbg !46
+  %add = add nsw i32 %1, %2, !dbg !47
+  store i32 %add, ptr %z, align 4, !dbg !44
+  %3 = load i32, ptr %z, align 4, !dbg !48
+  ret i32 %3, !dbg !49
 }
 
-attributes #0 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "struct2.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "dcfc377f80d9d75aede4bfb21faad130")
+!2 = !{i32 7, !"Dwarf Version", i32 5}
+!3 = !{i32 2, !"Debug Info Version", i32 3}
+!4 = !{i32 1, !"wchar_size", i32 4}
+!5 = !{i32 7, !"PIC Level", i32 2}
+!6 = !{i32 7, !"PIE Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 2}
+!8 = !{i32 7, !"frame-pointer", i32 2}
+!9 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!10 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 6, type: !11, scopeLine: 6, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !17)
+!11 = !DISubroutineType(types: !12)
+!12 = !{!13, !13, !14}
+!13 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!14 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !15, size: 64)
+!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!16 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!17 = !{}
+!18 = !DILocalVariable(name: "argc", arg: 1, scope: !10, file: !1, line: 6, type: !13)
+!19 = !DILocation(line: 6, column: 14, scope: !10)
+!20 = !DILocalVariable(name: "argv", arg: 2, scope: !10, file: !1, line: 6, type: !14)
+!21 = !DILocation(line: 6, column: 27, scope: !10)
+!22 = !DILocalVariable(name: "s", scope: !10, file: !1, line: 7, type: !23)
+!23 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !1, line: 1, size: 64, flags: DIFlagTypePassByValue, elements: !24, identifier: "_ZTS1S")
+!24 = !{!25, !26}
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !23, file: !1, line: 2, baseType: !13, size: 32)
+!26 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !23, file: !1, line: 3, baseType: !13, size: 32, offset: 32)
+!27 = !DILocation(line: 7, column: 5, scope: !10)
+!28 = !DILocation(line: 8, column: 7, scope: !29)
+!29 = distinct !DILexicalBlock(scope: !10, file: !1, line: 8, column: 7)
+!30 = !DILocation(line: 8, column: 12, scope: !29)
+!31 = !DILocation(line: 8, column: 7, scope: !10)
+!32 = !DILocation(line: 9, column: 7, scope: !33)
+!33 = distinct !DILexicalBlock(scope: !29, file: !1, line: 8, column: 17)
+!34 = !DILocation(line: 9, column: 9, scope: !33)
+!35 = !DILocation(line: 10, column: 7, scope: !33)
+!36 = !DILocation(line: 10, column: 9, scope: !33)
+!37 = !DILocation(line: 11, column: 3, scope: !33)
+!38 = !DILocation(line: 12, column: 7, scope: !39)
+!39 = distinct !DILexicalBlock(scope: !29, file: !1, line: 11, column: 10)
+!40 = !DILocation(line: 12, column: 9, scope: !39)
+!41 = !DILocation(line: 13, column: 7, scope: !39)
+!42 = !DILocation(line: 13, column: 9, scope: !39)
+!43 = !DILocalVariable(name: "z", scope: !10, file: !1, line: 15, type: !13)
+!44 = !DILocation(line: 15, column: 7, scope: !10)
+!45 = !DILocation(line: 15, column: 13, scope: !10)
+!46 = !DILocation(line: 15, column: 19, scope: !10)
+!47 = !DILocation(line: 15, column: 15, scope: !10)
+!48 = !DILocation(line: 16, column: 10, scope: !10)
+!49 = !DILocation(line: 16, column: 3, scope: !10)
diff --git a/examples/llvm-hello-world/target/struct3.ll b/examples/llvm-hello-world/target/struct3.ll
index 9f11e3fc5a..bb8d92c6b6 100644
--- a/examples/llvm-hello-world/target/struct3.ll
+++ b/examples/llvm-hello-world/target/struct3.ll
@@ -1,101 +1,162 @@
 ; ModuleID = 'struct3.cpp'
 source_filename = "struct3.cpp"
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"
 
 %struct.S = type { i32, i32 }
 
 $_ZN1SC2Eii = comdat any
 
-; Function Attrs: noinline norecurse optnone uwtable
-define i32 @main() #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
-  %1 = alloca i32, align 4
-  %2 = alloca %struct.S*, align 8
-  %3 = alloca i8*
-  %4 = alloca i32
-  %5 = alloca i32, align 4
-  store i32 0, i32* %1, align 4
-  %6 = call i8* @_Znwm(i64 8) #4
-  %7 = bitcast i8* %6 to %struct.S*
-  invoke void @_ZN1SC2Eii(%struct.S* %7, i32 10, i32 20)
-          to label %8 unwind label %22
-
-; <label>:8:                                      ; preds = %0
-  store %struct.S* %7, %struct.S** %2, align 8
-  %9 = load %struct.S*, %struct.S** %2, align 8
-  %10 = getelementptr inbounds %struct.S, %struct.S* %9, i32 0, i32 0
-  %11 = load i32, i32* %10, align 4
-  %12 = load %struct.S*, %struct.S** %2, align 8
-  %13 = getelementptr inbounds %struct.S, %struct.S* %12, i32 0, i32 1
-  %14 = load i32, i32* %13, align 4
-  %15 = add nsw i32 %11, %14
-  store i32 %15, i32* %5, align 4
-  %16 = load %struct.S*, %struct.S** %2, align 8
-  %17 = icmp eq %struct.S* %16, null
-  br i1 %17, label %20, label %18
-
-; <label>:18:                                     ; preds = %8
-  %19 = bitcast %struct.S* %16 to i8*
-  call void @_ZdlPv(i8* %19) #5
-  br label %20
-
-; <label>:20:                                     ; preds = %18, %8
-  %21 = load i32, i32* %5, align 4
-  ret i32 %21
-
-; <label>:22:                                     ; preds = %0
-  %23 = landingpad { i8*, i32 }
-          cleanup
-  %24 = extractvalue { i8*, i32 } %23, 0
-  store i8* %24, i8** %3, align 8
-  %25 = extractvalue { i8*, i32 } %23, 1
-  store i32 %25, i32* %4, align 4
-  call void @_ZdlPv(i8* %6) #5
-  br label %26
-
-; <label>:26:                                     ; preds = %22
-  %27 = load i8*, i8** %3, align 8
-  %28 = load i32, i32* %4, align 4
-  %29 = insertvalue { i8*, i32 } undef, i8* %27, 0
-  %30 = insertvalue { i8*, i32 } %29, i32 %28, 1
-  resume { i8*, i32 } %30
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main() #0 personality ptr @__gxx_personality_v0 !dbg !20 {
+entry:
+  %retval = alloca i32, align 4
+  %s = alloca ptr, align 8
+  %exn.slot = alloca ptr, align 8
+  %ehselector.slot = alloca i32, align 4
+  %sum = alloca i32, align 4
+  store i32 0, ptr %retval, align 4
+  call void @llvm.dbg.declare(metadata ptr %s, metadata !24, metadata !DIExpression()), !dbg !26
+  %call = call noalias noundef nonnull ptr @_Znwm(i64 noundef 8) #5, !dbg !27, !heapallocsite !3
+  invoke void @_ZN1SC2Eii(ptr noundef nonnull align 4 dereferenceable(8) %call, i32 noundef 10, i32 noundef 20)
+          to label %invoke.cont unwind label %lpad, !dbg !28
+
+invoke.cont:                                      ; preds = %entry
+  store ptr %call, ptr %s, align 8, !dbg !26
+  call void @llvm.dbg.declare(metadata ptr %sum, metadata !29, metadata !DIExpression()), !dbg !30
+  %0 = load ptr, ptr %s, align 8, !dbg !31
+  %x = getelementptr inbounds %struct.S, ptr %0, i32 0, i32 0, !dbg !32
+  %1 = load i32, ptr %x, align 4, !dbg !32
+  %2 = load ptr, ptr %s, align 8, !dbg !33
+  %y = getelementptr inbounds %struct.S, ptr %2, i32 0, i32 1, !dbg !34
+  %3 = load i32, ptr %y, align 4, !dbg !34
+  %add = add nsw i32 %1, %3, !dbg !35
+  store i32 %add, ptr %sum, align 4, !dbg !30
+  %4 = load ptr, ptr %s, align 8, !dbg !36
+  %isnull = icmp eq ptr %4, null, !dbg !37
+  br i1 %isnull, label %delete.end, label %delete.notnull, !dbg !37
+
+delete.notnull:                                   ; preds = %invoke.cont
+  call void @_ZdlPv(ptr noundef %4) #6, !dbg !37
+  br label %delete.end, !dbg !37
+
+delete.end:                                       ; preds = %delete.notnull, %invoke.cont
+  %5 = load i32, ptr %sum, align 4, !dbg !38
+  ret i32 %5, !dbg !39
+
+lpad:                                             ; preds = %entry
+  %6 = landingpad { ptr, i32 }
+          cleanup, !dbg !40
+  %7 = extractvalue { ptr, i32 } %6, 0, !dbg !40
+  store ptr %7, ptr %exn.slot, align 8, !dbg !40
+  %8 = extractvalue { ptr, i32 } %6, 1, !dbg !40
+  store i32 %8, ptr %ehselector.slot, align 4, !dbg !40
+  call void @_ZdlPv(ptr noundef %call) #6, !dbg !27
+  br label %eh.resume, !dbg !27
+
+eh.resume:                                        ; preds = %lpad
+  %exn = load ptr, ptr %exn.slot, align 8, !dbg !27
+  %sel = load i32, ptr %ehselector.slot, align 4, !dbg !27
+  %lpad.val = insertvalue { ptr, i32 } undef, ptr %exn, 0, !dbg !27
+  %lpad.val1 = insertvalue { ptr, i32 } %lpad.val, i32 %sel, 1, !dbg !27
+  resume { ptr, i32 } %lpad.val1, !dbg !27
 }
 
-; Function Attrs: nobuiltin
-declare noalias i8* @_Znwm(i64) #1
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: nobuiltin allocsize(0)
+declare noundef nonnull ptr @_Znwm(i64 noundef) #2
 
 ; Function Attrs: noinline nounwind optnone uwtable
-define linkonce_odr void @_ZN1SC2Eii(%struct.S*, i32, i32) unnamed_addr #2 comdat align 2 {
-  %4 = alloca %struct.S*, align 8
-  %5 = alloca i32, align 4
-  %6 = alloca i32, align 4
-  store %struct.S* %0, %struct.S** %4, align 8
-  store i32 %1, i32* %5, align 4
-  store i32 %2, i32* %6, align 4
-  %7 = load %struct.S*, %struct.S** %4, align 8
-  %8 = getelementptr inbounds %struct.S, %struct.S* %7, i32 0, i32 0
-  %9 = load i32, i32* %5, align 4
-  store i32 %9, i32* %8, align 4
-  %10 = getelementptr inbounds %struct.S, %struct.S* %7, i32 0, i32 1
-  %11 = load i32, i32* %6, align 4
-  store i32 %11, i32* %10, align 4
-  ret void
+define linkonce_odr dso_local void @_ZN1SC2Eii(ptr noundef nonnull align 4 dereferenceable(8) %this, i32 noundef %i, i32 noundef %j) unnamed_addr #3 comdat align 2 !dbg !41 {
+entry:
+  %this.addr = alloca ptr, align 8
+  %i.addr = alloca i32, align 4
+  %j.addr = alloca i32, align 4
+  store ptr %this, ptr %this.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %this.addr, metadata !42, metadata !DIExpression()), !dbg !43
+  store i32 %i, ptr %i.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %i.addr, metadata !44, metadata !DIExpression()), !dbg !45
+  store i32 %j, ptr %j.addr, align 4
+  call void @llvm.dbg.declare(metadata ptr %j.addr, metadata !46, metadata !DIExpression()), !dbg !47
+  %this1 = load ptr, ptr %this.addr, align 8
+  %x = getelementptr inbounds %struct.S, ptr %this1, i32 0, i32 0, !dbg !48
+  %0 = load i32, ptr %i.addr, align 4, !dbg !49
+  store i32 %0, ptr %x, align 4, !dbg !48
+  %y = getelementptr inbounds %struct.S, ptr %this1, i32 0, i32 1, !dbg !50
+  %1 = load i32, ptr %j.addr, align 4, !dbg !51
+  store i32 %1, ptr %y, align 4, !dbg !50
+  ret void, !dbg !52
 }
 
 declare i32 @__gxx_personality_v0(...)
 
 ; Function Attrs: nobuiltin nounwind
-declare void @_ZdlPv(i8*) #3
+declare void @_ZdlPv(ptr noundef) #4
 
-attributes #0 = { noinline norecurse optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { nobuiltin "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nobuiltin nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #4 = { builtin }
-attributes #5 = { builtin nounwind }
+attributes #0 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { nobuiltin allocsize(0) "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #3 = { noinline nounwind optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { nobuiltin nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #5 = { builtin allocsize(0) }
+attributes #6 = { builtin nounwind }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!12, !13, !14, !15, !16, !17, !18}
+!llvm.ident = !{!19}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 5.0.1 (tags/RELEASE_501/final 332326)"}
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, retainedTypes: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "struct3.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "c7fb26640a9fc424b32be72824c46ca7")
+!2 = !{!3}
+!3 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "S", file: !1, line: 1, size: 64, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !4, identifier: "_ZTS1S")
+!4 = !{!5, !7, !8}
+!5 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !3, file: !1, line: 2, baseType: !6, size: 32)
+!6 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!7 = !DIDerivedType(tag: DW_TAG_member, name: "y", scope: !3, file: !1, line: 3, baseType: !6, size: 32, offset: 32)
+!8 = !DISubprogram(name: "S", scope: !3, file: !1, line: 4, type: !9, scopeLine: 4, flags: DIFlagPrototyped, spFlags: 0)
+!9 = !DISubroutineType(types: !10)
+!10 = !{null, !11, !6, !6}
+!11 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !3, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!12 = !{i32 7, !"Dwarf Version", i32 5}
+!13 = !{i32 2, !"Debug Info Version", i32 3}
+!14 = !{i32 1, !"wchar_size", i32 4}
+!15 = !{i32 7, !"PIC Level", i32 2}
+!16 = !{i32 7, !"PIE Level", i32 2}
+!17 = !{i32 7, !"uwtable", i32 2}
+!18 = !{i32 7, !"frame-pointer", i32 2}
+!19 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!20 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 7, type: !21, scopeLine: 7, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !23)
+!21 = !DISubroutineType(types: !22)
+!22 = !{!6}
+!23 = !{}
+!24 = !DILocalVariable(name: "s", scope: !20, file: !1, line: 8, type: !25)
+!25 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !3, size: 64)
+!26 = !DILocation(line: 8, column: 6, scope: !20)
+!27 = !DILocation(line: 8, column: 10, scope: !20)
+!28 = !DILocation(line: 8, column: 14, scope: !20)
+!29 = !DILocalVariable(name: "sum", scope: !20, file: !1, line: 9, type: !6)
+!30 = !DILocation(line: 9, column: 7, scope: !20)
+!31 = !DILocation(line: 9, column: 13, scope: !20)
+!32 = !DILocation(line: 9, column: 16, scope: !20)
+!33 = !DILocation(line: 9, column: 20, scope: !20)
+!34 = !DILocation(line: 9, column: 23, scope: !20)
+!35 = !DILocation(line: 9, column: 18, scope: !20)
+!36 = !DILocation(line: 10, column: 10, scope: !20)
+!37 = !DILocation(line: 10, column: 3, scope: !20)
+!38 = !DILocation(line: 11, column: 10, scope: !20)
+!39 = !DILocation(line: 11, column: 3, scope: !20)
+!40 = !DILocation(line: 12, column: 1, scope: !20)
+!41 = distinct !DISubprogram(name: "S", linkageName: "_ZN1SC2Eii", scope: !3, file: !1, line: 4, type: !9, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, declaration: !8, retainedNodes: !23)
+!42 = !DILocalVariable(name: "this", arg: 1, scope: !41, type: !25, flags: DIFlagArtificial | DIFlagObjectPointer)
+!43 = !DILocation(line: 0, scope: !41)
+!44 = !DILocalVariable(name: "i", arg: 2, scope: !41, file: !1, line: 4, type: !6)
+!45 = !DILocation(line: 4, column: 9, scope: !41)
+!46 = !DILocalVariable(name: "j", arg: 3, scope: !41, file: !1, line: 4, type: !6)
+!47 = !DILocation(line: 4, column: 16, scope: !41)
+!48 = !DILocation(line: 4, column: 21, scope: !41)
+!49 = !DILocation(line: 4, column: 23, scope: !41)
+!50 = !DILocation(line: 4, column: 27, scope: !41)
+!51 = !DILocation(line: 4, column: 29, scope: !41)
+!52 = !DILocation(line: 4, column: 33, scope: !41)
diff --git a/examples/llvm-hello-world/target/taint.cpp b/examples/llvm-hello-world/target/taint.cpp
new file mode 100644
index 0000000000..6a5b1481eb
--- /dev/null
+++ b/examples/llvm-hello-world/target/taint.cpp
@@ -0,0 +1,35 @@
+
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
+size_t source([[clang::annotate("psr.source")]] char *Buffer,
+              size_t BufferSize) {
+  return fread(Buffer, BufferSize, 1, stdin);
+}
+
+void sink([[clang::annotate("psr.sink")]] const char *Buf, size_t BufferSize) {
+  fwrite(Buf, strnlen(Buf, BufferSize), 1, stdout);
+}
+
+void print(const char *Buf1, const char *Buf2, size_t Sz) {
+
+  const char *ToPrint;
+  if (rand()) {
+    ToPrint = Buf1;
+  } else {
+    ToPrint = Buf2;
+  }
+
+  sink(ToPrint, Sz);
+}
+
+int main() {
+  char Buffer[128];
+
+  source(Buffer, sizeof(Buffer));
+  char AnotherBuffer[128] = "Hello, World!";
+
+  print(Buffer, AnotherBuffer, sizeof(Buffer));
+}
diff --git a/examples/llvm-hello-world/target/taint.ll b/examples/llvm-hello-world/target/taint.ll
new file mode 100644
index 0000000000..64c00f92b9
--- /dev/null
+++ b/examples/llvm-hello-world/target/taint.ll
@@ -0,0 +1,673 @@
+; ModuleID = 'taint.cpp'
+source_filename = "taint.cpp"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+@.str = private unnamed_addr constant [11 x i8] c"psr.source\00", section "llvm.metadata"
+@.str.1 = private unnamed_addr constant [10 x i8] c"taint.cpp\00", section "llvm.metadata"
+@stdin = external global ptr, align 8
+@.str.2 = private unnamed_addr constant [9 x i8] c"psr.sink\00", section "llvm.metadata"
+@stdout = external global ptr, align 8
+@__const.main.AnotherBuffer = private unnamed_addr constant <{ [13 x i8], [115 x i8] }> <{ [13 x i8] c"Hello, World!", [115 x i8] zeroinitializer }>, align 16
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define dso_local noundef i64 @_Z6sourcePcm(ptr noundef %Buffer, i64 noundef %BufferSize) #0 !dbg !474 {
+entry:
+  %Buffer.addr = alloca ptr, align 8
+  %BufferSize.addr = alloca i64, align 8
+  store ptr %Buffer, ptr %Buffer.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %Buffer.addr, metadata !478, metadata !DIExpression()), !dbg !479
+  call void @llvm.var.annotation(ptr %Buffer.addr, ptr @.str, ptr @.str.1, i32 7, ptr null)
+  store i64 %BufferSize, ptr %BufferSize.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %BufferSize.addr, metadata !480, metadata !DIExpression()), !dbg !481
+  %0 = load ptr, ptr %Buffer.addr, align 8, !dbg !482
+  %1 = load i64, ptr %BufferSize.addr, align 8, !dbg !483
+  %2 = load ptr, ptr @stdin, align 8, !dbg !484
+  %call = call i64 @fread(ptr noundef %0, i64 noundef %1, i64 noundef 1, ptr noundef %2), !dbg !485
+  ret i64 %call, !dbg !486
+}
+
+; Function Attrs: nocallback nofree nosync nounwind readnone speculatable willreturn
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+; Function Attrs: inaccessiblememonly nocallback nofree nosync nounwind willreturn
+declare void @llvm.var.annotation(ptr, ptr, ptr, i32, ptr) #2
+
+declare i64 @fread(ptr noundef, i64 noundef, i64 noundef, ptr noundef) #3
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define dso_local void @_Z4sinkPKcm(ptr noundef %Buf, i64 noundef %BufferSize) #0 !dbg !487 {
+entry:
+  %Buf.addr = alloca ptr, align 8
+  %BufferSize.addr = alloca i64, align 8
+  store ptr %Buf, ptr %Buf.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %Buf.addr, metadata !490, metadata !DIExpression()), !dbg !491
+  call void @llvm.var.annotation(ptr %Buf.addr, ptr @.str.2, ptr @.str.1, i32 12, ptr null)
+  store i64 %BufferSize, ptr %BufferSize.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %BufferSize.addr, metadata !492, metadata !DIExpression()), !dbg !493
+  %0 = load ptr, ptr %Buf.addr, align 8, !dbg !494
+  %1 = load ptr, ptr %Buf.addr, align 8, !dbg !495
+  %2 = load i64, ptr %BufferSize.addr, align 8, !dbg !496
+  %call = call i64 @strnlen(ptr noundef %1, i64 noundef %2) #8, !dbg !497
+  %3 = load ptr, ptr @stdout, align 8, !dbg !498
+  %call1 = call i64 @fwrite(ptr noundef %0, i64 noundef %call, i64 noundef 1, ptr noundef %3), !dbg !499
+  ret void, !dbg !500
+}
+
+declare i64 @fwrite(ptr noundef, i64 noundef, i64 noundef, ptr noundef) #3
+
+; Function Attrs: nounwind readonly willreturn
+declare i64 @strnlen(ptr noundef, i64 noundef) #4
+
+; Function Attrs: mustprogress noinline optnone uwtable
+define dso_local void @_Z5printPKcS0_m(ptr noundef %Buf1, ptr noundef %Buf2, i64 noundef %Sz) #0 !dbg !501 {
+entry:
+  %Buf1.addr = alloca ptr, align 8
+  %Buf2.addr = alloca ptr, align 8
+  %Sz.addr = alloca i64, align 8
+  %ToPrint = alloca ptr, align 8
+  store ptr %Buf1, ptr %Buf1.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %Buf1.addr, metadata !504, metadata !DIExpression()), !dbg !505
+  store ptr %Buf2, ptr %Buf2.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %Buf2.addr, metadata !506, metadata !DIExpression()), !dbg !507
+  store i64 %Sz, ptr %Sz.addr, align 8
+  call void @llvm.dbg.declare(metadata ptr %Sz.addr, metadata !508, metadata !DIExpression()), !dbg !509
+  call void @llvm.dbg.declare(metadata ptr %ToPrint, metadata !510, metadata !DIExpression()), !dbg !511
+  %call = call i32 @rand() #9, !dbg !512
+  %tobool = icmp ne i32 %call, 0, !dbg !512
+  br i1 %tobool, label %if.then, label %if.else, !dbg !514
+
+if.then:                                          ; preds = %entry
+  %0 = load ptr, ptr %Buf1.addr, align 8, !dbg !515
+  store ptr %0, ptr %ToPrint, align 8, !dbg !517
+  br label %if.end, !dbg !518
+
+if.else:                                          ; preds = %entry
+  %1 = load ptr, ptr %Buf2.addr, align 8, !dbg !519
+  store ptr %1, ptr %ToPrint, align 8, !dbg !521
+  br label %if.end
+
+if.end:                                           ; preds = %if.else, %if.then
+  %2 = load ptr, ptr %ToPrint, align 8, !dbg !522
+  %3 = load i64, ptr %Sz.addr, align 8, !dbg !523
+  call void @_Z4sinkPKcm(ptr noundef %2, i64 noundef %3), !dbg !524
+  ret void, !dbg !525
+}
+
+; Function Attrs: nounwind
+declare i32 @rand() #5
+
+; Function Attrs: mustprogress noinline norecurse optnone uwtable
+define dso_local noundef i32 @main() #6 !dbg !526 {
+entry:
+  %Buffer = alloca [128 x i8], align 16
+  %AnotherBuffer = alloca [128 x i8], align 16
+  call void @llvm.dbg.declare(metadata ptr %Buffer, metadata !527, metadata !DIExpression()), !dbg !531
+  %arraydecay = getelementptr inbounds [128 x i8], ptr %Buffer, i64 0, i64 0, !dbg !532
+  %call = call noundef i64 @_Z6sourcePcm(ptr noundef %arraydecay, i64 noundef 128), !dbg !533
+  call void @llvm.dbg.declare(metadata ptr %AnotherBuffer, metadata !534, metadata !DIExpression()), !dbg !535
+  call void @llvm.memcpy.p0.p0.i64(ptr align 16 %AnotherBuffer, ptr align 16 @__const.main.AnotherBuffer, i64 128, i1 false), !dbg !535
+  %arraydecay1 = getelementptr inbounds [128 x i8], ptr %Buffer, i64 0, i64 0, !dbg !536
+  %arraydecay2 = getelementptr inbounds [128 x i8], ptr %AnotherBuffer, i64 0, i64 0, !dbg !537
+  call void @_Z5printPKcS0_m(ptr noundef %arraydecay1, ptr noundef %arraydecay2, i64 noundef 128), !dbg !538
+  ret i32 0, !dbg !539
+}
+
+; Function Attrs: argmemonly nocallback nofree nounwind willreturn
+declare void @llvm.memcpy.p0.p0.i64(ptr noalias nocapture writeonly, ptr noalias nocapture readonly, i64, i1 immarg) #7
+
+attributes #0 = { mustprogress noinline optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #1 = { nocallback nofree nosync nounwind readnone speculatable willreturn }
+attributes #2 = { inaccessiblememonly nocallback nofree nosync nounwind willreturn }
+attributes #3 = { "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #4 = { nounwind readonly willreturn "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #5 = { nounwind "frame-pointer"="all" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #6 = { mustprogress noinline norecurse optnone uwtable "frame-pointer"="all" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
+attributes #7 = { argmemonly nocallback nofree nounwind willreturn }
+attributes #8 = { nounwind readonly willreturn }
+attributes #9 = { nounwind }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!466, !467, !468, !469, !470, !471, !472}
+!llvm.ident = !{!473}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, imports: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "taint.cpp", directory: "phasar/examples/llvm-hello-world/target", checksumkind: CSK_MD5, checksum: "8c1eb5daa247b40a4b4eba02b5bbf906")
+!2 = !{!3, !9, !15, !21, !26, !31, !33, !35, !37, !39, !46, !53, !60, !64, !68, !72, !81, !85, !87, !92, !98, !102, !109, !111, !115, !119, !123, !125, !129, !133, !135, !139, !141, !143, !147, !151, !155, !159, !163, !167, !169, !176, !180, !184, !189, !191, !193, !197, !201, !202, !203, !204, !205, !206, !210, !214, !220, !224, !229, !231, !236, !238, !242, !250, !254, !258, !262, !266, !270, !274, !278, !282, !286, !293, !297, !301, !303, !305, !309, !314, !320, !324, !328, !330, !337, !341, !348, !350, !354, !358, !362, !366, !371, !376, !381, !382, !383, !384, !386, !387, !388, !389, !390, !391, !392, !398, !402, !406, !410, !414, !418, !420, !422, !424, !428, !432, !436, !440, !444, !446, !448, !450, !454, !458, !462, !464}
+!3 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !5, file: !8, line: 58)
+!4 = !DINamespace(name: "std", scope: null)
+!5 = !DIDerivedType(tag: DW_TAG_typedef, name: "max_align_t", file: !6, line: 24, baseType: !7)
+!6 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/__stddef_max_align_t.h", directory: "", checksumkind: CSK_MD5, checksum: "48e8e2456f77e6cda35d245130fa7259")
+!7 = !DICompositeType(tag: DW_TAG_structure_type, file: !6, line: 19, size: 256, flags: DIFlagFwdDecl, identifier: "_ZTS11max_align_t")
+!8 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstddef", directory: "")
+!9 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !10, file: !14, line: 98)
+!10 = !DIDerivedType(tag: DW_TAG_typedef, name: "FILE", file: !11, line: 7, baseType: !12)
+!11 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/FILE.h", directory: "", checksumkind: CSK_MD5, checksum: "571f9fb6223c42439075fdde11a0de5d")
+!12 = !DICompositeType(tag: DW_TAG_structure_type, name: "_IO_FILE", file: !13, line: 49, size: 1728, flags: DIFlagFwdDecl, identifier: "_ZTS8_IO_FILE")
+!13 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h", directory: "", checksumkind: CSK_MD5, checksum: "7a6d4a00a37ee6b9a40cd04bd01f5d00")
+!14 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdio", directory: "")
+!15 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !16, file: !14, line: 99)
+!16 = !DIDerivedType(tag: DW_TAG_typedef, name: "fpos_t", file: !17, line: 85, baseType: !18)
+!17 = !DIFile(filename: "/usr/include/stdio.h", directory: "", checksumkind: CSK_MD5, checksum: "1e435c46987a169d9f9186f63a512303")
+!18 = !DIDerivedType(tag: DW_TAG_typedef, name: "__fpos_t", file: !19, line: 14, baseType: !20)
+!19 = !DIFile(filename: "/usr/include/x86_64-linux-gnu/bits/types/__fpos_t.h", directory: "", checksumkind: CSK_MD5, checksum: "32de8bdaf3551a6c0a9394f9af4389ce")
+!20 = !DICompositeType(tag: DW_TAG_structure_type, name: "_G_fpos_t", file: !19, line: 10, size: 128, flags: DIFlagFwdDecl, identifier: "_ZTS9_G_fpos_t")
+!21 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !22, file: !14, line: 101)
+!22 = !DISubprogram(name: "clearerr", scope: !17, file: !17, line: 860, type: !23, flags: DIFlagPrototyped, spFlags: 0)
+!23 = !DISubroutineType(types: !24)
+!24 = !{null, !25}
+!25 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!26 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !27, file: !14, line: 102)
+!27 = !DISubprogram(name: "fclose", scope: !17, file: !17, line: 184, type: !28, flags: DIFlagPrototyped, spFlags: 0)
+!28 = !DISubroutineType(types: !29)
+!29 = !{!30, !25}
+!30 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!31 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !32, file: !14, line: 103)
+!32 = !DISubprogram(name: "feof", scope: !17, file: !17, line: 862, type: !28, flags: DIFlagPrototyped, spFlags: 0)
+!33 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !34, file: !14, line: 104)
+!34 = !DISubprogram(name: "ferror", scope: !17, file: !17, line: 864, type: !28, flags: DIFlagPrototyped, spFlags: 0)
+!35 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !36, file: !14, line: 105)
+!36 = !DISubprogram(name: "fflush", scope: !17, file: !17, line: 236, type: !28, flags: DIFlagPrototyped, spFlags: 0)
+!37 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !38, file: !14, line: 106)
+!38 = !DISubprogram(name: "fgetc", scope: !17, file: !17, line: 575, type: !28, flags: DIFlagPrototyped, spFlags: 0)
+!39 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !40, file: !14, line: 107)
+!40 = !DISubprogram(name: "fgetpos", scope: !17, file: !17, line: 829, type: !41, flags: DIFlagPrototyped, spFlags: 0)
+!41 = !DISubroutineType(types: !42)
+!42 = !{!30, !43, !44}
+!43 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !25)
+!44 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !45)
+!45 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !16, size: 64)
+!46 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !47, file: !14, line: 108)
+!47 = !DISubprogram(name: "fgets", scope: !17, file: !17, line: 654, type: !48, flags: DIFlagPrototyped, spFlags: 0)
+!48 = !DISubroutineType(types: !49)
+!49 = !{!50, !52, !30, !43}
+!50 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !51, size: 64)
+!51 = !DIBasicType(name: "char", size: 8, encoding: DW_ATE_signed_char)
+!52 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !50)
+!53 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !54, file: !14, line: 109)
+!54 = !DISubprogram(name: "fopen", scope: !17, file: !17, line: 264, type: !55, flags: DIFlagPrototyped, spFlags: 0)
+!55 = !DISubroutineType(types: !56)
+!56 = !{!25, !57, !57}
+!57 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !58)
+!58 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !59, size: 64)
+!59 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !51)
+!60 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !61, file: !14, line: 110)
+!61 = !DISubprogram(name: "fprintf", scope: !17, file: !17, line: 357, type: !62, flags: DIFlagPrototyped, spFlags: 0)
+!62 = !DISubroutineType(types: !63)
+!63 = !{!30, !43, !57, null}
+!64 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !65, file: !14, line: 111)
+!65 = !DISubprogram(name: "fputc", scope: !17, file: !17, line: 611, type: !66, flags: DIFlagPrototyped, spFlags: 0)
+!66 = !DISubroutineType(types: !67)
+!67 = !{!30, !30, !25}
+!68 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !69, file: !14, line: 112)
+!69 = !DISubprogram(name: "fputs", scope: !17, file: !17, line: 717, type: !70, flags: DIFlagPrototyped, spFlags: 0)
+!70 = !DISubroutineType(types: !71)
+!71 = !{!30, !57, !43}
+!72 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !73, file: !14, line: 113)
+!73 = !DISubprogram(name: "fread", scope: !17, file: !17, line: 738, type: !74, flags: DIFlagPrototyped, spFlags: 0)
+!74 = !DISubroutineType(types: !75)
+!75 = !{!76, !79, !76, !76, !43}
+!76 = !DIDerivedType(tag: DW_TAG_typedef, name: "size_t", file: !77, line: 46, baseType: !78)
+!77 = !DIFile(filename: "/usr/local/llvm-15/lib/clang/15.0.7/include/stddef.h", directory: "", checksumkind: CSK_MD5, checksum: "b76978376d35d5cd171876ac58ac1256")
+!78 = !DIBasicType(name: "unsigned long", size: 64, encoding: DW_ATE_unsigned)
+!79 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !80)
+!80 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: null, size: 64)
+!81 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !82, file: !14, line: 114)
+!82 = !DISubprogram(name: "freopen", scope: !17, file: !17, line: 271, type: !83, flags: DIFlagPrototyped, spFlags: 0)
+!83 = !DISubroutineType(types: !84)
+!84 = !{!25, !57, !57, !43}
+!85 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !86, file: !14, line: 115)
+!86 = !DISubprogram(name: "fscanf", linkageName: "__isoc23_fscanf", scope: !17, file: !17, line: 442, type: !62, flags: DIFlagPrototyped, spFlags: 0)
+!87 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !88, file: !14, line: 116)
+!88 = !DISubprogram(name: "fseek", scope: !17, file: !17, line: 779, type: !89, flags: DIFlagPrototyped, spFlags: 0)
+!89 = !DISubroutineType(types: !90)
+!90 = !{!30, !25, !91, !30}
+!91 = !DIBasicType(name: "long", size: 64, encoding: DW_ATE_signed)
+!92 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !93, file: !14, line: 117)
+!93 = !DISubprogram(name: "fsetpos", scope: !17, file: !17, line: 835, type: !94, flags: DIFlagPrototyped, spFlags: 0)
+!94 = !DISubroutineType(types: !95)
+!95 = !{!30, !25, !96}
+!96 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !97, size: 64)
+!97 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !16)
+!98 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !99, file: !14, line: 118)
+!99 = !DISubprogram(name: "ftell", scope: !17, file: !17, line: 785, type: !100, flags: DIFlagPrototyped, spFlags: 0)
+!100 = !DISubroutineType(types: !101)
+!101 = !{!91, !25}
+!102 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !103, file: !14, line: 119)
+!103 = !DISubprogram(name: "fwrite", scope: !17, file: !17, line: 745, type: !104, flags: DIFlagPrototyped, spFlags: 0)
+!104 = !DISubroutineType(types: !105)
+!105 = !{!76, !106, !76, !76, !43}
+!106 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !107)
+!107 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !108, size: 64)
+!108 = !DIDerivedType(tag: DW_TAG_const_type, baseType: null)
+!109 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !110, file: !14, line: 120)
+!110 = !DISubprogram(name: "getc", scope: !17, file: !17, line: 576, type: !28, flags: DIFlagPrototyped, spFlags: 0)
+!111 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !112, file: !14, line: 121)
+!112 = !DISubprogram(name: "getchar", scope: !17, file: !17, line: 582, type: !113, flags: DIFlagPrototyped, spFlags: 0)
+!113 = !DISubroutineType(types: !114)
+!114 = !{!30}
+!115 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !116, file: !14, line: 126)
+!116 = !DISubprogram(name: "perror", scope: !17, file: !17, line: 878, type: !117, flags: DIFlagPrototyped, spFlags: 0)
+!117 = !DISubroutineType(types: !118)
+!118 = !{null, !58}
+!119 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !120, file: !14, line: 127)
+!120 = !DISubprogram(name: "printf", scope: !17, file: !17, line: 363, type: !121, flags: DIFlagPrototyped, spFlags: 0)
+!121 = !DISubroutineType(types: !122)
+!122 = !{!30, !57, null}
+!123 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !124, file: !14, line: 128)
+!124 = !DISubprogram(name: "putc", scope: !17, file: !17, line: 612, type: !66, flags: DIFlagPrototyped, spFlags: 0)
+!125 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !126, file: !14, line: 129)
+!126 = !DISubprogram(name: "putchar", scope: !17, file: !17, line: 618, type: !127, flags: DIFlagPrototyped, spFlags: 0)
+!127 = !DISubroutineType(types: !128)
+!128 = !{!30, !30}
+!129 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !130, file: !14, line: 130)
+!130 = !DISubprogram(name: "puts", scope: !17, file: !17, line: 724, type: !131, flags: DIFlagPrototyped, spFlags: 0)
+!131 = !DISubroutineType(types: !132)
+!132 = !{!30, !58}
+!133 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !134, file: !14, line: 131)
+!134 = !DISubprogram(name: "remove", scope: !17, file: !17, line: 158, type: !131, flags: DIFlagPrototyped, spFlags: 0)
+!135 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !136, file: !14, line: 132)
+!136 = !DISubprogram(name: "rename", scope: !17, file: !17, line: 160, type: !137, flags: DIFlagPrototyped, spFlags: 0)
+!137 = !DISubroutineType(types: !138)
+!138 = !{!30, !58, !58}
+!139 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !140, file: !14, line: 133)
+!140 = !DISubprogram(name: "rewind", scope: !17, file: !17, line: 790, type: !23, flags: DIFlagPrototyped, spFlags: 0)
+!141 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !142, file: !14, line: 134)
+!142 = !DISubprogram(name: "scanf", linkageName: "__isoc23_scanf", scope: !17, file: !17, line: 445, type: !121, flags: DIFlagPrototyped, spFlags: 0)
+!143 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !144, file: !14, line: 135)
+!144 = !DISubprogram(name: "setbuf", scope: !17, file: !17, line: 334, type: !145, flags: DIFlagPrototyped, spFlags: 0)
+!145 = !DISubroutineType(types: !146)
+!146 = !{null, !43, !52}
+!147 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !148, file: !14, line: 136)
+!148 = !DISubprogram(name: "setvbuf", scope: !17, file: !17, line: 339, type: !149, flags: DIFlagPrototyped, spFlags: 0)
+!149 = !DISubroutineType(types: !150)
+!150 = !{!30, !43, !52, !30, !76}
+!151 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !152, file: !14, line: 137)
+!152 = !DISubprogram(name: "sprintf", scope: !17, file: !17, line: 365, type: !153, flags: DIFlagPrototyped, spFlags: 0)
+!153 = !DISubroutineType(types: !154)
+!154 = !{!30, !52, !57, null}
+!155 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !156, file: !14, line: 138)
+!156 = !DISubprogram(name: "sscanf", linkageName: "__isoc23_sscanf", scope: !17, file: !17, line: 447, type: !157, flags: DIFlagPrototyped, spFlags: 0)
+!157 = !DISubroutineType(types: !158)
+!158 = !{!30, !57, !57, null}
+!159 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !160, file: !14, line: 139)
+!160 = !DISubprogram(name: "tmpfile", scope: !17, file: !17, line: 194, type: !161, flags: DIFlagPrototyped, spFlags: 0)
+!161 = !DISubroutineType(types: !162)
+!162 = !{!25}
+!163 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !164, file: !14, line: 141)
+!164 = !DISubprogram(name: "tmpnam", scope: !17, file: !17, line: 211, type: !165, flags: DIFlagPrototyped, spFlags: 0)
+!165 = !DISubroutineType(types: !166)
+!166 = !{!50, !50}
+!167 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !168, file: !14, line: 143)
+!168 = !DISubprogram(name: "ungetc", scope: !17, file: !17, line: 731, type: !66, flags: DIFlagPrototyped, spFlags: 0)
+!169 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !170, file: !14, line: 144)
+!170 = !DISubprogram(name: "vfprintf", scope: !17, file: !17, line: 372, type: !171, flags: DIFlagPrototyped, spFlags: 0)
+!171 = !DISubroutineType(types: !172)
+!172 = !{!30, !43, !57, !173}
+!173 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !174, size: 64)
+!174 = !DICompositeType(tag: DW_TAG_structure_type, name: "__va_list_tag", file: !175, size: 192, flags: DIFlagFwdDecl, identifier: "_ZTS13__va_list_tag")
+!175 = !DIFile(filename: "taint.cpp", directory: "phasar/examples/llvm-hello-world/target")
+!176 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !177, file: !14, line: 145)
+!177 = !DISubprogram(name: "vprintf", scope: !17, file: !17, line: 378, type: !178, flags: DIFlagPrototyped, spFlags: 0)
+!178 = !DISubroutineType(types: !179)
+!179 = !{!30, !57, !173}
+!180 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !181, file: !14, line: 146)
+!181 = !DISubprogram(name: "vsprintf", scope: !17, file: !17, line: 380, type: !182, flags: DIFlagPrototyped, spFlags: 0)
+!182 = !DISubroutineType(types: !183)
+!183 = !{!30, !52, !57, !173}
+!184 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !186, file: !14, line: 175)
+!185 = !DINamespace(name: "__gnu_cxx", scope: null)
+!186 = !DISubprogram(name: "snprintf", scope: !17, file: !17, line: 385, type: !187, flags: DIFlagPrototyped, spFlags: 0)
+!187 = !DISubroutineType(types: !188)
+!188 = !{!30, !52, !76, !57, null}
+!189 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !190, file: !14, line: 176)
+!190 = !DISubprogram(name: "vfscanf", linkageName: "__isoc23_vfscanf", scope: !17, file: !17, line: 511, type: !171, flags: DIFlagPrototyped, spFlags: 0)
+!191 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !192, file: !14, line: 177)
+!192 = !DISubprogram(name: "vscanf", linkageName: "__isoc23_vscanf", scope: !17, file: !17, line: 516, type: !178, flags: DIFlagPrototyped, spFlags: 0)
+!193 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !194, file: !14, line: 178)
+!194 = !DISubprogram(name: "vsnprintf", scope: !17, file: !17, line: 389, type: !195, flags: DIFlagPrototyped, spFlags: 0)
+!195 = !DISubroutineType(types: !196)
+!196 = !{!30, !52, !76, !57, !173}
+!197 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !198, file: !14, line: 179)
+!198 = !DISubprogram(name: "vsscanf", linkageName: "__isoc23_vsscanf", scope: !17, file: !17, line: 519, type: !199, flags: DIFlagPrototyped, spFlags: 0)
+!199 = !DISubroutineType(types: !200)
+!200 = !{!30, !57, !57, !173}
+!201 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !186, file: !14, line: 185)
+!202 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !190, file: !14, line: 186)
+!203 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !192, file: !14, line: 187)
+!204 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !194, file: !14, line: 188)
+!205 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !198, file: !14, line: 189)
+!206 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !207, file: !209, line: 52)
+!207 = !DISubprogram(name: "abs", scope: !208, file: !208, line: 980, type: !127, flags: DIFlagPrototyped, spFlags: 0)
+!208 = !DIFile(filename: "/usr/include/stdlib.h", directory: "", checksumkind: CSK_MD5, checksum: "7fa2ecb2348a66f8b44ab9a15abd0b72")
+!209 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/bits/std_abs.h", directory: "")
+!210 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !211, file: !213, line: 131)
+!211 = !DIDerivedType(tag: DW_TAG_typedef, name: "div_t", file: !208, line: 63, baseType: !212)
+!212 = !DICompositeType(tag: DW_TAG_structure_type, file: !208, line: 59, size: 64, flags: DIFlagFwdDecl, identifier: "_ZTS5div_t")
+!213 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstdlib", directory: "")
+!214 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !215, file: !213, line: 132)
+!215 = !DIDerivedType(tag: DW_TAG_typedef, name: "ldiv_t", file: !208, line: 71, baseType: !216)
+!216 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !208, line: 67, size: 128, flags: DIFlagTypePassByValue, elements: !217, identifier: "_ZTS6ldiv_t")
+!217 = !{!218, !219}
+!218 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !216, file: !208, line: 69, baseType: !91, size: 64)
+!219 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !216, file: !208, line: 70, baseType: !91, size: 64, offset: 64)
+!220 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !221, file: !213, line: 134)
+!221 = !DISubprogram(name: "abort", scope: !208, file: !208, line: 730, type: !222, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!222 = !DISubroutineType(types: !223)
+!223 = !{null}
+!224 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !225, file: !213, line: 138)
+!225 = !DISubprogram(name: "atexit", scope: !208, file: !208, line: 734, type: !226, flags: DIFlagPrototyped, spFlags: 0)
+!226 = !DISubroutineType(types: !227)
+!227 = !{!30, !228}
+!228 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !222, size: 64)
+!229 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !230, file: !213, line: 141)
+!230 = !DISubprogram(name: "at_quick_exit", scope: !208, file: !208, line: 739, type: !226, flags: DIFlagPrototyped, spFlags: 0)
+!231 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !232, file: !213, line: 144)
+!232 = !DISubprogram(name: "atof", scope: !208, file: !208, line: 102, type: !233, flags: DIFlagPrototyped, spFlags: 0)
+!233 = !DISubroutineType(types: !234)
+!234 = !{!235, !58}
+!235 = !DIBasicType(name: "double", size: 64, encoding: DW_ATE_float)
+!236 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !237, file: !213, line: 145)
+!237 = !DISubprogram(name: "atoi", scope: !208, file: !208, line: 105, type: !131, flags: DIFlagPrototyped, spFlags: 0)
+!238 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !239, file: !213, line: 146)
+!239 = !DISubprogram(name: "atol", scope: !208, file: !208, line: 108, type: !240, flags: DIFlagPrototyped, spFlags: 0)
+!240 = !DISubroutineType(types: !241)
+!241 = !{!91, !58}
+!242 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !243, file: !213, line: 147)
+!243 = !DISubprogram(name: "bsearch", scope: !208, file: !208, line: 960, type: !244, flags: DIFlagPrototyped, spFlags: 0)
+!244 = !DISubroutineType(types: !245)
+!245 = !{!80, !107, !107, !76, !76, !246}
+!246 = !DIDerivedType(tag: DW_TAG_typedef, name: "__compar_fn_t", file: !208, line: 948, baseType: !247)
+!247 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !248, size: 64)
+!248 = !DISubroutineType(types: !249)
+!249 = !{!30, !107, !107}
+!250 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !251, file: !213, line: 148)
+!251 = !DISubprogram(name: "calloc", scope: !208, file: !208, line: 675, type: !252, flags: DIFlagPrototyped, spFlags: 0)
+!252 = !DISubroutineType(types: !253)
+!253 = !{!80, !76, !76}
+!254 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !255, file: !213, line: 149)
+!255 = !DISubprogram(name: "div", scope: !208, file: !208, line: 992, type: !256, flags: DIFlagPrototyped, spFlags: 0)
+!256 = !DISubroutineType(types: !257)
+!257 = !{!211, !30, !30}
+!258 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !259, file: !213, line: 150)
+!259 = !DISubprogram(name: "exit", scope: !208, file: !208, line: 756, type: !260, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!260 = !DISubroutineType(types: !261)
+!261 = !{null, !30}
+!262 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !263, file: !213, line: 151)
+!263 = !DISubprogram(name: "free", scope: !208, file: !208, line: 687, type: !264, flags: DIFlagPrototyped, spFlags: 0)
+!264 = !DISubroutineType(types: !265)
+!265 = !{null, !80}
+!266 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !267, file: !213, line: 152)
+!267 = !DISubprogram(name: "getenv", scope: !208, file: !208, line: 773, type: !268, flags: DIFlagPrototyped, spFlags: 0)
+!268 = !DISubroutineType(types: !269)
+!269 = !{!50, !58}
+!270 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !271, file: !213, line: 153)
+!271 = !DISubprogram(name: "labs", scope: !208, file: !208, line: 981, type: !272, flags: DIFlagPrototyped, spFlags: 0)
+!272 = !DISubroutineType(types: !273)
+!273 = !{!91, !91}
+!274 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !275, file: !213, line: 154)
+!275 = !DISubprogram(name: "ldiv", scope: !208, file: !208, line: 994, type: !276, flags: DIFlagPrototyped, spFlags: 0)
+!276 = !DISubroutineType(types: !277)
+!277 = !{!215, !91, !91}
+!278 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !279, file: !213, line: 155)
+!279 = !DISubprogram(name: "malloc", scope: !208, file: !208, line: 672, type: !280, flags: DIFlagPrototyped, spFlags: 0)
+!280 = !DISubroutineType(types: !281)
+!281 = !{!80, !76}
+!282 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !283, file: !213, line: 157)
+!283 = !DISubprogram(name: "mblen", scope: !208, file: !208, line: 1062, type: !284, flags: DIFlagPrototyped, spFlags: 0)
+!284 = !DISubroutineType(types: !285)
+!285 = !{!30, !58, !76}
+!286 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !287, file: !213, line: 158)
+!287 = !DISubprogram(name: "mbstowcs", scope: !208, file: !208, line: 1073, type: !288, flags: DIFlagPrototyped, spFlags: 0)
+!288 = !DISubroutineType(types: !289)
+!289 = !{!76, !290, !57, !76}
+!290 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !291)
+!291 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !292, size: 64)
+!292 = !DIBasicType(name: "wchar_t", size: 32, encoding: DW_ATE_signed)
+!293 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !294, file: !213, line: 159)
+!294 = !DISubprogram(name: "mbtowc", scope: !208, file: !208, line: 1065, type: !295, flags: DIFlagPrototyped, spFlags: 0)
+!295 = !DISubroutineType(types: !296)
+!296 = !{!30, !290, !57, !76}
+!297 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !298, file: !213, line: 161)
+!298 = !DISubprogram(name: "qsort", scope: !208, file: !208, line: 970, type: !299, flags: DIFlagPrototyped, spFlags: 0)
+!299 = !DISubroutineType(types: !300)
+!300 = !{null, !80, !76, !76, !246}
+!301 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !302, file: !213, line: 164)
+!302 = !DISubprogram(name: "quick_exit", scope: !208, file: !208, line: 762, type: !260, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!303 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !304, file: !213, line: 167)
+!304 = !DISubprogram(name: "rand", scope: !208, file: !208, line: 573, type: !113, flags: DIFlagPrototyped, spFlags: 0)
+!305 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !306, file: !213, line: 168)
+!306 = !DISubprogram(name: "realloc", scope: !208, file: !208, line: 683, type: !307, flags: DIFlagPrototyped, spFlags: 0)
+!307 = !DISubroutineType(types: !308)
+!308 = !{!80, !80, !76}
+!309 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !310, file: !213, line: 169)
+!310 = !DISubprogram(name: "srand", scope: !208, file: !208, line: 575, type: !311, flags: DIFlagPrototyped, spFlags: 0)
+!311 = !DISubroutineType(types: !312)
+!312 = !{null, !313}
+!313 = !DIBasicType(name: "unsigned int", size: 32, encoding: DW_ATE_unsigned)
+!314 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !315, file: !213, line: 170)
+!315 = !DISubprogram(name: "strtod", scope: !208, file: !208, line: 118, type: !316, flags: DIFlagPrototyped, spFlags: 0)
+!316 = !DISubroutineType(types: !317)
+!317 = !{!235, !57, !318}
+!318 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !319)
+!319 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !50, size: 64)
+!320 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !321, file: !213, line: 171)
+!321 = !DISubprogram(name: "strtol", linkageName: "__isoc23_strtol", scope: !208, file: !208, line: 215, type: !322, flags: DIFlagPrototyped, spFlags: 0)
+!322 = !DISubroutineType(types: !323)
+!323 = !{!91, !57, !318, !30}
+!324 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !325, file: !213, line: 172)
+!325 = !DISubprogram(name: "strtoul", linkageName: "__isoc23_strtoul", scope: !208, file: !208, line: 219, type: !326, flags: DIFlagPrototyped, spFlags: 0)
+!326 = !DISubroutineType(types: !327)
+!327 = !{!78, !57, !318, !30}
+!328 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !329, file: !213, line: 173)
+!329 = !DISubprogram(name: "system", scope: !208, file: !208, line: 923, type: !131, flags: DIFlagPrototyped, spFlags: 0)
+!330 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !331, file: !213, line: 175)
+!331 = !DISubprogram(name: "wcstombs", scope: !208, file: !208, line: 1077, type: !332, flags: DIFlagPrototyped, spFlags: 0)
+!332 = !DISubroutineType(types: !333)
+!333 = !{!76, !52, !334, !76}
+!334 = !DIDerivedType(tag: DW_TAG_restrict_type, baseType: !335)
+!335 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !336, size: 64)
+!336 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !292)
+!337 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !338, file: !213, line: 176)
+!338 = !DISubprogram(name: "wctomb", scope: !208, file: !208, line: 1069, type: !339, flags: DIFlagPrototyped, spFlags: 0)
+!339 = !DISubroutineType(types: !340)
+!340 = !{!30, !50, !292}
+!341 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !342, file: !213, line: 204)
+!342 = !DIDerivedType(tag: DW_TAG_typedef, name: "lldiv_t", file: !208, line: 81, baseType: !343)
+!343 = distinct !DICompositeType(tag: DW_TAG_structure_type, file: !208, line: 77, size: 128, flags: DIFlagTypePassByValue, elements: !344, identifier: "_ZTS7lldiv_t")
+!344 = !{!345, !347}
+!345 = !DIDerivedType(tag: DW_TAG_member, name: "quot", scope: !343, file: !208, line: 79, baseType: !346, size: 64)
+!346 = !DIBasicType(name: "long long", size: 64, encoding: DW_ATE_signed)
+!347 = !DIDerivedType(tag: DW_TAG_member, name: "rem", scope: !343, file: !208, line: 80, baseType: !346, size: 64, offset: 64)
+!348 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !349, file: !213, line: 210)
+!349 = !DISubprogram(name: "_Exit", scope: !208, file: !208, line: 768, type: !260, flags: DIFlagPrototyped | DIFlagNoReturn, spFlags: 0)
+!350 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !351, file: !213, line: 214)
+!351 = !DISubprogram(name: "llabs", scope: !208, file: !208, line: 984, type: !352, flags: DIFlagPrototyped, spFlags: 0)
+!352 = !DISubroutineType(types: !353)
+!353 = !{!346, !346}
+!354 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !355, file: !213, line: 220)
+!355 = !DISubprogram(name: "lldiv", scope: !208, file: !208, line: 998, type: !356, flags: DIFlagPrototyped, spFlags: 0)
+!356 = !DISubroutineType(types: !357)
+!357 = !{!342, !346, !346}
+!358 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !359, file: !213, line: 231)
+!359 = !DISubprogram(name: "atoll", scope: !208, file: !208, line: 113, type: !360, flags: DIFlagPrototyped, spFlags: 0)
+!360 = !DISubroutineType(types: !361)
+!361 = !{!346, !58}
+!362 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !363, file: !213, line: 232)
+!363 = !DISubprogram(name: "strtoll", linkageName: "__isoc23_strtoll", scope: !208, file: !208, line: 238, type: !364, flags: DIFlagPrototyped, spFlags: 0)
+!364 = !DISubroutineType(types: !365)
+!365 = !{!346, !57, !318, !30}
+!366 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !367, file: !213, line: 233)
+!367 = !DISubprogram(name: "strtoull", linkageName: "__isoc23_strtoull", scope: !208, file: !208, line: 243, type: !368, flags: DIFlagPrototyped, spFlags: 0)
+!368 = !DISubroutineType(types: !369)
+!369 = !{!370, !57, !318, !30}
+!370 = !DIBasicType(name: "unsigned long long", size: 64, encoding: DW_ATE_unsigned)
+!371 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !372, file: !213, line: 235)
+!372 = !DISubprogram(name: "strtof", scope: !208, file: !208, line: 124, type: !373, flags: DIFlagPrototyped, spFlags: 0)
+!373 = !DISubroutineType(types: !374)
+!374 = !{!375, !57, !318}
+!375 = !DIBasicType(name: "float", size: 32, encoding: DW_ATE_float)
+!376 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !185, entity: !377, file: !213, line: 236)
+!377 = !DISubprogram(name: "strtold", scope: !208, file: !208, line: 127, type: !378, flags: DIFlagPrototyped, spFlags: 0)
+!378 = !DISubroutineType(types: !379)
+!379 = !{!380, !57, !318}
+!380 = !DIBasicType(name: "long double", size: 128, encoding: DW_ATE_float)
+!381 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !342, file: !213, line: 244)
+!382 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !349, file: !213, line: 246)
+!383 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !351, file: !213, line: 248)
+!384 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !385, file: !213, line: 249)
+!385 = !DISubprogram(name: "div", linkageName: "_ZN9__gnu_cxx3divExx", scope: !185, file: !213, line: 217, type: !356, flags: DIFlagPrototyped, spFlags: 0)
+!386 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !355, file: !213, line: 250)
+!387 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !359, file: !213, line: 252)
+!388 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !372, file: !213, line: 253)
+!389 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !363, file: !213, line: 254)
+!390 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !367, file: !213, line: 255)
+!391 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !377, file: !213, line: 256)
+!392 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !393, file: !397, line: 77)
+!393 = !DISubprogram(name: "memchr", scope: !394, file: !394, line: 89, type: !395, flags: DIFlagPrototyped, spFlags: 0)
+!394 = !DIFile(filename: "/usr/include/string.h", directory: "", checksumkind: CSK_MD5, checksum: "165db1185644f68894fa9e0d17055d70")
+!395 = !DISubroutineType(types: !396)
+!396 = !{!107, !107, !30, !76}
+!397 = !DIFile(filename: "/usr/lib/gcc/x86_64-linux-gnu/13/../../../../include/c++/13/cstring", directory: "")
+!398 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !399, file: !397, line: 78)
+!399 = !DISubprogram(name: "memcmp", scope: !394, file: !394, line: 64, type: !400, flags: DIFlagPrototyped, spFlags: 0)
+!400 = !DISubroutineType(types: !401)
+!401 = !{!30, !107, !107, !76}
+!402 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !403, file: !397, line: 79)
+!403 = !DISubprogram(name: "memcpy", scope: !394, file: !394, line: 43, type: !404, flags: DIFlagPrototyped, spFlags: 0)
+!404 = !DISubroutineType(types: !405)
+!405 = !{!80, !79, !106, !76}
+!406 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !407, file: !397, line: 80)
+!407 = !DISubprogram(name: "memmove", scope: !394, file: !394, line: 47, type: !408, flags: DIFlagPrototyped, spFlags: 0)
+!408 = !DISubroutineType(types: !409)
+!409 = !{!80, !80, !107, !76}
+!410 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !411, file: !397, line: 81)
+!411 = !DISubprogram(name: "memset", scope: !394, file: !394, line: 61, type: !412, flags: DIFlagPrototyped, spFlags: 0)
+!412 = !DISubroutineType(types: !413)
+!413 = !{!80, !80, !30, !76}
+!414 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !415, file: !397, line: 82)
+!415 = !DISubprogram(name: "strcat", scope: !394, file: !394, line: 149, type: !416, flags: DIFlagPrototyped, spFlags: 0)
+!416 = !DISubroutineType(types: !417)
+!417 = !{!50, !52, !57}
+!418 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !419, file: !397, line: 83)
+!419 = !DISubprogram(name: "strcmp", scope: !394, file: !394, line: 156, type: !137, flags: DIFlagPrototyped, spFlags: 0)
+!420 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !421, file: !397, line: 84)
+!421 = !DISubprogram(name: "strcoll", scope: !394, file: !394, line: 163, type: !137, flags: DIFlagPrototyped, spFlags: 0)
+!422 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !423, file: !397, line: 85)
+!423 = !DISubprogram(name: "strcpy", scope: !394, file: !394, line: 141, type: !416, flags: DIFlagPrototyped, spFlags: 0)
+!424 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !425, file: !397, line: 86)
+!425 = !DISubprogram(name: "strcspn", scope: !394, file: !394, line: 293, type: !426, flags: DIFlagPrototyped, spFlags: 0)
+!426 = !DISubroutineType(types: !427)
+!427 = !{!76, !58, !58}
+!428 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !429, file: !397, line: 87)
+!429 = !DISubprogram(name: "strerror", scope: !394, file: !394, line: 419, type: !430, flags: DIFlagPrototyped, spFlags: 0)
+!430 = !DISubroutineType(types: !431)
+!431 = !{!50, !30}
+!432 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !433, file: !397, line: 88)
+!433 = !DISubprogram(name: "strlen", scope: !394, file: !394, line: 407, type: !434, flags: DIFlagPrototyped, spFlags: 0)
+!434 = !DISubroutineType(types: !435)
+!435 = !{!76, !58}
+!436 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !437, file: !397, line: 89)
+!437 = !DISubprogram(name: "strncat", scope: !394, file: !394, line: 152, type: !438, flags: DIFlagPrototyped, spFlags: 0)
+!438 = !DISubroutineType(types: !439)
+!439 = !{!50, !52, !57, !76}
+!440 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !441, file: !397, line: 90)
+!441 = !DISubprogram(name: "strncmp", scope: !394, file: !394, line: 159, type: !442, flags: DIFlagPrototyped, spFlags: 0)
+!442 = !DISubroutineType(types: !443)
+!443 = !{!30, !58, !58, !76}
+!444 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !445, file: !397, line: 91)
+!445 = !DISubprogram(name: "strncpy", scope: !394, file: !394, line: 144, type: !438, flags: DIFlagPrototyped, spFlags: 0)
+!446 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !447, file: !397, line: 92)
+!447 = !DISubprogram(name: "strspn", scope: !394, file: !394, line: 297, type: !426, flags: DIFlagPrototyped, spFlags: 0)
+!448 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !449, file: !397, line: 93)
+!449 = !DISubprogram(name: "strtok", scope: !394, file: !394, line: 356, type: !416, flags: DIFlagPrototyped, spFlags: 0)
+!450 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !451, file: !397, line: 94)
+!451 = !DISubprogram(name: "strxfrm", scope: !394, file: !394, line: 166, type: !452, flags: DIFlagPrototyped, spFlags: 0)
+!452 = !DISubroutineType(types: !453)
+!453 = !{!76, !52, !57, !76}
+!454 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !455, file: !397, line: 95)
+!455 = !DISubprogram(name: "strchr", scope: !394, file: !394, line: 228, type: !456, flags: DIFlagPrototyped, spFlags: 0)
+!456 = !DISubroutineType(types: !457)
+!457 = !{!58, !58, !30}
+!458 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !459, file: !397, line: 96)
+!459 = !DISubprogram(name: "strpbrk", scope: !394, file: !394, line: 305, type: !460, flags: DIFlagPrototyped, spFlags: 0)
+!460 = !DISubroutineType(types: !461)
+!461 = !{!58, !58, !58}
+!462 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !463, file: !397, line: 97)
+!463 = !DISubprogram(name: "strrchr", scope: !394, file: !394, line: 255, type: !456, flags: DIFlagPrototyped, spFlags: 0)
+!464 = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !4, entity: !465, file: !397, line: 98)
+!465 = !DISubprogram(name: "strstr", scope: !394, file: !394, line: 332, type: !460, flags: DIFlagPrototyped, spFlags: 0)
+!466 = !{i32 7, !"Dwarf Version", i32 5}
+!467 = !{i32 2, !"Debug Info Version", i32 3}
+!468 = !{i32 1, !"wchar_size", i32 4}
+!469 = !{i32 7, !"PIC Level", i32 2}
+!470 = !{i32 7, !"PIE Level", i32 2}
+!471 = !{i32 7, !"uwtable", i32 2}
+!472 = !{i32 7, !"frame-pointer", i32 2}
+!473 = !{!"clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)"}
+!474 = distinct !DISubprogram(name: "source", linkageName: "_Z6sourcePcm", scope: !1, file: !1, line: 7, type: !475, scopeLine: 8, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !477)
+!475 = !DISubroutineType(types: !476)
+!476 = !{!76, !50, !76}
+!477 = !{}
+!478 = !DILocalVariable(name: "Buffer", arg: 1, scope: !474, file: !1, line: 7, type: !50)
+!479 = !DILocation(line: 7, column: 55, scope: !474)
+!480 = !DILocalVariable(name: "BufferSize", arg: 2, scope: !474, file: !1, line: 8, type: !76)
+!481 = !DILocation(line: 8, column: 22, scope: !474)
+!482 = !DILocation(line: 9, column: 16, scope: !474)
+!483 = !DILocation(line: 9, column: 24, scope: !474)
+!484 = !DILocation(line: 9, column: 39, scope: !474)
+!485 = !DILocation(line: 9, column: 10, scope: !474)
+!486 = !DILocation(line: 9, column: 3, scope: !474)
+!487 = distinct !DISubprogram(name: "sink", linkageName: "_Z4sinkPKcm", scope: !1, file: !1, line: 12, type: !488, scopeLine: 12, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !477)
+!488 = !DISubroutineType(types: !489)
+!489 = !{null, !58, !76}
+!490 = !DILocalVariable(name: "Buf", arg: 1, scope: !487, file: !1, line: 12, type: !58)
+!491 = !DILocation(line: 12, column: 55, scope: !487)
+!492 = !DILocalVariable(name: "BufferSize", arg: 2, scope: !487, file: !1, line: 12, type: !76)
+!493 = !DILocation(line: 12, column: 67, scope: !487)
+!494 = !DILocation(line: 13, column: 10, scope: !487)
+!495 = !DILocation(line: 13, column: 23, scope: !487)
+!496 = !DILocation(line: 13, column: 28, scope: !487)
+!497 = !DILocation(line: 13, column: 15, scope: !487)
+!498 = !DILocation(line: 13, column: 44, scope: !487)
+!499 = !DILocation(line: 13, column: 3, scope: !487)
+!500 = !DILocation(line: 14, column: 1, scope: !487)
+!501 = distinct !DISubprogram(name: "print", linkageName: "_Z5printPKcS0_m", scope: !1, file: !1, line: 16, type: !502, scopeLine: 16, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !477)
+!502 = !DISubroutineType(types: !503)
+!503 = !{null, !58, !58, !76}
+!504 = !DILocalVariable(name: "Buf1", arg: 1, scope: !501, file: !1, line: 16, type: !58)
+!505 = !DILocation(line: 16, column: 24, scope: !501)
+!506 = !DILocalVariable(name: "Buf2", arg: 2, scope: !501, file: !1, line: 16, type: !58)
+!507 = !DILocation(line: 16, column: 42, scope: !501)
+!508 = !DILocalVariable(name: "Sz", arg: 3, scope: !501, file: !1, line: 16, type: !76)
+!509 = !DILocation(line: 16, column: 55, scope: !501)
+!510 = !DILocalVariable(name: "ToPrint", scope: !501, file: !1, line: 18, type: !58)
+!511 = !DILocation(line: 18, column: 15, scope: !501)
+!512 = !DILocation(line: 19, column: 7, scope: !513)
+!513 = distinct !DILexicalBlock(scope: !501, file: !1, line: 19, column: 7)
+!514 = !DILocation(line: 19, column: 7, scope: !501)
+!515 = !DILocation(line: 20, column: 15, scope: !516)
+!516 = distinct !DILexicalBlock(scope: !513, file: !1, line: 19, column: 15)
+!517 = !DILocation(line: 20, column: 13, scope: !516)
+!518 = !DILocation(line: 21, column: 3, scope: !516)
+!519 = !DILocation(line: 22, column: 15, scope: !520)
+!520 = distinct !DILexicalBlock(scope: !513, file: !1, line: 21, column: 10)
+!521 = !DILocation(line: 22, column: 13, scope: !520)
+!522 = !DILocation(line: 25, column: 8, scope: !501)
+!523 = !DILocation(line: 25, column: 17, scope: !501)
+!524 = !DILocation(line: 25, column: 3, scope: !501)
+!525 = !DILocation(line: 26, column: 1, scope: !501)
+!526 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 28, type: !113, scopeLine: 28, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !477)
+!527 = !DILocalVariable(name: "Buffer", scope: !526, file: !1, line: 29, type: !528)
+!528 = !DICompositeType(tag: DW_TAG_array_type, baseType: !51, size: 1024, elements: !529)
+!529 = !{!530}
+!530 = !DISubrange(count: 128)
+!531 = !DILocation(line: 29, column: 8, scope: !526)
+!532 = !DILocation(line: 31, column: 10, scope: !526)
+!533 = !DILocation(line: 31, column: 3, scope: !526)
+!534 = !DILocalVariable(name: "AnotherBuffer", scope: !526, file: !1, line: 32, type: !528)
+!535 = !DILocation(line: 32, column: 8, scope: !526)
+!536 = !DILocation(line: 34, column: 9, scope: !526)
+!537 = !DILocation(line: 34, column: 17, scope: !526)
+!538 = !DILocation(line: 34, column: 3, scope: !526)
+!539 = !DILocation(line: 35, column: 1, scope: !526)
diff --git a/examples/use-phasar-as-library/README.md b/examples/use-phasar-as-library/README.md
index 5f5f6c1828..f764d34578 100644
--- a/examples/use-phasar-as-library/README.md
+++ b/examples/use-phasar-as-library/README.md
@@ -5,4 +5,5 @@ This guide assumes that you have installed PhASAR such that the `find_package` c
 
 You can choose the PhASAR components that you need in the `find_package` command.
 
+Please take a look at the [CMakeLists.txt](./CMakeLists.txt) to see, how you can setup your project to use PhASAR with CMake's `find_package`.
 To use phasar from a custom install location, you may specify the `phasar_ROOT` CMake variable to point to phasar's install directory.
diff --git a/examples/use-phasar-with-fetch-content/README.md b/examples/use-phasar-with-fetch-content/README.md
index 46ea387b0d..4abb718a29 100644
--- a/examples/use-phasar-with-fetch-content/README.md
+++ b/examples/use-phasar-with-fetch-content/README.md
@@ -3,3 +3,5 @@
 This small example shows how you can setup a CMake project that uses PhASAR as a library.
 This guide does not assume that you have installed PhASAR already.
 Instead it will download PhASAR at configure-time and build the necessary parts together with your project as-if it was a sub-module.
+
+Please take a look at the [CMakeLists.txt](./CMakeLists.txt) to see, how you can setup your project to use PhASAR with CMake's FetchContent.
diff --git a/include/phasar/DataFlow/IfdsIde/EntryPointUtils.h b/include/phasar/DataFlow/IfdsIde/EntryPointUtils.h
index 800fe01e7d..6080a9a80e 100644
--- a/include/phasar/DataFlow/IfdsIde/EntryPointUtils.h
+++ b/include/phasar/DataFlow/IfdsIde/EntryPointUtils.h
@@ -12,10 +12,12 @@
 
 #include "phasar/ControlFlow/CFGBase.h"
 #include "phasar/DB/ProjectIRDBBase.h"
+#include "phasar/Domain/BinaryDomain.h"
 
 #include "llvm/ADT/STLExtras.h"
 
 #include <functional>
+#include <type_traits>
 
 namespace psr {
 
@@ -71,10 +73,12 @@ void forallStartingPoints(const EntryRange &EntryPoints, const I *ICF,
 
 template <typename EntryRange, typename C, typename DB, typename SeedsT,
           typename D, typename L>
-void addSeedsForStartingPoints(const EntryRange &EntryPoints,
-                               const ProjectIRDBBase<DB> *IRDB,
-                               const CFGBase<C> &CFG, SeedsT &Seeds,
-                               const D &ZeroValue, const L &BottomValue) {
+std::enable_if_t<std::is_convertible_v<L, typename SeedsT::l_t> &&
+                 std::is_convertible_v<D, typename SeedsT::d_t>>
+addSeedsForStartingPoints(const EntryRange &EntryPoints,
+                          const ProjectIRDBBase<DB> *IRDB,
+                          const CFGBase<C> &CFG, SeedsT &Seeds,
+                          const D &ZeroValue, const L &BottomValue) {
   forallStartingPoints(EntryPoints, IRDB, CFG,
                        [&Seeds, &ZeroValue, &BottomValue](const auto &SP) {
                          Seeds.addSeed(SP, ZeroValue, BottomValue);
@@ -83,14 +87,39 @@ void addSeedsForStartingPoints(const EntryRange &EntryPoints,
 
 template <typename EntryRange, typename I, typename SeedsT, typename D,
           typename L>
-void addSeedsForStartingPoints(const EntryRange &EntryPoints, const I *ICF,
-                               SeedsT &Seeds, const D &ZeroValue,
-                               const L &BottomValue) {
+std::enable_if_t<std::is_convertible_v<L, typename SeedsT::l_t> &&
+                 std::is_convertible_v<D, typename SeedsT::d_t>>
+addSeedsForStartingPoints(const EntryRange &EntryPoints, const I *ICF,
+                          SeedsT &Seeds, const D &ZeroValue,
+                          const L &BottomValue) {
   forallStartingPoints(EntryPoints, ICF,
                        [&Seeds, &ZeroValue, &BottomValue](const auto &SP) {
                          Seeds.addSeed(SP, ZeroValue, BottomValue);
                        });
 }
+
+/// Simplification for IFDS, passing BinaryDomain::BOTTOM as L
+template <typename EntryRange, typename C, typename DB, typename SeedsT,
+          typename D>
+std::enable_if_t<std::is_same_v<BinaryDomain, typename SeedsT::l_t> &&
+                 std::is_convertible_v<D, typename SeedsT::d_t>>
+addSeedsForStartingPoints(const EntryRange &EntryPoints,
+                          const ProjectIRDBBase<DB> *IRDB,
+                          const CFGBase<C> &CFG, SeedsT &Seeds,
+                          const D &ZeroValue) {
+  addSeedsForStartingPoints(EntryPoints, IRDB, CFG, Seeds, ZeroValue,
+                            BinaryDomain::BOTTOM);
+}
+
+/// Simplification for IFDS, passing BinaryDomain::BOTTOM as L
+template <typename EntryRange, typename I, typename SeedsT, typename D>
+std::enable_if_t<std::is_same_v<BinaryDomain, typename SeedsT::l_t> &&
+                 std::is_convertible_v<D, typename SeedsT::d_t>>
+addSeedsForStartingPoints(const EntryRange &EntryPoints, const I *ICF,
+                          SeedsT &Seeds, const D &ZeroValue) {
+  addSeedsForStartingPoints(EntryPoints, ICF, Seeds, ZeroValue,
+                            BinaryDomain::BOTTOM);
+}
 } // namespace psr
 
 #endif // PHASAR_DATAFLOW_IFDSIDE_ENTRYPOINTUTILS_H
diff --git a/include/phasar/DataFlow/IfdsIde/InitialSeeds.h b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
index fa2f86fe14..140cbc0cee 100644
--- a/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
+++ b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
@@ -29,6 +29,10 @@ template <typename N, typename D, typename L> class InitialSeeds {
 public:
   using GeneralizedSeeds = std::map<N, std::map<D, L>>;
 
+  using n_t = N;
+  using d_t = D;
+  using l_t = L;
+
   InitialSeeds() = default;
 
   template <typename LL = L,
diff --git a/include/phasar/PhasarLLVM/DataFlow.h b/include/phasar/PhasarLLVM/DataFlow.h
index abae6a2084..1c4e6a4611 100644
--- a/include/phasar/PhasarLLVM/DataFlow.h
+++ b/include/phasar/PhasarLLVM/DataFlow.h
@@ -10,6 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOW_H
 #define PHASAR_PHASARLLVM_DATAFLOW_H
 
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMSolverResults.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
index 98933d2caf..aac4390f97 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
@@ -66,6 +66,8 @@ class DefaultAliasAwareIDEProblem
 public:
   using typename IDETabulationProblem<AnalysisDomainTy>::db_t;
 
+  using detail::IDEAliasAwareDefaultFlowFunctionsImpl::getAliasInfo;
+
   /// Constructs an IDETabulationProblem with the usual arguments + alias
   /// information.
   ///
@@ -80,8 +82,6 @@ class DefaultAliasAwareIDEProblem
                                                ZeroValue),
         detail::IDEAliasAwareDefaultFlowFunctionsImpl(AS) {}
 
-  using detail::IDEAliasAwareDefaultFlowFunctionsImpl::getAliasInfo;
-
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
                                                           n_t Succ) override {
     return getNormalFlowFunctionImpl(Curr, Succ);
diff --git a/include/phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h b/include/phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h
index aa7941deb5..543e1e575f 100644
--- a/include/phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h
+++ b/include/phasar/PhasarLLVM/TaintConfig/TaintConfigUtilities.h
@@ -85,6 +85,53 @@ void collectSanitizedFacts(ContainerTy &Dest, const LLVMTaintConfig &Config,
     }
   }
 }
+
+// ----------------------------------
+
+template <typename ContainerTy,
+          typename = std::enable_if_t<std::is_same_v<
+              typename ContainerTy::value_type, const llvm::Value *>>>
+[[nodiscard]] ContainerTy getGeneratedFacts(const LLVMTaintConfig &Config,
+                                            const llvm::CallBase *CB,
+                                            const llvm::Function *Callee) {
+  ContainerTy Ret;
+  collectGeneratedFacts(Ret, Config, CB, Callee);
+  return Ret;
+}
+
+template <typename ContainerTy, typename Pred,
+          typename = std::enable_if_t<std::is_same_v<
+              typename ContainerTy::value_type, const llvm::Value *>>>
+[[nodiscard]] ContainerTy
+getLeakedFacts(const LLVMTaintConfig &Config, const llvm::CallBase *CB,
+               const llvm::Function *Callee, Pred &&LeakIf) {
+  ContainerTy Ret;
+  collectLeakedFacts(Ret, Config, CB, Callee, PSR_FWD(LeakIf));
+  return Ret;
+}
+
+template <typename ContainerTy,
+          typename = std::enable_if_t<std::is_same_v<
+              typename ContainerTy::value_type, const llvm::Value *>>>
+[[nodiscard]] ContainerTy getLeakedFacts(const LLVMTaintConfig &Config,
+                                         const llvm::CallBase *CB,
+                                         const llvm::Function *Callee) {
+  ContainerTy Ret;
+  collectLeakedFacts(Ret, Config, CB, Callee);
+  return Ret;
+}
+
+template <typename ContainerTy,
+          typename = std::enable_if_t<std::is_same_v<
+              typename ContainerTy::value_type, const llvm::Value *>>>
+[[nodiscard]] ContainerTy getSanitizedFacts(const LLVMTaintConfig &Config,
+                                            const llvm::CallBase *CB,
+                                            const llvm::Function *Callee) {
+  ContainerTy Ret;
+  collectSanitizedFacts(Ret, Config, CB, Callee);
+  return Ret;
+}
+
 } // namespace psr
 
 #endif // PHASAR_PHASARLLVM_TAINTCONFIG_TAINTCONFIGUTILITIES_H
diff --git a/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp b/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp
index fbdb822424..7528eb9c5d 100644
--- a/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp
+++ b/lib/PhasarLLVM/TaintConfig/LLVMTaintConfig.cpp
@@ -474,7 +474,7 @@ void LLVMTaintConfig::printImpl(llvm::raw_ostream &OS) const {
   OS << "TaintConfiguration: ";
   if (SourceValues.empty() && SinkValues.empty() && SanitizerValues.empty() &&
       !getRegisteredSourceCallBack() && !getRegisteredSinkCallBack()) {
-    OS << "empty";
+    OS << "empty\n";
     return;
   }
   OS << "\n\tSourceCallBack registered: " << (bool)SourceCallBack << '\n';
diff --git a/phasar-clang_more_help.txt b/phasar-clang_more_help.txt
deleted file mode 100644
index c3e53fef4e..0000000000
--- a/phasar-clang_more_help.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- R"(
-===================================================================
-=== Phasar a LLVM-based Static Analysis Framework - User Manual ===
-===================================================================
-
-Clang MODE
-
-
-Command-line options
-====================
-TODO : add further detailed description of the command-line args)"
diff --git a/phasar-llvm_more_help.txt b/phasar-llvm_more_help.txt
deleted file mode 100644
index cded086b77..0000000000
--- a/phasar-llvm_more_help.txt
+++ /dev/null
@@ -1,32 +0,0 @@
- R"(
-===================================================================
-=== Phasar a LLVM-based Static Analysis Framework - User Manual ===
-===================================================================
-
-Analyses
---------
-
-cmd parameter - analysis name - analysis type
-
-=== These analyses are only for testing purposes ===
-none                  - /                                                 - /
-ifds-solvertest       - IFDS solver test                                  - IFDS
-ide-solvertest	      - IDE solver test                                   - IDE
-intra-mono-solvertest - intra MONOTONE solver test                        - MONO
-inter-mono-solvertest - inter MONOTONE solver test (context-based)        - MONO
-
-=== The actual analyses ===
-ifds-fstaint          - static environment variable tracing               - IFDS
-ifds-const            - an immutability analysis                          - IFDS
-ifds-lca              - linear constant propagation                       - IFDS
-ifds-taint            - a taint analysis tracking IO                      - IFDS
-ifds-ta               - type analysis                                     - IFDS
-ifds-uninit           - a simple uninitialized variables analysis         - IFDS
-ide-lca               - an IDE version of the linear constant propagation - IDE
-ide-taint             - an IDE version of the taint analysis              - IDE
-ide-ts                - a simple type analysis                            - IDE
-intra-mono-fca        - full constant propagation analysis                - MONO
-inter-mono-taint      - taint analysis                                    - MONO
-
-Of course the user can choose more than one analysis to be run on the code.
-)"

From 63525662f6a6a67a7ed6a23ed251c27f336915b8 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Fri, 25 Jul 2025 18:10:48 +0200
Subject: [PATCH 13/24] Misc Changes (#773)

* replaced llvm-14 with llvm-15 in relevant files

* some changes

* more efficient call-graph

* String-nbased vtable getter + CG-test with dbg info

* minor in CG

* annotation fix + test fix

* removed bitcasts and fixed tests

* Fix Annotation.cpp + TaintConfigTest

* Quick-fix LLVMTypeHierarchyTest

* fix one IIA test

* Fix StringtestCpp for generalized LCA

* first half of tests fixed

* fixed first half of tests

* fixed all but one test in IDEInstInteractionAnalysisTest

* fixed all but two tests

* Fix IIAFlowFact equality

* Re-add getVFTableGlobal

* fixed some newly failed tests

* trade soundness for precision in LLVMAliasSet

* ci.yml update

* Revert "fixed some newly failed tests"

* pre-commit hook

* Two Tests + xtaint09 test fix for pipeline

* Basic Opaque Pointer Impl, bugged

* switching to DebugInfoFinder

* re-add the quick-fix for LLVMTypeHierarchy

* OpaquePtr type mapping, missing subroutines

* Introducing a pass to save ptr types

* Revert "Introducing a pass to save ptr types"

This reverts commit 2a91b6ddac99665490df6f06789b2013201c37ec.

* moving phasar to DIBasedTypeHierarchy

* full switch to DIBasedTypeHierarchy + Test fixes

* fixed PathTracingTest

* dtaresolver deprecated and test fixes

* Fixed OTFTest

* trimmed trailing whitespace

* minor fixes

* readded TypeToDIType map for RTAResolver

* pre-commit clang-format fix

* pre-commit clang-format llvmbasedicfg.cpp

* moved RTAResolver to DITypes

* implemented review suggestions

* Log error if trying to instantiate DTAResolver + minor

* Add breaking changes

* Also compare gep type in IIA EqualGEPDescriptor

* Expose getDILocation()

* expose getSrcCodeFromIR for DebugLocation + minor

* Remove some unused includes

* Make TaintConfigData compatible with C++20

* Compatibility with opaque pointers

* Allow setting the LLVM version from higher-level projects

* Getting rid of UB in CHAResolver

* Start adding more sophisticated type extraction (WIP)

* Handle function calls in getVarTypeFromIR

* better fallback handling for getDebugLocation, etc

* Better IntraMonoSolver dump

* minor

* improve intra mono dump

* minor

* expose getNonPureVirtualVFTEntry as namespace-scope function + fix build with LLVM 14

* Fix RTA resolver

* Add missing include

* Fix solveIFDSProblem + cherry-pick fix of DIBasedTypeHierarchy::buildTypeGraph

* dump functions from debugger

* Remove unused-variable warning in release mode for CallGraph.h

* minor fix in CHA and RTA resolvers

* Some cleanup

* Add ome additional robustness to LLVMIRToSrc

* Fix AllBottom::compose + make FilteredLLVMAliasSet a bit more robust

* Make getAllExitPoints more flexible + minor

* Handle atexit() in GlobalCtorsDtorsModel (not only __cxa_atexit())

* minor fix in FilteredLLVMAliasSet::isInReachableAllocationSites

* pre-commit

* pre-commit

* Fix name

* Fix new CastInfo for EdgeFunction

* Make LLVMProjectIRDB movable and add static function load() that returns an ErrorOr

* Add function to find the va-list alloca to reduce code duplication

* Remove TODO in ProjectIRDB

* Apply review comments

* minor

---------

Co-authored-by: mxHuber <huber.maximilian.leo@gmail.com>
Co-authored-by: Fabian Schiebel <fabianbs@mail.uni-paderborn.de>
Co-authored-by: Sriteja Kummita <sriteja.ku@gmail.com>
---
 .../phasar/DataFlow/IfdsIde/EdgeFunction.h    |   5 +-
 .../DataFlow/IfdsIde/EdgeFunctionUtils.h      | 213 ++++++++++--------
 .../PhasarLLVM/ControlFlow/LLVMBasedICFG.h    |   2 -
 .../ControlFlow/LLVMVFTableProvider.h         |   9 +
 .../ControlFlow/Resolver/Resolver.h           |   4 +
 .../ControlFlow/SparseLLVMBasedICFG.h         |   2 +-
 .../ControlFlow/SparseLLVMBasedICFGView.h     |   2 +-
 .../phasar/PhasarLLVM/DB/LLVMProjectIRDB.h    |  44 +++-
 .../DataFlow/IfdsIde/LLVMFlowFunctions.h      |  44 +---
 .../Problems/IDEExtendedTaintAnalysis.h       |   2 -
 .../phasar/PhasarLLVM/Utils/LLVMShorthands.h  |  16 +-
 include/phasar/Utils/Macros.h                 |  19 ++
 include/phasar/Utils/Utilities.h              |   3 +-
 lib/CMakeLists.txt                            |   1 -
 .../ControlFlow/GlobalCtorsDtorsModel.cpp     |  64 ++++--
 .../ControlFlow/LLVMBasedCallGraphBuilder.cpp |  10 +-
 .../ControlFlow/LLVMVFTableProvider.cpp       |  42 +++-
 .../ControlFlow/Resolver/CHAResolver.cpp      |   2 +-
 .../ControlFlow/Resolver/OTFResolver.cpp      |  18 +-
 .../ControlFlow/Resolver/RTAResolver.cpp      |  53 ++++-
 .../ControlFlow/Resolver/Resolver.cpp         |   3 +-
 lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp         | 142 +++++++++---
 .../Problems/IDEExtendedTaintAnalysis.cpp     |  25 +-
 .../MapFactsToCalleeFlowFunction.cpp          |  28 +--
 .../MapFactsToCallerFlowFunction.cpp          |  20 +-
 .../IfdsIde/Problems/IDETypeStateAnalysis.cpp |  20 +-
 .../Pointer/FilteredLLVMAliasSet.cpp          |   7 +-
 .../TypeHierarchy/DIBasedTypeHierarchy.cpp    |   2 -
 .../TypeHierarchy/LLVMTypeHierarchy.cpp       |   9 -
 lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp          |  16 +-
 lib/PhasarLLVM/Utils/LLVMShorthands.cpp       |  76 ++++++-
 .../virtual_callsites/CMakeLists.txt          |   1 +
 .../LLVMBasedICFGGlobCtorDtorTest.cpp         |  12 +-
 33 files changed, 554 insertions(+), 362 deletions(-)

diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
index ca6c0ad706..0559e17afe 100644
--- a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
@@ -827,8 +827,7 @@ template <typename L> struct DenseMapInfo<psr::EdgeFunction<L>> {
 
 // LLVM is currently overhauling its casting system. Use the new variant once
 // possible!
-// Note: The new variant (With CastInfo) is not tested yet!
-#if LLVM_MAJOR < 15
+#if LLVM_VERSION_MAJOR < 15
 
 template <typename To, typename L>
 struct isa_impl_cl<To, const psr::EdgeFunction<L>> {
@@ -876,7 +875,7 @@ cast_or_null(const psr::EdgeFunction<L> &EF) noexcept { // NOLINT
 template <typename To, typename L>
 struct CastIsPossible<To, psr::EdgeFunction<L>> {
   static inline bool isPossible(const psr::EdgeFunction<L> &EF) noexcept {
-    return EF->template isa<To>();
+    return EF.template isa<To>();
   }
 };
 
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
index bfbc9d2333..72c4aa1a3f 100644
--- a/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
@@ -40,13 +40,67 @@ template <typename L> struct EdgeIdentity final {
        const EdgeFunction<l_t> &OtherFunction);
 };
 
+template <typename L> struct ConstantEdgeFunction {
+  using l_t = L;
+  using JLattice = JoinLatticeTraits<L>;
+  using value_type = typename NonTopBotValue<l_t>::type;
+
+  [[nodiscard]] l_t computeTarget(ByConstRef<l_t> /*Source*/) const
+      noexcept(std::is_nothrow_constructible_v<l_t, const value_type &>) {
+    static_assert(IsEdgeFunction<ConstantEdgeFunction>);
+    return Value;
+  }
+
+  template <typename ConcreteEF, typename = std::enable_if_t<std::is_base_of_v<
+                                     ConstantEdgeFunction, ConcreteEF>>>
+  [[nodiscard]] static EdgeFunction<l_t>
+  compose(EdgeFunctionRef<ConcreteEF> This,
+          const EdgeFunction<l_t> &SecondFunction);
+
+  template <typename ConcreteEF, typename = std::enable_if_t<std::is_base_of_v<
+                                     ConstantEdgeFunction, ConcreteEF>>>
+  [[nodiscard]] static EdgeFunction<l_t>
+  join(EdgeFunctionRef<ConcreteEF> This,
+       const EdgeFunction<l_t> &OtherFunction);
+
+  [[nodiscard]] constexpr bool isConstant() const noexcept { return true; }
+
+  // -- constant data member
+
+  value_type Value{};
+};
+
+template <typename L, typename = std::enable_if_t<
+                          CanEfficientlyPassByValue<ConstantEdgeFunction<L>>>>
+[[nodiscard]] bool operator==(ConstantEdgeFunction<L> LHS,
+                              ConstantEdgeFunction<L> RHS) noexcept {
+  return LHS.Value == RHS.Value;
+}
+
+template <typename L, typename = std::enable_if_t<
+                          !CanEfficientlyPassByValue<ConstantEdgeFunction<L>>>>
+[[nodiscard]] bool operator==(const ConstantEdgeFunction<L> &LHS,
+                              const ConstantEdgeFunction<L> &RHS) noexcept {
+  return LHS.Value == RHS.Value;
+}
+
+template <typename L>
+[[nodiscard]] llvm::raw_ostream &
+operator<<(llvm::raw_ostream &OS, ByConstRef<ConstantEdgeFunction<L>> Id) {
+  OS << "ConstantEF";
+  if constexpr (is_llvm_printable_v<
+                    typename ConstantEdgeFunction<L>::value_type>) {
+    OS << '[' << Id.Value << ']';
+  }
+  return OS;
+}
+
 template <typename L> struct AllBottom final {
   using l_t = L;
   using JLattice = JoinLatticeTraits<L>;
 
   [[no_unique_address]] std::conditional_t<HasJoinLatticeTraits<l_t>, EmptyType,
-                                           l_t>
-      BottomValue;
+                                           l_t> BottomValue;
 
   [[nodiscard]] l_t computeTarget(ByConstRef<l_t> /*Source*/) const noexcept {
     static_assert(std::is_trivially_copyable_v<AllBottom>);
@@ -61,7 +115,25 @@ template <typename L> struct AllBottom final {
   [[nodiscard]] static EdgeFunction<l_t>
   compose(EdgeFunctionRef<AllBottom> This,
           const EdgeFunction<l_t> &SecondFunction) {
-    return SecondFunction.isConstant() ? SecondFunction : This;
+    if (SecondFunction.isConstant()) {
+      return SecondFunction;
+    }
+
+    if constexpr (HasJoinLatticeTraits<L>) {
+      auto ConstVal = SecondFunction.computeTarget(JLattice::bottom());
+      if (ConstVal == JLattice::bottom()) {
+        return This;
+      }
+
+      return ConstantEdgeFunction<L>{
+          NonTopBotValue<L>::unwrap(std::move(ConstVal))};
+    } else {
+      // Note: This used to be the default behavior, but it appears to be too
+      // restrictive
+      return This;
+    }
+
+    // return SecondFunction.isConstant() ? SecondFunction : This;
   }
 
   [[nodiscard]] static EdgeFunction<l_t>
@@ -85,8 +157,7 @@ template <typename L> struct AllTop final {
   using JLattice = JoinLatticeTraits<L>;
 
   [[no_unique_address]] std::conditional_t<HasJoinLatticeTraits<l_t>, EmptyType,
-                                           l_t>
-      TopValue;
+                                           l_t> TopValue;
 
   [[nodiscard]] l_t computeTarget(ByConstRef<l_t> /*Source*/) const noexcept {
     static_assert(std::is_trivially_copyable_v<AllTop>);
@@ -149,97 +220,6 @@ defaultComposeOrNull(const EdgeFunction<L> &This,
   return nullptr;
 }
 
-template <typename L> struct ConstantEdgeFunction {
-  using l_t = L;
-  using JLattice = JoinLatticeTraits<L>;
-  using value_type = typename NonTopBotValue<l_t>::type;
-
-  [[nodiscard]] l_t computeTarget(ByConstRef<l_t> /*Source*/) const
-      noexcept(std::is_nothrow_constructible_v<l_t, const value_type &>) {
-    static_assert(IsEdgeFunction<ConstantEdgeFunction>);
-    return Value;
-  }
-
-  template <typename ConcreteEF, typename = std::enable_if_t<std::is_base_of_v<
-                                     ConstantEdgeFunction, ConcreteEF>>>
-  [[nodiscard]] static EdgeFunction<l_t>
-  compose(EdgeFunctionRef<ConcreteEF> This,
-          const EdgeFunction<l_t> &SecondFunction) {
-    if (auto Default = defaultComposeOrNull(This, SecondFunction)) {
-      return Default;
-    }
-
-    auto ConstVal = SecondFunction.computeTarget(This->Value);
-    if constexpr (!EdgeFunctionBase::IsSOOCandidate<ConstantEdgeFunction>) {
-      if (ConstVal == This->Value) {
-        return This;
-      }
-    }
-
-    if constexpr (AreEqualityComparable<decltype(JLattice::bottom()), l_t>) {
-      if (JLattice::bottom() == ConstVal) {
-        return AllBottom<l_t>{};
-      }
-    } else {
-      if (l_t(JLattice::bottom()) == ConstVal) {
-        return AllBottom<l_t>{};
-      }
-    }
-
-    if constexpr (AreEqualityComparable<decltype(JLattice::top()), l_t>) {
-      if (JLattice::top() == ConstVal) {
-        /// TODO: Can this ever happen?
-        return AllTop<l_t>{};
-      }
-    } else {
-      if (l_t(JLattice::top()) == ConstVal) {
-        /// TODO: Can this ever happen?
-        return AllTop<l_t>{};
-      }
-    }
-
-    return ConstantEdgeFunction{
-        NonTopBotValue<l_t>::unwrap(std::move(ConstVal))};
-  }
-
-  template <typename ConcreteEF, typename = std::enable_if_t<std::is_base_of_v<
-                                     ConstantEdgeFunction, ConcreteEF>>>
-  [[nodiscard]] static EdgeFunction<l_t>
-  join(EdgeFunctionRef<ConcreteEF> This,
-       const EdgeFunction<l_t> &OtherFunction);
-
-  [[nodiscard]] constexpr bool isConstant() const noexcept { return true; }
-
-  // -- constant data member
-
-  value_type Value{};
-};
-
-template <typename L, typename = std::enable_if_t<
-                          CanEfficientlyPassByValue<ConstantEdgeFunction<L>>>>
-[[nodiscard]] bool operator==(ConstantEdgeFunction<L> LHS,
-                              ConstantEdgeFunction<L> RHS) noexcept {
-  return LHS.Value == RHS.Value;
-}
-
-template <typename L, typename = std::enable_if_t<
-                          !CanEfficientlyPassByValue<ConstantEdgeFunction<L>>>>
-[[nodiscard]] bool operator==(const ConstantEdgeFunction<L> &LHS,
-                              const ConstantEdgeFunction<L> &RHS) noexcept {
-  return LHS.Value == RHS.Value;
-}
-
-template <typename L>
-[[nodiscard]] llvm::raw_ostream &
-operator<<(llvm::raw_ostream &OS, ByConstRef<ConstantEdgeFunction<L>> Id) {
-  OS << "ConstantEF";
-  if constexpr (is_llvm_printable_v<
-                    typename ConstantEdgeFunction<L>::value_type>) {
-    OS << '[' << Id.Value << ']';
-  }
-  return OS;
-}
-
 template <typename L> struct EdgeFunctionComposer {
   using l_t = L;
 
@@ -461,6 +441,47 @@ EdgeFunction<L> EdgeIdentity<L>::join(EdgeFunctionRef<EdgeIdentity> This,
   return OtherFunction.joinWith(This);
 }
 
+template <typename L>
+template <typename ConcreteEF, typename>
+EdgeFunction<L>
+ConstantEdgeFunction<L>::compose(EdgeFunctionRef<ConcreteEF> This,
+                                 const EdgeFunction<L> &SecondFunction) {
+  if (auto Default = defaultComposeOrNull(This, SecondFunction)) {
+    return Default;
+  }
+
+  auto ConstVal = SecondFunction.computeTarget(This->Value);
+  if constexpr (!EdgeFunctionBase::IsSOOCandidate<ConstantEdgeFunction>) {
+    if (ConstVal == This->Value) {
+      return This;
+    }
+  }
+
+  if constexpr (AreEqualityComparable<decltype(JLattice::bottom()), L>) {
+    if (JLattice::bottom() == ConstVal) {
+      return AllBottom<L>{};
+    }
+  } else {
+    if (L(JLattice::bottom()) == ConstVal) {
+      return AllBottom<L>{};
+    }
+  }
+
+  if constexpr (AreEqualityComparable<decltype(JLattice::top()), L>) {
+    if (JLattice::top() == ConstVal) {
+      /// TODO: Can this ever happen?
+      return AllTop<L>{};
+    }
+  } else {
+    if (L(JLattice::top()) == ConstVal) {
+      /// TODO: Can this ever happen?
+      return AllTop<L>{};
+    }
+  }
+
+  return ConstantEdgeFunction{NonTopBotValue<L>::unwrap(std::move(ConstVal))};
+}
+
 template <typename L>
 template <typename ConcreteEF, typename>
 EdgeFunction<L>
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
index fbb2693c95..b14ca90f75 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
@@ -26,13 +26,11 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Utils/LLVMBasedContainerConfig.h"
-#include "phasar/Utils/MaybeUniquePtr.h"
 #include "phasar/Utils/Soundness.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/Instruction.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
index 646ff71322..ffaa42caef 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
@@ -12,6 +12,8 @@
 
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
 
+#include "llvm/ADT/StringMap.h"
+
 #include <unordered_map>
 
 namespace llvm {
@@ -38,7 +40,14 @@ class LLVMVFTableProvider {
   [[nodiscard]] const LLVMVFTable *
   getVFTableOrNull(const llvm::DIType *Type) const;
 
+  [[nodiscard]] const llvm::GlobalVariable *
+  getVFTableGlobal(const llvm::DIType *Type) const;
+
+  [[nodiscard]] const llvm::GlobalVariable *
+  getVFTableGlobal(llvm::StringRef ClearTypeName) const;
+
 private:
+  llvm::StringMap<const llvm::GlobalVariable *> ClearNameTVMap;
   std::unordered_map<const llvm::DIType *, LLVMVFTable> TypeVFTMap;
 };
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
index c59717c25f..205a1431f1 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
@@ -113,6 +113,10 @@ class Resolver {
 
   [[nodiscard]] virtual std::string str() const = 0;
 
+  /// Whether the ICFG needs to reconsider all dynamic call-sites once there
+  /// have been changes through handlePossibleTargets().
+  ///
+  /// Make false for performance (may be less sound then)
   [[nodiscard]] virtual bool mutatesHelperAnalysisInformation() const noexcept {
     // Conservatively returns true. Override if possible
     return true;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
index df946ae27a..d9a1d9a931 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
@@ -24,7 +24,7 @@ struct SVFGCache;
 /// Conforms to the ICFGBase CRTP interface.
 ///
 /// Use this in the IDESolver or IFDSSolver to profit from the SparseIFDS or
-/// SparseIDE optimization after Karakays et al. "Symbol-Specific Sparsification
+/// SparseIDE optimization after Karakaya et al. "Symbol-Specific Sparsification
 /// of Interprocedural Distributive Environment Problems"
 /// <https://doi.org/10.48550/arXiv.2401.14813>
 class SparseLLVMBasedICFG
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
index 64010f2935..25b773d675 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
@@ -34,7 +34,7 @@ struct CFGTraits<SparseLLVMBasedICFGView> : CFGTraits<LLVMBasedCFG> {};
 /// It still owns the sparse value-flow graphs.
 ///
 /// Use this in the IDESolver or IFDSSolver to profit from the SparseIFDS or
-/// SparseIDE optimization after Karakays et al. "Symbol-Specific Sparsification
+/// SparseIDE optimization after Karakaya et al. "Symbol-Specific Sparsification
 /// of Interprocedural Distributive Environment Problems"
 /// <https://doi.org/10.48550/arXiv.2401.14813>
 class SparseLLVMBasedICFGView
diff --git a/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h b/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
index 0b970fcfed..03b6c03ea8 100644
--- a/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
+++ b/include/phasar/PhasarLLVM/DB/LLVMProjectIRDB.h
@@ -12,6 +12,7 @@
 
 #include "phasar/DB/ProjectIRDBBase.h"
 #include "phasar/PhasarLLVM/Utils/LLVMBasedContainerConfig.h"
+#include "phasar/Utils/Macros.h"
 #include "phasar/Utils/MaybeUniquePtr.h"
 
 #include "llvm/ADT/ArrayRef.h"
@@ -21,6 +22,7 @@
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
+#include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/MemoryBufferRef.h"
 #include "llvm/Support/raw_ostream.h"
 
@@ -56,6 +58,14 @@ class LLVMProjectIRDB : public ProjectIRDBBase<LLVMProjectIRDB> {
   /// ownership of it. The module is optionally being preprocessed.
   explicit LLVMProjectIRDB(std::unique_ptr<llvm::Module> Mod,
                            bool DoPreprocessing = true);
+  /// Initializes the new ProjectIRDB with the given IR Module and takes
+  /// ownership of it. The module is optionally being preprocessed. Takes the
+  /// given LLVMContext and binds its lifetime to the lifetime of the
+  /// constructed ProjectIRDB
+  explicit LLVMProjectIRDB(std::unique_ptr<llvm::Module> Mod,
+                           std::unique_ptr<llvm::LLVMContext> Ctx,
+                           bool DoPreprocessing = true);
+
   /// Parses the given LLVM IR file and owns the resulting IR Module.
   /// If an error occurs, an error message is written to stderr and subsequent
   /// calls to isValid() return false.
@@ -63,16 +73,33 @@ class LLVMProjectIRDB : public ProjectIRDBBase<LLVMProjectIRDB> {
                            bool EnableOpaquePointers = LLVM_VERSION_MAJOR > 14);
 
   LLVMProjectIRDB(const LLVMProjectIRDB &) = delete;
-  LLVMProjectIRDB &operator=(LLVMProjectIRDB &) = delete;
+  LLVMProjectIRDB &operator=(const LLVMProjectIRDB &) = delete;
+
+  LLVMProjectIRDB(LLVMProjectIRDB &&) noexcept = default;
+  LLVMProjectIRDB &operator=(LLVMProjectIRDB &&) noexcept = default;
 
   ~LLVMProjectIRDB();
 
-  [[nodiscard]] static std::unique_ptr<llvm::Module>
-  getParsedIRModuleOrNull(const llvm::Twine &IRFileName,
-                          llvm::LLVMContext &Ctx) noexcept;
-  [[nodiscard]] static std::unique_ptr<llvm::Module>
-  getParsedIRModuleOrNull(llvm::MemoryBufferRef IRFileContent,
-                          llvm::LLVMContext &Ctx) noexcept;
+  [[nodiscard]] PSR_DEPRECATED("Deprecated in favor of getParsedIRModuleOrErr",
+                               "getParsedIRModuleOrErr") static std::
+      unique_ptr<llvm::Module> getParsedIRModuleOrNull(
+          const llvm::Twine &IRFileName, llvm::LLVMContext &Ctx) noexcept;
+
+  [[nodiscard]] PSR_DEPRECATED("Deprecated in favor of getParsedIRModuleOrErr",
+                               "getParsedIRModuleOrErr") static std::
+      unique_ptr<llvm::Module> getParsedIRModuleOrNull(
+          llvm::MemoryBufferRef IRFileContent, llvm::LLVMContext &Ctx) noexcept;
+
+  [[nodiscard]] static llvm::ErrorOr<std::unique_ptr<llvm::Module>>
+  getParsedIRModuleOrErr(const llvm::Twine &IRFileName,
+                         llvm::LLVMContext &Ctx) noexcept;
+  [[nodiscard]] static llvm::ErrorOr<std::unique_ptr<llvm::Module>>
+  getParsedIRModuleOrErr(llvm::MemoryBufferRef IRFileContent,
+                         llvm::LLVMContext &Ctx) noexcept;
+
+  [[nodiscard]] static llvm::ErrorOr<LLVMProjectIRDB>
+  load(const llvm::Twine &IRFileName,
+       bool EnableOpaquePointers = LLVM_VERSION_MAJOR > 14);
 
   /// Also use the const overload
   using ProjectIRDBBase::getFunction;
@@ -163,7 +190,8 @@ class LLVMProjectIRDB : public ProjectIRDBBase<LLVMProjectIRDB> {
   /// the preprocessing as well
   void preprocessModule(llvm::Module *NonConstMod);
 
-  llvm::LLVMContext Ctx;
+  // LLVMContext is not movable, so wrap it into a unique_ptr
+  std::unique_ptr<llvm::LLVMContext> Ctx;
   MaybeUniquePtr<llvm::Module> Mod = nullptr;
   size_t IdOffset = 0;
   llvm::SmallVector<const llvm::Value *, 0> IdToInst;
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
index cf568e2837..83fc7252e4 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h
@@ -193,26 +193,8 @@ mapFactsToCallee(const llvm::CallBase *CallSite, const llvm::Function *DestFun,
           std::any_of(
               ArgIt, ArgEnd,
               std::bind(std::ref(PropArg), std::placeholders::_1, Source))) {
-        // Over-approximate by trying to add the
-        //   alloca [1 x %struct.__va_list_tag], align 16
-        // to the results
-        // find the allocated %struct.__va_list_tag and generate it
-
-        for (const auto &BB : *DestFun) {
-          for (const auto &I : BB) {
-            if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-              if (Alloc->getAllocatedType()->isArrayTy() &&
-                  Alloc->getAllocatedType()->getArrayNumElements() > 0 &&
-                  Alloc->getAllocatedType()
-                      ->getArrayElementType()
-                      ->isStructTy() &&
-                  Alloc->getAllocatedType()
-                          ->getArrayElementType()
-                          ->getStructName() == "struct.__va_list_tag") {
-                Res.insert(std::invoke(FactConstructor, Alloc));
-              }
-            }
-          }
+        if (const auto *VaListAlloca = getVaListTagOrNull(*DestFun)) {
+          Res.insert(std::invoke(FactConstructor, VaListAlloca));
         }
       }
 
@@ -306,24 +288,10 @@ FlowFunctionPtrType<D, Container> mapFactsToCaller(
       }
 
       if (ArgIt != ArgEnd) {
-        // Over-approximate by trying to add the
-        //   alloca [1 x %struct.__va_list_tag], align 16
-        // to the results
-        // find the allocated %struct.__va_list_tag and generate it
-
-        for (const auto &I : llvm::instructions(DestFun)) {
-          if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-            const auto *AllocTy = Alloc->getAllocatedType();
-            if (AllocTy->isArrayTy() && AllocTy->getArrayNumElements() > 0 &&
-                AllocTy->getArrayElementType()->isStructTy() &&
-                AllocTy->getArrayElementType()->getStructName() ==
-                    "struct.__va_list_tag") {
-              if (std::invoke(PropArg, Alloc, Source)) {
-                std::transform(ArgIt, ArgEnd, std::inserter(Res, Res.end()),
-                               FactConstructor);
-                break;
-              }
-            }
+        if (const auto *VaListAlloca = getVaListTagOrNull(*DestFun)) {
+          if (std::invoke(PropArg, VaListAlloca, Source)) {
+            std::transform(ArgIt, ArgEnd, std::inserter(Res, Res.end()),
+                           FactConstructor);
           }
         }
       }
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
index bad969a70e..fa1efd880b 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.h
@@ -154,8 +154,6 @@ class IDEExtendedTaintAnalysis
     }
   }
 
-  static const llvm::Value *getVAListTagOrNull(const llvm::Function *DestFun);
-
   void populateWithMayAliases(SourceConfigTy &Facts);
 
   bool isMustAlias(const SanitizerConfigTy &Facts, d_t CurrNod);
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
index 1292499460..f4fad2d4cb 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
@@ -33,6 +33,9 @@ class StoreInst;
 class BranchInst;
 class Module;
 class CallInst;
+class AllocaInst;
+class DIType;
+class DIDerivedType;
 } // namespace llvm
 
 namespace psr {
@@ -103,6 +106,9 @@ std::string llvmIRToShortString(const llvm::Value *V);
 
 LLVM_DUMP_METHOD void dumpIRValue(const llvm::Value *V);
 LLVM_DUMP_METHOD void dumpIRValue(const llvm::Instruction *V);
+LLVM_DUMP_METHOD void dumpIRValue(const llvm::Function *V);
+LLVM_DUMP_METHOD void dumpDIType(const llvm::DIType *Ty);
+LLVM_DUMP_METHOD void dumpDIType(const llvm::DIDerivedType *Ty);
 
 /**
  * @brief Returns all LLVM Global Values that are used in the given LLVM
@@ -192,10 +198,11 @@ const llvm::StoreInst *getNthStoreInstruction(const llvm::Function *F,
                                               unsigned StoNo);
 
 llvm::SmallVector<const llvm::Instruction *, 2>
-getAllExitPoints(const llvm::Function *F);
+getAllExitPoints(const llvm::Function *F, bool IncludeResume = true);
 void appendAllExitPoints(
     const llvm::Function *F,
-    llvm::SmallVectorImpl<const llvm::Instruction *> &ExitPoints);
+    llvm::SmallVectorImpl<const llvm::Instruction *> &ExitPoints,
+    bool IncludeResume = true);
 
 /**
  * @brief Returns the LLVM Module to which the given LLVM Value belongs to.
@@ -271,6 +278,11 @@ class ModulesToSlotTracker {
   static llvm::ModuleSlotTracker &
   getSlotTrackerForModule(const llvm::Module *Module);
 };
+
+[[nodiscard]] const llvm::AllocaInst *
+getVaListTagOrNull(const llvm::Function &Fun);
+
+[[nodiscard]] bool isVaListAlloca(const llvm::AllocaInst &Alloc);
 } // namespace psr
 
 #endif
diff --git a/include/phasar/Utils/Macros.h b/include/phasar/Utils/Macros.h
index 9620018de8..9d089bc4f8 100644
--- a/include/phasar/Utils/Macros.h
+++ b/include/phasar/Utils/Macros.h
@@ -18,4 +18,23 @@
 #define PSR_CONCEPT concept
 #endif
 
+#if __cpp_constinit >= 201907L
+#define PSR_CONSTINIT constinit
+#elif __clang__
+#define PSR_CONSTINIT [[clang::require_constant_initialization]]
+#else
+#define PSR_CONSTINIT
+#endif
+
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#if __has_feature(attribute_deprecated_with_message)
+#define PSR_DEPRECATED(MSG, REPLACEMENT)                                       \
+  __attribute__((deprecated(MSG, REPLACEMENT)))
+#else
+#define PSR_DEPRECATED(MSG, REPLACEMENT) [[deprecated(MSG)]]
+#endif
+
 #endif // PHASAR_UTILS_MACROS_H
diff --git a/include/phasar/Utils/Utilities.h b/include/phasar/Utils/Utilities.h
index 612732679f..a4265d36fc 100644
--- a/include/phasar/Utils/Utilities.h
+++ b/include/phasar/Utils/Utilities.h
@@ -251,7 +251,8 @@ auto remove_by_index(Container &Cont, const Indices &Idx) {
 
 /// See <https://en.cppreference.com/w/cpp/utility/forward_like>
 template <class T, class U>
-[[nodiscard]] constexpr auto &&forward_like(U &&X) noexcept { // NOLINT
+[[nodiscard]] LLVM_ATTRIBUTE_ALWAYS_INLINE constexpr auto &&
+forward_like(U &&X) noexcept { // NOLINT
   // NOLINTNEXTLINE
   constexpr bool is_adding_const = std::is_const_v<std::remove_reference_t<T>>;
   if constexpr (std::is_lvalue_reference_v<T &&>) {
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3351b1c590..ab2eae3998 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -29,7 +29,6 @@ set(PHASAR_LINK_LIBS
     phasar_dataflow_ifdside
     phasar_dataflow_mono
     phasar_dataflow_pathsensitivity
-    phasar_db
     phasar_domain
 
     phasar_llvm
diff --git a/lib/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.cpp b/lib/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.cpp
index e6a53249bb..cffe27cb89 100644
--- a/lib/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.cpp
+++ b/lib/PhasarLLVM/ControlFlow/GlobalCtorsDtorsModel.cpp
@@ -15,6 +15,8 @@
 #include "phasar/Utils/Logger.h"
 
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/IRBuilder.h"
 
 #include <functional>
@@ -61,6 +63,33 @@ collectGlobalDtors(const llvm::Module &Mod) {
   return Ret;
 }
 
+static llvm::SmallVector<llvm::FunctionCallee>
+collectRegisteredDtorsAtExit(const llvm::Module &Mod) {
+  llvm::SmallVector<llvm::FunctionCallee> Ret;
+
+  auto *AtExitFn = Mod.getFunction("atexit");
+  if (!AtExitFn) {
+    return Ret;
+  }
+
+  for (auto *User : AtExitFn->users()) {
+    auto *Call = llvm::dyn_cast<llvm::CallBase>(User);
+    if (!Call) {
+      continue;
+    }
+
+    auto *DtorOp = llvm::dyn_cast_or_null<llvm::Function>(
+        Call->getArgOperand(0)->stripPointerCastsAndAliases());
+    if (!DtorOp) {
+      continue;
+    }
+
+    Ret.push_back(DtorOp);
+  }
+
+  return Ret;
+}
+
 static llvm::SmallVector<std::pair<llvm::FunctionCallee, llvm::Value *>, 4>
 collectRegisteredDtorsForModule(const llvm::Module &Mod) {
   // NOLINTNEXTLINE
@@ -72,16 +101,6 @@ collectRegisteredDtorsForModule(const llvm::Module &Mod) {
     return RegisteredDtors;
   }
 
-  auto getConstantBitcastArgument = // NOLINT
-      [](llvm::Value *V) -> llvm::Value * {
-    auto *CE = llvm::dyn_cast<llvm::ConstantExpr>(V);
-    if (!CE) {
-      return V;
-    }
-
-    return CE->getOperand(0);
-  };
-
   for (auto *User : CxaAtExitFn->users()) {
     auto *Call = llvm::dyn_cast<llvm::CallBase>(User);
     if (!Call) {
@@ -89,8 +108,8 @@ collectRegisteredDtorsForModule(const llvm::Module &Mod) {
     }
 
     auto *DtorOp = llvm::dyn_cast_or_null<llvm::Function>(
-        getConstantBitcastArgument(Call->getArgOperand(0)));
-    auto *DtorArgOp = getConstantBitcastArgument(Call->getArgOperand(1));
+        Call->getArgOperand(0)->stripPointerCastsAndAliases());
+    auto *DtorArgOp = Call->getArgOperand(1)->stripPointerCastsAndAliases();
 
     if (!DtorOp || !DtorArgOp) {
       continue;
@@ -122,8 +141,9 @@ static std::string getReducedModuleName(const llvm::Module &M) {
 
 static llvm::Function *createDtorCallerForModule(
     llvm::Module &Mod,
-    const llvm::SmallVectorImpl<std::pair<llvm::FunctionCallee, llvm::Value *>>
-        &RegisteredDtors) {
+    llvm::ArrayRef<std::pair<llvm::FunctionCallee, llvm::Value *>>
+        RegisteredDtors,
+    llvm::ArrayRef<llvm::FunctionCallee> RegisteredDtorsAtExit) {
 
   auto *PhasarDtorCaller = llvm::cast<llvm::Function>(
       Mod.getOrInsertFunction((GlobalCtorsDtorsModel::DtorsCallerName +
@@ -137,12 +157,14 @@ static llvm::Function *createDtorCallerForModule(
 
   llvm::IRBuilder<> IRB(BB);
 
-  for (auto It = RegisteredDtors.rbegin(), End = RegisteredDtors.rend();
-       It != End; ++It) {
-    auto FunCallee = It->first;
+  for (auto FunCallee : llvm::reverse(RegisteredDtorsAtExit)) {
+    IRB.CreateCall(FunCallee, {});
+  }
+
+  for (auto [FunCallee, Arg] : llvm::reverse(RegisteredDtors)) {
     assert(FunCallee.getFunctionType()->getNumParams() == 1);
     auto *ExpectedArgType = FunCallee.getFunctionType()->getParamType(0);
-    auto *Arg = It->second;
+
     if (Arg->getType() != ExpectedArgType) {
       if (!Arg->getType()->canLosslesslyBitCastTo(ExpectedArgType)) {
         PHASAR_LOG_LEVEL(
@@ -171,8 +193,9 @@ static llvm::Function *createDtorCallerForModule(
                        "Collect Registered Dtors for Module " << Mod.getName());
 
   auto RegisteredDtors = collectRegisteredDtorsForModule(Mod);
+  auto RegisteredDtorsAtExit = collectRegisteredDtorsAtExit(Mod);
 
-  if (RegisteredDtors.empty()) {
+  if (RegisteredDtors.empty() && RegisteredDtorsAtExit.empty()) {
     return nullptr;
   }
 
@@ -180,7 +203,8 @@ static llvm::Function *createDtorCallerForModule(
                        "> Found " << RegisteredDtors.size()
                                   << " Registered Dtors");
 
-  auto *RegisteredDtorCaller = createDtorCallerForModule(Mod, RegisteredDtors);
+  auto *RegisteredDtorCaller =
+      createDtorCallerForModule(Mod, RegisteredDtors, RegisteredDtorsAtExit);
   // auto It =
   GlobalDtors.emplace(0, RegisteredDtorCaller);
   // GlobalDtorFn.try_emplace(RegisteredDtorCaller, it);
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
index 10ea6c257c..e3f65c00ec 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
@@ -6,7 +6,7 @@
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/PAMMMacros.h"
 #include "phasar/Utils/Soundness.h"
@@ -111,8 +111,8 @@ static bool fillPossibleTargets(
     PossibleTargets.insert(StaticCallee);
 
     PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG",
-                         "Found static call-site: "
-                             << "  " << llvmIRToString(CS));
+                         "Found static call-site: " << "  "
+                                                    << llvmIRToString(CS));
     return true;
   }
 
@@ -122,8 +122,8 @@ static bool fillPossibleTargets(
 
   // the function call must be resolved dynamically
   PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG",
-                       "Found dynamic call-site: "
-                           << "  " << llvmIRToString(CS));
+                       "Found dynamic call-site: " << "  "
+                                                   << llvmIRToString(CS));
 
   PossibleTargets = Res.resolveIndirectCall(CS);
 
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp b/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
index 45820e2793..4abbc34fd3 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
@@ -16,14 +16,23 @@
 #include "llvm/Support/Casting.h"
 
 using namespace psr;
+static constexpr llvm::StringLiteral TIPrefix = "typeinfo name for ";
 
 static std::string getTypeName(const llvm::DIType *DITy) {
-  if (const auto *CompTy = llvm::dyn_cast<llvm::DICompositeType>(DITy)) {
-    auto Ident = CompTy->getIdentifier();
-    return Ident.empty() ? llvm::demangle(CompTy->getName().str())
-                         : llvm::demangle(Ident.str());
+  auto Ret = [DITy] {
+    if (const auto *CompTy = llvm::dyn_cast<llvm::DICompositeType>(DITy)) {
+      auto Ident = CompTy->getIdentifier();
+      return Ident.empty() ? llvm::demangle(CompTy->getName().str())
+                           : llvm::demangle(Ident.str());
+    }
+    return llvm::demangle(DITy->getName().str());
+  }();
+
+  if (llvm::StringRef(Ret).startswith(TIPrefix)) {
+    Ret.erase(0, TIPrefix.size());
   }
-  return llvm::demangle(DITy->getName().str());
+
+  return Ret;
 }
 
 static std::vector<const llvm::Function *> getVirtualFunctions(
@@ -31,11 +40,6 @@ static std::vector<const llvm::Function *> getVirtualFunctions(
     const llvm::DIType *Type) {
   auto ClearName = getTypeName(Type);
 
-  static constexpr llvm::StringLiteral TIPrefix = "typeinfo name for ";
-  if (llvm::StringRef(ClearName).startswith(TIPrefix)) {
-    ClearName = ClearName.substr(TIPrefix.size());
-  }
-
   auto It = ClearNameTVMap.find(ClearName);
 
   if (It != ClearNameTVMap.end()) {
@@ -53,8 +57,6 @@ static std::vector<const llvm::Function *> getVirtualFunctions(
 }
 
 LLVMVFTableProvider::LLVMVFTableProvider(const llvm::Module &Mod) {
-  llvm::StringMap<const llvm::GlobalVariable *> ClearNameTVMap;
-
   for (const auto &Glob : Mod.globals()) {
     if (DIBasedTypeHierarchy::isVTable(Glob.getName())) {
       auto Demang = llvm::demangle(Glob.getName().str());
@@ -88,3 +90,19 @@ LLVMVFTableProvider::getVFTableOrNull(const llvm::DIType *Type) const {
   auto It = TypeVFTMap.find(Type);
   return It != TypeVFTMap.end() ? &It->second : nullptr;
 }
+
+const llvm::GlobalVariable *
+LLVMVFTableProvider::getVFTableGlobal(const llvm::DIType *Type) const {
+  auto Name = getTypeName(Type);
+  return getVFTableGlobal(Name);
+}
+
+const llvm::GlobalVariable *
+LLVMVFTableProvider::getVFTableGlobal(llvm::StringRef ClearTypeName) const {
+  // llvm::errs() << "[getVFTableGlobal]: " << ClearTypeName << '\n';
+  if (auto It = ClearNameTVMap.find(ClearTypeName);
+      It != ClearNameTVMap.end()) {
+    return It->second;
+  }
+  return nullptr;
+}
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
index ba464cd0a6..15dcdf0e1c 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
@@ -76,7 +76,7 @@ auto CHAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
   for (const auto &FallbackTy : FallbackTys) {
     const auto *Target =
         getNonPureVirtualVFTEntry(FallbackTy, VtableIndex, CallSite);
-    if (Target) {
+    if (Target && psr::isConsistentCall(CallSite, Target)) {
       PossibleCallees.insert(Target);
     }
   }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
index 6e70e7de01..d82c1d29ce 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
@@ -252,24 +252,8 @@ OTFResolver::getActualFormalPointerPairs(const llvm::CallBase *CallSite,
     // in case of vararg, we can pair-up incoming pointer parameters with the
     // vararg pack of the callee target. the vararg pack will alias
     // (intra-procedurally) with any pointer values loaded from the pack
-    const llvm::AllocaInst *VarArgs = nullptr;
-
-    for (const auto &I : llvm::instructions(CalleeTarget)) {
-      if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-        if (const auto *AT =
-                llvm::dyn_cast<llvm::ArrayType>(Alloca->getAllocatedType())) {
-          if (const auto *ST =
-                  llvm::dyn_cast<llvm::StructType>(AT->getArrayElementType())) {
-            if (ST->hasName() && ST->getName() == "struct.__va_list_tag") {
-              VarArgs = Alloca;
-              break;
-            }
-          }
-        }
-      }
-    }
 
-    if (VarArgs) {
+    if (const auto *VarArgs = getVaListTagOrNull(*CalleeTarget)) {
       for (; Idx < CallSite->arg_size(); ++Idx) {
         if (CallSite->getArgOperand(Idx)->getType()->isPointerTy()) {
           Pairs.emplace_back(CallSite->getArgOperand(Idx), VarArgs);
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
index 05342b05ac..05b9e006d4 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
@@ -18,17 +18,16 @@
 
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
-#include "phasar/Utils/Utilities.h"
 
+#include "llvm/BinaryFormat/Dwarf.h"
 #include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
 #include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Casting.h"
@@ -76,7 +75,7 @@ auto RTAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
     if (ReachableTypes.find(PossibleType) != EndIt) {
       const auto *Target =
           getNonPureVirtualVFTEntry(PossibleType, VtableIndex, CallSite);
-      if (Target) {
+      if (Target && psr::isConsistentCall(CallSite, Target)) {
         PossibleCallTargets.insert(Target);
       }
     }
@@ -91,18 +90,52 @@ auto RTAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
 
 std::string RTAResolver::str() const { return "RTA"; }
 
-/// More or less copied from GeneralStatisticsAnalysis
+static const llvm::DICompositeType *
+isCompositeStructType(const llvm::DIType *Ty) {
+  if (const auto *CompTy = llvm::dyn_cast_if_present<llvm::DICompositeType>(Ty);
+      CompTy && (CompTy->getTag() == llvm::dwarf::DW_TAG_structure_type ||
+                 CompTy->getTag() == llvm::dwarf::DW_TAG_class_type)) {
+
+    return CompTy;
+  }
+
+  return nullptr;
+}
+
 void RTAResolver::resolveAllocatedCompositeTypes() {
   if (!AllocatedCompositeTypes.empty()) {
     return;
   }
 
-  llvm::DebugInfoFinder DIF;
-  DIF.processModule(*IRDB->getModule());
+  llvm::DenseSet<const llvm::DICompositeType *> AllocatedTypes;
 
-  for (const auto *Ty : DIF.types()) {
-    if (const auto *CompTy = llvm::dyn_cast<llvm::DICompositeType>(Ty)) {
-      AllocatedCompositeTypes.push_back(CompTy);
+  for (const auto *Inst : IRDB->getAllInstructions()) {
+    if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(Inst)) {
+      if (const auto *Ty = isCompositeStructType(getVarTypeFromIR(Alloca))) {
+        AllocatedTypes.insert(Ty);
+      }
+    } else if (const auto *Call = llvm::dyn_cast<llvm::CallBase>(Inst)) {
+      if (const auto *Callee = llvm::dyn_cast<llvm::Function>(
+              Call->getCalledOperand()->stripPointerCastsAndAliases())) {
+        if (psr::isHeapAllocatingFunction(Callee)) {
+          const auto *MDNode = Call->getMetadata("heapallocsite");
+          if (const auto *CompTy = llvm::
+#if LLVM_VERSION_MAJOR >= 15
+                  dyn_cast_if_present
+#else
+                  dyn_cast_or_null
+#endif
+              <llvm::DICompositeType>(MDNode);
+              isCompositeStructType(CompTy)) {
+
+            AllocatedTypes.insert(CompTy);
+          }
+        }
+      }
     }
   }
+
+  AllocatedCompositeTypes.reserve(AllocatedTypes.size());
+  AllocatedCompositeTypes.insert(AllocatedCompositeTypes.end(),
+                                 AllocatedTypes.begin(), AllocatedTypes.end());
 }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
index 9065a43415..7153b557f7 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
@@ -62,7 +62,7 @@ std::optional<unsigned> psr::getVFTIndex(const llvm::CallBase *CallSite) {
 }
 
 const llvm::DIType *psr::getReceiverType(const llvm::CallBase *CallSite) {
-  if (CallSite->arg_empty() ||
+  if (!CallSite || CallSite->arg_empty() ||
       (CallSite->hasStructRetAttr() && CallSite->arg_size() < 2)) {
     return nullptr;
   }
@@ -149,7 +149,6 @@ namespace psr {
 Resolver::Resolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP)
     : IRDB(IRDB), VTP(VTP) {
   assert(IRDB != nullptr);
-  assert(VTP != nullptr);
 }
 
 void Resolver::preCall(const llvm::Instruction *Inst) {}
diff --git a/lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp b/lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp
index 2bb171e1be..27c35db533 100644
--- a/lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp
+++ b/lib/PhasarLLVM/DB/LLVMProjectIRDB.cpp
@@ -3,12 +3,13 @@
 #include "phasar/Config/Configuration.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
+#include "phasar/Utils/Macros.h"
 
-#include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/AssemblyAnnotationWriter.h"
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/InstIterator.h"
+#include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Verifier.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/Support/Debug.h"
@@ -17,6 +18,8 @@
 #include "llvm/Support/SourceMgr.h"
 
 #include <charconv>
+#include <memory>
+#include <system_error>
 
 namespace psr {
 
@@ -35,58 +38,135 @@ static void setOpaquePointersForCtx(llvm::LLVMContext &Ctx, bool Enable) {
 #endif
 }
 
-std::unique_ptr<llvm::Module>
-LLVMProjectIRDB::getParsedIRModuleOrNull(llvm::MemoryBufferRef IRFileContent,
-                                         llvm::LLVMContext &Ctx) noexcept {
+namespace {
+enum class IRDBParsingError {
+  CouldNotParse = 1,
+  CouldNotVerify = 2,
+};
+
+class IRDBParsingErrorCategory : public std::error_category {
+  [[nodiscard]] const char *name() const noexcept override {
+    return "IRDBParsingError";
+  }
+
+  [[nodiscard]] std::string message(int Value) const override {
+    switch (IRDBParsingError(Value)) {
+    case IRDBParsingError::CouldNotParse:
+      return "Could not parse LLVM IR";
+    case IRDBParsingError::CouldNotVerify:
+      return "Parsed LLVM IR could not be verified";
+    default:
+      return "Unknown error while parsing IRDB";
+    }
+  }
+};
+
+PSR_CONSTINIT IRDBParsingErrorCategory IRDBParsingErrorCat{};
+
+std::error_code make_error_code(IRDBParsingError Err) noexcept {
+  return {int(Err), IRDBParsingErrorCat};
+}
+} // namespace
+
+} // namespace psr
+
+namespace std {
+template <> struct is_error_code_enum<psr::IRDBParsingError> : true_type {};
+} // namespace std
 
+namespace psr {
+
+llvm::ErrorOr<std::unique_ptr<llvm::Module>>
+LLVMProjectIRDB::getParsedIRModuleOrErr(llvm::MemoryBufferRef IRFileContent,
+                                        llvm::LLVMContext &Ctx) noexcept {
   llvm::SMDiagnostic Diag;
   std::unique_ptr<llvm::Module> M = llvm::parseIR(IRFileContent, Diag, Ctx);
   bool BrokenDebugInfo = false;
   if (M == nullptr) {
     Diag.print(nullptr, llvm::errs());
-    return nullptr;
+    return IRDBParsingError::CouldNotParse;
   }
-  /* Crash in presence of llvm-3.9.1 module (segfault) */
-  if (M == nullptr || llvm::verifyModule(*M, &llvm::errs(), &BrokenDebugInfo)) {
+
+  if (llvm::verifyModule(*M, &llvm::errs(), &BrokenDebugInfo)) {
     PHASAR_LOG_LEVEL(ERROR, IRFileContent.getBufferIdentifier()
                                 << " could not be parsed correctly!");
-    return nullptr;
+    return IRDBParsingError::CouldNotVerify;
   }
   if (BrokenDebugInfo) {
     PHASAR_LOG_LEVEL(WARNING, "Debug info is broken!");
   }
+
   return M;
 }
 
+llvm::ErrorOr<std::unique_ptr<llvm::Module>>
+LLVMProjectIRDB::getParsedIRModuleOrErr(const llvm::Twine &IRFileName,
+                                        llvm::LLVMContext &Ctx) noexcept {
+  // Look at LLVM's IRReader.cpp for reference
+
+  auto FileOrErr =
+      llvm::MemoryBuffer::getFileOrSTDIN(IRFileName, /*IsText=*/true);
+  if (std::error_code EC = FileOrErr.getError()) {
+    return FileOrErr.getError();
+  }
+
+  return getParsedIRModuleOrErr(*FileOrErr.get(), Ctx);
+}
+
+std::unique_ptr<llvm::Module>
+LLVMProjectIRDB::getParsedIRModuleOrNull(llvm::MemoryBufferRef IRFileContent,
+                                         llvm::LLVMContext &Ctx) noexcept {
+
+  auto Mod = getParsedIRModuleOrErr(IRFileContent, Ctx);
+  if (Mod) {
+    return std::move(*Mod);
+  }
+
+  return nullptr;
+}
+
 std::unique_ptr<llvm::Module>
 LLVMProjectIRDB::getParsedIRModuleOrNull(const llvm::Twine &IRFileName,
                                          llvm::LLVMContext &Ctx) noexcept {
-  // Look at LLVM's IRReader.cpp for reference
+  auto Mod = getParsedIRModuleOrErr(IRFileName, Ctx);
+  if (Mod) {
+    return std::move(*Mod);
+  }
 
+  return nullptr;
+}
+
+llvm::ErrorOr<LLVMProjectIRDB>
+LLVMProjectIRDB::load(const llvm::Twine &IRFileName,
+                      bool EnableOpaquePointers) {
   auto FileOrErr =
       llvm::MemoryBuffer::getFileOrSTDIN(IRFileName, /*IsText=*/true);
-  if (std::error_code EC = FileOrErr.getError()) {
-    llvm::SmallString<128> Buf;
-    auto Err = llvm::SMDiagnostic(IRFileName.toStringRef(Buf),
-                                  llvm::SourceMgr::DK_Error,
-                                  "Could not open input file: " + EC.message());
-    Err.print(nullptr, llvm::errs());
-    return nullptr;
+  if (!FileOrErr) {
+    return FileOrErr.getError();
   }
-  return getParsedIRModuleOrNull(*FileOrErr.get(), Ctx);
+
+  auto Ctx = std::make_unique<llvm::LLVMContext>();
+
+  auto M = getParsedIRModuleOrErr(**FileOrErr, *Ctx);
+  if (!M) {
+    return M.getError();
+  }
+
+  return LLVMProjectIRDB(std::move(*M), std::move(Ctx), EnableOpaquePointers);
 }
 
 LLVMProjectIRDB::LLVMProjectIRDB(const llvm::Twine &IRFileName,
-                                 bool EnableOpaquePointers) {
-  setOpaquePointersForCtx(Ctx, EnableOpaquePointers);
-  auto M = getParsedIRModuleOrNull(IRFileName, Ctx);
+                                 bool EnableOpaquePointers)
+    : Ctx(new llvm::LLVMContext()) {
+  setOpaquePointersForCtx(*Ctx, EnableOpaquePointers);
+  auto M = getParsedIRModuleOrErr(IRFileName, *Ctx);
 
   if (!M) {
     return;
   }
 
-  auto *NonConst = M.get();
-  Mod = std::move(M);
+  auto *NonConst = M->get();
+  Mod = std::move(M.get());
   ModulesToSlotTracker::setMSTForModule(Mod.get());
   preprocessModule(NonConst);
 }
@@ -171,16 +251,24 @@ LLVMProjectIRDB::LLVMProjectIRDB(std::unique_ptr<llvm::Module> Mod,
   }
 }
 
+LLVMProjectIRDB::LLVMProjectIRDB(std::unique_ptr<llvm::Module> Mod,
+                                 std::unique_ptr<llvm::LLVMContext> Ctx,
+                                 bool DoPreprocessing)
+    : LLVMProjectIRDB(std::move(Mod), DoPreprocessing) {
+  this->Ctx = std::move(Ctx);
+}
+
 LLVMProjectIRDB::LLVMProjectIRDB(llvm::MemoryBufferRef Buf,
-                                 bool EnableOpaquePointers) {
-  setOpaquePointersForCtx(Ctx, EnableOpaquePointers);
-  auto M = getParsedIRModuleOrNull(Buf, Ctx);
+                                 bool EnableOpaquePointers)
+    : Ctx(new llvm::LLVMContext()) {
+  setOpaquePointersForCtx(*Ctx, EnableOpaquePointers);
+  auto M = getParsedIRModuleOrErr(Buf, *Ctx);
   if (!M) {
     return;
   }
 
-  auto *NonConst = M.get();
-  Mod = std::move(M);
+  auto *NonConst = M->get();
+  Mod = std::move(M.get());
   ModulesToSlotTracker::setMSTForModule(Mod.get());
   preprocessModule(NonConst);
 }
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
index b617db9887..1f189a29cd 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
@@ -301,7 +301,7 @@ IDEExtendedTaintAnalysis::getCallFlowFunction(n_t CallStmt, f_t DestFun) {
   }
 
   bool HasVarargs = Call->arg_size() > DestFun->arg_size();
-  const auto *const VA = HasVarargs ? getVAListTagOrNull(DestFun) : nullptr;
+  const auto *const VA = HasVarargs ? getVaListTagOrNull(*DestFun) : nullptr;
 
   return lambdaFlow([this, Call, DestFun, VA](d_t Source) -> std::set<d_t> {
     if (isZeroValue(Source)) {
@@ -359,29 +359,6 @@ IDEExtendedTaintAnalysis::getCallFlowFunction(n_t CallStmt, f_t DestFun) {
   });
 }
 
-const llvm::Value *
-IDEExtendedTaintAnalysis::getVAListTagOrNull(const llvm::Function *DestFun) {
-  // Copied from IDELinearConstantAnalysis:
-  // Over-approximate by trying to add the
-  //   alloca [1 x %struct.__va_list_tag], align 16
-  // to the results
-  // find the allocated %struct.__va_list_tag and generate it
-  for (auto It = llvm::inst_begin(DestFun), End = llvm::inst_end(DestFun);
-       It != End; ++It) {
-    if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(&*It)) {
-      if (Alloc->getAllocatedType()->isArrayTy() &&
-          Alloc->getAllocatedType()->getArrayNumElements() > 0 &&
-          Alloc->getAllocatedType()->getArrayElementType()->isStructTy() &&
-          Alloc->getAllocatedType()->getArrayElementType()->getStructName() ==
-              "struct.__va_list_tag") {
-        return Alloc;
-      }
-    }
-  }
-  // Maybe the va_list is unused in the function body
-  return nullptr;
-}
-
 IDEExtendedTaintAnalysis::FlowFunctionPtrType
 IDEExtendedTaintAnalysis::getRetFlowFunction(n_t CallSite, f_t CalleeFun,
                                              n_t ExitStmt,
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
index d00d89537d..67ff7b7c6f 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
@@ -9,11 +9,13 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.h"
 
-#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
+#include "llvm/IR/InstrTypes.h"
+#include "llvm/IR/Instructions.h"
+
 namespace psr::glca {
 
 MapFactsToCalleeFlowFunction::MapFactsToCalleeFlowFunction(
@@ -34,30 +36,14 @@ MapFactsToCalleeFlowFunction::computeTargets(const llvm::Value *Source) {
   std::set<const llvm::Value *> Res;
   // Handle C-style varargs functions
   if (Callee->isVarArg()) {
+    const auto *VaListAlloca = getVaListTagOrNull(*Callee);
     // Map actual parameter into corresponding formal parameter.
     for (unsigned Idx = 0; Idx < Actuals.size(); ++Idx) {
       if (Source == Actuals[Idx] || (LLVMZeroValue::isLLVMZeroValue(Source) &&
                                      isConstant(Actuals[Idx]))) {
-        if (Idx >= Callee->arg_size() && !Callee->isDeclaration()) {
-          // Over-approximate by trying to add the
-          //   alloca [1 x %struct.__va_list_tag], align 16
-          // to the results
-          // find the allocated %struct.__va_list_tag and generate it
-          for (const auto &BB : *Callee) {
-            for (const auto &I : BB) {
-              if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-                if (Alloc->getAllocatedType()->isArrayTy() &&
-                    Alloc->getAllocatedType()->getArrayNumElements() > 0 &&
-                    Alloc->getAllocatedType()
-                        ->getArrayElementType()
-                        ->isStructTy() &&
-                    Alloc->getAllocatedType()
-                            ->getArrayElementType()
-                            ->getStructName() == "struct.__va_list_tag") {
-                  Res.insert(Alloc);
-                }
-              }
-            }
+        if (Idx >= Callee->arg_size()) {
+          if (VaListAlloca) {
+            Res.insert(VaListAlloca);
           }
         } else {
           Res.insert(Formals[Idx]); // corresponding formal
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
index 731a7ecd5b..e26d801d06 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
@@ -10,6 +10,7 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.h"
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/ConstantHelper.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstrTypes.h"
@@ -37,23 +38,8 @@ MapFactsToCallerFlowFunction::computeTargets(const llvm::Value *Source) {
   std::set<const llvm::Value *> Res;
   // Handle C-style varargs functions
   if (Callee->isVarArg() && !Callee->isDeclaration()) {
-    const llvm::Instruction *AllocVarArg = nullptr;
-    // Find the allocation of %struct.__va_list_tag
-    for (const auto &BB : *Callee) {
-      for (const auto &I : BB) {
-        if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-          if (Alloc->getAllocatedType()->isArrayTy() &&
-              Alloc->getAllocatedType()->getArrayNumElements() > 0 &&
-              Alloc->getAllocatedType()->getArrayElementType()->isStructTy() &&
-              Alloc->getAllocatedType()
-                      ->getArrayElementType()
-                      ->getStructName() == "struct.__va_list_tag") {
-            AllocVarArg = Alloc;
-            // TODO break out this nested loop earlier (without goto ;-)
-          }
-        }
-      }
-    }
+    const auto *AllocVarArg = getVaListTagOrNull(*Callee);
+
     // Generate the varargs things by using an over-approximation
     if (Source != nullptr && Source == AllocVarArg &&
         Source->getType()->isPointerTy()) {
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
index 0a88533389..2ad21cc686 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
@@ -124,25 +124,7 @@ auto IDETypeStateAnalysisBase::getRetFlowFunction(n_t CallSite, f_t CalleeFun,
     container_type Res;
     // Handle C-style varargs functions
     if (CalleeFun->isVarArg() && !CalleeFun->isDeclaration()) {
-      const llvm::Instruction *AllocVarArg;
-      // Find the allocation of %struct.__va_list_tag
-      for (const auto &BB : *CalleeFun) {
-        for (const auto &I : BB) {
-          if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-            if (Alloc->getAllocatedType()->isArrayTy() &&
-                Alloc->getAllocatedType()->getArrayNumElements() > 0 &&
-                Alloc->getAllocatedType()
-                    ->getArrayElementType()
-                    ->isStructTy() &&
-                Alloc->getAllocatedType()
-                        ->getArrayElementType()
-                        ->getStructName() == "struct.__va_list_tag") {
-              AllocVarArg = Alloc;
-              // TODO break out this nested loop earlier (without goto ;-)
-            }
-          }
-        }
-      }
+      const auto *AllocVarArg = getVaListTagOrNull(*CalleeFun);
       // Generate the varargs things by using an over-approximation
       if (Source == AllocVarArg) {
         for (unsigned Idx = CalleeFun->arg_size(); Idx < CS->arg_size();
diff --git a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
index 2766f8e5a9..f6ed829e87 100644
--- a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
@@ -180,7 +180,7 @@ auto FilteredLLVMAliasSet::getReachableAllocationSites(
     return &getDefaultValue<AliasSetTy>();
   }
 
-  const auto *Fun = I->getFunction();
+  const auto *Fun = I ? I->getFunction() : nullptr;
   auto &AllocSites = ReachableAllocationSitesMap[ReachableAllocationSitesKey{
       {Fun, IntraProcOnly}, V}];
   if (AllocSites) {
@@ -222,6 +222,11 @@ auto FilteredLLVMAliasSet::getReachableAllocationSites(
 bool FilteredLLVMAliasSet::isInReachableAllocationSites(
     const llvm::Value *V, const llvm::Value *PotentialValue, bool IntraProcOnly,
     const llvm::Instruction *I) {
+
+  if (PotentialValue == V) {
+    return true;
+  }
+
   // if V is not a (interesting) pointer we can return an empty set
   if (!isInterestingPointer(V)) {
     return false;
diff --git a/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
index 36319dc05a..3d854848b4 100644
--- a/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
@@ -23,9 +23,7 @@
 #include "llvm/Demangle/Demangle.h"
 #include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/Metadata.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
diff --git a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
index 028abe8659..9aef06815b 100644
--- a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
@@ -20,9 +20,6 @@
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
-#include "phasar/Utils/NlohmannLogging.h"
-#include "phasar/Utils/PAMMMacros.h"
-#include "phasar/Utils/Utilities.h"
 
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Demangle/Demangle.h"
@@ -30,18 +27,12 @@
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
-#include "llvm/IR/Operator.h"
-#include "llvm/Support/Format.h"
 
 #include "boost/graph/graphviz.hpp"
 #include "boost/graph/transitive_closure.hpp"
 
-#include <algorithm>
 #include <cassert>
-#include <memory>
 #include <ostream>
 
 using namespace std;
diff --git a/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp b/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
index ac36114d33..d54be64350 100644
--- a/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
@@ -29,6 +29,7 @@
 #include "llvm/IR/Operator.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Support/Casting.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
@@ -181,7 +182,8 @@ getOffsetAndBase(const llvm::Value *V) {
 }
 
 static llvm::DIType *getStructElementType(llvm::DIType *BaseTy, size_t Offset) {
-  const auto *DerivedTy = llvm::dyn_cast<llvm::DIDerivedType>(BaseTy);
+  const auto *DerivedTy =
+      llvm::dyn_cast_if_present<llvm::DIDerivedType>(BaseTy);
   auto *StructTy = DerivedTy ? DerivedTy->getBaseType() : BaseTy;
 
   if (Offset == 0 && DerivedTy) {
@@ -189,13 +191,13 @@ static llvm::DIType *getStructElementType(llvm::DIType *BaseTy, size_t Offset) {
   }
 
   if (const auto *CompositeTy =
-          llvm::dyn_cast<llvm::DICompositeType>(StructTy)) {
-    if (Offset > CompositeTy->getElements().size()) {
+          llvm::dyn_cast_if_present<llvm::DICompositeType>(StructTy)) {
+    auto Elems = CompositeTy->getElements();
+    if (!Elems || Offset >= Elems.size()) {
       return nullptr;
     }
-    auto Elems = CompositeTy->getElements();
 
-    if (auto *ElemTy = llvm::dyn_cast<llvm::DIType>(Elems[Offset])) {
+    if (auto *ElemTy = llvm::dyn_cast_if_present<llvm::DIType>(Elems[Offset])) {
       return ElemTy;
     }
   }
@@ -239,6 +241,10 @@ static llvm::DIType *getVarTypeFromIRRec(const llvm::Value *V, size_t Depth) {
 }
 
 llvm::DIType *psr::getVarTypeFromIR(const llvm::Value *V) {
+  if (!V) {
+    return nullptr;
+  }
+
   return getVarTypeFromIRRec(V, 0);
 }
 
diff --git a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
index 2b8fac6aa3..18cb20c97e 100644
--- a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
@@ -27,8 +27,10 @@
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
+#include "llvm/IR/InstIterator.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/ModuleSlotTracker.h"
 #include "llvm/IR/Value.h"
@@ -40,7 +42,6 @@
 #include <memory>
 #include <mutex>
 
-using namespace std;
 using namespace psr;
 
 bool psr::isIntegerLikeType(const llvm::Type *T) noexcept {
@@ -206,7 +207,9 @@ std::string psr::llvmIRToShortString(const llvm::Value *V) {
       I && !I->getType()->isVoidTy()) {
     V->printAsOperand(RSO, true, getModuleSlotTrackerFor(V));
   } else if (const auto *F = llvm::dyn_cast<llvm::Function>(V)) {
-    RSO << F->getName();
+    RSO << "fun @" << F->getName();
+  } else if (const auto *Glob = llvm::dyn_cast<llvm::GlobalVariable>(V)) {
+    RSO << "glob @" << Glob->getName();
   } else {
     V->print(RSO, getModuleSlotTrackerFor(V));
   }
@@ -238,6 +241,21 @@ void psr::dumpIRValue(const llvm::Value *V) {
 void psr::dumpIRValue(const llvm::Instruction *V) {
   llvm::outs() << llvmIRToString(V) << '\n';
 }
+void psr::dumpIRValue(const llvm::Function *V) {
+  llvm::outs() << llvmIRToString(V) << '\n';
+}
+
+void psr::dumpDIType(const llvm::DIType *Ty) {
+  if (!Ty) {
+    llvm::errs() << "<null>\n";
+  }
+
+  Ty->print(llvm::errs());
+}
+
+void psr::dumpDIType(const llvm::DIDerivedType *Ty) {
+  dumpDIType(static_cast<const llvm::DIType *>(Ty));
+}
 
 std::vector<const llvm::Value *>
 psr::globalValuesUsedinFunction(const llvm::Function *F) {
@@ -270,9 +288,9 @@ std::string psr::getMetaDataID(const llvm::Value *V) {
           .str();
     }
   } else if (const auto *Arg = llvm::dyn_cast<llvm::Argument>(V)) {
-    string FName = Arg->getParent()->getName().str();
-    string ArgNr = std::to_string(getFunctionArgumentNr(Arg));
-    return string(FName + "." + ArgNr);
+    std::string FName = Arg->getParent()->getName().str();
+    std::string ArgNr = std::to_string(getFunctionArgumentNr(Arg));
+    return FName + "." + ArgNr;
   }
   return "-1";
 }
@@ -317,15 +335,16 @@ const llvm::Instruction *psr::getNthInstruction(const llvm::Function *F,
 }
 
 llvm::SmallVector<const llvm::Instruction *, 2>
-psr::getAllExitPoints(const llvm::Function *F) {
+psr::getAllExitPoints(const llvm::Function *F, bool IncludeResume) {
   llvm::SmallVector<const llvm::Instruction *, 2> Ret;
-  appendAllExitPoints(F, Ret);
+  appendAllExitPoints(F, Ret, IncludeResume);
   return Ret;
 }
 
 void psr::appendAllExitPoints(
     const llvm::Function *F,
-    llvm::SmallVectorImpl<const llvm::Instruction *> &ExitPoints) {
+    llvm::SmallVectorImpl<const llvm::Instruction *> &ExitPoints,
+    bool IncludeResume) {
   if (!F) {
     return;
   }
@@ -335,7 +354,7 @@ void psr::appendAllExitPoints(
     assert(Term && "Invalid IR: Each BasicBlock must have a terminator "
                    "instruction at the end");
     if (llvm::isa<llvm::ReturnInst>(Term) ||
-        llvm::isa<llvm::ResumeInst>(Term)) {
+        (IncludeResume && llvm::isa<llvm::ResumeInst>(Term))) {
       ExitPoints.push_back(Term);
     }
   }
@@ -559,3 +578,42 @@ void ModulesToSlotTracker::deleteMSTForModule(const llvm::Module *M) {
     MToST.erase(It);
   }
 }
+
+const llvm::AllocaInst *psr::getVaListTagOrNull(const llvm::Function &Fun) {
+  if (Fun.isDeclaration()) {
+    return nullptr;
+  }
+  for (const auto &I : llvm::instructions(Fun)) {
+    if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(&I);
+        Alloca && isVaListAlloca(*Alloca)) {
+      return Alloca;
+    }
+  }
+  return nullptr;
+}
+
+bool psr::isVaListAlloca(const llvm::AllocaInst &Alloc) {
+  // Over-approximate by trying to add the
+  //   alloca [1 x %struct.__va_list_tag], align 16
+  // to the results
+
+  const auto *Ty = Alloc.getAllocatedType();
+  if (Ty->isArrayTy() && Ty->getArrayNumElements() > 0 &&
+      Ty->getArrayElementType()->isStructTy() &&
+      Ty->getArrayElementType()->getStructName() == "struct.__va_list_tag") {
+    return true;
+  }
+
+  // On windows, the alloca just allocates a pointer that is directly used by
+  // the va_start intrinsic.
+  // Note that on linux (where the above __va_list_tag heuristic works), the
+  // alloca is *not* directly used by the va_start intrinsic; there, a gep lays
+  // in between
+  for (const auto &Use : Alloc.uses()) {
+    if (llvm::isa<llvm::VAStartInst>(Use.getUser())) {
+      return true;
+    }
+  }
+
+  return false;
+}
diff --git a/test/llvm_test_code/virtual_callsites/CMakeLists.txt b/test/llvm_test_code/virtual_callsites/CMakeLists.txt
index 4a329e510e..a4f9d3e0c8 100644
--- a/test/llvm_test_code/virtual_callsites/CMakeLists.txt
+++ b/test/llvm_test_code/virtual_callsites/CMakeLists.txt
@@ -11,4 +11,5 @@ set(NoMem2regSources
 
 foreach(TEST_SRC ${NoMem2regSources})
   generate_ll_file(FILE ${TEST_SRC})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
 endforeach(TEST_SRC)
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp
index 9b74a67f1c..e3278110f7 100644
--- a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGGlobCtorDtorTest.cpp
@@ -102,18 +102,18 @@ TEST_F(LLVMBasedICFGGlobCtorDtorTest, CtorTest) {
 TEST_F(LLVMBasedICFGGlobCtorDtorTest, CtorTest2) {
 
   llvm::LLVMContext Ctx;
-  auto M1 = LLVMProjectIRDB::getParsedIRModuleOrNull(
+  auto M1 = LLVMProjectIRDB::getParsedIRModuleOrErr(
       PathToLLFiles + "globals_ctor_2_1_cpp.ll", Ctx);
-  auto M2 = LLVMProjectIRDB::getParsedIRModuleOrNull(
+  auto M2 = LLVMProjectIRDB::getParsedIRModuleOrErr(
       PathToLLFiles + "globals_ctor_2_2_cpp.ll", Ctx);
 
-  ASSERT_NE(nullptr, M1);
-  ASSERT_NE(nullptr, M2);
+  ASSERT_TRUE(M1);
+  ASSERT_TRUE(M2);
 
-  auto LinkerError = llvm::Linker::linkModules(*M1, std::move(M2));
+  auto LinkerError = llvm::Linker::linkModules(**M1, std::move(*M2));
   ASSERT_FALSE(LinkerError);
 
-  LLVMProjectIRDB IRDB(std::move(M1), /*DoPreprocessing*/ true);
+  LLVMProjectIRDB IRDB(std::move(*M1), /*DoPreprocessing*/ true);
   DIBasedTypeHierarchy TH(IRDB);
   LLVMAliasSet PT(&IRDB);
   LLVMBasedICFG ICFG(&IRDB, CallGraphAnalysisType::OTF, {"main"}, &TH, &PT,

From e5e20bae3fabbfe5beedfa860ab1bccca667c2e4 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Sun, 27 Jul 2025 09:04:14 +0200
Subject: [PATCH 14/24] Fix Type-based Call-Graphs with Multiple Inheritance
 (#776)

* replaced llvm-14 with llvm-15 in relevant files

* some changes

* more efficient call-graph

* String-nbased vtable getter + CG-test with dbg info

* minor in CG

* annotation fix + test fix

* removed bitcasts and fixed tests

* Fix Annotation.cpp + TaintConfigTest

* Quick-fix LLVMTypeHierarchyTest

* fix one IIA test

* Fix StringtestCpp for generalized LCA

* first half of tests fixed

* fixed first half of tests

* fixed all but one test in IDEInstInteractionAnalysisTest

* fixed all but two tests

* Fix IIAFlowFact equality

* Re-add getVFTableGlobal

* fixed some newly failed tests

* trade soundness for precision in LLVMAliasSet

* ci.yml update

* Revert "fixed some newly failed tests"

* pre-commit hook

* Two Tests + xtaint09 test fix for pipeline

* Basic Opaque Pointer Impl, bugged

* switching to DebugInfoFinder

* re-add the quick-fix for LLVMTypeHierarchy

* OpaquePtr type mapping, missing subroutines

* Introducing a pass to save ptr types

* Revert "Introducing a pass to save ptr types"

This reverts commit 2a91b6ddac99665490df6f06789b2013201c37ec.

* moving phasar to DIBasedTypeHierarchy

* full switch to DIBasedTypeHierarchy + Test fixes

* fixed PathTracingTest

* dtaresolver deprecated and test fixes

* Fixed OTFTest

* trimmed trailing whitespace

* minor fixes

* readded TypeToDIType map for RTAResolver

* pre-commit clang-format fix

* pre-commit clang-format llvmbasedicfg.cpp

* moved RTAResolver to DITypes

* implemented review suggestions

* Log error if trying to instantiate DTAResolver + minor

* Add breaking changes

* Also compare gep type in IIA EqualGEPDescriptor

* Expose getDILocation()

* expose getSrcCodeFromIR for DebugLocation + minor

* Remove some unused includes

* Make TaintConfigData compatible with C++20

* Compatibility with opaque pointers

* Allow setting the LLVM version from higher-level projects

* Getting rid of UB in CHAResolver

* Start adding more sophisticated type extraction (WIP)

* Handle function calls in getVarTypeFromIR

* better fallback handling for getDebugLocation, etc

* Better IntraMonoSolver dump

* minor

* improve intra mono dump

* minor

* expose getNonPureVirtualVFTEntry as namespace-scope function + fix build with LLVM 14

* Fix RTA resolver

* Add missing include

* Fix solveIFDSProblem + cherry-pick fix of DIBasedTypeHierarchy::buildTypeGraph

* Potential fix, needs testing

* Look into the right VTable, when resolving a virtual call

* pre-commit

* some cleanup

---------

Co-authored-by: mxHuber <huber.maximilian.leo@gmail.com>
Co-authored-by: Fabian Schiebel <fabianbs@mail.uni-paderborn.de>
---
 .../ControlFlow/LLVMVFTableProvider.h         |  27 +++-
 .../ControlFlow/Resolver/CHAResolver.h        |   3 +-
 .../ControlFlow/Resolver/NOResolver.h         |   6 +-
 .../ControlFlow/Resolver/OTFResolver.h        |   6 +-
 .../ControlFlow/Resolver/RTAResolver.h        |   3 +-
 .../ControlFlow/Resolver/Resolver.h           |  25 ++--
 .../TypeHierarchy/DIBasedTypeHierarchy.h      |   2 +
 .../PhasarLLVM/TypeHierarchy/LLVMVFTable.h    |  10 +-
 include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h |   1 -
 include/phasar/Utils/DefaultValue.h           |  20 +++
 include/phasar/Utils/HashUtils.h              |  27 ++++
 include/phasar/Utils/MapUtils.h               |  69 +++++++++
 lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp  |   1 +
 .../ControlFlow/LLVMVFTableProvider.cpp       | 136 ++++++++++++++----
 .../ControlFlow/Resolver/CHAResolver.cpp      |  15 +-
 .../ControlFlow/Resolver/NOResolver.cpp       |  14 +-
 .../ControlFlow/Resolver/OTFResolver.cpp      |  27 ++--
 .../ControlFlow/Resolver/RTAResolver.cpp      |  25 ++--
 .../ControlFlow/Resolver/Resolver.cpp         |  52 ++++---
 .../TypeHierarchy/DIBasedTypeHierarchy.cpp    |   2 +-
 .../TypeHierarchy/LLVMTypeHierarchy.cpp       |   3 +-
 lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp  |  37 ++---
 lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp          |   1 +
 .../llvm_test_code/call_graphs/CMakeLists.txt |   2 +
 .../call_graphs/virtual_call_10.cpp           |  22 +++
 .../call_graphs/virtual_call_11.cpp           |  45 ++++++
 .../PhasarLLVM/ControlFlow/CMakeLists.txt     |   1 +
 ...MBasedICFG_RTA_MultipleInheritanceTest.cpp | 122 ++++++++++++++++
 28 files changed, 557 insertions(+), 147 deletions(-)
 create mode 100644 include/phasar/Utils/HashUtils.h
 create mode 100644 include/phasar/Utils/MapUtils.h
 create mode 100644 test/llvm_test_code/call_graphs/virtual_call_10.cpp
 create mode 100644 test/llvm_test_code/call_graphs/virtual_call_11.cpp
 create mode 100644 unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTA_MultipleInheritanceTest.cpp

diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
index ffaa42caef..2352b049bc 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h
@@ -11,9 +11,13 @@
 #define PHASAR_PHASARLLVM_CONTROLFLOW_LLVMVFTABLEPROVIDER_H
 
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
+#include "phasar/Utils/HashUtils.h"
 
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringMap.h"
+#include "llvm/IR/DebugInfoMetadata.h"
 
+#include <cstdint>
 #include <unordered_map>
 
 namespace llvm {
@@ -37,8 +41,19 @@ class LLVMVFTableProvider {
   explicit LLVMVFTableProvider(const LLVMProjectIRDB &IRDB);
 
   [[nodiscard]] bool hasVFTable(const llvm::DIType *Type) const;
-  [[nodiscard]] const LLVMVFTable *
-  getVFTableOrNull(const llvm::DIType *Type) const;
+  [[nodiscard]] const LLVMVFTable *getVFTableOrNull(const llvm::DIType *Type,
+                                                    uint32_t Index = 0) const;
+
+  [[nodiscard]] const llvm::SmallDenseSet<uint32_t> &
+  getVTableIndexInHierarchy(const llvm::DIType *DerivedType,
+                            const llvm::DIType *BaseType) const;
+
+  /// Supercedes DIBasedTypeHierarchy::removeVTablePrefix
+  [[nodiscard]] static llvm::StringRef
+  removeVTablePrefix(llvm::StringRef GlobName) noexcept;
+
+  /// Supercedes DIBasedTypeHierarchy::isVTable
+  [[nodiscard]] static bool isVTable(llvm::StringRef MangledVarName);
 
   [[nodiscard]] const llvm::GlobalVariable *
   getVFTableGlobal(const llvm::DIType *Type) const;
@@ -48,7 +63,13 @@ class LLVMVFTableProvider {
 
 private:
   llvm::StringMap<const llvm::GlobalVariable *> ClearNameTVMap;
-  std::unordered_map<const llvm::DIType *, LLVMVFTable> TypeVFTMap;
+  std::unordered_map<std::pair<const llvm::DIType *, uint32_t>, LLVMVFTable,
+                     PairHash>
+      TypeVFTMap;
+  std::unordered_map<
+      const llvm::DIType *,
+      llvm::SmallDenseMap<const llvm::DIType *, llvm::SmallDenseSet<uint32_t>>>
+      BasesOfVirt;
 };
 } // namespace psr
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
index dc6f7c8ff1..8186bdba16 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
@@ -38,7 +38,8 @@ class CHAResolver : public Resolver {
   // dtor in CHAResolver.cpp
   ~CHAResolver() override;
 
-  FunctionSetTy resolveVirtualCall(const llvm::CallBase *CallSite) override;
+  void resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                          const llvm::CallBase *CallSite) override;
 
   [[nodiscard]] std::string str() const override;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
index 88afa796e5..044815e287 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
@@ -25,9 +25,11 @@ class NOResolver final : public Resolver {
 
   ~NOResolver() override = default;
 
-  FunctionSetTy resolveVirtualCall(const llvm::CallBase *CallSite) override;
+  void resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                          const llvm::CallBase *CallSite) override;
 
-  FunctionSetTy resolveFunctionPointer(const llvm::CallBase *CallSite) override;
+  void resolveFunctionPointer(FunctionSetTy &PossibleTargets,
+                              const llvm::CallBase *CallSite) override;
 
   [[nodiscard]] std::string str() const override;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
index eca760ae77..41b3f6e878 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
@@ -48,9 +48,11 @@ class OTFResolver : public Resolver {
   void handlePossibleTargets(const llvm::CallBase *CallSite,
                              FunctionSetTy &CalleeTargets) override;
 
-  FunctionSetTy resolveVirtualCall(const llvm::CallBase *CallSite) override;
+  void resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                          const llvm::CallBase *CallSite) override;
 
-  FunctionSetTy resolveFunctionPointer(const llvm::CallBase *CallSite) override;
+  void resolveFunctionPointer(FunctionSetTy &PossibleTargets,
+                              const llvm::CallBase *CallSite) override;
 
   static std::set<const llvm::Type *>
   getReachableTypes(const LLVMAliasInfo::AliasSetTy &Values);
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
index c6e003211f..6e89063a9d 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
@@ -38,7 +38,8 @@ class RTAResolver : public CHAResolver {
 
   ~RTAResolver() override = default;
 
-  FunctionSetTy resolveVirtualCall(const llvm::CallBase *CallSite) override;
+  void resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                          const llvm::CallBase *CallSite) override;
 
   [[nodiscard]] std::string str() const override;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
index 205a1431f1..09b8147424 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
@@ -52,10 +52,9 @@ getReceiverType(const llvm::CallBase *CallSite);
 
 /// Assuming that `CallSite` is a virtual call, where `Idx` is retrieved through
 /// `getVFTIndex()` and `T` through `getReceiverType()`
-[[nodiscard]] const llvm::Function *
-getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
-                          const llvm::CallBase *CallSite,
-                          const psr::LLVMVFTableProvider &VTP);
+[[nodiscard]] const llvm::Function *getNonPureVirtualVFTEntry(
+    const llvm::DIType *T, unsigned Idx, const llvm::CallBase *CallSite,
+    const psr::LLVMVFTableProvider &VTP, const llvm::DIType *ReceiverType);
 
 [[nodiscard]] std::string getReceiverTypeName(const llvm::CallBase *CallSite);
 
@@ -79,11 +78,12 @@ class Resolver {
 
   const llvm::Function *
   getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
-                            const llvm::CallBase *CallSite) {
+                            const llvm::CallBase *CallSite,
+                            const llvm::DIType *ReceiverType) {
     if (!VTP) {
       return nullptr;
     }
-    return psr::getNonPureVirtualVFTEntry(T, Idx, CallSite, *VTP);
+    return psr::getNonPureVirtualVFTEntry(T, Idx, CallSite, *VTP, ReceiverType);
   }
 
 public:
@@ -103,12 +103,6 @@ class Resolver {
   [[nodiscard]] FunctionSetTy
   resolveIndirectCall(const llvm::CallBase *CallSite);
 
-  [[nodiscard]] virtual FunctionSetTy
-  resolveVirtualCall(const llvm::CallBase *CallSite) = 0;
-
-  [[nodiscard]] virtual FunctionSetTy
-  resolveFunctionPointer(const llvm::CallBase *CallSite);
-
   virtual void otherInst(const llvm::Instruction *Inst);
 
   [[nodiscard]] virtual std::string str() const = 0;
@@ -126,6 +120,13 @@ class Resolver {
                                           const LLVMVFTableProvider *VTP,
                                           const DIBasedTypeHierarchy *TH,
                                           LLVMAliasInfoRef PT = nullptr);
+
+protected:
+  virtual void resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                                  const llvm::CallBase *CallSite) = 0;
+
+  virtual void resolveFunctionPointer(FunctionSetTy &PossibleTargets,
+                                      const llvm::CallBase *CallSite);
 };
 } // namespace psr
 
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
index d4554958a8..fccd023f85 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h
@@ -58,7 +58,9 @@ class DIBasedTypeHierarchy
                                 const DIBasedTypeHierarchyData &SerializedData);
   ~DIBasedTypeHierarchy() override = default;
 
+  [[deprecated("Use LLVMVFTableProvider::isVTable() instead")]]
   static bool isVTable(llvm::StringRef VarName);
+  [[deprecated("Use LLVMVFTableProvider::removeVTablePrefix() instead")]]
   static std::string removeVTablePrefix(llvm::StringRef VarName);
 
   [[nodiscard]] bool hasType(ClassType Type) const override {
diff --git a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
index a68c1b341a..e4955ab05b 100644
--- a/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
+++ b/include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h
@@ -73,26 +73,26 @@ class LLVMVFTable : public VFTable<const llvm::Function *> {
 
   void printAsJson(llvm::raw_ostream &OS) const override;
 
-  [[nodiscard]] std::vector<const llvm::Function *>::iterator begin() {
+  [[nodiscard]] std::vector<const llvm::Function *>::iterator begin() noexcept {
     return VFT.begin();
   }
 
   [[nodiscard]] std::vector<const llvm::Function *>::const_iterator
-  begin() const {
+  begin() const noexcept {
     return VFT.begin();
   };
 
-  [[nodiscard]] std::vector<const llvm::Function *>::iterator end() {
+  [[nodiscard]] std::vector<const llvm::Function *>::iterator end() noexcept {
     return VFT.end();
   };
 
   [[nodiscard]] std::vector<const llvm::Function *>::const_iterator
-  end() const {
+  end() const noexcept {
     return VFT.end();
   };
 
   [[nodiscard]] static std::vector<const llvm::Function *>
-  getVFVectorFromIRVTable(const llvm::ConstantStruct &);
+  getVFVectorFromIRVTable(const llvm::ConstantStruct &VT, uint32_t Index = 0);
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h b/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
index fd57c81e0d..915787ff87 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
@@ -33,7 +33,6 @@ class Value;
 class GlobalVariable;
 class Module;
 class DIFile;
-class DIType;
 class DILocation;
 } // namespace llvm
 
diff --git a/include/phasar/Utils/DefaultValue.h b/include/phasar/Utils/DefaultValue.h
index 3dde71aeb3..e63b10018a 100644
--- a/include/phasar/Utils/DefaultValue.h
+++ b/include/phasar/Utils/DefaultValue.h
@@ -40,6 +40,26 @@ getDefaultValue() noexcept(std::is_nothrow_default_constructible_v<T>) {
   }
 }
 
+namespace detail {
+struct DefaultCast {
+  template <typename To,
+            typename = std::enable_if_t<CanEfficientlyPassByValue<To>>>
+  operator To() && {
+    return psr::getDefaultValue<To>();
+  }
+
+  template <typename To,
+            typename = std::enable_if_t<!CanEfficientlyPassByValue<To>>>
+  operator const To &() && {
+    return psr::getDefaultValue<To>();
+  }
+};
+} // namespace detail
+
+/// Provides a value that automatically converts to (a const-ref to) the
+/// default-constructed object of the expected receiver type.
+static constexpr detail::DefaultCast default_value() noexcept { return {}; }
+
 } // namespace psr
 
 #endif // PHASAR_UTILS_DEFAULTVALUE_H
diff --git a/include/phasar/Utils/HashUtils.h b/include/phasar/Utils/HashUtils.h
new file mode 100644
index 0000000000..3815d29ff7
--- /dev/null
+++ b/include/phasar/Utils/HashUtils.h
@@ -0,0 +1,27 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_HASHUTILS_H
+#define PHASAR_UTILS_HASHUTILS_H
+
+#include "llvm/ADT/DenseMapInfo.h"
+
+#include <cstddef>
+#include <utility>
+
+namespace psr {
+struct PairHash {
+  template <typename T, typename U>
+  size_t operator()(const std::pair<T, U> &Pair) const noexcept {
+    return llvm::DenseMapInfo<std::pair<T, U>>::getHashValue(Pair);
+  }
+};
+} // namespace psr
+
+#endif // PHASAR_UTILS_HASHUTILS_H
diff --git a/include/phasar/Utils/MapUtils.h b/include/phasar/Utils/MapUtils.h
new file mode 100644
index 0000000000..c087aaa0ee
--- /dev/null
+++ b/include/phasar/Utils/MapUtils.h
@@ -0,0 +1,69 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_MAPUTILS_H
+#define PHASAR_UTILS_MAPUTILS_H
+
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/DefaultValue.h"
+#include "phasar/Utils/Macros.h"
+
+#include "llvm/ADT/STLForwardCompat.h"
+
+#include <type_traits>
+#include <utility>
+
+namespace psr {
+
+template <typename MapT, typename KeyT,
+          typename = std::enable_if_t<std::is_lvalue_reference_v<MapT>>>
+static auto getOrDefault(MapT &&Map, KeyT &&Key) -> ByConstRef<
+    llvm::remove_cvref_t<decltype(Map.find(PSR_FWD(Key))->second)>> {
+  auto It = Map.find(PSR_FWD(Key));
+  if (It == Map.end()) {
+    return default_value();
+  }
+
+  return It->second;
+}
+
+template <
+    typename MapT, typename KeyT,
+    typename = std::enable_if_t<std::is_lvalue_reference_v<MapT>>,
+    std::enable_if_t<
+        !psr::CanEfficientlyPassByValue<llvm::remove_cvref_t<KeyT>>, int> = 0>
+static auto getOrNull(MapT &&Map, KeyT &&Key)
+    -> decltype(&Map.find(PSR_FWD(Key))->second) {
+  auto It = Map.find(PSR_FWD(Key));
+  decltype(&It->second) Ret = nullptr;
+  if (It != Map.end()) {
+    Ret = &It->second;
+  }
+
+  return Ret;
+}
+
+template <
+    typename MapT, typename KeyT,
+    typename = std::enable_if_t<std::is_lvalue_reference_v<MapT>>,
+    std::enable_if_t<psr::CanEfficientlyPassByValue<llvm::remove_cvref_t<KeyT>>,
+                     int> = 0>
+static auto getOrNull(MapT &&Map, KeyT Key)
+    -> decltype(&Map.find(Key)->second) {
+  auto It = Map.find(Key);
+  decltype(&It->second) Ret = nullptr;
+  if (It != Map.end()) {
+    Ret = &It->second;
+  }
+
+  return Ret;
+}
+} // namespace psr
+
+#endif // PHASAR_UTILS_MAPUTILS_H
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
index addd88c957..7d6bd38fd3 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
@@ -27,6 +27,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instruction.h"
+#include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 
 #include <utility>
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp b/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
index 4abbc34fd3..67246c938e 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp
@@ -4,7 +4,7 @@
 #include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
-#include "phasar/Utils/Logger.h"
+#include "phasar/Utils/MapUtils.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/BinaryFormat/Dwarf.h"
@@ -16,51 +16,83 @@
 #include "llvm/Support/Casting.h"
 
 using namespace psr;
-static constexpr llvm::StringLiteral TIPrefix = "typeinfo name for ";
+
+static constexpr llvm::StringLiteral TSPrefixDemang = "typeinfo name for ";
+static constexpr llvm::StringLiteral VTablePrefixDemang = "vtable for ";
+static constexpr llvm::StringLiteral VTablePrefix = "_ZTV";
 
 static std::string getTypeName(const llvm::DIType *DITy) {
-  auto Ret = [DITy] {
+  auto TypeName = [DITy] {
     if (const auto *CompTy = llvm::dyn_cast<llvm::DICompositeType>(DITy)) {
-      auto Ident = CompTy->getIdentifier();
-      return Ident.empty() ? llvm::demangle(CompTy->getName().str())
-                           : llvm::demangle(Ident.str());
+      if (auto Ident = CompTy->getIdentifier(); !Ident.empty()) {
+        return Ident;
+      }
     }
-    return llvm::demangle(DITy->getName().str());
+    return DITy->getName();
   }();
 
-  if (llvm::StringRef(Ret).startswith(TIPrefix)) {
-    Ret.erase(0, TIPrefix.size());
+  // In LLVM 17 demangle() takes a StringRef
+  auto Ret = llvm::demangle(TypeName.str());
+
+  if (llvm::StringRef(Ret).startswith(TSPrefixDemang)) {
+    Ret.erase(0, TSPrefixDemang.size());
   }
 
   return Ret;
 }
 
-static std::vector<const llvm::Function *> getVirtualFunctions(
-    const llvm::StringMap<const llvm::GlobalVariable *> &ClearNameTVMap,
-    const llvm::DIType *Type) {
-  auto ClearName = getTypeName(Type);
+static void insertVirtualFunctions(
+    std::unordered_map<std::pair<const llvm::DIType *, uint32_t>, LLVMVFTable,
+                       PairHash> &Into,
+    const llvm::DIType *Type, const llvm::GlobalVariable *VTableGlobal) {
+  if (!VTableGlobal) {
+    return;
+  }
+
+  if (const auto *VT = llvm::dyn_cast<llvm::ConstantStruct>(
+          VTableGlobal->getInitializer())) {
+    auto NumElems = VT->getNumOperands();
 
-  auto It = ClearNameTVMap.find(ClearName);
+    // llvm::errs() << "[insertVirtualFunctions]: VT: " << *VT << '\n';
+    // llvm::errs() << "[insertVirtualFunctions]: >  NumElems: " << NumElems
+    // << '\n';
+    for (uint32_t I = 0; I != NumElems; ++I) {
+      Into[{Type, I}] = LLVMVFTable::getVFVectorFromIRVTable(*VT, I);
+    }
+  }
+}
 
-  if (It != ClearNameTVMap.end()) {
-    if (!It->second->hasInitializer()) {
-      PHASAR_LOG_LEVEL_CAT(DEBUG, "DIBasedTypeHierarchy",
-                           ClearName << " does not have initializer");
-      return {};
+static void getBasesOfVirt(
+    llvm::SmallDenseMap<const llvm::DIType *, llvm::SmallDenseSet<uint32_t>>
+        &Into,
+    const llvm::DICompositeType *VirtTy, uint32_t CurrIdx = 0) {
+  Into[VirtTy].insert(CurrIdx);
+  for (const auto *Elem : VirtTy->getElements()) {
+    const auto *Inher = llvm::dyn_cast<llvm::DIDerivedType>(Elem);
+    if (!Inher) {
+      // Inheritance is always at the front of the member-list
+      break;
+    }
+    if (Inher->getTag() != llvm::dwarf::DW_TAG_inheritance) {
+      continue;
     }
-    if (const auto *I = llvm::dyn_cast<llvm::ConstantStruct>(
-            It->second->getInitializer())) {
-      return LLVMVFTable::getVFVectorFromIRVTable(*I);
+
+    const auto *BaseClass =
+        llvm::dyn_cast<llvm::DICompositeType>(Inher->getBaseType());
+    if (!BaseClass || !BaseClass->getVTableHolder()) {
+      continue;
     }
+    getBasesOfVirt(Into, BaseClass, CurrIdx);
+    CurrIdx++;
   }
-  return {};
 }
 
 LLVMVFTableProvider::LLVMVFTableProvider(const llvm::Module &Mod) {
   for (const auto &Glob : Mod.globals()) {
-    if (DIBasedTypeHierarchy::isVTable(Glob.getName())) {
+    if (isVTable(Glob.getName())) {
       auto Demang = llvm::demangle(Glob.getName().str());
-      auto ClearName = DIBasedTypeHierarchy::removeVTablePrefix(Demang);
+      auto ClearName = removeVTablePrefix(Demang);
+      // llvm::errs() << "> ClearName: " << ClearName << '\n';
       ClearNameTVMap.try_emplace(ClearName, &Glob);
     }
   }
@@ -71,8 +103,14 @@ LLVMVFTableProvider::LLVMVFTableProvider(const llvm::Module &Mod) {
     if (const auto *CompTy = llvm::dyn_cast<llvm::DICompositeType>(Ty)) {
       if (CompTy->getTag() == llvm::dwarf::DW_TAG_class_type ||
           CompTy->getTag() == llvm::dwarf::DW_TAG_structure_type) {
-        TypeVFTMap.try_emplace(CompTy,
-                               getVirtualFunctions(ClearNameTVMap, CompTy));
+        insertVirtualFunctions(
+            TypeVFTMap, CompTy,
+            getOrDefault(ClearNameTVMap, getTypeName(CompTy)));
+
+        if (CompTy->getVTableHolder()) {
+          auto &BaseTys = BasesOfVirt[CompTy];
+          getBasesOfVirt(BaseTys, CompTy);
+        }
       }
     }
   }
@@ -82,12 +120,13 @@ LLVMVFTableProvider::LLVMVFTableProvider(const LLVMProjectIRDB &IRDB)
     : LLVMVFTableProvider(*IRDB.getModule()) {}
 
 bool LLVMVFTableProvider::hasVFTable(const llvm::DIType *Type) const {
-  return TypeVFTMap.count(Type);
+  return TypeVFTMap.count({Type, 0});
 }
 
 const LLVMVFTable *
-LLVMVFTableProvider::getVFTableOrNull(const llvm::DIType *Type) const {
-  auto It = TypeVFTMap.find(Type);
+LLVMVFTableProvider::getVFTableOrNull(const llvm::DIType *Type,
+                                      uint32_t Index) const {
+  auto It = TypeVFTMap.find({Type, Index});
   return It != TypeVFTMap.end() ? &It->second : nullptr;
 }
 
@@ -106,3 +145,40 @@ LLVMVFTableProvider::getVFTableGlobal(llvm::StringRef ClearTypeName) const {
   }
   return nullptr;
 }
+
+static const auto &getDefaultIndices() {
+  static const llvm::SmallDenseSet<uint32_t> DefaultIndices = {0};
+  return DefaultIndices;
+}
+
+const llvm::SmallDenseSet<uint32_t> &
+LLVMVFTableProvider::getVTableIndexInHierarchy(
+    const llvm::DIType *DerivedType, const llvm::DIType *BaseType) const {
+  auto OuterIt = BasesOfVirt.find(DerivedType);
+  if (OuterIt == BasesOfVirt.end()) {
+    return getDefaultIndices();
+  }
+
+  auto InnerIt = OuterIt->second.find(BaseType);
+  if (InnerIt == OuterIt->second.end()) {
+    return getDefaultIndices();
+  }
+
+  return InnerIt->second;
+}
+
+llvm::StringRef
+LLVMVFTableProvider::removeVTablePrefix(llvm::StringRef GlobName) noexcept {
+  if (GlobName.startswith(VTablePrefixDemang)) {
+    return GlobName.drop_front(VTablePrefixDemang.size());
+  }
+  if (GlobName.startswith(VTablePrefix)) {
+    return GlobName.drop_front(VTablePrefix.size());
+  }
+  return GlobName;
+}
+
+/// Supercedes DIBasedTypeHierarchy::isVTable() + removeVTablePrefix
+bool LLVMVFTableProvider::isVTable(llvm::StringRef MangledVarName) {
+  return MangledVarName.startswith(VTablePrefix);
+}
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
index 15dcdf0e1c..393e810fb1 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
@@ -43,8 +43,8 @@ CHAResolver::CHAResolver(const LLVMProjectIRDB *IRDB,
 
 CHAResolver::~CHAResolver() = default;
 
-auto CHAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
-    -> FunctionSetTy {
+void CHAResolver::resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                                     const llvm::CallBase *CallSite) {
   PHASAR_LOG_LEVEL(DEBUG, "Call virtual function: ");
   // Leading to SEGFAULT in Unittests. Error only when run in Debug mode
   // << llvmIRToString(CallSite));
@@ -59,7 +59,7 @@ auto CHAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
                          // run in Debug mode
                          // << llvmIRToString(CallSite)
                          << "\n");
-    return {};
+    return;
   }
 
   auto VtableIndex = RetrievedVtableIndex.value();
@@ -71,16 +71,13 @@ auto CHAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
   // also insert all possible subtypes vtable entries
   auto FallbackTys = TH->getSubTypes(ReceiverTy);
 
-  FunctionSetTy PossibleCallees;
-
   for (const auto &FallbackTy : FallbackTys) {
-    const auto *Target =
-        getNonPureVirtualVFTEntry(FallbackTy, VtableIndex, CallSite);
+    const auto *Target = getNonPureVirtualVFTEntry(FallbackTy, VtableIndex,
+                                                   CallSite, ReceiverTy);
     if (Target && psr::isConsistentCall(CallSite, Target)) {
-      PossibleCallees.insert(Target);
+      PossibleTargets.insert(Target);
     }
   }
-  return PossibleCallees;
 }
 
 std::string CHAResolver::str() const { return "CHA"; }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp
index f825f52549..9dc6a56c28 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp
@@ -26,15 +26,11 @@ NOResolver::NOResolver(const LLVMProjectIRDB *IRDB,
                        const LLVMVFTableProvider *VTP)
     : Resolver(IRDB, VTP) {}
 
-auto NOResolver::resolveVirtualCall(const llvm::CallBase * /*CallSite*/)
-    -> FunctionSetTy {
-  return {};
-}
-
-auto NOResolver::resolveFunctionPointer(const llvm::CallBase * /*CallSite*/)
-    -> FunctionSetTy {
-  return {};
-}
+void NOResolver::resolveVirtualCall(FunctionSetTy & /*PossibleTargets*/,
+                                    const llvm::CallBase * /*CallSite*/) {}
+
+void NOResolver::resolveFunctionPointer(FunctionSetTy & /*PossibleTargets*/,
+                                        const llvm::CallBase * /*CallSite*/) {}
 
 std::string NOResolver::str() const { return "NOResolver"; }
 
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
index d82c1d29ce..c4168649c9 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
@@ -65,9 +65,8 @@ void OTFResolver::handlePossibleTargets(const llvm::CallBase *CallSite,
   }
 }
 
-auto OTFResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
-    -> FunctionSetTy {
-  FunctionSetTy PossibleCallTargets;
+void OTFResolver::resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                                     const llvm::CallBase *CallSite) {
 
   PHASAR_LOG_LEVEL(DEBUG,
                    "Call virtual function: " << llvmIRToString(CallSite));
@@ -79,7 +78,7 @@ auto OTFResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
                      "Error with resolveVirtualCall : impossible to retrieve "
                      "the vtable index\n"
                          << llvmIRToString(CallSite) << "\n");
-    return {};
+    return;
   }
 
   auto VtableIndex = RetrievedVtableIndex.value();
@@ -104,23 +103,19 @@ auto OTFResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
               !isConsistentCall(CallSite, Callee)) {
             continue;
           }
-          PossibleCallTargets.insert(Callee);
+          PossibleTargets.insert(Callee);
         }
       }
     }
   }
-
-  return PossibleCallTargets;
 }
 
-auto OTFResolver::resolveFunctionPointer(const llvm::CallBase *CallSite)
-    -> FunctionSetTy {
+void OTFResolver::resolveFunctionPointer(FunctionSetTy &PossibleTargets,
+                                         const llvm::CallBase *CallSite) {
   if (!CallSite->getCalledOperand()) {
-    return {};
+    return;
   }
 
-  FunctionSetTy Callees;
-
   auto PTS = PT.getAliasSet(CallSite->getCalledOperand(), CallSite);
 
   llvm::SmallVector<const llvm::GlobalVariable *, 2> GlobalVariableWL;
@@ -138,7 +133,7 @@ auto OTFResolver::resolveFunctionPointer(const llvm::CallBase *CallSite)
 
     if (const auto *F = llvm::dyn_cast<llvm::Function>(P)) {
       if (isConsistentCall(CallSite, F)) {
-        Callees.insert(F);
+        PossibleTargets.insert(F);
       }
     }
 
@@ -181,14 +176,14 @@ auto OTFResolver::resolveFunctionPointer(const llvm::CallBase *CallSite)
             if (const auto *F =
                     llvm::dyn_cast<llvm::Function>(CE->getOperand(0));
                 F && isConsistentCall(CallSite, F)) {
-              Callees.insert(F);
+              PossibleTargets.insert(F);
             }
           }
         }
 
         if (const auto *F = llvm::dyn_cast<llvm::Function>(Op)) {
           if (isConsistentCall(CallSite, F)) {
-            Callees.insert(F);
+            PossibleTargets.insert(F);
           }
         } else if (auto *CA = llvm::dyn_cast<llvm::ConstantAggregate>(Op)) {
           ConstantAggregateWL.push_back(CA);
@@ -204,8 +199,6 @@ auto OTFResolver::resolveFunctionPointer(const llvm::CallBase *CallSite)
       }
     }
   }
-
-  return Callees;
 }
 
 std::set<const llvm::Type *>
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
index 05b9e006d4..33afea40c2 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
@@ -23,16 +23,14 @@
 #include "phasar/Utils/Logger.h"
 
 #include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
 #include "llvm/Support/Casting.h"
+#include "llvm/Support/raw_ostream.h"
 
-using namespace std;
 using namespace psr;
 
 RTAResolver::RTAResolver(const LLVMProjectIRDB *IRDB,
@@ -42,10 +40,8 @@ RTAResolver::RTAResolver(const LLVMProjectIRDB *IRDB,
   resolveAllocatedCompositeTypes();
 }
 
-auto RTAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
-    -> FunctionSetTy {
-
-  FunctionSetTy PossibleCallTargets;
+void RTAResolver::resolveVirtualCall(FunctionSetTy &PossibleTargets,
+                                     const llvm::CallBase *CallSite) {
 
   PHASAR_LOG_LEVEL(DEBUG,
                    "Call virtual function: " << llvmIRToString(CallSite));
@@ -57,7 +53,7 @@ auto RTAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
                      "Error with resolveVirtualCall : impossible to retrieve "
                      "the vtable index\n"
                          << llvmIRToString(CallSite) << "\n");
-    return {};
+    return;
   }
 
   auto VtableIndex = RetrievedVtableIndex.value();
@@ -73,19 +69,18 @@ auto RTAResolver::resolveVirtualCall(const llvm::CallBase *CallSite)
   auto EndIt = ReachableTypes.end();
   for (const auto *PossibleType : AllocatedCompositeTypes) {
     if (ReachableTypes.find(PossibleType) != EndIt) {
-      const auto *Target =
-          getNonPureVirtualVFTEntry(PossibleType, VtableIndex, CallSite);
+
+      const auto *Target = getNonPureVirtualVFTEntry(PossibleType, VtableIndex,
+                                                     CallSite, ReceiverType);
       if (Target && psr::isConsistentCall(CallSite, Target)) {
-        PossibleCallTargets.insert(Target);
+        PossibleTargets.insert(Target);
       }
     }
   }
 
-  if (PossibleCallTargets.empty()) {
-    return CHAResolver::resolveVirtualCall(CallSite);
+  if (PossibleTargets.empty()) {
+    CHAResolver::resolveVirtualCall(PossibleTargets, CallSite);
   }
-
-  return PossibleCallTargets;
 }
 
 std::string RTAResolver::str() const { return "RTA"; }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
index 7153b557f7..f97fc8c1f1 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
@@ -61,6 +61,15 @@ std::optional<unsigned> psr::getVFTIndex(const llvm::CallBase *CallSite) {
   return std::nullopt;
 }
 
+static const llvm::DIType *stripPointerTypes(const llvm::DIType *DITy) {
+  while (const auto *DerivedTy =
+             llvm::dyn_cast_if_present<llvm::DIDerivedType>(DITy)) {
+    // get rid of the pointer
+    DITy = DerivedTy->getBaseType();
+  }
+  return DITy;
+}
+
 const llvm::DIType *psr::getReceiverType(const llvm::CallBase *CallSite) {
   if (!CallSite || CallSite->arg_empty() ||
       (CallSite->hasStructRetAttr() && CallSite->arg_size() < 2)) {
@@ -75,23 +84,23 @@ const llvm::DIType *psr::getReceiverType(const llvm::CallBase *CallSite) {
   }
 
   if (const auto *DITy = getVarTypeFromIR(Receiver)) {
-    while (const auto *DerivedTy =
-               llvm::dyn_cast_if_present<llvm::DIDerivedType>(DITy)) {
-      // get rid of the pointer
-      DITy = DerivedTy->getBaseType();
-    }
-    return DITy;
+    return stripPointerTypes(DITy);
+  }
+
+  if (const auto *Var =
+          getDILocalVariable(Receiver->stripPointerCastsAndAliases())) {
+    return stripPointerTypes(Var->getType());
   }
 
   return nullptr;
 }
 
-const llvm::Function *
-psr::getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
-                               const llvm::CallBase *CallSite,
-                               const LLVMVFTableProvider &VTP) {
+const llvm::Function *psr::getNonPureVirtualVFTEntry(
+    const llvm::DIType *T, unsigned Idx, const llvm::CallBase *CallSite,
+    const LLVMVFTableProvider &VTP, const llvm::DIType *ReceiverType) {
+  auto VTIndex = *VTP.getVTableIndexInHierarchy(T, ReceiverType).begin();
 
-  if (const auto *VT = VTP.getVFTableOrNull(T)) {
+  if (const auto *VT = VTP.getVFTableOrNull(T, VTIndex)) {
     const auto *Target = VT->getFunction(Idx);
     if (Target &&
         Target->getName() != DIBasedTypeHierarchy::PureVirtualCallName &&
@@ -135,6 +144,8 @@ bool psr::isVirtualCall(const llvm::Instruction *Inst,
   // check potential receiver type
   const auto *RecType = getReceiverType(CallSite);
   if (!RecType) {
+    llvm::errs() << "No receiver type found for call at "
+                 << llvmIRToString(Inst) << '\n';
     return false;
   }
 
@@ -160,28 +171,31 @@ void Resolver::postCall(const llvm::Instruction *Inst) {}
 
 auto Resolver::resolveIndirectCall(const llvm::CallBase *CallSite)
     -> FunctionSetTy {
+  FunctionSetTy PossibleTargets;
   if (VTP && isVirtualCall(CallSite, *VTP)) {
-    return resolveVirtualCall(CallSite);
+    resolveVirtualCall(PossibleTargets, CallSite);
   }
-  return resolveFunctionPointer(CallSite);
+
+  if (PossibleTargets.empty()) {
+    resolveFunctionPointer(PossibleTargets, CallSite);
+  }
+
+  return PossibleTargets;
 }
 
-auto Resolver::resolveFunctionPointer(const llvm::CallBase *CallSite)
-    -> FunctionSetTy {
+void Resolver::resolveFunctionPointer(FunctionSetTy &PossibleTargets,
+                                      const llvm::CallBase *CallSite) {
   // we may wish to optimise this function
   // naive implementation that considers every function whose signature
   // matches the call-site's signature as a callee target
   PHASAR_LOG_LEVEL(DEBUG,
                    "Call function pointer: " << llvmIRToString(CallSite));
-  FunctionSetTy CalleeTargets;
 
   for (const auto *F : IRDB->getAllFunctions()) {
     if (F->hasAddressTaken() && isConsistentCall(CallSite, F)) {
-      CalleeTargets.insert(F);
+      PossibleTargets.insert(F);
     }
   }
-
-  return CalleeTargets;
 }
 
 void Resolver::otherInst(const llvm::Instruction *Inst) {}
diff --git a/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
index 3d854848b4..4967c9faf0 100644
--- a/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp
@@ -315,7 +315,7 @@ bool DIBasedTypeHierarchy::isVTable(llvm::StringRef VarName) {
   if (VarName.startswith(VTablePrefix)) {
     return true;
   }
-  // In LLVM 16 demangle() takes a StringRef
+  // In LLVM 17 demangle() takes a StringRef
   auto Demang = llvm::demangle(VarName.str());
   return llvm::StringRef(Demang).startswith(VTablePrefixDemang);
 }
diff --git a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
index 9aef06815b..716f759af0 100644
--- a/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.cpp
@@ -337,8 +337,7 @@ LLVMTypeHierarchy::getType(llvm::StringRef TypeName) const {
   }
 
   // Sometimes, clang adds a .base suffix
-  std::string TN = TypeName.str() + ".base";
-  return getTypeImpl(TypeGraph, TN);
+  return getTypeImpl(TypeGraph, (TypeName + ".base").str());
 }
 
 std::vector<const llvm::StructType *> LLVMTypeHierarchy::getAllTypes() const {
diff --git a/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp b/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
index f2a5a849bd..7a7e487b94 100644
--- a/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
+++ b/lib/PhasarLLVM/TypeHierarchy/LLVMVFTable.cpp
@@ -10,15 +10,12 @@
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
 
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTableData.h"
-#include "phasar/Utils/NlohmannLogging.h"
 
+#include "llvm/IR/Constants.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/GlobalAlias.h"
-#include "llvm/IR/Operator.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include <algorithm>
-#include <utility>
 
 using namespace psr;
 
@@ -51,7 +48,7 @@ void LLVMVFTable::print(llvm::raw_ostream &OS) const {
 [[nodiscard]] LLVMVFTableData LLVMVFTable::getVFTableData() const {
   LLVMVFTableData Data;
 
-  for (const auto &Curr : VFT) {
+  for (const auto *Curr : VFT) {
     if (Curr) {
       Data.VFT.push_back(Curr->getName().str());
       continue;
@@ -69,22 +66,26 @@ void LLVMVFTable::printAsJson(llvm::raw_ostream &OS) const {
 }
 
 std::vector<const llvm::Function *>
-LLVMVFTable::getVFVectorFromIRVTable(const llvm::ConstantStruct &VT) {
+LLVMVFTable::getVFVectorFromIRVTable(const llvm::ConstantStruct &VT,
+                                     uint32_t Index) {
   std::vector<const llvm::Function *> VFS;
-  for (const auto &Op : VT.operands()) {
-    if (const auto *CA = llvm::dyn_cast<llvm::ConstantArray>(Op)) {
-      // Start iterating at offset 2, because offset 0 is vbase offset, offset 1
-      // is RTTI
-      for (const auto *It = std::next(CA->operands().begin(), 2);
-           It != CA->operands().end(); ++It) {
-        const auto *Entry = It->get()->stripPointerCastsAndAliases();
-
-        const auto *F = llvm::dyn_cast<llvm::Function>(Entry);
-        VFS.push_back(F);
-      }
+  if (Index >= VT.getNumOperands()) {
+    return VFS;
+  }
+
+  const auto *Op = VT.getOperand(Index);
+
+  if (const auto *CA = llvm::dyn_cast<llvm::ConstantArray>(Op)) {
+    // Start iterating at offset 2, because offset 0 is vbase offset, offset 1
+    // is RTTI
+    for (const auto *It = std::next(CA->operands().begin(), 2);
+         It != CA->operands().end(); ++It) {
+      const auto *Entry = It->get()->stripPointerCastsAndAliases();
+
+      const auto *F = llvm::dyn_cast<llvm::Function>(Entry);
+      VFS.push_back(F);
     }
   }
   return VFS;
 }
-
 } // namespace psr
diff --git a/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp b/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
index d54be64350..09abf5fecd 100644
--- a/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
@@ -32,6 +32,7 @@
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
+#include "llvm/Support/raw_ostream.h"
 
 #include <filesystem>
 #include <fstream>
diff --git a/test/llvm_test_code/call_graphs/CMakeLists.txt b/test/llvm_test_code/call_graphs/CMakeLists.txt
index 9a4557b178..833ff39d2e 100644
--- a/test/llvm_test_code/call_graphs/CMakeLists.txt
+++ b/test/llvm_test_code/call_graphs/CMakeLists.txt
@@ -27,6 +27,8 @@ set(NoMem2regSources
 	virtual_call_7.cpp
 	virtual_call_8.cpp
 	virtual_call_9.cpp
+	virtual_call_10.cpp
+	virtual_call_11.cpp
 	global_ctor_dtor_1.cpp
 	global_ctor_dtor_2.cpp
 	global_ctor_dtor_3.cpp
diff --git a/test/llvm_test_code/call_graphs/virtual_call_10.cpp b/test/llvm_test_code/call_graphs/virtual_call_10.cpp
new file mode 100644
index 0000000000..121eee4d41
--- /dev/null
+++ b/test/llvm_test_code/call_graphs/virtual_call_10.cpp
@@ -0,0 +1,22 @@
+// handle virtual function call on a pointer to an interface implementation
+
+struct A {
+  virtual ~A() = default;
+  virtual void foo() = 0;
+};
+
+struct B {
+  virtual ~B() = default;
+  virtual void bar() = 0;
+};
+
+struct ABImpl : A, B {
+  void foo() override {}
+  void bar() override {}
+};
+
+int main() {
+  B *ABptr = new ABImpl;
+  ABptr->bar();
+  delete ABptr;
+}
diff --git a/test/llvm_test_code/call_graphs/virtual_call_11.cpp b/test/llvm_test_code/call_graphs/virtual_call_11.cpp
new file mode 100644
index 0000000000..e98782e23f
--- /dev/null
+++ b/test/llvm_test_code/call_graphs/virtual_call_11.cpp
@@ -0,0 +1,45 @@
+// handle virtual function call on a pointer to an interface implementation
+
+struct A {
+  virtual void foo() = 0;
+};
+
+struct B {
+  virtual void bar() = 0;
+};
+
+struct ABImpl : A, B {
+  void foo() override {}
+  void bar() override {}
+};
+
+struct C {
+
+  virtual void baz() {}
+};
+
+struct ABCImpl : C, ABImpl {
+  void foo() override {}
+  void bar() override {}
+  void baz() override {}
+};
+
+void callFoo(A &a) { //
+  a.foo();
+}
+
+void callBar(B &b) { //
+  b.bar();
+}
+
+void callBaz(C &c) { //
+  c.baz();
+}
+
+int main() {
+  ABCImpl abc;
+
+  callFoo(abc);
+  callBar(abc);
+  callBaz(abc);
+}
diff --git a/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt b/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt
index 11a79b8389..95d3b00e67 100644
--- a/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt
+++ b/unittests/PhasarLLVM/ControlFlow/CMakeLists.txt
@@ -4,6 +4,7 @@ set(ControlFlowSources
 	LLVMBasedICFG_CHATest.cpp
 	LLVMBasedICFG_OTFTest.cpp
 	LLVMBasedICFG_RTATest.cpp
+	LLVMBasedICFG_RTA_MultipleInheritanceTest.cpp
 	LLVMBasedBackwardCFGTest.cpp
 	LLVMBasedBackwardICFGTest.cpp
 	LLVMBasedICFGExportTest.cpp
diff --git a/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTA_MultipleInheritanceTest.cpp b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTA_MultipleInheritanceTest.cpp
new file mode 100644
index 0000000000..594aa828cc
--- /dev/null
+++ b/unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_RTA_MultipleInheritanceTest.cpp
@@ -0,0 +1,122 @@
+#include "phasar/Config/Configuration.h"
+#include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+
+#include "llvm/IR/InstIterator.h"
+#include "llvm/IR/InstrTypes.h"
+#include "llvm/Support/Casting.h"
+
+#include "TestConfig.h"
+#include "gtest/gtest.h"
+
+using namespace psr;
+
+static const llvm::CallBase *getCallInLine(const llvm::Function &F,
+                                           uint32_t Line) {
+  for (const auto &I : llvm::instructions(F)) {
+    const auto *CB = llvm::dyn_cast<llvm::CallBase>(&I);
+    if (!CB) {
+      continue;
+    }
+
+    auto CBLine = getLineFromIR(CB);
+    if (CBLine == Line) {
+      return CB;
+    }
+  }
+  return nullptr;
+}
+
+TEST(LLVMBasedICFG_RTATest, VirtualCallSite_10) {
+  // TODO: test if getNonPureVirtualVFTEntry gets the correct inheritance and
+  // not just the first one every time
+
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "call_graphs/virtual_call_10_cpp_dbg.ll");
+  DIBasedTypeHierarchy TH(IRDB);
+  LLVMBasedICFG ICFG(&IRDB, CallGraphAnalysisType::RTA, {"main"}, &TH);
+  const llvm::Function *MainF = IRDB.getFunctionDefinition("main");
+  ASSERT_TRUE(MainF);
+
+  // --- At Line 20: ABptr->bar();
+
+  const auto *CallToBar = getCallInLine(*MainF, 20);
+  ASSERT_TRUE(CallToBar);
+  const auto *BarF = IRDB.getFunction("_ZThn8_N6ABImpl3barEv");
+  ASSERT_TRUE(BarF);
+
+  auto BarCallees = ICFG.getCalleesOfCallAt(CallToBar);
+  // non-virtual thunk to ABImpl::bar()
+  EXPECT_EQ(llvm::ArrayRef{BarF}, BarCallees);
+
+  // --- At Line 21: delete ABptr;
+
+  const auto *CallToDtor = getCallInLine(*MainF, 21);
+  ASSERT_TRUE(CallToDtor);
+  const auto *DtorF = IRDB.getFunction("_ZThn8_N6ABImplD0Ev");
+  ASSERT_TRUE(DtorF);
+
+  auto DtorCallees = ICFG.getCalleesOfCallAt(CallToDtor);
+
+  // non-virtual thunk to ABImpl::~ABImpl()
+  EXPECT_EQ(llvm::ArrayRef{DtorF}, DtorCallees);
+}
+
+TEST(LLVMBasedICFG_RTATest, VirtualCallSite_11) {
+  // TODO: test if getNonPureVirtualVFTEntry gets the correct inheritance and
+  // not just the first one every time
+
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "call_graphs/virtual_call_11_cpp_dbg.ll");
+  DIBasedTypeHierarchy TH(IRDB);
+  LLVMBasedICFG ICFG(&IRDB, CallGraphAnalysisType::RTA, {"main"}, &TH);
+  const llvm::Function *CallFooF = IRDB.getFunctionDefinition("_Z7callFooR1A");
+  const llvm::Function *CallBarF = IRDB.getFunctionDefinition("_Z7callBarR1B");
+  const llvm::Function *CallBazF = IRDB.getFunctionDefinition("_Z7callBazR1C");
+  ASSERT_TRUE(CallFooF);
+  ASSERT_TRUE(CallBarF);
+  ASSERT_TRUE(CallBazF);
+
+  // --- At Line 28:   a.foo();
+
+  const auto *CallToFoo = getCallInLine(*CallFooF, 28);
+  ASSERT_TRUE(CallToFoo);
+  const auto *FooF = IRDB.getFunction("_ZThn8_N7ABCImpl3fooEv");
+  ASSERT_TRUE(FooF);
+
+  auto FooCallees = ICFG.getCalleesOfCallAt(CallToFoo);
+  // non-virtual thunk to ABCImpl::foo()
+  EXPECT_EQ(llvm::ArrayRef{FooF}, FooCallees);
+
+  // --- At Line 32:   b.bar();
+
+  const auto *CallToBar = getCallInLine(*CallBarF, 32);
+  ASSERT_TRUE(CallToBar);
+  const auto *BarF = IRDB.getFunction("_ZThn16_N7ABCImpl3barEv");
+  ASSERT_TRUE(BarF);
+
+  auto BarCallees = ICFG.getCalleesOfCallAt(CallToBar);
+  // non-virtual thunk to ABCImpl::bar()
+  EXPECT_EQ(llvm::ArrayRef{BarF}, BarCallees);
+
+  // --- At Line 36:   c.baz();
+
+  const auto *CallToBaz = getCallInLine(*CallBazF, 36);
+  ASSERT_TRUE(CallToBaz);
+  const auto *BazF = IRDB.getFunction("_ZN7ABCImpl3bazEv");
+  ASSERT_TRUE(BazF);
+
+  auto BazCallees = ICFG.getCalleesOfCallAt(CallToBaz);
+  // ABCImpl::baz()
+  EXPECT_EQ(llvm::ArrayRef{BazF}, BazCallees);
+}
+
+int main(int Argc, char **Argv) {
+  ::testing::InitGoogleTest(&Argc, Argv);
+  return RUN_ALL_TESTS();
+}

From 501c7e361885e6d4ae7ef0782eff7ae7971e5761 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Fri, 5 Sep 2025 11:47:11 +0200
Subject: [PATCH 15/24] Refactor AnalysisPrinter (#790)

* Refactor AnalysisPrinter to take a llvm::raw_ostream& in onFinalize() and provide a sensible default for LLVM-based analyses.
Fixes missing emit-text-report output in phasar-cli

* minor
---
 .../04-run-ifds-analysis/otf-reporter.cpp     |   5 +
 .../DataFlow/IfdsIde/IDETabulationProblem.h   |  46 +++++--
 .../DataFlow/IfdsIde/IFDSTabulationProblem.h  |   7 ++
 .../IfdsIde/Problems/IDETypeStateAnalysis.h   |  44 +++----
 .../IfdsIde/Problems/IFDSConstAnalysis.h      |   2 -
 .../IfdsIde/Problems/IFDSTaintAnalysis.h      |   2 -
 .../Problems/IFDSUninitializedVariables.h     |   2 -
 .../PhasarLLVM/Domain/LLVMAnalysisDomain.h    |  10 ++
 .../PhasarLLVM/Utils/LLVMAnalysisPrinter.h    | 116 ++++++++++++++++++
 include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h |  10 ++
 .../PhasarLLVM/Utils/SourceMgrPrinter.h       |  49 ++++----
 include/phasar/Utils/AnalysisPrinterBase.h    |  21 ++--
 include/phasar/Utils/DefaultAnalysisPrinter.h |  38 +++---
 .../Utils/DefaultAnalysisPrinterSelector.h    |  24 ++++
 .../phasar/Utils/OnTheFlyAnalysisPrinter.h    |  19 ++-
 .../Problems/IDEExtendedTaintAnalysis.cpp     |   6 +-
 .../IfdsIde/Problems/IFDSTaintAnalysis.cpp    |   2 +-
 .../Problems/IFDSUninitializedVariables.cpp   |  66 +++++-----
 lib/PhasarLLVM/Domain/CMakeLists.txt          |   3 +
 lib/PhasarLLVM/Utils/LLVMAnalysisPrinter.cpp  |   7 ++
 lib/PhasarLLVM/Utils/SourceMgrPrinter.cpp     |  16 ---
 unittests/Utils/AnalysisPrinterTest.cpp       |   7 +-
 unittests/Utils/SourceMgrPrinterTest.cpp      |   4 +-
 23 files changed, 340 insertions(+), 166 deletions(-)
 create mode 100644 include/phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h
 create mode 100644 include/phasar/Utils/DefaultAnalysisPrinterSelector.h
 create mode 100644 lib/PhasarLLVM/Utils/LLVMAnalysisPrinter.cpp
 delete mode 100644 lib/PhasarLLVM/Utils/SourceMgrPrinter.cpp

diff --git a/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp b/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp
index e2e0dda622..5cb69dbc43 100644
--- a/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp
+++ b/examples/how-to/04-run-ifds-analysis/otf-reporter.cpp
@@ -7,6 +7,11 @@
 
 namespace {
 /// A listener that gets notified, whenever the taint analysis detects a leak
+///
+/// Checkout the analysis-printers that are already provided by PhASAR:
+/// - "phasar/Utils/OnTheFlyReporter.h"
+/// - "phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h"
+/// - "phasar/PhasarLLVM/Utils/SourceMgrPrinter.h"
 class LeakReporter
     : public psr::AnalysisPrinterBase<psr::LLVMIFDSAnalysisDomainDefault> {
 
diff --git a/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
index 46e1cee632..cb5c4c131c 100644
--- a/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
+++ b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
@@ -18,13 +18,18 @@
 #include "phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h"
 #include "phasar/DataFlow/IfdsIde/InitialSeeds.h"
 #include "phasar/DataFlow/IfdsIde/Solver/GenericSolverResults.h"
-#include "phasar/DataFlow/IfdsIde/SolverResults.h"
+#include "phasar/Utils/DefaultAnalysisPrinterSelector.h"
 #include "phasar/Utils/JoinLattice.h"
+#include "phasar/Utils/Macros.h"
+#include "phasar/Utils/MaybeUniquePtr.h"
 #include "phasar/Utils/NullAnalysisPrinter.h"
 #include "phasar/Utils/SemiRing.h"
 #include "phasar/Utils/Soundness.h"
 
+#include "llvm/Support/raw_ostream.h"
+
 #include <cassert>
+#include <memory>
 #include <optional>
 #include <set>
 #include <string>
@@ -96,20 +101,28 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
           ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
       : IRDB(IRDB), EntryPoints(std::move(EntryPoints)),
         ZeroValue(std::move(ZeroValue)),
-        Printer(NullAnalysisPrinter<AnalysisDomainTy>::getInstance()) {
+        Printer(std::make_unique<typename DefaultAnalysisPrinterSelector<
+                    AnalysisDomainTy>::type>()) {
     assert(IRDB != nullptr);
   }
 
-  void setAnalysisPrinter(AnalysisPrinterBase<AnalysisDomainTy> *P) {
+  IDETabulationProblem(IDETabulationProblem &&) noexcept = default;
+  IDETabulationProblem &operator=(IDETabulationProblem &&) noexcept = default;
+
+  IDETabulationProblem(const IDETabulationProblem &) = delete;
+  IDETabulationProblem &operator=(const IDETabulationProblem &) = delete;
+
+  ~IDETabulationProblem() override = default;
+
+  void
+  setAnalysisPrinter(MaybeUniquePtr<AnalysisPrinterBase<AnalysisDomainTy>> P) {
     if (P) {
-      Printer = P;
+      Printer = std::move(P);
     } else {
       Printer = NullAnalysisPrinter<AnalysisDomainTy>::getInstance();
     }
   }
 
-  ~IDETabulationProblem() override = default;
-
   /// Checks if the given data-flow fact is the special tautological lambda (or
   /// zero) fact.
   [[nodiscard]] virtual bool isZeroValue(d_t FlowFact) const noexcept {
@@ -148,7 +161,7 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
   virtual void
   emitTextReport([[maybe_unused]] GenericSolverResults<n_t, d_t, l_t> Results,
                  llvm::raw_ostream &OS = llvm::outs()) {
-    OS << "No text report available!\n";
+    Printer->onFinalize(OS);
   }
 
   /// Generates a graphical report, e.g. in html or other markup languages, of
@@ -163,7 +176,9 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
   /// the level of soundness is ignored. Otherwise, true.
   virtual bool setSoundness(Soundness /*S*/) { return false; }
 
-  const ProjectIRDBBase<db_t> *getProjectIRDB() const noexcept { return IRDB; }
+  [[nodiscard]] const ProjectIRDBBase<db_t> *getProjectIRDB() const noexcept {
+    return IRDB;
+  }
 
 protected:
   typename FlowFunctions<AnalysisDomainTy, Container>::FlowFunctionPtrType
@@ -172,6 +187,19 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
         std::move(FactToGenerate), getZeroValue());
   }
 
+  template <typename D = d_t, typename L = l_t>
+  void onResult(n_t Instr, D &&DfFact, L &&LatticeElement,
+                DataFlowAnalysisType AnalysisType) {
+    Printer->onResult(Instr, PSR_FWD(DfFact), PSR_FWD(LatticeElement),
+                      AnalysisType);
+  }
+
+  template <typename D = d_t, typename L = l_t>
+  std::enable_if_t<std::is_same_v<L, psr::BinaryDomain>>
+  onResult(n_t Instr, D &&DfFact, DataFlowAnalysisType AnalysisType) {
+    Printer->onResult(Instr, PSR_FWD(DfFact), AnalysisType);
+  }
+
   /// Seeds that just start with ZeroValue and bottomElement() at the starting
   /// points of each EntryPoint function.
   /// Takes the __ALL__ EntryPoint into account.
@@ -196,7 +224,7 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
 
   [[maybe_unused]] Soundness SF = Soundness::Soundy;
 
-  AnalysisPrinterBase<AnalysisDomainTy> *Printer;
+  MaybeUniquePtr<AnalysisPrinterBase<AnalysisDomainTy>> Printer;
 };
 
 } // namespace psr
diff --git a/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
index 2f884bd842..723f0acce3 100644
--- a/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
+++ b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
@@ -59,6 +59,13 @@ class IFDSTabulationProblem
                                  std::vector<std::string> EntryPoints,
                                  d_t ZeroValue)
       : Base(IRDB, std::move(EntryPoints), std::move(ZeroValue)) {}
+
+  IFDSTabulationProblem(IFDSTabulationProblem &&) noexcept = default;
+  IFDSTabulationProblem &operator=(IFDSTabulationProblem &&) noexcept = default;
+
+  IFDSTabulationProblem(const IFDSTabulationProblem &) = delete;
+  IFDSTabulationProblem &operator=(const IFDSTabulationProblem &) = delete;
+
   ~IFDSTabulationProblem() override = default;
 
   EdgeFunction<l_t> getNormalEdgeFunction(n_t /*Curr*/, d_t /*CurrNode*/,
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
index 35226bf2f7..0b68a4f7ac 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
@@ -54,6 +54,14 @@ class IDETypeStateAnalysisBase
 public:
   virtual ~IDETypeStateAnalysisBase() = default;
 
+  IDETypeStateAnalysisBase(IDETypeStateAnalysisBase &&) noexcept = default;
+  IDETypeStateAnalysisBase &
+  operator=(IDETypeStateAnalysisBase &&) noexcept = default;
+
+  IDETypeStateAnalysisBase(const IDETypeStateAnalysisBase &) = delete;
+  IDETypeStateAnalysisBase &
+  operator=(const IDETypeStateAnalysisBase &) noexcept = delete;
+
 protected:
   IDETypeStateAnalysisBase(LLVMAliasInfoRef PT) noexcept : PT(PT) {}
 
@@ -195,8 +203,7 @@ class IDETypeStateAnalysis
     }
 
     [[no_unique_address]] std::conditional_t<HasJoinLatticeTraits<l_t>,
-                                             EmptyType, l_t>
-        BotElement{};
+                                             EmptyType, l_t> BotElement{};
 
     static EdgeFunction<l_t> join(EdgeFunctionRef<TSEdgeFunctionComposer> This,
                                   const EdgeFunction<l_t> &OtherFunction) {
@@ -348,8 +355,6 @@ class IDETypeStateAnalysis
     assert(PT);
   }
 
-  ~IDETypeStateAnalysis() override = default;
-
   // start formulating our analysis by specifying the parts required for IFDS
 
   FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override {
@@ -513,32 +518,19 @@ class IDETypeStateAnalysis
 
   void emitTextReport(GenericSolverResults<n_t, d_t, l_t> SR,
                       llvm::raw_ostream &OS = llvm::outs()) override {
-    LLVMBasedCFG CFG;
+
     for (const auto &F : this->IRDB->getAllFunctions()) {
       for (const auto &BB : *F) {
         for (const auto &I : BB) {
           auto Results = SR.resultsAt(&I, true);
 
-          if (CFG.isExitInst(&I)) {
-            for (auto Res : Results) {
-              if (const auto *Alloca =
-                      llvm::dyn_cast<llvm::AllocaInst>(Res.first)) {
-                if (Res.second == TSD->error()) {
-                  // ERROR STATE DETECTED
-                  this->Printer->onResult(&I, Res.first, TSD->error(),
-                                          TSD->analysisType());
-                }
-              }
-            }
-          } else {
-            for (auto Res : Results) {
-              if (const auto *Alloca =
-                      llvm::dyn_cast<llvm::AllocaInst>(Res.first)) {
-                if (Res.second == TSD->error()) {
-                  // ERROR STATE DETECTED
-                  this->Printer->onResult(&I, Res.first, TSD->error(),
-                                          TSD->analysisType());
-                }
+          for (auto Res : Results) {
+            if (const auto *Alloca =
+                    llvm::dyn_cast<llvm::AllocaInst>(Res.first)) {
+              if (Res.second == TSD->error()) {
+                // ERROR STATE DETECTED
+                this->onResult(&I, Res.first, TSD->error(),
+                               TSD->analysisType());
               }
             }
           }
@@ -546,7 +538,7 @@ class IDETypeStateAnalysis
       }
     }
 
-    this->Printer->onFinalize();
+    this->Printer->onFinalize(OS);
   }
 
   [[nodiscard]] bool
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
index 8d67741547..7dd0d7c5df 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysis.h
@@ -49,8 +49,6 @@ class IFDSConstAnalysis
   IFDSConstAnalysis(const LLVMProjectIRDB *IRDB, LLVMAliasInfoRef PT,
                     std::vector<std::string> EntryPoints = {"main"});
 
-  ~IFDSConstAnalysis() override = default;
-
   /**
    * If the current instruction is a store instruction, the memory locations's
    * state of initialization is checked. If the memory location was already
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h
index 5c5f72d24a..c9e03340ab 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.h
@@ -58,8 +58,6 @@ class IFDSTaintAnalysis
                     std::vector<std::string> EntryPoints = {"main"},
                     bool TaintMainArgs = true);
 
-  ~IFDSTaintAnalysis() override = default;
-
   FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override;
 
   FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFun) override;
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h
index 5b91aae39e..10046e0782 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.h
@@ -40,8 +40,6 @@ class IFDSUninitializedVariables
   IFDSUninitializedVariables(const LLVMProjectIRDB *IRDB,
                              std::vector<std::string> EntryPoints = {"main"});
 
-  ~IFDSUninitializedVariables() override = default;
-
   FlowFunctionPtrType getNormalFlowFunction(n_t Curr, n_t Succ) override;
 
   FlowFunctionPtrType getCallFlowFunction(n_t CallSite, f_t DestFun) override;
diff --git a/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h b/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
index c4330c4e4b..80aadd85f9 100644
--- a/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
+++ b/include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h
@@ -11,6 +11,9 @@
 #define PHASAR_PHASARLLVM_DOMAIN_LLVMANALYSISDOMAIN_H
 
 #include "phasar/Domain/AnalysisDomain.h"
+#include "phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h"
+#include "phasar/Utils/DefaultAnalysisPrinterSelector.h"
+#include "phasar/Utils/TypeTraits.h"
 
 namespace llvm {
 class Value;
@@ -43,6 +46,13 @@ struct LLVMAnalysisDomainDefault : public AnalysisDomain {
 using LLVMIFDSAnalysisDomainDefault =
     WithBinaryValueDomain<LLVMAnalysisDomainDefault>;
 
+extern template class DefaultLLVMAnalysisPrinter<LLVMIFDSAnalysisDomainDefault>;
+
+template <>
+struct DefaultAnalysisPrinterSelector<LLVMIFDSAnalysisDomainDefault>
+    : type_identity<DefaultLLVMAnalysisPrinter<LLVMIFDSAnalysisDomainDefault>> {
+};
+
 } // namespace psr
 
 #endif // PHASAR_PHASARLLVM_DOMAIN_LLVMANALYSISDOMAIN_H
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h b/include/phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h
new file mode 100644
index 0000000000..7592168dd1
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h
@@ -0,0 +1,116 @@
+#ifndef PHASAR_PHASARLLVM_UTILS_LLVMANALYSISPRINTER_H
+#define PHASAR_PHASARLLVM_UTILS_LLVMANALYSISPRINTER_H
+
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/DefaultAnalysisPrinter.h"
+
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/IR/Function.h"
+
+#include <type_traits>
+
+namespace psr {
+
+template <typename AnalysisDomainTy>
+class DefaultLLVMAnalysisPrinter
+    : public AnalysisPrinterBase<AnalysisDomainTy> {
+  using n_t = typename AnalysisDomainTy::n_t;
+  using d_t = typename AnalysisDomainTy::d_t;
+  using l_t = typename AnalysisDomainTy::l_t;
+
+public:
+  DefaultLLVMAnalysisPrinter() noexcept = default;
+
+private:
+  static std::optional<DebugLocation> getDbgLoc(n_t Instr,
+                                                ByConstRef<d_t> DfFact) {
+    auto Ret = getDebugLocation(Instr);
+    if constexpr (std::is_convertible_v<ByConstRef<d_t>, const llvm::Value *>) {
+      if (!Ret) {
+        Ret = getDebugLocation(static_cast<const llvm::Value *>(DfFact));
+      }
+    }
+    return Ret;
+  }
+
+  void printVariables(llvm::raw_ostream &OS,
+                      llvm::ArrayRef<Warning<AnalysisDomainTy>> Results) {
+    if constexpr (std::is_convertible_v<const d_t &, const llvm::Value *>) {
+      bool HasVariable = false;
+      for (const auto &Warn : Results) {
+        if (auto VarName = getVarNameFromIR(Warn.Fact); !VarName.empty()) {
+          if (!HasVariable) {
+            HasVariable = true;
+            OS << "  Variable: " << VarName;
+          } else {
+            OS << ", " << VarName;
+          }
+        }
+      }
+      if (HasVariable) {
+        OS << '\n';
+      }
+    }
+  }
+
+  void doOnResult(n_t Instr, d_t DfFact, l_t Lattice,
+                  DataFlowAnalysisType AnalysisType) override {
+    if (auto DbgLoc = getDbgLoc(Instr, DfFact)) {
+      DbgResultsEntries[*DbgLoc].emplace_back(Instr, std::move(DfFact),
+                                              std::move(Lattice), AnalysisType);
+    } else {
+      NonDbgResultsEntries.emplace_back(Instr, std::move(DfFact),
+                                        std::move(Lattice), AnalysisType);
+    }
+  }
+
+  void doOnFinalize(llvm::raw_ostream &OS) override {
+    size_t Ctr = 0;
+    for (const auto &[DbgLoc, Results] : DbgResultsEntries) {
+      OS << '#' << ++Ctr << ": ";
+      OS << "At " << getFilePathFromIR(DbgLoc.File) << ':' << DbgLoc.Line << ':'
+         << DbgLoc.Column << ":\n";
+      OS << "  In Function: " << Results.front().Instr->getFunction()->getName()
+         << '\n';
+      if (auto SrcCode = getSrcCodeFromIR(DbgLoc); !SrcCode.empty()) {
+        OS << "  Source code: " << SrcCode << '\n';
+      }
+      printVariables(OS, Results);
+      OS << "\n  Corresponding IR Statements:\n";
+      for (const auto &Warn : Results) {
+        OS << "    At IR statement: " << NToString(Warn.Instr) << '\n';
+        OS << "      Fact: " << DToString(Warn.Fact) << '\n';
+
+        if constexpr (!std::is_same_v<l_t, BinaryDomain>) {
+          OS << "      Value: " << LToString(Warn.LatticeElement) << '\n';
+        }
+        OS << '\n';
+      }
+    }
+
+    // Fallback in case we don't have debug information:
+    for (const auto &Iter : NonDbgResultsEntries) {
+      OS << "At IR statement: " << NToString(Iter.Instr) << '\n';
+      OS << "  In Function: " << Iter.Instr->getFunction()->getName() << '\n';
+      OS << "  Fact: " << DToString(Iter.Fact) << '\n';
+
+      if constexpr (!std::is_same_v<l_t, BinaryDomain>) {
+        OS << "  Value: " << LToString(Iter.LatticeElement) << '\n';
+      }
+      OS << '\n';
+    }
+
+    DbgResultsEntries.clear();
+    NonDbgResultsEntries.clear();
+  }
+
+  std::map<DebugLocation, llvm::SmallVector<Warning<AnalysisDomainTy>, 1>>
+      DbgResultsEntries;
+  std::vector<Warning<AnalysisDomainTy>> NonDbgResultsEntries{};
+};
+
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_UTILS_LLVMANALYSISPRINTER_H
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h b/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
index 915787ff87..dee54cb9d2 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMIRToSrc.h
@@ -23,6 +23,7 @@
 
 #include <optional>
 #include <string>
+#include <tuple>
 
 // Forward declaration of types for which we only use its pointer or ref type
 namespace llvm {
@@ -47,6 +48,15 @@ struct DebugLocation {
   unsigned Line{};
   unsigned Column{};
   const llvm::DIFile *File{};
+
+  friend constexpr bool operator<(DebugLocation L, DebugLocation R) noexcept {
+    return std::tie(L.File, L.Line, L.Column) <
+           std::tie(R.File, R.Line, R.Column);
+  }
+  friend constexpr bool operator==(DebugLocation L, DebugLocation R) noexcept {
+    return std::tie(L.File, L.Line, L.Column) ==
+           std::tie(R.File, R.Line, R.Column);
+  }
 };
 
 [[nodiscard]] llvm::DILocalVariable *getDILocalVariable(const llvm::Value *V);
diff --git a/include/phasar/PhasarLLVM/Utils/SourceMgrPrinter.h b/include/phasar/PhasarLLVM/Utils/SourceMgrPrinter.h
index 58b00e9a9c..7f8fa3265a 100644
--- a/include/phasar/PhasarLLVM/Utils/SourceMgrPrinter.h
+++ b/include/phasar/PhasarLLVM/Utils/SourceMgrPrinter.h
@@ -5,53 +5,34 @@
 #include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMSourceManager.h"
 #include "phasar/Utils/AnalysisPrinterBase.h"
+#include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/MaybeUniquePtr.h"
 
 #include "llvm/ADT/FunctionExtras.h"
+#include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include <type_traits>
 
 namespace psr {
 
-namespace detail {
-class SourceMgrPrinterBase {
-public:
-  explicit SourceMgrPrinterBase(
-      llvm::unique_function<std::string(DataFlowAnalysisType)> &&PrintMessage,
-      llvm::raw_ostream &OS = llvm::errs(),
-      llvm::SourceMgr::DiagKind WKind = llvm::SourceMgr::DK_Warning);
-
-  explicit SourceMgrPrinterBase(
-      llvm::unique_function<std::string(DataFlowAnalysisType)> &&PrintMessage,
-      const llvm::Twine &OutFileName,
-      llvm::SourceMgr::DiagKind WKind = llvm::SourceMgr::DK_Warning);
-
-protected:
-  LLVMSourceManager SrcMgr;
-
-  llvm::unique_function<std::string(DataFlowAnalysisType)> GetPrintMessage;
-  MaybeUniquePtr<llvm::raw_ostream> OS = &llvm::errs();
-  llvm::SourceMgr::DiagKind WarningKind;
-};
-} // namespace detail
-
 template <typename AnalysisDomainTy>
-class SourceMgrPrinter : public AnalysisPrinterBase<AnalysisDomainTy>,
-                         private detail::SourceMgrPrinterBase {
+class SourceMgrPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   using n_t = typename AnalysisDomainTy::n_t;
   using d_t = typename AnalysisDomainTy::d_t;
   using l_t = typename AnalysisDomainTy::l_t;
 
 public:
   explicit SourceMgrPrinter(
-      llvm::unique_function<std::string(DataFlowAnalysisType)> &&PrintMessage,
+      llvm::unique_function<std::string(n_t Inst, ByConstRef<d_t> Fact,
+                                        ByConstRef<l_t>, DataFlowAnalysisType)>
+          &&GetMessage,
       llvm::raw_ostream &OS = llvm::errs(),
       llvm::SourceMgr::DiagKind WKind = llvm::SourceMgr::DK_Warning)
-      : detail::SourceMgrPrinterBase(std::move(PrintMessage), OS, WKind) {}
+      : OS(&OS), WarningKind(WKind), GetPrintMessage(std::move(GetMessage)) {}
 
 private:
-  void doOnResult(n_t Inst, d_t Fact, l_t /*Value*/,
+  void doOnResult(n_t Inst, d_t Fact, l_t Value,
                   DataFlowAnalysisType AnalysisType) override {
     auto SrcLoc = SrcMgr.getDebugLocation(Inst);
     if constexpr (std::is_convertible_v<d_t, const llvm::Value *>) {
@@ -61,10 +42,22 @@ class SourceMgrPrinter : public AnalysisPrinterBase<AnalysisDomainTy>,
       }
     }
 
+    auto Msg = GetPrintMessage(Inst, Fact, Value, AnalysisType);
     if (SrcLoc) {
-      SrcMgr.print(*OS, *SrcLoc, WarningKind, GetPrintMessage(AnalysisType));
+      SrcMgr.print(*OS, *SrcLoc, WarningKind, Msg);
+    } else {
+      llvm::SMDiagnostic Diag("", WarningKind, Msg);
+      Diag.print(nullptr, *OS);
     }
   }
+
+  LLVMSourceManager SrcMgr;
+
+  llvm::raw_ostream *OS = &llvm::errs();
+  llvm::SourceMgr::DiagKind WarningKind;
+  llvm::unique_function<std::string(n_t Inst, ByConstRef<d_t> Fact,
+                                    ByConstRef<l_t>, DataFlowAnalysisType)>
+      GetPrintMessage;
 };
 
 } // namespace psr
diff --git a/include/phasar/Utils/AnalysisPrinterBase.h b/include/phasar/Utils/AnalysisPrinterBase.h
index ec95b47d79..57ee963d9d 100644
--- a/include/phasar/Utils/AnalysisPrinterBase.h
+++ b/include/phasar/Utils/AnalysisPrinterBase.h
@@ -3,6 +3,7 @@
 
 #include "phasar/Domain/BinaryDomain.h"
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
+#include "phasar/Utils/Macros.h"
 
 #include "llvm/Support/raw_ostream.h"
 
@@ -18,25 +19,26 @@ template <typename AnalysisDomainTy> class AnalysisPrinterBase {
   using l_t = typename AnalysisDomainTy::l_t;
 
 public:
-  template <typename L = l_t, typename = std::enable_if_t<!std::is_same_v<
-                                  std::decay_t<L>, psr::BinaryDomain>>>
-  void onResult(n_t Instr, d_t DfFact, l_t LatticeElement,
+  template <typename D = d_t, typename L = l_t>
+  void onResult(n_t Instr, D &&DfFact, L &&LatticeElement,
                 DataFlowAnalysisType AnalysisType) {
-    doOnResult(Instr, DfFact, LatticeElement, AnalysisType);
+    doOnResult(Instr, PSR_FWD(DfFact), PSR_FWD(LatticeElement), AnalysisType);
   }
 
-  template <typename L = l_t, typename = std::enable_if_t<std::is_same_v<
-                                  std::decay_t<L>, psr::BinaryDomain>>>
-  void onResult(n_t Instr, d_t DfFact, DataFlowAnalysisType AnalysisType) {
-    doOnResult(Instr, DfFact, psr::BinaryDomain::BOTTOM, AnalysisType);
+  template <typename D = d_t, typename L = l_t>
+  std::enable_if_t<std::is_same_v<L, psr::BinaryDomain>>
+  onResult(n_t Instr, D &&DfFact, DataFlowAnalysisType AnalysisType) {
+    doOnResult(Instr, PSR_FWD(DfFact), psr::BinaryDomain::BOTTOM, AnalysisType);
   }
 
   void onInitialize() { doOnInitialize(); }
 
   void onFinalize() { doOnFinalize(); }
+  void onFinalize(llvm::raw_ostream &OS) { doOnFinalize(OS); }
 
   AnalysisPrinterBase() = default;
   virtual ~AnalysisPrinterBase() = default;
+
   AnalysisPrinterBase(const AnalysisPrinterBase &) = delete;
   AnalysisPrinterBase &operator=(const AnalysisPrinterBase &) = delete;
 
@@ -48,7 +50,8 @@ template <typename AnalysisDomainTy> class AnalysisPrinterBase {
                           DataFlowAnalysisType /*AnalysisType*/) = 0;
 
   virtual void doOnInitialize() {}
-  virtual void doOnFinalize() {}
+  virtual void doOnFinalize() { doOnFinalize(llvm::outs()); }
+  virtual void doOnFinalize(llvm::raw_ostream &OS) {}
 };
 
 } // namespace psr
diff --git a/include/phasar/Utils/DefaultAnalysisPrinter.h b/include/phasar/Utils/DefaultAnalysisPrinter.h
index 8923c21d58..0fa8be851b 100644
--- a/include/phasar/Utils/DefaultAnalysisPrinter.h
+++ b/include/phasar/Utils/DefaultAnalysisPrinter.h
@@ -3,11 +3,11 @@
 
 #include "phasar/Domain/BinaryDomain.h"
 #include "phasar/Utils/AnalysisPrinterBase.h"
-#include "phasar/Utils/IO.h"
-#include "phasar/Utils/MaybeUniquePtr.h"
+#include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/Printer.h"
 
-#include <optional>
+#include "llvm/Support/raw_ostream.h"
+
 #include <type_traits>
 #include <vector>
 
@@ -23,9 +23,10 @@ template <typename AnalysisDomainTy> struct Warning {
   l_t LatticeElement;
   DataFlowAnalysisType AnalysisType;
 
-  // Constructor
-  Warning(n_t Inst, d_t DfFact, l_t Lattice,
-          DataFlowAnalysisType DfAnalysisType)
+  // Constructor -- With C++20, we can get rid of it; then the below
+  // emplace_back works on aggregates too
+  constexpr Warning(n_t Inst, ByMoveRef<d_t> DfFact, ByMoveRef<l_t> Lattice,
+                    DataFlowAnalysisType DfAnalysisType) noexcept
       : Instr(std::move(Inst)), Fact(std::move(DfFact)),
         LatticeElement(std::move(Lattice)), AnalysisType(DfAnalysisType) {}
 };
@@ -39,36 +40,29 @@ class DefaultAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   using l_t = typename AnalysisDomainTy::l_t;
 
 public:
-  explicit DefaultAnalysisPrinter(llvm::raw_ostream &OS = llvm::outs())
-      : OS(&OS) {}
-
-  explicit DefaultAnalysisPrinter(const llvm::Twine &Filename)
-      : AnalysisPrinterBase<AnalysisDomainTy>(),
-        OS(openFileStream(Filename)) {};
-
-  ~DefaultAnalysisPrinter() override = default;
+  DefaultAnalysisPrinter() noexcept = default;
 
 private:
   void doOnResult(n_t Instr, d_t DfFact, l_t Lattice,
                   DataFlowAnalysisType AnalysisType) override {
-    AnalysisResults.emplace_back(Instr, DfFact, Lattice, AnalysisType);
+    AnalysisResults.emplace_back(Instr, std::move(DfFact), std::move(Lattice),
+                                 AnalysisType);
   }
 
-  void doOnFinalize() override {
+  void doOnFinalize(llvm::raw_ostream &OS) override {
     for (const auto &Iter : AnalysisResults) {
-
-      *OS << "\nAt IR statement: " << NToString(Iter.Instr) << "\n";
-
-      *OS << "\tFact: " << DToString(Iter.Fact) << "\n";
+      OS << "At IR statement: " << NToString(Iter.Instr) << '\n';
+      OS << "  Fact: " << DToString(Iter.Fact) << '\n';
 
       if constexpr (!std::is_same_v<l_t, BinaryDomain>) {
-        *OS << "Value: " << LToString(Iter.LatticeElement) << "\n";
+        OS << "  Value: " << LToString(Iter.LatticeElement) << '\n';
       }
+      OS << '\n';
     }
+    AnalysisResults.clear();
   }
 
   std::vector<Warning<AnalysisDomainTy>> AnalysisResults{};
-  MaybeUniquePtr<llvm::raw_ostream> OS = &llvm::outs();
 };
 
 } // namespace psr
diff --git a/include/phasar/Utils/DefaultAnalysisPrinterSelector.h b/include/phasar/Utils/DefaultAnalysisPrinterSelector.h
new file mode 100644
index 0000000000..aa8a293755
--- /dev/null
+++ b/include/phasar/Utils/DefaultAnalysisPrinterSelector.h
@@ -0,0 +1,24 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_UTILS_DEFAULTANALYSISPRINTERSELECTOR_H
+#define PHASAR_UTILS_DEFAULTANALYSISPRINTERSELECTOR_H
+
+#include "phasar/Utils/DefaultAnalysisPrinter.h"
+#include "phasar/Utils/TypeTraits.h"
+
+namespace psr {
+
+template <typename AnalysisDomainTy, typename = void>
+struct DefaultAnalysisPrinterSelector
+    : type_identity<DefaultAnalysisPrinter<AnalysisDomainTy>> {};
+
+} // namespace psr
+
+#endif // PHASAR_DATAFLOW_IFDSIDE_DEFAULTANALYSISPRINTERSELECTOR_H
diff --git a/include/phasar/Utils/OnTheFlyAnalysisPrinter.h b/include/phasar/Utils/OnTheFlyAnalysisPrinter.h
index 9d3bf73270..449545cbf5 100644
--- a/include/phasar/Utils/OnTheFlyAnalysisPrinter.h
+++ b/include/phasar/Utils/OnTheFlyAnalysisPrinter.h
@@ -11,6 +11,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 #include <cassert>
+
 namespace psr {
 
 /// This class implements the AnalysisPrinterBase that prints the analysis
@@ -24,15 +25,11 @@ class OnTheFlyAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   using l_t = typename AnalysisDomainTy::l_t;
 
 public:
-  explicit OnTheFlyAnalysisPrinter(llvm::raw_ostream &OS)
-      : AnalysisPrinterBase<AnalysisDomainTy>(), OS(&OS) {};
+  explicit OnTheFlyAnalysisPrinter(llvm::raw_ostream &OS = llvm::outs())
+      : OS(&OS) {};
 
   explicit OnTheFlyAnalysisPrinter(const llvm::Twine &Filename)
-      : AnalysisPrinterBase<AnalysisDomainTy>(),
-        OS(openFileStream(Filename)) {};
-
-  OnTheFlyAnalysisPrinter() = default;
-  ~OnTheFlyAnalysisPrinter() = default;
+      : OS(openFileStream(Filename)) {};
 
   [[nodiscard]] bool isValid() const noexcept { return OS != nullptr; }
 
@@ -40,11 +37,13 @@ class OnTheFlyAnalysisPrinter : public AnalysisPrinterBase<AnalysisDomainTy> {
   void doOnResult(n_t Instr, d_t DfFact, l_t LatticeElement,
                   DataFlowAnalysisType /*AnalysisType*/) override {
     assert(isValid());
-    *OS << "\nAt IR statement: " << NToString(Instr) << "\n";
-    *OS << "\tFact: " << DToString(DfFact) << "\n";
+    *OS << "At IR statement: " << NToString(Instr) << '\n';
+    *OS << "  Fact: " << DToString(DfFact) << '\n';
+
     if constexpr (!std::is_same_v<l_t, BinaryDomain>) {
-      *OS << "Value: " << LToString(LatticeElement) << "\n";
+      *OS << "  Value: " << LToString(LatticeElement) << '\n';
     }
+    *OS << '\n';
   }
 
   MaybeUniquePtr<llvm::raw_ostream> OS = nullptr;
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
index 1f189a29cd..f1b5852f50 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
@@ -732,12 +732,12 @@ void IDEExtendedTaintAnalysis::emitTextReport(
 
   for (auto &[Inst, LeakSet] : Leaks) {
     for (const auto &Leak : LeakSet) {
-      Printer->onResult(Inst, makeFlowFact(Leak), Top{},
-                        DataFlowAnalysisType::IDEExtendedTaintAnalysis);
+      onResult(Inst, makeFlowFact(Leak), Top{},
+               DataFlowAnalysisType::IDEExtendedTaintAnalysis);
     }
   }
 
-  Printer->onFinalize();
+  Printer->onFinalize(OS);
 }
 
 // Helpers:
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
index e4c94e45af..57ebd8844d 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysis.cpp
@@ -518,7 +518,7 @@ void IFDSTaintAnalysis::emitTextReport(
     GenericSolverResults<n_t, d_t, BinaryDomain> /*SR*/,
     llvm::raw_ostream &OS) {
   OS << "\n----- Found the following leaks -----\n";
-  Printer->onFinalize();
+  Printer->onFinalize(OS);
 }
 
 bool IFDSTaintAnalysis::isInteresting(
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp
index 2b84b4d7b7..b0b6e0bc6e 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariables.cpp
@@ -204,8 +204,8 @@ IFDSUninitializedVariables::getNormalFlowFunction(
             !llvm::isa<llvm::CastInst>(Curr) &&
             !llvm::isa<llvm::PHINode>(Curr)) {
           UndefValueUses[Curr].insert(Operand);
-          Printer->onResult(Curr, Operand,
-                            DataFlowAnalysisType::IFDSUninitializedVariables);
+          onResult(Curr, Operand,
+                   DataFlowAnalysisType::IFDSUninitializedVariables);
         }
         return {Source, Curr};
       }
@@ -398,41 +398,43 @@ void IFDSUninitializedVariables::emitTextReport(
     GenericSolverResults<n_t, d_t, l_t> /*Result*/, llvm::raw_ostream &OS) {
   OS << "====================== IFDS-Uninitialized-Analysis Report "
         "======================\n";
+
   if (UndefValueUses.empty()) {
     OS << "No uses of uninitialized variables found by the analysis!\n";
-  } else {
-    if (!IRDB->debugInfoAvailable()) {
-      // Emit only IR code, function name and module info
-      OS << "\nWARNING: No Debug Info available - emiting results without "
-            "source code mapping!\n";
-      OS << "\nTotal uses of uninitialized IR Value's: "
-         << UndefValueUses.size() << '\n';
-      size_t Count = 0;
-      for (const auto &User : UndefValueUses) {
-        OS << "\n---------------------------------  " << ++Count
-           << ". Use  ---------------------------------\n\n";
-        OS << "At IR statement: " << NToString(User.first);
-        OS << "\n    in function: " << getFunctionNameFromIR(User.first);
-        OS << "\n    in module  : " << getModuleIDFromIR(User.first) << "\n\n";
-        for (const auto *UndefV : User.second) {
-          OS << "   Uninit Value: " << DToString(UndefV);
-          OS << '\n';
-        }
-      }
-      OS << '\n';
-    } else {
-      auto UninitResults = aggregateResults();
-      OS << "\nTotal uses of uninitialized variables: " << UninitResults.size()
-         << '\n';
-      size_t Count = 0;
-      for (auto Res : UninitResults) {
-        OS << "\n---------------------------------  " << ++Count
-           << ". Use  ---------------------------------\n\n";
-        Res.print(OS);
+    return;
+  }
+  if (!IRDB->debugInfoAvailable()) {
+    // Emit only IR code, function name and module info
+    OS << "\nWARNING: No Debug Info available - emiting results without "
+          "source code mapping!\n";
+    OS << "\nTotal uses of uninitialized IR Value's: " << UndefValueUses.size()
+       << '\n';
+    size_t Count = 0;
+    for (const auto &User : UndefValueUses) {
+      OS << "\n---------------------------------  " << ++Count
+         << ". Use  ---------------------------------\n\n";
+      OS << "At IR statement: " << NToString(User.first);
+      OS << "\n    in function: " << getFunctionNameFromIR(User.first);
+      OS << "\n    in module  : " << getModuleIDFromIR(User.first) << "\n\n";
+      for (const auto *UndefV : User.second) {
+        OS << "   Uninit Value: " << DToString(UndefV);
+        OS << '\n';
       }
     }
-    Printer->onFinalize();
+    OS << '\n';
+  } else {
+    auto UninitResults = aggregateResults();
+    OS << "\nTotal uses of uninitialized variables: " << UninitResults.size()
+       << '\n';
+    size_t Count = 0;
+    for (auto Res : UninitResults) {
+      OS << "\n---------------------------------  " << ++Count
+         << ". Use  ---------------------------------\n\n";
+      Res.print(OS);
+    }
   }
+
+  // Printer->onFinalize(OS);
 }
 
 std::vector<IFDSUninitializedVariables::UninitResult>
diff --git a/lib/PhasarLLVM/Domain/CMakeLists.txt b/lib/PhasarLLVM/Domain/CMakeLists.txt
index e7dd25cf52..8c8ae40519 100644
--- a/lib/PhasarLLVM/Domain/CMakeLists.txt
+++ b/lib/PhasarLLVM/Domain/CMakeLists.txt
@@ -5,4 +5,7 @@ add_phasar_library(phasar_llvm_domain
 
   MODULE_FILES
     Domain.cppm
+
+  LINK_PRIVATE
+    nlohmann_json
 )
diff --git a/lib/PhasarLLVM/Utils/LLVMAnalysisPrinter.cpp b/lib/PhasarLLVM/Utils/LLVMAnalysisPrinter.cpp
new file mode 100644
index 0000000000..6fda7ef860
--- /dev/null
+++ b/lib/PhasarLLVM/Utils/LLVMAnalysisPrinter.cpp
@@ -0,0 +1,7 @@
+#include "phasar/PhasarLLVM/Utils/LLVMAnalysisPrinter.h"
+
+#include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
+
+using namespace psr;
+
+template class psr::DefaultLLVMAnalysisPrinter<LLVMIFDSAnalysisDomainDefault>;
diff --git a/lib/PhasarLLVM/Utils/SourceMgrPrinter.cpp b/lib/PhasarLLVM/Utils/SourceMgrPrinter.cpp
deleted file mode 100644
index 01687a5dcf..0000000000
--- a/lib/PhasarLLVM/Utils/SourceMgrPrinter.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "phasar/PhasarLLVM/Utils/SourceMgrPrinter.h"
-
-#include "phasar/Utils/IO.h"
-
-using namespace psr;
-
-detail::SourceMgrPrinterBase::SourceMgrPrinterBase(
-    llvm::unique_function<std::string(DataFlowAnalysisType)> &&PrintMessage,
-    llvm::raw_ostream &OS, llvm::SourceMgr::DiagKind WKind)
-    : GetPrintMessage(std::move(PrintMessage)), OS(&OS), WarningKind(WKind) {}
-
-detail::SourceMgrPrinterBase::SourceMgrPrinterBase(
-    llvm::unique_function<std::string(DataFlowAnalysisType)> &&PrintMessage,
-    const llvm::Twine &OutFileName, llvm::SourceMgr::DiagKind WKind)
-    : GetPrintMessage(std::move(PrintMessage)), OS(openFileStream(OutFileName)),
-      WarningKind(WKind) {}
diff --git a/unittests/Utils/AnalysisPrinterTest.cpp b/unittests/Utils/AnalysisPrinterTest.cpp
index 546c9d3049..f189afef29 100644
--- a/unittests/Utils/AnalysisPrinterTest.cpp
+++ b/unittests/Utils/AnalysisPrinterTest.cpp
@@ -15,6 +15,7 @@
 
 #include "TestConfig.h"
 #include "gtest/gtest.h"
+
 using namespace psr;
 using CallBackPairTy = std::pair<IDEExtendedTaintAnalysis<>::config_callback_t,
                                  IDEExtendedTaintAnalysis<>::config_callback_t>;
@@ -30,7 +31,7 @@ class GroundTruthCollector
 public:
   // constructor init Groundtruth in each fixture
   GroundTruthCollector(llvm::DenseMap<int, std::set<std::string>> &GroundTruth)
-      : GroundTruth(GroundTruth){};
+      : GroundTruth(GroundTruth) {};
 
   void findAndRemove(llvm::DenseMap<int, std::set<std::string>> &Map1,
                      llvm::DenseMap<int, std::set<std::string>> &Map2) {
@@ -54,7 +55,9 @@ class GroundTruthCollector
     findAndRemove(FoundLeak, GroundTruth);
   }
 
-  void doOnFinalize() override { EXPECT_TRUE(GroundTruth.empty()); }
+  void doOnFinalize(llvm::raw_ostream & /*OS*/) override {
+    EXPECT_TRUE(GroundTruth.empty());
+  }
 
   llvm::DenseMap<int, std::set<std::string>> GroundTruth{};
 };
diff --git a/unittests/Utils/SourceMgrPrinterTest.cpp b/unittests/Utils/SourceMgrPrinterTest.cpp
index 59f4fc69a0..7fc8340641 100644
--- a/unittests/Utils/SourceMgrPrinterTest.cpp
+++ b/unittests/Utils/SourceMgrPrinterTest.cpp
@@ -31,8 +31,8 @@ class GroundTruthCollector
   GroundTruthCollector(std::initializer_list<std::string> GroundTruth,
                        bool Dump = false)
       : SourceMgrPrinter<LLVMIFDSAnalysisDomainDefault>(
-            [](DataFlowAnalysisType) { return ""; }, OS),
-        GroundTruth(GroundTruth), OS(Str), Dump(Dump){};
+            [](auto &&...) { return ""; }, OS),
+        GroundTruth(GroundTruth), OS(Str), Dump(Dump) {};
 
 private:
   void doOnFinalize() override {

From 0024a53db5d431a9b9f41e93fa01552b6fbd4d94 Mon Sep 17 00:00:00 2001
From: Maximilian Leo Huber <huber.maximilian.leo@gmail.com>
Date: Fri, 5 Sep 2025 11:01:49 +0000
Subject: [PATCH 16/24] SourceCode-based IFDS/IDE UnitTests (#789)

* Add utility function to aid src-code based unittests

* half of xtaint test, stuck on 12

* Fixed all but 09 and 12

* fixed all enabled ext taint tests

* reworked test structure

* refractor + more tests. Weird errors

* debug commit

* Fix psr::getDILocation()

* std::variant for SrcCodeLocationEntry

* bug fixed + ext taint test works

* compile tests as dbg + ground truths

* Fix Gt for UninitTest_02_SHOULD_LEAK

* Add TestingSrcLocation

* GLCA nearly done, questions for meeting

* taint double free tests fail

* Fixed IFDSConstAnalysisTest

* fixed tainttest and segfaults + refactoring

* Fix AnalysisPrinterTest

* Convert AnalysisPrinterTest to src-code-based ground-truth

* Start converting InstInterationAnalysis tests

* Convert some more IIA test cases

* Add more IIA tests

* Convert FIIA-test + fix use-after-free in IIA test

* HandleTypeState_03 not working

* All but three fileio tests work

* UninitVarTest fixed all but one

* fixed all but 03 of TSAnalysisFile

* Fixed all but one test

* Fixed UninitTest_21

* Enable modeling of instruction-operands in TestingSrcLocation + fix 20th uninit test

* reworked test 06

* cleanup

* readded LIBCPP_GTEST_SKIP

* fixed use after scope in taint analysis test

* Make IDEExtendedTaintAnalysisTest more compact

* Convert IIAFlowFact tests +make GLCA test more compact

* Refactor rest of IfdsIde tests

* Move everything in SrcCodeLocationEntry to psr::unittest + some cleanup

* Some cleanup

---------

Co-authored-by: Fabian Schiebel <fabian.schiebel@iem.fraunhofer.de>
Co-authored-by: Fabian Schiebel <fabianbs@mail.upb.de>
---
 .clang-tidy                                   |    2 +-
 .../DataFlow/IfdsIde/Solver/IDESolver.h       |    8 +-
 include/phasar/Domain/LatticeDomain.h         |   11 +-
 include/phasar/Utils/BitVectorSet.h           |   11 +-
 lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp          |   12 +-
 .../general_linear_constant/CMakeLists.txt    |    2 +-
 .../general_linear_constant/NullTest.c        |    5 +-
 .../inst_interaction/CMakeLists.txt           |    4 +-
 .../openssl/key_derivation/CMakeLists.txt     |    2 +-
 .../openssl/secure_heap/CMakeLists.txt        |    2 +-
 .../openssl/secure_memory/CMakeLists.txt      |    2 +-
 .../taint_analysis/CMakeLists.txt             |    2 +-
 .../typestate_analysis_fileio/CMakeLists.txt  |    5 -
 test/llvm_test_code/xtaint/CMakeLists.txt     |   11 +-
 .../Problems/IDEExtendedTaintAnalysisTest.cpp |  245 ++--
 .../Problems/IDEFeatureTaintAnalysisTest.cpp  |  985 +++++++++----
 .../Problems/IDEGeneralizedLCATest.cpp        |  175 ++-
 .../IDEInstInteractionAnalysisTest.cpp        | 1255 ++++++++++-------
 .../IDELinearConstantAnalysisSwiftTest.cpp    |    3 +-
 .../IDELinearConstantAnalysisTest.cpp         |    5 +-
 .../IDELinearConstantAnalysis_DotTest.cpp     |    8 +-
 .../Problems/IDETSAnalysisFileIOTest.cpp      |  777 +++++-----
 .../IDETSAnalysisOpenSSLEVPKDFTest.cpp        |   19 +-
 .../IDETSAnalysisOpenSSLSecureHeapTest.cpp    |   17 +-
 .../IDETSAnalysisOpenSSLSecureMemoryTest.cpp  |   14 +-
 .../Problems/IFDSConstAnalysisTest.cpp        |  179 ++-
 .../Problems/IFDSTaintAnalysisTest.cpp        |  274 ++--
 .../IFDSUninitializedVariablesTest.cpp        |  264 ++--
 .../DataFlow/IfdsIde/SparseIDESolverTest.cpp  |    4 +-
 .../Pointer/FilteredLLVMAliasSetTest.cpp      |    4 +-
 .../PhasarLLVM/TypeHierarchy/CMakeLists.txt   |    2 +-
 unittests/TestUtils/SrcCodeLocationEntry.h    |  450 ++++++
 unittests/Utils/AnalysisPrinterTest.cpp       |   83 +-
 33 files changed, 3143 insertions(+), 1699 deletions(-)
 create mode 100644 unittests/TestUtils/SrcCodeLocationEntry.h

diff --git a/.clang-tidy b/.clang-tidy
index 3e95f2eaea..3308a915db 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -61,7 +61,7 @@ CheckOptions:
   - 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|equal_to|to_string|DToString|NToString|FToString|LToString|hash_value)
+    value:           (try_emplace|from_json|to_json|equal_to|to_string|DToString|NToString|FToString|LToString|hash_value|dyn_cast)
   - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
     value:           1
   - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
index 534357f5bb..fe1827b661 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IDESolver.h
@@ -1616,7 +1616,7 @@ class IDESolver
         } else {
           // Get the fact-ID
           D1FactId = G.getFactID(D1Fact);
-          std::string D1Label = DToString(D1Fact);
+          std::string D1Label{DToString(D1Fact)};
 
           // Get or create the fact subgraph
           D1FSG = FG->getOrCreateFactSG(D1FactId, D1Label);
@@ -1634,7 +1634,7 @@ class IDESolver
           if (!IDEProblem.isZeroValue(D2Fact)) {
             // Get the fact-ID
             D2FactId = G.getFactID(D2Fact);
-            std::string D2Label = DToString(D2Fact);
+            std::string D2Label{DToString(D2Fact)};
             DOTNode D2 = {FuncName, D2Label, N2StmtId, D2FactId, false, true};
             std::string EFLabel;
             auto EFVec = IntermediateEdgeFunctions[std::make_tuple(
@@ -1719,7 +1719,7 @@ class IDESolver
         } else {
           // Get the fact-ID
           D1FactId = G.getFactID(D1Fact);
-          std::string D1Label = DToString(D1Fact);
+          std::string D1Label{DToString(D1Fact)};
           D1 = {FNameOfN1, D1Label, N1StmtId, D1FactId, false, true};
           // FG should already exist even for single statement functions
           if (!G.containsFactSG(FNameOfN1, D1FactId)) {
@@ -1738,7 +1738,7 @@ class IDESolver
           } else {
             // Get the fact-ID
             D2FactId = G.getFactID(D2Fact);
-            std::string D2Label = DToString(D2Fact);
+            std::string D2Label{DToString(D2Fact)};
             D2 = {FNameOfN2, D2Label, N2StmtId, D2FactId, false, true};
             // FG should already exist even for single statement functions
             if (!G.containsFactSG(FNameOfN2, D2FactId)) {
diff --git a/include/phasar/Domain/LatticeDomain.h b/include/phasar/Domain/LatticeDomain.h
index d45f7bc45a..560409f370 100644
--- a/include/phasar/Domain/LatticeDomain.h
+++ b/include/phasar/Domain/LatticeDomain.h
@@ -11,6 +11,7 @@
 #define PHASAR_DOMAIN_LATTICEDOMAIN_H
 
 #include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/DebugOutput.h"
 #include "phasar/Utils/JoinLattice.h"
 #include "phasar/Utils/TypeTraits.h"
 
@@ -100,9 +101,7 @@ struct LatticeDomain : public std::variant<Top, L, Bottom> {
   }
 };
 
-template <typename L,
-          typename = std::void_t<decltype(std::declval<llvm::raw_ostream &>()
-                                          << std::declval<L>())>>
+template <typename L>
 inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
                                      const LatticeDomain<L> &LD) {
   if (LD.isBottom()) {
@@ -114,7 +113,11 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
 
   const auto *Val = LD.getValueOrNull();
   assert(Val && "Only alternative remaining is L");
-  return OS << *Val;
+  if constexpr (is_llvm_printable_v<L>) {
+    return OS << *Val;
+  } else {
+    return OS << PrettyPrinter{*Val};
+  }
 }
 
 template <typename L>
diff --git a/include/phasar/Utils/BitVectorSet.h b/include/phasar/Utils/BitVectorSet.h
index c64f8f41bf..b11786e847 100644
--- a/include/phasar/Utils/BitVectorSet.h
+++ b/include/phasar/Utils/BitVectorSet.h
@@ -292,9 +292,9 @@ class BitVectorSet {
 
   [[nodiscard]] size_t size() const noexcept { return Bits.count(); }
 
-  [[nodiscard]] const BitVectorTy &getBits() const &noexcept { return Bits; }
-  [[nodiscard]] BitVectorTy &getBits() &noexcept { return Bits; }
-  [[nodiscard]] BitVectorTy &&getBits() &&noexcept { return std::move(Bits); }
+  [[nodiscard]] const BitVectorTy &getBits() const & noexcept { return Bits; }
+  [[nodiscard]] BitVectorTy &getBits() & noexcept { return Bits; }
+  [[nodiscard]] BitVectorTy &&getBits() && noexcept { return std::move(Bits); }
 
   friend bool operator==(const BitVectorSet &Lhs, const BitVectorSet &Rhs) {
     bool LeftEmpty = Lhs.empty();
@@ -392,6 +392,11 @@ class BitVectorSet {
     EndIter.setBits(Bits);
     return EndIter;
   }
+
+  static void clearPosition() {
+    Position.left.clear();
+    Position.right.clear();
+  }
 };
 
 // Overloads with the other intersectWith functions from Utilities.h
diff --git a/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp b/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
index 09abf5fecd..af8b41bf76 100644
--- a/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMIRToSrc.cpp
@@ -101,15 +101,19 @@ static llvm::DISubprogram *getDISubprogram(const llvm::Value *V) {
 
 llvm::DILocation *psr::getDILocation(const llvm::Value *V) {
   // Arguments and Instruction such as AllocaInst
-  if (auto *DbgIntr = getDbgVarIntrinsic(V)) {
-    if (auto *MN = DbgIntr->getMetadata(llvm::LLVMContext::MD_dbg)) {
+
+  if (const auto *I = llvm::dyn_cast<llvm::Instruction>(V)) {
+    if (auto *MN = I->getMetadata(llvm::LLVMContext::MD_dbg)) {
       return llvm::dyn_cast<llvm::DILocation>(MN);
     }
-  } else if (const auto *I = llvm::dyn_cast<llvm::Instruction>(V)) {
-    if (auto *MN = I->getMetadata(llvm::LLVMContext::MD_dbg)) {
+  }
+
+  if (auto *DbgIntr = getDbgVarIntrinsic(V)) {
+    if (auto *MN = DbgIntr->getMetadata(llvm::LLVMContext::MD_dbg)) {
       return llvm::dyn_cast<llvm::DILocation>(MN);
     }
   }
+
   return nullptr;
 }
 
diff --git a/test/llvm_test_code/general_linear_constant/CMakeLists.txt b/test/llvm_test_code/general_linear_constant/CMakeLists.txt
index c1da0c9533..d0e555ccf6 100644
--- a/test/llvm_test_code/general_linear_constant/CMakeLists.txt
+++ b/test/llvm_test_code/general_linear_constant/CMakeLists.txt
@@ -14,5 +14,5 @@ set(Sources
 )
 
 foreach(TEST_SRC ${Sources})
-  generate_ll_file(FILE ${TEST_SRC})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
 endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/general_linear_constant/NullTest.c b/test/llvm_test_code/general_linear_constant/NullTest.c
index 7858875af1..550254165f 100644
--- a/test/llvm_test_code/general_linear_constant/NullTest.c
+++ b/test/llvm_test_code/general_linear_constant/NullTest.c
@@ -2,4 +2,7 @@ char *foo(char *str) { return str; }
 
 extern void puts(const char *);
 
-int main() { puts(foo(0)); }
+int main() {
+  puts(foo(0));
+  return 0;
+}
diff --git a/test/llvm_test_code/inst_interaction/CMakeLists.txt b/test/llvm_test_code/inst_interaction/CMakeLists.txt
index 6fdfa88e8b..e5307f4949 100644
--- a/test/llvm_test_code/inst_interaction/CMakeLists.txt
+++ b/test/llvm_test_code/inst_interaction/CMakeLists.txt
@@ -41,9 +41,9 @@ set(SourcesOpt
 )
 
 foreach(TEST_SRC ${Sources})
-  generate_ll_file(FILE ${TEST_SRC})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
 endforeach(TEST_SRC)
 
 foreach(TEST_SRC ${SourcesOpt})
-  generate_ll_file(FILE ${TEST_SRC} O1)
+  generate_ll_file(FILE ${TEST_SRC} DEBUG O1)
 endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/openssl/key_derivation/CMakeLists.txt b/test/llvm_test_code/openssl/key_derivation/CMakeLists.txt
index 7565aeef5e..39770d7dbf 100644
--- a/test/llvm_test_code/openssl/key_derivation/CMakeLists.txt
+++ b/test/llvm_test_code/openssl/key_derivation/CMakeLists.txt
@@ -2,5 +2,5 @@ file(GLOB openssl_files *.c *.cpp)
 
 foreach(TEST_SRC ${openssl_files})
   get_filename_component(TEST_SRC_FILE ${TEST_SRC} NAME)
-  generate_ll_file(FILE ${TEST_SRC_FILE})
+  generate_ll_file(FILE ${TEST_SRC_FILE} DEBUG)
 endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/openssl/secure_heap/CMakeLists.txt b/test/llvm_test_code/openssl/secure_heap/CMakeLists.txt
index 7565aeef5e..39770d7dbf 100644
--- a/test/llvm_test_code/openssl/secure_heap/CMakeLists.txt
+++ b/test/llvm_test_code/openssl/secure_heap/CMakeLists.txt
@@ -2,5 +2,5 @@ file(GLOB openssl_files *.c *.cpp)
 
 foreach(TEST_SRC ${openssl_files})
   get_filename_component(TEST_SRC_FILE ${TEST_SRC} NAME)
-  generate_ll_file(FILE ${TEST_SRC_FILE})
+  generate_ll_file(FILE ${TEST_SRC_FILE} DEBUG)
 endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/openssl/secure_memory/CMakeLists.txt b/test/llvm_test_code/openssl/secure_memory/CMakeLists.txt
index 7565aeef5e..39770d7dbf 100644
--- a/test/llvm_test_code/openssl/secure_memory/CMakeLists.txt
+++ b/test/llvm_test_code/openssl/secure_memory/CMakeLists.txt
@@ -2,5 +2,5 @@ file(GLOB openssl_files *.c *.cpp)
 
 foreach(TEST_SRC ${openssl_files})
   get_filename_component(TEST_SRC_FILE ${TEST_SRC} NAME)
-  generate_ll_file(FILE ${TEST_SRC_FILE})
+  generate_ll_file(FILE ${TEST_SRC_FILE} DEBUG)
 endforeach(TEST_SRC)
diff --git a/test/llvm_test_code/taint_analysis/CMakeLists.txt b/test/llvm_test_code/taint_analysis/CMakeLists.txt
index cbefe33821..1c3ff627f7 100644
--- a/test/llvm_test_code/taint_analysis/CMakeLists.txt
+++ b/test/llvm_test_code/taint_analysis/CMakeLists.txt
@@ -38,7 +38,7 @@ set(NoMem2regSources
 )
 
 foreach(TEST_SRC ${NoMem2regSources})
-  generate_ll_file(FILE ${TEST_SRC})
+  generate_ll_file(FILE ${TEST_SRC} DEBUG)
 endforeach(TEST_SRC)
 
 add_subdirectory(dummy_source_sink)
diff --git a/test/llvm_test_code/typestate_analysis_fileio/CMakeLists.txt b/test/llvm_test_code/typestate_analysis_fileio/CMakeLists.txt
index 9da0ecdc68..ef2be35b66 100644
--- a/test/llvm_test_code/typestate_analysis_fileio/CMakeLists.txt
+++ b/test/llvm_test_code/typestate_analysis_fileio/CMakeLists.txt
@@ -1,10 +1,5 @@
 file(GLOB typestate_files *.c *.cpp)
 
-foreach(TEST_SRC ${typestate_files})
-  get_filename_component(TEST_SRC_FILE ${TEST_SRC} NAME)
-  generate_ll_file(FILE ${TEST_SRC_FILE})
-endforeach(TEST_SRC)
-
 foreach(TEST_SRC ${typestate_files})
   get_filename_component(TEST_SRC_FILE ${TEST_SRC} NAME)
   generate_ll_file(FILE ${TEST_SRC_FILE} DEBUG)
diff --git a/test/llvm_test_code/xtaint/CMakeLists.txt b/test/llvm_test_code/xtaint/CMakeLists.txt
index ad1fa8702f..c3f8041798 100644
--- a/test/llvm_test_code/xtaint/CMakeLists.txt
+++ b/test/llvm_test_code/xtaint/CMakeLists.txt
@@ -1,5 +1,6 @@
-set(XTAINT_SOURCES
+set(XTAINT_DBG_SOURCES
     xtaint01.cpp
+    xtaint01_json.cpp
     # xtaint01_json.cpp
     xtaint02.cpp
     xtaint03.cpp
@@ -24,14 +25,6 @@ set(XTAINT_SOURCES
     xtaint21.cpp
 )
 
-set(XTAINT_DBG_SOURCES
-    xtaint01_json.cpp
-)
-
-foreach(TEST_SRC ${XTAINT_SOURCES})
-  generate_ll_file(FILE ${TEST_SRC})
-endforeach(TEST_SRC)
-
 foreach(TEST_SRC ${XTAINT_DBG_SOURCES})
  generate_ll_file(FILE ${TEST_SRC} DEBUG)
 endforeach(TEST_SRC)
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
index 51af9f3058..3237404bbf 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEExtendedTaintAnalysisTest.cpp
@@ -11,35 +11,26 @@
 
 #include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TaintConfig/LLVMTaintConfig.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
-#include "phasar/Utils/DebugOutput.h"
 #include "phasar/Utils/Utilities.h"
 
-#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/Demangle/Demangle.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instructions.h"
-#include "llvm/IR/Module.h"
-#include "llvm/Support/Casting.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
-#include "nlohmann/json.hpp"
 
 #include <tuple>
-#include <type_traits>
 #include <utility>
 #include <variant>
 
-using namespace std;
 using namespace psr;
-using json = nlohmann::json;
+using namespace psr::unittest;
 
 using CallBackPairTy = std::pair<IDEExtendedTaintAnalysis<>::config_callback_t,
                                  IDEExtendedTaintAnalysis<>::config_callback_t>;
@@ -51,14 +42,14 @@ class IDETaintAnalysisTest : public ::testing::Test {
   static constexpr auto PathToLLFiles = PHASAR_BUILD_SUBFOLDER("xtaint/");
   const std::vector<std::string> EntryPoints = {"main"};
 
-  IDETaintAnalysisTest() = default;
-  ~IDETaintAnalysisTest() override = default;
+  using TaintSetT = std::set<TestingSrcLocation>;
 
   void doAnalysis(
-      const llvm::Twine &IRFile, const map<int, set<string>> &GroundTruth,
+      const llvm::Twine &IRFilePath,
+      const std::map<TestingSrcLocation, TaintSetT> &GroundTruth,
       std::variant<std::monostate, TaintConfigData *, CallBackPairTy> Config,
       bool DumpResults = true) {
-    HelperAnalyses HA(IRFile, EntryPoints);
+    HelperAnalyses HA(PathToLLFiles + IRFilePath, EntryPoints);
 
     auto TC =
         std::visit(Overloaded{[&](std::monostate) {
@@ -93,34 +84,26 @@ class IDETaintAnalysisTest : public ::testing::Test {
     compareResults(TaintProblem, Solver, GroundTruth);
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
+  void
+  compareResults(IDEExtendedTaintAnalysis<> &TaintProblem,
+                 IDESolver_P<IDEExtendedTaintAnalysis<>> &Solver,
+                 const std::map<TestingSrcLocation, TaintSetT> &GroundTruth) {
+    auto GroundTruthEntries = convertTestingLocationSetMapInIR(
+        GroundTruth, *TaintProblem.getProjectIRDB());
 
-  void TearDown() override {}
+    std::map<const llvm::Instruction *, std::set<const llvm::Value *>>
+        FoundLeaks;
 
-  void compareResults(IDEExtendedTaintAnalysis<> &TaintProblem,
-                      IDESolver_P<IDEExtendedTaintAnalysis<>> &Solver,
-                      const map<int, set<string>> &GroundTruth) {
-
-    map<int, set<string>> FoundLeaks;
-    for (const auto &Leak :
+    for (const auto &[LeakInst, LeakVals] :
          TaintProblem.getAllLeaks(Solver.getSolverResults())) {
-      llvm::errs() << "Leak: " << PrettyPrinter{Leak} << '\n';
-      int SinkId = stoi(getMetaDataID(Leak.first));
-      set<string> LeakedValueIds;
-      for (const auto &LV : Leak.second) {
-        LeakedValueIds.insert(getMetaDataID(LV));
-      }
-      FoundLeaks.emplace(SinkId, LeakedValueIds);
+      FoundLeaks[LeakInst].insert(LeakVals.begin(), LeakVals.end());
     }
-    EXPECT_EQ(FoundLeaks, GroundTruth);
+
+    EXPECT_EQ(FoundLeaks, GroundTruthEntries);
   }
 }; // Test Fixture
 
 TEST_F(IDETaintAnalysisTest, XTaint01_Json) {
-  map<int, set<string>> Gt;
-
-  Gt[7] = {"6"};
-
   TaintConfigData Config;
 
   FunctionData FuncDataMain;
@@ -134,192 +117,184 @@ TEST_F(IDETaintAnalysisTest, XTaint01_Json) {
   Config.Functions.push_back(std::move(FuncDataMain));
   Config.Functions.push_back(std::move(FuncDataPrint));
 
-  doAnalysis({PathToLLFiles + "xtaint01_json_cpp_dbg.ll"}, Gt, &Config);
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {{
+      LineColFun{8, 3, "main"},
+      {LineColFunOp{8, 9, "main", llvm::Instruction::Load}},
+  }};
+
+  doAnalysis("xtaint01_json_cpp_dbg.ll", GroundTruth, &Config);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint01) {
-  map<int, set<string>> Gt;
-
-  Gt[13] = {"12"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{8, 3, "main"},
+       {LineColFunOp{8, 9, "main", llvm::Instruction::Load}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint01_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint01_cpp_dbg.ll", GroundTruth, std::monostate{});
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint02) {
-  map<int, set<string>> Gt;
-
-  Gt[18] = {"17"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{9, 3, "main"},
+       {LineColFunOp{9, 9, "main", llvm::Instruction::Load}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint02_cpp.ll"}, Gt, std::monostate{}, true);
+  doAnalysis("xtaint02_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
-TEST_F(IDETaintAnalysisTest, XTaint03) {
-  map<int, set<string>> Gt;
 
-  Gt[21] = {"20"};
+TEST_F(IDETaintAnalysisTest, XTaint03) {
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{10, 3, "main"},
+       {LineColFunOp{10, 9, "main", llvm::Instruction::Load}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint03_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint03_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint04) {
-  map<int, set<string>> Gt;
+  auto Call = LineColFun{6, 3, "_Z3barPi"};
 
-  Gt[16] = {"15"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {Call, {OperandOf{0, Call}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint04_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint04_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 // XTaint05 is similar to 06, but even harder
 
 TEST_F(IDETaintAnalysisTest, XTaint06) {
-  map<int, set<string>> Gt;
-
-  // no leaks expected
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      // no leaks expected
+  };
 
-  doAnalysis({PathToLLFiles + "xtaint06_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint06_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
-/// In the new TaintConfig specifying source/sink/sanitizer properties for extra
-/// parameters of C-style variadic functions is not (yet?) supported. So, the
-/// tests XTaint07 and XTaint08 are disabled.
+/// In the new TaintConfig specifying source/sink/sanitizer properties for
+/// extra parameters of C-style variadic functions is not (yet?) supported.
+/// So, the tests XTaint07 and XTaint08 are disabled.
 TEST_F(IDETaintAnalysisTest, DISABLED_XTaint07) {
-  map<int, set<string>> Gt;
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{10, 0, "main"},
+       {LineColFunOp{10, 18, "main", llvm::Instruction::Load}}}};
 
-  Gt[21] = {"20"};
-
-  doAnalysis({PathToLLFiles + "xtaint07_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint07_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, DISABLED_XTaint08) {
-  map<int, set<string>> Gt;
-
-  Gt[24] = {"23"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{20, 3, "main"},
+       {LineColFunOp{20, 18, "main", llvm::Instruction::Load}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint08_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint08_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint09_1) {
-  map<int, set<string>> Gt;
-
-  Gt[25] = {"24"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{14, 3, "main"}, {LineColFun{14, 8, "main"}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint09_1_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint09_1_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint09) {
-  map<int, set<string>> Gt;
+  auto SinkCall = LineColFun{16, 3, "main"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {SinkCall, {OperandOf{0, SinkCall}}}};
 
-  Gt[24] = {"23"};
-
-  doAnalysis({PathToLLFiles + "xtaint09_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint09_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, DISABLED_XTaint10) {
-  map<int, set<string>> Gt;
-
-  // undefined behaviour: sometimes this test fails, but most of the time
-  // it passes. It only fails when executed together with other tests. It
-  // never failed (so far) for ./IDEExtendedTaintAnalysisTest
-  // --Gtest_filter=*XTaint10
-  // UPDATE: With the fixed k-limiting, this test
-  // almost always fails due to aliasing issues, so disable it.
-  // TODO: Also update the Gt
-  Gt[33] = {"32"};
-
-  doAnalysis({PathToLLFiles + "xtaint10_cpp.ll"}, Gt, std::monostate{});
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      // no leaks expected
+  };
+
+  doAnalysis("xtaint10_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, DISABLED_XTaint11) {
-  map<int, set<string>> Gt;
-
-  // no leaks expected; actually finds "27" at 28
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      // no leaks expected
+  };
 
-  doAnalysis({PathToLLFiles + "xtaint11_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint11_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint12) {
-  map<int, set<string>> Gt;
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{19, 3, "main"}, {LineColFun{19, 8, "main"}}}};
 
-  // We sanitize an alias - since we don't have must-alias relations, we cannot
-  // kill aliases at all
-  Gt[28] = {"27"};
-
-  doAnalysis({PathToLLFiles + "xtaint12_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint12_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint13) {
-  map<int, set<string>> Gt;
-
-  Gt[30] = {"29"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{17, 3, "main"}, {LineColFun{17, 8, "main"}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint13_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint13_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint14) {
-  map<int, set<string>> Gt;
-
-  Gt[33] = {"32"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{24, 3, "main"}, {LineColFun{24, 8, "main"}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint14_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint14_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 /// The TaintConfig fails to get all call-sites of Source::get, because it has
 /// no CallGraph information
 TEST_F(IDETaintAnalysisTest, DISABLED_XTaint15) {
-  map<int, set<string>> Gt;
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      // no leaks expected
+  };
 
-  Gt[47] = {"46"};
-
-  doAnalysis({PathToLLFiles + "xtaint15_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint15_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint16) {
-  map<int, set<string>> Gt;
-
-  Gt[24] = {"23"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{13, 3, "main"}, {LineColFun{13, 8, "main"}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint16_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint16_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint17) {
-  map<int, set<string>> Gt;
-
-  Gt[27] = {"26"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{17, 3, "main"}, {LineColFun{17, 8, "main"}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint17_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint17_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint18) {
-  map<int, set<string>> Gt;
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      // no leaks expected
+  };
 
-  // Gt[26] = {"25"};
-
-  doAnalysis({PathToLLFiles + "xtaint18_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint18_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 PHASAR_SKIP_TEST(TEST_F(IDETaintAnalysisTest, XTaint19) {
   // Is now the same as XTaint17
   GTEST_SKIP();
-  map<int, set<string>> Gt;
 
-  Gt[22] = {"21"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{17, 3, "main"}, {LineColFun{17, 8, "main"}}}};
 
-  doAnalysis({PathToLLFiles + "xtaint19_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint19_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 })
 
 TEST_F(IDETaintAnalysisTest, XTaint20) {
-  map<int, set<string>> Gt;
-
-  Gt[22] = {"14"};
-  Gt[24] = {"23"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{12, 3, "main"}, {LineColFun{6, 7, "main"}}},
+      {LineColFun{13, 3, "main"}, {LineColFun{13, 8, "main"}}},
+  };
 
-  doAnalysis({PathToLLFiles + "xtaint20_cpp.ll"}, Gt, std::monostate{});
+  doAnalysis("xtaint20_cpp_dbg.ll", GroundTruth, std::monostate{}, true);
 }
 
 TEST_F(IDETaintAnalysisTest, XTaint21) {
-  map<int, set<string>> Gt;
-
-  Gt[10] = {"2"};
-  Gt[12] = {"11"};
+  std::map<TestingSrcLocation, TaintSetT> GroundTruth = {
+      {LineColFun{17, 3, "main"}, {LineColFun{11, 7, "main"}}},
+      {LineColFun{18, 3, "main"}, {LineColFun{18, 8, "main"}}},
+  };
 
   IDEExtendedTaintAnalysis<>::config_callback_t SourceCB =
       [](const llvm::Instruction *Inst) {
@@ -343,7 +318,7 @@ TEST_F(IDETaintAnalysisTest, XTaint21) {
         return Ret;
       };
 
-  doAnalysis({PathToLLFiles + "xtaint21_cpp.ll"}, Gt,
+  doAnalysis("xtaint21_cpp_dbg.ll", GroundTruth,
              CallBackPairTy{std::move(SourceCB), std::move(SinkCB)});
 }
 
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
index 243cb2d6a7..2b98d117b1 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
@@ -1,30 +1,35 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h"
 
-#include "phasar/Config/Configuration.h"
 #include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
-#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMSolverResults.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMSolverResults.h" // for resultsAtInLLVMSSA
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/BitVectorSet.h"
-#include "phasar/Utils/Logger.h"
+#include "phasar/Utils/Fn.h"
 
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instruction.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
+#include <set>
+
 namespace {
 
 using namespace psr;
+using namespace psr::unittest;
+
+using TaintSetT = std::set<TestingSrcLocation>;
 
-static std::string printSet(const std::set<std::string> &EdgeFact) {
+static std::string printSet(const TaintSetT &EdgeFact) {
   std::string Ret;
   llvm::raw_string_ostream ROS(Ret);
   llvm::interleaveComma(EdgeFact, ROS << '<');
@@ -38,9 +43,10 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
   static constexpr auto PathToLlFiles =
       PHASAR_BUILD_SUBFOLDER("inst_interaction/");
 
+  using VarNameT = std::variant<std::string, unittest::RetVal>;
   // Function - Line Nr - Variable - Values
   using IIACompactResult_t =
-      std::tuple<std::string, std::size_t, std::string, std::set<std::string>>;
+      std::tuple<TestingSrcLocation, VarNameT, std::set<TestingSrcLocation>>;
 
   std::optional<HelperAnalyses> HA;
   LLVMProjectIRDB *IRDB{};
@@ -50,17 +56,52 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
     HA.emplace(PathToLlFiles + LlvmFilePath, EntryPoints,
                HelperAnalysisConfig{}.withCGType(CallGraphAnalysisType::CHA));
     IRDB = &HA->getProjectIRDB();
+  }
 
-    for (const auto &Glob : IRDB->getModule()->globals()) {
-      BitVectorSet<std::string, llvm::SmallBitVector> BV;
-      BV.insert(getMetaDataID(&Glob));
-    }
+  [[nodiscard]] bool matchesVar(const llvm::Value *Fact,
+                                const VarNameT &VarName) {
+    return std::visit(
+        psr::Overloaded{
+            [&](const std::string &Name) {
+              if (!llvm::isa<llvm::AllocaInst>(Fact) &&
+                  !llvm::isa<llvm::GlobalVariable>(Fact)) {
+                return false;
+              }
+              auto FactName = psr::getVarNameFromIR(Fact);
+              return FactName == Name;
+            },
+            [&](RetVal R) {
+              return llvm::any_of(Fact->users(), [R](const auto *V) {
+                const auto *Ret = llvm::dyn_cast<llvm::ReturnInst>(V);
+                return Ret && Ret->getFunction()->getName() == R.InFunction;
+              });
+            },
+        },
+        VarName);
+  }
+  [[nodiscard]] std::string printVar(const VarNameT &VarName) {
+    return std::visit(psr::Overloaded{
+                          [](const std::string &Name) { return Name; },
+                          [](RetVal R) { return R.str(); },
+                      },
+                      VarName);
+  }
 
-    // Initialze IDs
-    for (const auto *Inst : IRDB->getAllInstructions()) {
-      BitVectorSet<std::string, llvm::SmallBitVector> BV;
-      BV.insert(getMetaDataID(Inst));
+  static TaintSetT generateTaintsAtInst(const llvm::Instruction *Inst) {
+    TaintSetT Labels;
+    auto [Line, Col] = getLineAndColFromIR(Inst);
+    if (Col == 0 && llvm::isa<llvm::StoreInst>(Inst)) {
+      std::tie(Line, Col) = getLineAndColFromIR(
+          Inst->getOperand(llvm::StoreInst::getPointerOperandIndex()));
+    }
+    if (Line != 0) {
+      Labels.insert(LineColFun{
+          Line,
+          Col,
+          Inst->getFunction()->getName(),
+      });
     }
+    return Labels;
   }
 
   void
@@ -70,27 +111,16 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
                               bool PrintDump = false) {
     initializeIR(LlvmFilePath, EntryPoints);
 
-    // IDEInstInteractionAnalysisT<std::string, true> IIAProblem(IRDB, &ICFG,
-    // &PT,
-    //                                                           EntryPoints);
-
     // use Phasar's instruction ids as testing labels
     auto Generator =
         [](std::variant<const llvm::Instruction *, const llvm::GlobalVariable *>
-               Current) -> std::set<std::string> {
+               Current) -> TaintSetT {
       return std::visit(
-          [](const auto *InstOrGlob) -> std::set<std::string> {
-            std::set<std::string> Labels;
-            if (InstOrGlob->hasMetadata()) {
-              std::string Label =
-                  llvm::cast<llvm::MDString>(
-                      InstOrGlob->getMetadata(PhasarConfig::MetaDataKind())
-                          ->getOperand(0))
-                      ->getString()
-                      .str();
-              Labels.insert(Label);
-            }
-            return Labels;
+          psr::Overloaded{
+              [](const llvm::GlobalVariable *Glob) {
+                return TaintSetT{GlobalVar{Glob->getName()}};
+              },
+              fn<&generateTaintsAtInst>,
           },
           Current);
     };
@@ -98,44 +128,29 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
     auto IIAProblem = createAnalysisProblem<IDEFeatureTaintAnalysis>(
         *HA, EntryPoints, Generator);
 
-    // if (PrintDump) {
-    //   psr::Logger::initializeStderrLogger(SeverityLevel::DEBUG);
-    // }
-
     IDESolver IIASolver(IIAProblem, &HA->getICFG());
     IIASolver.solve();
-    // if (PrintDump) {
-    //   // IRDB->emitPreprocessedIR(llvm::outs());
-    //   IIASolver.dumpResults();
-    //   llvm::errs()
-    //       << "\n======================================================\n";
-    //   printDump(HA->getProjectIRDB(), IIASolver.getSolverResults());
-    // }
+
     // do the comparison
-    for (const auto &[FunName, SrcLine, VarName, LatticeVal] : GroundTruth) {
-      const auto *Fun = IRDB->getFunctionDefinition(FunName);
-      const auto *IRLine = getNthInstruction(Fun, SrcLine);
-      auto ResultMap = IIASolver.resultsAt(IRLine);
-      assert(IRLine && "Could not retrieve IR line!");
+    for (const auto &[InstLoc, VarName, ExpectedVal] : GroundTruth) {
+      const auto *IRLoc = testingLocInIR(InstLoc, *IRDB);
+      ASSERT_TRUE(IRLoc) << "Could not retrieve IR Loc: " << InstLoc.str();
+      ASSERT_TRUE(llvm::isa<llvm::Instruction>(IRLoc));
+      auto ResultMap =
+          IIASolver.resultsAt(llvm::cast<llvm::Instruction>(IRLoc));
       bool FactFound = false;
-      for (auto &[Fact, Value] : ResultMap) {
-        std::string FactStr;
-        llvm::raw_string_ostream RSO(FactStr);
-        RSO << *Fact;
-        llvm::StringRef FactRef(FactStr);
-        if (FactRef.ltrim().startswith("%" + VarName + " ") ||
-            FactRef.ltrim().startswith("@" + VarName + " ")) {
-          PHASAR_LOG_LEVEL(DFADEBUG, "Checking variable: " << FactStr);
-          EXPECT_EQ(LatticeVal, Value.toSet<std::string>())
-              << "Value do not match for Variable '" << VarName
-              << "': Expected " << printSet(LatticeVal)
-              << "; got: " << LToString(Value.toBVSet<std::string>());
+      for (auto &[Fact, ComputedVal] : ResultMap) {
+        if (matchesVar(Fact, VarName)) {
+          EXPECT_EQ(ExpectedVal, ComputedVal.toSet<TestingSrcLocation>())
+              << "Unexpected taint-set at " << InstLoc << " for variable '"
+              << printVar(VarName) << "' (" << llvmIRToString(Fact) << ")";
           FactFound = true;
         }
       }
 
-      EXPECT_TRUE(FactFound) << "Variable '" << VarName << "' missing at '"
-                             << llvmIRToString(IRLine) << "'.";
+      EXPECT_TRUE(FactFound)
+          << "Variable '" << printVar(VarName) << "' missing at '"
+          << llvmIRToString(IRLoc) << "'.";
     }
 
     if (PrintDump || HasFailure()) {
@@ -146,10 +161,12 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
     }
   }
 
-  void TearDown() override {}
+  void TearDown() override {
+    BitVectorSet<TestingSrcLocation, llvm::SmallBitVector>::clearPosition();
+  }
 
   // See vara::PhasarTaintAnalysis::taintsForInst
-  [[nodiscard]] inline std::set<std::string>
+  [[nodiscard]] inline TaintSetT
   taintsForInst(const llvm::Instruction *Inst,
                 SolverResults<const llvm::Instruction *, const llvm::Value *,
                               IDEFeatureTaintEdgeFact> SR) {
@@ -162,27 +179,28 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
       return {};
     }
 
-    std::set<std::string> AggregatedTaints;
+    TaintSetT AggregatedTaints;
 
-    if (Inst->getType()->isVoidTy()) { // For void types, we need to look what
-                                       // taints flow into the inst
+    if (Inst->getType()->isVoidTy()) {
+      // For void types, we need to look what
+      // taints flow into the inst
 
-      // auto Results = SR.resultsAt(Inst);
       assert(Inst->getNumOperands() >= 1 &&
              "Found case without first operand.");
       AggregatedTaints =
-          SR.resultAt(Inst, Inst->getOperand(0)).toSet<std::string>();
+          SR.resultAt(Inst, Inst->getOperand(0)).toSet<TestingSrcLocation>();
 
     } else {
       auto Results = SR.resultsAtInLLVMSSA(Inst);
       auto SearchPosTaints = Results.find(Inst);
       if (SearchPosTaints != Results.end()) {
-        AggregatedTaints = SearchPosTaints->second.toSet<std::string>();
+        AggregatedTaints = SearchPosTaints->second.toSet<TestingSrcLocation>();
       }
     }
 
     // additionalStaticTaints
-    AggregatedTaints.insert(getMetaDataID(Inst));
+    auto AdditionalTaints = generateTaintsAtInst(Inst);
+    AggregatedTaints.insert(AdditionalTaints.begin(), AdditionalTaints.end());
 
     return AggregatedTaints;
   }
@@ -207,343 +225,726 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 9, "i", std::set<std::string>{"4"});
-  GroundTruth.emplace("main", 9, "j",
-                      std::set<std::string>{"4", "5", "6", "7"});
-  GroundTruth.emplace("main", 9, "retval", std::set<std::string>{"3"});
-  doAnalysisAndCompareResults("basic_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main9 = LineColFun{4, 3, "main"};
+  GroundTruth.emplace(Main9, "i", TaintSetT{LineColFun{2, 7, "main"}});
+  GroundTruth.emplace(Main9, "j",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{3, 11, "main"},
+                          LineColFun{3, 13, "main"},
+                          LineColFun{3, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 24, "retval", std::set<std::string>{"6"});
-  GroundTruth.emplace("main", 24, "argc.addr", std::set<std::string>{"7"});
-  GroundTruth.emplace("main", 24, "argv.addr", std::set<std::string>{"8"});
-  GroundTruth.emplace("main", 24, "i", std::set<std::string>{"16", "18"});
-  GroundTruth.emplace("main", 24, "j",
-                      std::set<std::string>{"9", "10", "11", "12"});
-  GroundTruth.emplace("main", 24, "k",
-                      std::set<std::string>{"21", "16", "18", "20"});
-  doAnalysisAndCompareResults("basic_02_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main24 = LineColFun{10, 3, "main"};
+
+  GroundTruth.emplace(Main24, "argc", TaintSetT{LineColFun{1, 14, "main"}});
+  GroundTruth.emplace(Main24, "argv", TaintSetT{LineColFun{1, 27, "main"}});
+  GroundTruth.emplace(Main24, "i",
+                      TaintSetT{
+                          LineColFun{5, 7, "main"},
+                          LineColFun{7, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "j",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{3, 11, "main"},
+                          LineColFun{3, 13, "main"},
+                          LineColFun{3, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "k",
+                      TaintSetT{
+                          LineColFun{5, 7, "main"},
+                          LineColFun{7, 7, "main"},
+                          LineColFun{9, 11, "main"},
+                          LineColFun{9, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_02_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 20, "retval", std::set<std::string>{"3"});
-  GroundTruth.emplace("main", 20, "i",
-                      std::set<std::string>{"4", "10", "11", "12"});
-  GroundTruth.emplace("main", 20, "x",
-                      std::set<std::string>{"5", "14", "15", "16"});
-  doAnalysisAndCompareResults("basic_03_cpp.ll", {"main"}, GroundTruth, false);
+
+  auto Main20 = LineColFun{6, 3, "main"};
+
+  GroundTruth.emplace(Main20, "i",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{4, 5, "main"},
+                      });
+  GroundTruth.emplace(Main20, "x",
+                      TaintSetT{
+                          LineColFun{3, 12, "main"},
+                          LineColFun{3, 28, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_03_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
-PHASAR_SKIP_TEST(TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_04) {
-  // If we use libcxx this won't work since internal implementation is different
+TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_04) {
+
   LIBCPP_GTEST_SKIP;
 
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 23, "retval", std::set<std::string>{"7"});
-  GroundTruth.emplace("main", 23, "argc.addr", std::set<std::string>{"8"});
-  GroundTruth.emplace("main", 23, "argv.addr", std::set<std::string>{"9"});
-  GroundTruth.emplace("main", 23, "i", std::set<std::string>{"10"});
-  GroundTruth.emplace("main", 23, "j",
-                      std::set<std::string>{"10", "11", "12", "13"});
-  GroundTruth.emplace(
-      "main", 23, "k",
-      std::set<std::string>{"10", "11", "12", "13", "14", "18", "19"});
-  doAnalysisAndCompareResults("basic_04_cpp.ll", {"main"}, GroundTruth, false);
-})
+  auto Main23 = LineColFun{11, 3, "main"};
+
+  GroundTruth.emplace(Main23, "argc",
+                      TaintSetT{
+                          LineColFun{3, 14, "main"},
+                      });
+  GroundTruth.emplace(Main23, "argv",
+                      TaintSetT{
+                          LineColFun{3, 27, "main"},
+                      });
+  GroundTruth.emplace(Main23, "i",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                      });
+  GroundTruth.emplace(Main23, "j",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main23, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{8, 9, "main"},
+                          LineColFun{8, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_04_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
+}
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_05) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 11, "i", std::set<std::string>{"5", "7"});
-  GroundTruth.emplace("main", 11, "retval", std::set<std::string>{"2"});
-  doAnalysisAndCompareResults("basic_05_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main11 = LineColFun{10, 3, "main"};
+  GroundTruth.emplace(Main11, "i",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                          LineColFun{8, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_05_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_06) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 19, "retval", std::set<std::string>{"5"});
-  GroundTruth.emplace("main", 19, "i", std::set<std::string>{"15", "6", "13"});
-  GroundTruth.emplace("main", 19, "j", std::set<std::string>{"15", "6", "13"});
-  GroundTruth.emplace("main", 19, "k", std::set<std::string>{"6"});
-  GroundTruth.emplace("main", 19, "p",
-                      std::set<std::string>{"1", "2", "9", "11"});
-  doAnalysisAndCompareResults("basic_06_cpp.ll", {"main"}, GroundTruth, true);
+  auto Main19 = LineColFun{14, 3, "main"};
+
+  GroundTruth.emplace(Main19, "i",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                          LineColFun{13, 8, "main"},
+                          LineColFun{13, 6, "main"},
+                      });
+  GroundTruth.emplace(Main19, "j",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                          LineColFun{13, 8, "main"},
+                          LineColFun{13, 6, "main"},
+                      });
+  GroundTruth.emplace(Main19, "k",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                      });
+  GroundTruth.emplace(Main19, "p",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{9, 7, "main"},
+                          LineColFun{11, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_06_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_07) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 15, "retval", std::set<std::string>{"5"});
-  GroundTruth.emplace("main", 15, "argc.addr", std::set<std::string>{"6"});
-  GroundTruth.emplace("main", 15, "argv.addr", std::set<std::string>{"7"});
-  GroundTruth.emplace("main", 15, "i", std::set<std::string>{"12"});
-  GroundTruth.emplace("main", 15, "j",
-                      std::set<std::string>{"8", "9", "10", "11"});
-  doAnalysisAndCompareResults("basic_07_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main15 = LineColFun{5, 3, "main"};
+
+  GroundTruth.emplace(Main15, "argc",
+                      TaintSetT{
+                          LineColFun{1, 14, "main"},
+                      });
+  GroundTruth.emplace(Main15, "argv",
+                      TaintSetT{
+                          LineColFun{1, 27, "main"},
+                      });
+  // strong update on i
+  GroundTruth.emplace(Main15, "i",
+                      TaintSetT{
+                          LineColFun{4, 5, "main"},
+                      });
+  GroundTruth.emplace(Main15, "j",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{3, 11, "main"},
+                          LineColFun{3, 13, "main"},
+                          LineColFun{3, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_07_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_08) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 12, "retval", std::set<std::string>{"2"});
-  GroundTruth.emplace("main", 12, "i", std::set<std::string>{"9"});
-  doAnalysisAndCompareResults("basic_08_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main12 = LineColFun{11, 3, "main"};
+
+  // strong update on i
+  GroundTruth.emplace(Main12, "i",
+                      TaintSetT{
+                          LineColFun{10, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_08_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_09) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 10, "i", std::set<std::string>{"4"});
-  GroundTruth.emplace("main", 10, "j", std::set<std::string>{"4", "6", "7"});
-  GroundTruth.emplace("main", 10, "retval", std::set<std::string>{"3"});
-  doAnalysisAndCompareResults("basic_09_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = LineColFun{6, 3, "main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{3, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{3, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{5, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_09_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_10) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 6, "i", std::set<std::string>{"3"});
-  GroundTruth.emplace("main", 6, "retval", std::set<std::string>{"2"});
-  doAnalysisAndCompareResults("basic_10_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main6 = LineColFun{4, 3, "main"};
+  GroundTruth.emplace(Main6, "i",
+                      TaintSetT{
+                          LineColFun{3, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_10_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleBasicTest_11) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 20, "FeatureSelector",
-                      std::set<std::string>{"5", "7", "8"});
-  GroundTruth.emplace("main", 20, "retval", std::set<std::string>{"11", "16"});
-  doAnalysisAndCompareResults("basic_11_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main20 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main20, "FeatureSelector",
+                      TaintSetT{
+                          LineColFun{3, 14, "main"},
+                          LineColFun{4, 25, "main"},
+                          LineColFun{4, 7, "main"},
+                      });
+
+  GroundTruth.emplace(Main20, RetVal{"main"},
+                      TaintSetT{
+                          LineColFun{7, 5, "main"},
+                          LineColFun{15, 3, "main"},
+                          LineColFun{16, 1, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_11_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 14, "retval", std::set<std::string>{"8"});
-  GroundTruth.emplace("main", 14, "i", std::set<std::string>{"9"});
-  GroundTruth.emplace("main", 14, "j",
-                      std::set<std::string>{"12", "9", "10", "11"});
-  GroundTruth.emplace(
-      "main", 14, "k",
-      std::set<std::string>{"15", "1", "2", "13", "14", "12", "9", "10", "11"});
-  doAnalysisAndCompareResults("call_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main14 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main14, "i",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                      });
+  GroundTruth.emplace(Main14, "j",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main14, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{6, 11, "main"},
+                          LineColFun{6, 14, "main"},
+                          LineColFun{1, 12, "_Z2idi"},
+                          LineColFun{1, 24, "_Z2idi"},
+                      });
+
+  doAnalysisAndCompareResults("call_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 13, "retval", std::set<std::string>{"12"});
-  GroundTruth.emplace("main", 13, "i", std::set<std::string>{"13"});
-  GroundTruth.emplace("main", 13, "j", std::set<std::string>{"14"});
-  GroundTruth.emplace("main", 13, "k",
-                      std::set<std::string>{"4", "5", "15", "6", "3", "14", "2",
-                                            "13", "16", "17", "18"});
-  doAnalysisAndCompareResults("call_02_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main13 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main13, "i",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                      });
+  GroundTruth.emplace(Main13, "j",
+                      TaintSetT{
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main13, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{6, 15, "main"},
+                          LineColFun{6, 18, "main"},
+                          LineColFun{6, 11, "main"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{1, 13, "_Z3sumii"},
+                          LineColFun{1, 20, "_Z3sumii"},
+                          LineColFun{1, 32, "_Z3sumii"},
+                          LineColFun{1, 36, "_Z3sumii"},
+                          LineColFun{1, 34, "_Z3sumii"},
+                      });
+
+  doAnalysisAndCompareResults("call_02_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 10, "retval", std::set<std::string>{"20"});
-  GroundTruth.emplace("main", 10, "i", std::set<std::string>{"21"});
-  GroundTruth.emplace("main", 10, "j",
-                      std::set<std::string>{"22", "23", "15", "6", "21", "2",
-                                            "13", "8", "9", "11", "12", "10",
-                                            "24"});
-  doAnalysisAndCompareResults("call_03_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{9, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{9, 7, "main"},
+                          LineColFun{10, 21, "main"},
+                          LineColFun{6, 1, "_Z9factorialj"},
+                          LineColFun{3, 5, "_Z9factorialj"},
+                          LineColFun{9, 7, "main"},
+                          LineColFun{1, 29, "_Z9factorialj"},
+                          LineColFun{5, 3, "_Z9factorialj"},
+                          LineColFun{5, 10, "_Z9factorialj"},
+                          LineColFun{5, 14, "_Z9factorialj"},
+                          LineColFun{5, 24, "_Z9factorialj"},
+                          LineColFun{5, 12, "_Z9factorialj"},
+                          LineColFun{5, 26, "_Z9factorialj"},
+                          LineColFun{10, 11, "main"},
+                          LineColFun{10, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_03_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_04) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 20, "retval", std::set<std::string>{"33"});
-  GroundTruth.emplace("main", 20, "i", std::set<std::string>{"34"});
-  GroundTruth.emplace("main", 20, "j",
-                      std::set<std::string>{"15", "6", "2", "13", "8", "9",
-                                            "11", "12", "10", "35", "36", "34",
-                                            "37"});
-  GroundTruth.emplace("main", 20, "k",
-                      std::set<std::string>{"41", "19", "15", "6",  "44", "2",
-                                            "13", "8",  "45", "18", "9",  "11",
-                                            "12", "10", "46", "24", "25", "35",
-                                            "36", "27", "23", "26", "38", "34",
-                                            "37", "42", "43", "39", "40"});
-  doAnalysisAndCompareResults("call_04_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{13, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{6, 1, "_Z9factorialj"},
+                          LineColFun{3, 5, "_Z9factorialj"},
+                          LineColFun{1, 29, "_Z9factorialj"},
+                          LineColFun{5, 3, "_Z9factorialj"},
+                          LineColFun{5, 10, "_Z9factorialj"},
+                          LineColFun{5, 14, "_Z9factorialj"},
+                          LineColFun{5, 24, "_Z9factorialj"},
+                          LineColFun{5, 12, "_Z9factorialj"},
+                          LineColFun{5, 26, "_Z9factorialj"},
+                          LineColFun{14, 21, "main"},
+                          LineColFun{13, 7, "main"},
+                          LineColFun{14, 7, "main"},
+                          LineColFun{14, 11, "main"},
+                      });
+  GroundTruth.emplace(Main10, "k",
+                      TaintSetT{
+                          LineColFun{16, 12, "main"},
+                          LineColFun{8, 24, "_Z2idi"},
+                          LineColFun{6, 1, "_Z9factorialj"},
+                          LineColFun{3, 5, "_Z9factorialj"},
+                          LineColFun{16, 5, "main"},
+                          LineColFun{1, 29, "_Z9factorialj"},
+                          LineColFun{5, 3, "_Z9factorialj"},
+                          LineColFun{5, 10, "_Z9factorialj"},
+                          LineColFun{5, 14, "_Z9factorialj"},
+                          LineColFun{16, 5, "main"},
+                          LineColFun{8, 12, "_Z2idi"},
+                          LineColFun{5, 24, "_Z9factorialj"},
+                          LineColFun{5, 12, "_Z9factorialj"},
+                          LineColFun{5, 26, "_Z9factorialj"},
+                          LineColFun{16, 12, "main"},
+                          LineColFun{10, 20, "_Z3sumii"},
+                          LineColFun{10, 32, "_Z3sumii"},
+                          LineColFun{14, 11, "main"},
+                          LineColFun{14, 21, "main"},
+                          LineColFun{10, 34, "_Z3sumii"},
+                          LineColFun{10, 36, "_Z3sumii"},
+                          LineColFun{10, 13, "_Z3sumii"},
+                          LineColFun{15, 11, "main"},
+                          LineColFun{15, 14, "main"},
+                          LineColFun{13, 7, "main"},
+                          LineColFun{14, 7, "main"},
+                          LineColFun{16, 8, "main"},
+                          LineColFun{16, 15, "main"},
+                          LineColFun{15, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_04_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_05) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 10, "retval", std::set<std::string>{"8"});
-  GroundTruth.emplace("main", 10, "i", std::set<std::string>{"3", "11", "9"});
-  GroundTruth.emplace("main", 10, "j", std::set<std::string>{"3", "10", "12"});
-  doAnalysisAndCompareResults("call_05_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{2, 38, "_Z18setValueToFortyTwoPi"},
+                          LineColFun{7, 3, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{2, 38, "_Z18setValueToFortyTwoPi"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{8, 3, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_05_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_06) {
   // NOTE: Here we are suffering from IntraProceduralAliasesOnly
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 24, "retval", std::set<std::string>{"11"});
-  GroundTruth.emplace(
-      "main", 24, "i",
-      std::set<std::string>{"3", "1", "2", "16", "17", "18", "12"});
-  GroundTruth.emplace(
-      "main", 24, "j",
-      std::set<std::string>{"19", "20", "21", "3", "1", "2", "13"});
-  GroundTruth.emplace(
-      "main", 24, "k",
-      std::set<std::string>{"22", "23", "3", "14", "1", "2", "24"});
-  GroundTruth.emplace(
-      "main", 24, "l",
-      std::set<std::string>{"15", "3", "1", "2", "25", "26", "27"});
-  doAnalysisAndCompareResults("call_06_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main24 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main24, "i",
+                      TaintSetT{
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{9, 17, "main"},
+                          LineColFun{9, 5, "main"},
+                          LineColFun{9, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "j",
+                      TaintSetT{
+                          LineColFun{10, 7, "main"},
+                          LineColFun{10, 17, "main"},
+                          LineColFun{10, 5, "main"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{6, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "k",
+                      TaintSetT{
+                          LineColFun{11, 17, "main"},
+                          LineColFun{11, 7, "main"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{7, 7, "main"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{11, 5, "main"},
+                      });
+  GroundTruth.emplace(Main24, "l",
+                      TaintSetT{
+                          LineColFun{8, 7, "main"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{12, 7, "main"},
+                          LineColFun{12, 17, "main"},
+                          LineColFun{12, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_06_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleCallTest_07) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 6, "retval", std::set<std::string>{"7"});
-  GroundTruth.emplace("main", 6, "VarIR", std::set<std::string>{"6", "3", "8"});
-  doAnalysisAndCompareResults("call_07_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main6 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main6, "VarIR",
+                      TaintSetT{
+                          LineColFun{7, 7, "main"},
+                          LineColFun{3, 6, "_Z13inputRefParamRi"},
+                          LineColFun{8, 3, "main"},
+                      });
+  doAnalysisAndCompareResults("call_07_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleGlobalTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 9, "retval", std::set<std::string>{"3"});
-  GroundTruth.emplace("main", 9, "i", std::set<std::string>{"7"});
-  GroundTruth.emplace("main", 9, "j", std::set<std::string>{"0", "5", "6"});
-  doAnalysisAndCompareResults("global_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main9 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main9, "i",
+                      TaintSetT{
+                          LineColFun{6, 5, "main"},
+                      });
+  GroundTruth.emplace(Main9, "j",
+                      TaintSetT{
+                          GlobalVar{"i"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{5, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("global_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleGlobalTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("_Z5initBv", 2, "a", std::set<std::string>{"0"});
-  GroundTruth.emplace("_Z5initBv", 2, "b", std::set<std::string>{"2"});
-  GroundTruth.emplace("main", 12, "a", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 12, "b", std::set<std::string>{"2"});
-  GroundTruth.emplace("main", 12, "retval", std::set<std::string>{"6"});
-  GroundTruth.emplace("main", 12, "c", std::set<std::string>{"1", "8", "7"});
-  doAnalysisAndCompareResults("global_02_cpp.ll", {"main"}, GroundTruth, false);
+
+  auto Main12 = RetStmt{"main"};
+  auto Init2 = RetStmt{"_Z5initBv"};
+
+  GroundTruth.emplace(Init2, "a",
+                      TaintSetT{
+                          GlobalVar{"a"},
+                      });
+  GroundTruth.emplace(Init2, "b",
+                      TaintSetT{
+                          LineColFun{4, 18, "_Z5initBv"},
+                      });
+
+  GroundTruth.emplace(Main12, "a",
+                      TaintSetT{
+                          GlobalVar{"a"},
+                      });
+  GroundTruth.emplace(Main12, "b",
+                      TaintSetT{
+                          LineColFun{4, 18, "_Z5initBv"},
+                      });
+  GroundTruth.emplace(Main12, "c",
+                      TaintSetT{
+                          GlobalVar{"b"},
+                          LineColFun{7, 7, "main"},
+                          LineColFun{7, 11, "main"},
+                      });
+
+  doAnalysisAndCompareResults("global_02_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleGlobalTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 1, "GlobalFeature", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 2, "GlobalFeature", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 17, "GlobalFeature", std::set<std::string>{"0"});
-  doAnalysisAndCompareResults("global_03_cpp.ll", {"main"}, GroundTruth, false);
+  GroundTruth.emplace(LineColFun{6, 11, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{6, 25, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(RetStmt{"main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+
+  doAnalysisAndCompareResults("global_03_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleGlobalTest_04) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 1, "GlobalFeature", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 2, "GlobalFeature", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 17, "GlobalFeature", std::set<std::string>{"0"});
-  GroundTruth.emplace("_Z7doStuffi", 1, "GlobalFeature",
-                      std::set<std::string>{"0"});
-  GroundTruth.emplace("_Z7doStuffi", 2, "GlobalFeature",
-                      std::set<std::string>{"0"});
-  doAnalysisAndCompareResults("global_04_cpp.ll", {"main", "_Z7doStuffi"},
+  GroundTruth.emplace(LineColFun{8, 11, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{8, 25, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(RetStmt{"main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{3, 31, "_Z7doStuffi"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{3, 22, "_Z7doStuffi"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+
+  doAnalysisAndCompareResults("global_04_cpp_dbg.ll", {"main", "_Z7doStuffi"},
                               GroundTruth, false);
 }
-TEST_F(IDEFeatureTaintAnalysisTest, HandleGlobalTest_05) {
-  std::set<IIACompactResult_t> GroundTruth;
-
-  // NOTE: Facts at init() should be empty, except for its own ID;
-  //       g should be strongly updated
-
-  GroundTruth.emplace("main", 1, "g", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 2, "g", std::set<std::string>{"2"});
-  GroundTruth.emplace("main", 4, "call",
-                      std::set<std::string>{"2", "4", "7", "8"});
-  GroundTruth.emplace("main", 4, "g", std::set<std::string>{"2"});
-
-  doAnalysisAndCompareResults("global_05_cpp.ll", {"main"}, GroundTruth, true);
-}
 
 TEST_F(IDEFeatureTaintAnalysisTest, KillTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 12, "retval", std::set<std::string>{"4"});
-  GroundTruth.emplace("main", 12, "i", std::set<std::string>{"5"});
-  GroundTruth.emplace("main", 12, "j", std::set<std::string>{"10"});
-  GroundTruth.emplace("main", 12, "k", std::set<std::string>{"9", "8", "5"});
-  doAnalysisAndCompareResults("KillTest_01_cpp.ll", {"main"}, GroundTruth,
+  auto Main12 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main12, "i",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                      });
+  GroundTruth.emplace(Main12, "j",
+                      TaintSetT{
+                          LineColFun{5, 5, "main"},
+                      });
+  GroundTruth.emplace(Main12, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{4, 11, "main"},
+                          LineColFun{2, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("KillTest_01_cpp_dbg.ll", {"main"}, GroundTruth,
                               false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, KillTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 12, "retval", std::set<std::string>{"6"});
-  GroundTruth.emplace("main", 12, "A", std::set<std::string>{"0"});
-  GroundTruth.emplace("main", 12, "B", std::set<std::string>{"2"});
-  GroundTruth.emplace("main", 12, "C", std::set<std::string>{"1", "7", "8"});
-  doAnalysisAndCompareResults("KillTest_02_cpp.ll", {"main"}, GroundTruth,
+  auto Main12 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main12, "A",
+                      TaintSetT{
+                          GlobalVar{"A"},
+                      });
+  GroundTruth.emplace(Main12, "B",
+                      TaintSetT{
+                          LineColFun{4, 18, "_Z5initBv"},
+                      });
+  GroundTruth.emplace(Main12, "C",
+                      TaintSetT{
+                          GlobalVar{"B"},
+                          LineColFun{7, 11, "main"},
+                          LineColFun{7, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("KillTest_02_cpp_dbg.ll", {"main"}, GroundTruth,
                               false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleReturnTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 6, "retval", std::set<std::string>{"3"});
-  GroundTruth.emplace("main", 6, "localVar", std::set<std::string>{"4"});
-  GroundTruth.emplace("main", 6, "call", std::set<std::string>{"0", "5"});
-  GroundTruth.emplace("main", 8, "localVar",
-                      std::set<std::string>{"0", "5", "6"});
-  GroundTruth.emplace("main", 8, "call", std::set<std::string>{"0", "5"});
-  doAnalysisAndCompareResults("return_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main6 = LineColFun{7, 12, "main"};
+  auto Main8 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main6, "localVar",
+                      TaintSetT{
+                          LineColFun{6, 12, "main"},
+                      });
+  GroundTruth.emplace(Main8, "localVar",
+                      TaintSetT{
+                          LineColFun{2, 30, "_Z20returnIntegerLiteralv"},
+                          LineColFun{7, 14, "main"},
+                          LineColFun{7, 12, "main"},
+                      });
+
+  doAnalysisAndCompareResults("return_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleHeapTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 17, "retval", std::set<std::string>{"3"});
-  GroundTruth.emplace("main", 17, "i", std::set<std::string>{"5", "6"});
-  GroundTruth.emplace("main", 17, "j",
-                      std::set<std::string>{"5", "6", "7", "8", "9"});
-  doAnalysisAndCompareResults("heap_01_cpp.ll", {"main"}, GroundTruth, false);
-}
 
-PHASAR_SKIP_TEST(TEST_F(IDEFeatureTaintAnalysisTest, HandleRVOTest_01) {
-  GTEST_SKIP() << "This test heavily depends on the used stdlib version. TODO: "
-                  "add a better one";
+  auto Main17 = RetStmt{"main"};
+  GroundTruth.emplace(Main17, "i",
+                      TaintSetT{
+                          LineColFun{3, 12, "main"},
+                          LineColFun{3, 8, "main"},
+                      });
+  GroundTruth.emplace(Main17, "j",
+                      TaintSetT{
+                          LineColFun{3, 12, "main"},
+                          LineColFun{3, 8, "main"},
+                          LineColFun{4, 12, "main"},
+                          LineColFun{4, 11, "main"},
+                          LineColFun{4, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("heap_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
+}
 
-  std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 16, "retval", std::set<std::string>{"75", "76"});
-  GroundTruth.emplace("main", 16, "str",
-                      std::set<std::string>{"70", "65", "72", "74", "77"});
-  GroundTruth.emplace("main", 16, "ref.tmp",
-                      std::set<std::string>{"66", "9", "72", "73", "71"});
-  doAnalysisAndCompareResults("rvo_01_cpp.ll", {"main"}, GroundTruth, false);
-})
-
-PHASAR_SKIP_TEST(TEST_F(IDEFeatureTaintAnalysisTest, HandleRVOTest_02) {
-  GTEST_SKIP() << "This test heavily depends on the used stdlib version. TODO: "
-                  "add a better one";
+// PHASAR_SKIP_TEST(TEST_F(IDEFeatureTaintAnalysisTest, HandleRVOTest_02) {
+//   GTEST_SKIP() << "This test heavily depends on the used stdlib version.
+//   TODO: "
+//                   "add a better one";
 
-  std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 18, "retval", std::set<std::string>{"75", "76"});
-  GroundTruth.emplace("main", 18, "str",
-                      std::set<std::string>{"70", "65", "72", "74", "77"});
-  GroundTruth.emplace("main", 18, "ref.tmp",
-                      std::set<std::string>{"66", "9", "72", "73", "71"});
-  doAnalysisAndCompareResults("rvo_02_cpp.ll", {"main"}, GroundTruth, true);
-})
+//   std::set<IIACompactResult_t> GroundTruth;
+//   GroundTruth.emplace("main", 18, "retval", std::set<std::string>{"75",
+//   "76"}); GroundTruth.emplace("main", 18, "str",
+//                       std::set<std::string>{"70", "65", "72", "74", "77"});
+//   GroundTruth.emplace("main", 18, "ref.tmp",
+//                       std::set<std::string>{"66", "9", "72", "73", "71"});
+//   doAnalysisAndCompareResults("rvo_02_cpp.ll", {"main"}, GroundTruth, true);
+// })
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleRVOTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-
-  GroundTruth.emplace(
-      "main", 19, "Str",
-      std::set<std::string>{"39", "43", "46", "49", "51", "54", "63"});
-  GroundTruth.emplace("main", 19, "ref.tmp",
-                      std::set<std::string>{"13", "19", "2", "20", "23", "24",
-                                            "25", "27", "29", "32", "40", "45",
-                                            "46", "47"});
-  GroundTruth.emplace("main", 19, "ref.tmp1",
-                      std::set<std::string>{"1", "13", "19", "20", "23", "24",
-                                            "25", "27", "29", "32", "48", "49",
-                                            "50"});
-  doAnalysisAndCompareResults("rvo_03_cpp.ll", {"main"}, GroundTruth, true);
+  auto Main19 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main19, "Str",
+                      TaintSetT{
+                          LineColFun{49, 10, "main"},
+                          LineColFun{49, 10, "main"},
+                          LineColFun{51, 7, "main"},
+                          LineColFun{52, 7, "main"},
+                          LineColFun{53, 14, "main"},
+                          LineColFun{54, 1, "main"},
+                          LineColFun{41, 10, "_ZN6StringC2Ev"},
+                      });
+
+  doAnalysisAndCompareResults("rvo_03_cpp_dbg.ll", {"main"}, GroundTruth, true);
 }
 
 TEST_F(IDEFeatureTaintAnalysisTest, HandleRVOTest_04) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace("main", 10, "retval", std::set<std::string>{"14"});
-  GroundTruth.emplace(
-      "main", 10, "F",
-      std::set<std::string>{"12", "15", "16", "17", "2", "3", "9"});
-  GroundTruth.emplace("main", 10, "ref.tmp",
-                      std::set<std::string>{"16", "17", "2", "3", "9"});
-  doAnalysisAndCompareResults("rvo_04_cpp.ll", {"main"}, GroundTruth, true);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "F",
+                      TaintSetT{
+                          LineColFun{17, 7, "main"},
+                          LineColFun{17, 7, "main"},
+                          LineColFun{18, 7, "main"},
+                          LineColFun{18, 5, "main"},
+                          LineColFun{14, 26, "_Z9createFoov"},
+                          LineColFun{14, 26, "_Z9createFoov"},
+                          LineColFun{7, 7, "_ZN3FooC2Ev"},
+                      });
+
+  doAnalysisAndCompareResults("rvo_04_cpp_dbg.ll", {"main"}, GroundTruth, true);
 }
 
 } // namespace
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
index d81885c43f..de8b4e8fde 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp
@@ -10,28 +10,29 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.h"
 
 #include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCA/EdgeValue.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-#include "phasar/Utils/Logger.h"
 
-#include "llvm/Support/raw_ostream.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/Support/Casting.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <unordered_set>
 #include <vector>
 
 using namespace psr;
 using namespace psr::glca;
+using namespace psr::unittest;
 
-using groundTruth_t =
-    std::tuple<const IDEGeneralizedLCA::l_t, unsigned, unsigned>;
+using l_t = IDEGeneralizedLCA::l_t;
+using groundTruth_t = std::tuple<l_t, TestingSrcLocation, TestingSrcLocation>;
 
 /* ============== TEST FIXTURE ============== */
 
@@ -68,127 +69,171 @@ class IDEGeneralizedLCATest : public ::testing::Test {
   /// \brief compares the computed results with every given tuple (value,
   /// alloca, inst)
   void compareResults(const std::vector<groundTruth_t> &Expected) {
-    for (const auto &[EVal, VrId, InstId] : Expected) {
-      const auto *Vr = HA->getProjectIRDB().getInstruction(VrId);
-      const auto *Inst = HA->getProjectIRDB().getInstruction(InstId);
-      ASSERT_NE(nullptr, Vr);
-      ASSERT_NE(nullptr, Inst);
-      auto Result = LCASolver->resultAt(Inst, Vr);
-
-      EXPECT_EQ(EVal, Result) << "vr:" << VrId << " inst:" << InstId
-                              << " Expected: " << EVal << " Got:" << Result;
+    for (const auto &[EVal, VarLoc, InstLoc] : Expected) {
+      const auto *Var = testingLocInIR(VarLoc, HA->getProjectIRDB());
+      const auto *Inst = llvm::dyn_cast_if_present<llvm::Instruction>(
+          testingLocInIR(InstLoc, HA->getProjectIRDB()));
+
+      ASSERT_TRUE(Var) << "Cannot map location " << VarLoc.str() << " to LLVM";
+      ASSERT_TRUE(Inst) << "Cannot map location " << InstLoc.str()
+                        << " to LLVM";
+
+      auto Result = LCASolver->resultAt(Inst, Var);
+      EXPECT_EQ(EVal, Result)
+          << "At VarLoc: " << VarLoc.str() << ", InstLoc: " << InstLoc.str()
+          << ";\n  aka. Var: " << llvmIRToString(Var)
+          << "; Inst: " << llvmIRToString(Inst) << ":\n  Expected: " << EVal
+          << " Got:" << LToString(Result);
     }
   }
 
 }; // class Fixture
 
 TEST_F(IDEGeneralizedLCATest, SimpleTest) {
-  initialize("SimpleTest_c.ll");
+  initialize("SimpleTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(10)}, 3, 20});
-  GroundTruth.push_back({{EdgeValue(15)}, 4, 20});
+
+  GroundTruth.emplace_back(l_t{EdgeValue(10)}, LineColFun{4, 0, "main"},
+                           LineColFun{7, 3, "main"});
+  GroundTruth.emplace_back(l_t{EdgeValue(15)}, LineColFun{5, 0, "main"},
+                           LineColFun{7, 3, "main"});
+
   compareResults(GroundTruth);
 }
-
 TEST_F(IDEGeneralizedLCATest, BranchTest) {
-  initialize("BranchTest_c.ll");
+  initialize("BranchTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(25), EdgeValue(43)}, 3, 22});
-  GroundTruth.push_back({{EdgeValue(24)}, 4, 22});
+
+  GroundTruth.push_back(
+      {{EdgeValue(25)}, LineColFun{7, 11, "main"}, LineColFun{8, 3, "main"}});
+  GroundTruth.push_back(
+      {{EdgeValue(24)}, LineColFun{7, 9, "main"}, LineColFun{8, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, FPtest) {
-  initialize("FPtest_c.ll");
-
+  initialize("FPtest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(4.5)}, 1, 16});
-  GroundTruth.push_back({{EdgeValue(2.0)}, 2, 16});
+
+  GroundTruth.push_back(
+      {{EdgeValue(4.5)}, LineColFun{4, 9, "main"}, LineColFun{6, 3, "main"}});
+  GroundTruth.push_back(
+      {{EdgeValue(2.0)}, LineColFun{5, 9, "main"}, LineColFun{6, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, StringTest) {
-  initialize("StringTest_c.ll");
+  initialize("StringTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue("Hello, World")}, 2, 8});
-  GroundTruth.push_back({{EdgeValue("Hello, World")}, 3, 8});
+
+  GroundTruth.push_back({{EdgeValue("Hello, World")},
+                         LineColFun{4, 0, "main"},
+                         LineColFun{7, 3, "main"}});
+  GroundTruth.push_back({{EdgeValue("Hello, World")},
+                         LineColFun{5, 0, "main"},
+                         LineColFun{7, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, StringBranchTest) {
-  initialize("StringBranchTest_c.ll");
+  initialize("StringBranchTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back(
-      {{EdgeValue("Hello, World"), EdgeValue("Hello Hello")}, 3, 15});
-  GroundTruth.push_back({{EdgeValue("Hello Hello")}, 4, 15});
+
+  GroundTruth.push_back({{EdgeValue("Hello Hello"), EdgeValue("Hello, World")},
+                         LineColFun{5, 15, "main"},
+                         LineColFun{10, 3, "main"}});
+  GroundTruth.push_back({{EdgeValue("Hello Hello")},
+                         LineColFun{6, 15, "main"},
+                         LineColFun{10, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, StringTestCpp) {
-  initialize("StringTest_cpp.ll");
+  initialize("StringTest_cpp_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  const auto *LastMainInstruction =
-      getLastInstructionOf(HA->getProjectIRDB().getFunction("main"));
+
   GroundTruth.push_back({{EdgeValue("Hello, World")},
-                         7,
-                         static_cast<unsigned int>(
-                             std::stoi(getMetaDataID(LastMainInstruction)))});
+                         LineColFun{4, 15, "main"},
+                         LineColFun{6, 1, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, FloatDivisionTest) {
-  initialize("FloatDivision_c.ll");
+  initialize("FloatDivision_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(nullptr)}, 1, 24}); // i
-  GroundTruth.push_back({{EdgeValue(1.0)}, 2, 24});     // j
-  GroundTruth.push_back({{EdgeValue(-7.0)}, 3, 24});    // k
+
+  GroundTruth.push_back(
+      {{EdgeValue(1.0)}, LineColFun{5, 9, "main"}, LineColFun{8, 3, "main"}});
+  GroundTruth.push_back({{EdgeValue(nullptr)},
+                         LineColFun{6, 9, "main"},
+                         LineColFun{8, 3, "main"}});
+  GroundTruth.push_back(
+      {{EdgeValue(-7.0)}, LineColFun{7, 9, "main"}, LineColFun{8, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, SimpleFunctionTest) {
-  initialize("SimpleFunctionTest_c.ll");
+  initialize("SimpleFunctionTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(48)}, 10, 31});      // i
-  GroundTruth.push_back({{EdgeValue(nullptr)}, 11, 31}); // j
+
+  GroundTruth.push_back(
+      {{EdgeValue(48)}, LineColFun{8, 7, "main"}, LineColFun{10, 3, "main"}});
+  GroundTruth.push_back({{EdgeValue(nullptr)},
+                         LineColFun{9, 7, "main"},
+                         LineColFun{10, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, GlobalVariableTest) {
-  initialize("GlobalVariableTest_c.ll");
+  initialize("GlobalVariableTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(50)}, 7, 13}); // i
-  GroundTruth.push_back({{EdgeValue(8)}, 10, 13}); // j
+
+  GroundTruth.push_back(
+      {{EdgeValue(50)}, LineColFun{4, 13, "main"}, LineColFun{6, 3, "main"}});
+  GroundTruth.push_back(
+      {{EdgeValue(8)}, LineColFun{5, 13, "main"}, LineColFun{6, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, Imprecision) {
-  initialize("Imprecision_c.ll");
-  //   auto xInst = IRDB->getInstruction(0); // foo.x
-  //   auto yInst = IRDB->getInstruction(1); // foo.y
-  //  auto barInst = IRDB->getInstruction(7);
+  initialize("Imprecision_c_dbg.ll");
+  std::vector<groundTruth_t> GroundTruth;
 
-  // llvm::outs() << "foo.x = " << LCASolver->resultAt(barInst, xInst) <<
-  // std::endl; llvm::outs() << "foo.y = " << LCASolver->resultAt(barInst,
-  // yInst)
-  // << std::endl;
+  GroundTruth.push_back({{EdgeValue(1), EdgeValue(2)},
+                         LineColFun{3, 14, "foo"},
+                         LineColFun{3, 26, "foo"}});
+  GroundTruth.push_back({{EdgeValue(2), EdgeValue(3)},
+                         LineColFun{3, 21, "foo"},
+                         LineColFun{3, 26, "foo"}});
 
-  std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(1), EdgeValue(2)}, 0, 7}); // i
-  GroundTruth.push_back({{EdgeValue(2), EdgeValue(3)}, 1, 7}); // j
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, ReturnConstTest) {
-  initialize("ReturnConstTest_c.ll");
+  initialize("ReturnConstTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue(43)}, 7, 8}); // i
+
+  GroundTruth.push_back(
+      {{EdgeValue(43)}, LineColFun{6, 12, "main"}, LineColFun{6, 3, "main"}});
+
   compareResults(GroundTruth);
 }
 
 TEST_F(IDEGeneralizedLCATest, NullTest) {
-  initialize("NullTest_c.ll");
+  initialize("NullTest_c_dbg.ll");
   std::vector<groundTruth_t> GroundTruth;
-  GroundTruth.push_back({{EdgeValue("")}, 4, 5}); // foo(null)
+
+  GroundTruth.push_back(
+      {{EdgeValue("")}, LineColFun{1, 31, "foo"}, LineColFun{1, 24, "foo"}});
+
   compareResults(GroundTruth);
 }
 
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
index 59a474013b..33fcdaa918 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp
@@ -10,32 +10,41 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h"
 
 #include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
+#include "phasar/Domain/LatticeDomain.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/HelperAnalysisConfig.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/BitVectorSet.h"
-#include "phasar/Utils/Logger.h"
+#include "phasar/Utils/Printer.h"
+#include "phasar/Utils/Utilities.h"
 
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/Support/Casting.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
 #include <set>
+#include <stdexcept>
 #include <string>
 #include <tuple>
 #include <variant>
 
 using namespace psr;
+using namespace psr::unittest;
+
+using TaintSetT = BitVectorSet<TestingSrcLocation>;
 
 /* ============== TEST FIXTURE ============== */
 class IDEInstInteractionAnalysisTest : public ::testing::Test {
@@ -43,16 +52,15 @@ class IDEInstInteractionAnalysisTest : public ::testing::Test {
   static constexpr auto PathToLlFiles =
       PHASAR_BUILD_SUBFOLDER("inst_interaction/");
 
+  using VarNameT = std::variant<std::string, unittest::RetVal>;
   // Function - Line Nr - Variable - Values
   using IIACompactResult_t =
-      std::tuple<std::string, std::size_t, std::string,
-                 IDEInstInteractionAnalysisT<std::string, true>::l_t>;
+      std::tuple<TestingSrcLocation, VarNameT,
+                 IDEInstInteractionAnalysisT<TestingSrcLocation>::l_t>;
 
   std::optional<HelperAnalyses> HA;
   LLVMProjectIRDB *IRDB{};
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
   void initializeIR(const std::string &LlvmFilePath,
                     const std::vector<std::string> &EntryPoints = {"main"}) {
     HA.emplace(PathToLlFiles + LlvmFilePath, EntryPoints,
@@ -60,6 +68,55 @@ class IDEInstInteractionAnalysisTest : public ::testing::Test {
     IRDB = &HA->getProjectIRDB();
   }
 
+  [[nodiscard]] const llvm::Instruction *getInst(TestingSrcLocation Loc) {
+    const auto *Ret = llvm::dyn_cast_if_present<llvm::Instruction>(
+        testingLocInIR(Loc, HA->getProjectIRDB()));
+    if (!Ret) {
+      throw std::runtime_error("Cannot convert loc " + Loc.str() + " to LLVM");
+    }
+    return Ret;
+  }
+
+  [[nodiscard]] bool matchesVar(const llvm::Value *Fact,
+                                const VarNameT &VarName) {
+    return std::visit(
+        psr::Overloaded{
+            [&](const std::string &Name) {
+              if (!llvm::isa<llvm::AllocaInst>(Fact) &&
+                  !llvm::isa<llvm::GlobalVariable>(Fact)) {
+                return false;
+              }
+              auto FactName = psr::getVarNameFromIR(Fact);
+              return FactName == Name;
+            },
+            [&](RetVal R) {
+              return llvm::any_of(Fact->users(), [R](const auto *V) {
+                const auto *Ret = llvm::dyn_cast<llvm::ReturnInst>(V);
+                return Ret && Ret->getFunction()->getName() == R.InFunction;
+              });
+            },
+        },
+        VarName);
+  }
+  [[nodiscard]] std::string printVar(const VarNameT &VarName) {
+    return std::visit(psr::Overloaded{
+                          [](const std::string &Name) { return Name; },
+                          [](RetVal R) { return R.str(); },
+                      },
+                      VarName);
+  }
+  [[nodiscard]] LatticeDomain<std::set<TestingSrcLocation>>
+  sorted(const IDEInstInteractionAnalysisT<TestingSrcLocation>::l_t &Values) {
+    if (const auto *Set = Values.getValueOrNull()) {
+      std::set<TestingSrcLocation> Ret(Set->begin(), Set->end());
+      return Ret;
+    }
+    if (Values.isBottom()) {
+      return Bottom{};
+    }
+    return Top{};
+  }
+
   void
   doAnalysisAndCompareResults(const std::string &LlvmFilePath,
                               const std::vector<std::string> &EntryPoints,
@@ -70,31 +127,39 @@ class IDEInstInteractionAnalysisTest : public ::testing::Test {
       IRDB->emitPreprocessedIR(llvm::outs());
     }
 
-    // IDEInstInteractionAnalysisT<std::string, true> IIAProblem(IRDB, &ICFG,
-    // &PT,
-    //                                                           EntryPoints);
     assert(HA);
     auto IIAProblem =
-        createAnalysisProblem<IDEInstInteractionAnalysisT<std::string>>(
+        createAnalysisProblem<IDEInstInteractionAnalysisT<TestingSrcLocation>>(
             *HA, EntryPoints);
-    // use Phasar's instruction ids as testing labels
+
     auto Generator =
         [](std::variant<const llvm::Instruction *, const llvm::GlobalVariable *>
-               Current) -> std::set<std::string> {
+               Current) -> std::set<TestingSrcLocation> {
       return std::visit(
-          [](const auto *InstOrGlob) -> std::set<std::string> {
-            std::set<std::string> Labels;
-            if (InstOrGlob->hasMetadata()) {
-              std::string Label =
-                  llvm::cast<llvm::MDString>(
-                      InstOrGlob->getMetadata(PhasarConfig::MetaDataKind())
-                          ->getOperand(0))
-                      ->getString()
-                      .str();
-              Labels.insert(Label);
-            }
-            return Labels;
-          },
+          psr::Overloaded{
+              [](const llvm::GlobalVariable *Glob)
+                  -> std::set<TestingSrcLocation> {
+                std::set<TestingSrcLocation> Labels;
+                Labels.insert(GlobalVar{Glob->getName()});
+                return Labels;
+              },
+              [](const llvm::Instruction *Inst)
+                  -> std::set<TestingSrcLocation> {
+                std::set<TestingSrcLocation> Labels;
+                auto [Line, Col] = getLineAndColFromIR(Inst);
+                if (Col == 0 && llvm::isa<llvm::StoreInst>(Inst)) {
+                  std::tie(Line, Col) = getLineAndColFromIR(Inst->getOperand(
+                      llvm::StoreInst::getPointerOperandIndex()));
+                }
+                if (Line != 0) {
+                  Labels.insert(LineColFun{
+                      Line,
+                      Col,
+                      Inst->getFunction()->getName(),
+                  });
+                }
+                return Labels;
+              }},
           Current);
     };
     // register the above generator function
@@ -105,49 +170,48 @@ class IDEInstInteractionAnalysisTest : public ::testing::Test {
       IIASolver.dumpResults();
     }
     // do the comparison
-    for (const auto &[FunName, SrcLine, VarName, LatticeVal] : GroundTruth) {
-      const auto *Fun = IRDB->getFunctionDefinition(FunName);
-      const auto *IRLine = getNthInstruction(Fun, SrcLine);
-      auto ResultMap = IIASolver.resultsAt(IRLine);
-      assert(IRLine && "Could not retrieve IR line!");
+    for (const auto &[InstLoc, VarName, ExpectedVal] : GroundTruth) {
+      //   const auto *Fun = IRDB->getFunctionDefinition(FunName);
+      //   const auto *IRLine = getNthInstruction(Fun, SrcLine);
+      const auto *IRLoc = testingLocInIR(InstLoc, *IRDB);
+      ASSERT_TRUE(IRLoc) << "Could not retrieve IR Loc: " << InstLoc.str();
+      ASSERT_TRUE(llvm::isa<llvm::Instruction>(IRLoc));
+      auto ResultMap =
+          IIASolver.resultsAt(llvm::cast<llvm::Instruction>(IRLoc));
       bool FactFound = false;
-      for (auto &[Fact, Value] : ResultMap) {
-        std::string FactStr;
-        llvm::raw_string_ostream RSO(FactStr);
-        RSO << *Fact.getBase();
-        llvm::StringRef FactRef(FactStr);
-        if (FactRef.ltrim().startswith("%" + VarName + " ") ||
-            FactRef.ltrim().startswith("@" + VarName + " ")) {
-          PHASAR_LOG_LEVEL(DFADEBUG, "Checking variable: " << FactStr);
-          EXPECT_EQ(LatticeVal, Value);
+      for (auto &[Fact, ComputedVal] : ResultMap) {
+        if (matchesVar(Fact.getBase(), VarName)) {
+          EXPECT_EQ(sorted(ExpectedVal), sorted(ComputedVal))
+              << "Unexpected taint-set at " << InstLoc << " for variable '"
+              << printVar(VarName) << "' (" << llvmIRToString(Fact.getBase())
+              << ")";
           FactFound = true;
         }
       }
-      if (!FactFound) {
-        PHASAR_LOG_LEVEL(DFADEBUG, "Variable '" << VarName << "' missing at '"
-                                                << llvmIRToString(IRLine)
-                                                << "'.");
-      }
-      EXPECT_TRUE(FactFound);
+
+      EXPECT_TRUE(FactFound)
+          << "Variable '" << printVar(VarName) << "' missing at '"
+          << llvmIRToString(IRLoc) << "'.";
     }
   }
 
-  void TearDown() override {}
+  void TearDown() override {
+    BitVectorSet<TestingSrcLocation>::clearPosition();
+  }
 
 }; // Test Fixture
 
 TEST_F(IDEInstInteractionAnalysisTest, FieldSensArrayConstruction_01) {
-  initializeIR("array_01_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("array_01_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{2, 7, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 13);
+  Inst = getInst(LineColFun{5, 3, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 16);
+  Inst = getInst(LineColFun{6, 3, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
@@ -155,21 +219,21 @@ TEST_F(IDEInstInteractionAnalysisTest, FieldSensArrayConstruction_01) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, FieldSensArrayConstruction_02) {
-  initializeIR("array_02_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("array_02_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{2, 7, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 3);
+  Inst = getInst(LineColFun{4, 7, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 5);
+  Inst = getInst(LineColFun{3, 3, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 6);
+  Inst = getInst(OperandOf{llvm::StoreInst::getPointerOperandIndex(),
+                           LineColFun{3, 16, "main"}});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
@@ -177,21 +241,28 @@ TEST_F(IDEInstInteractionAnalysisTest, FieldSensArrayConstruction_02) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, FieldSensArrayConstruction_03) {
-  initializeIR("array_03_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("array_03_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{2, 7, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 5);
+
+  auto Store = LineColFun{3, 19, "main"};
+  auto LastGep = OperandOf{llvm::StoreInst::getPointerOperandIndex(), Store};
+  auto FirstGep = LineColFun{3, 3, "main"};
+
+  Inst = getInst(FirstGep);
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 6);
+
+  const auto *LastGepInst = getInst(LastGep);
+
+  Inst = llvm::cast<llvm::Instruction>(LastGepInst->getOperand(0));
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 7);
+  Inst = LastGepInst;
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
@@ -199,17 +270,16 @@ TEST_F(IDEInstInteractionAnalysisTest, FieldSensArrayConstruction_03) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, FieldSensStructConstruction_01) {
-  initializeIR("struct_01_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("struct_01_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{8, 7, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 14);
+  Inst = getInst(LineColFun{12, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 17);
+  Inst = getInst(LineColFun{13, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
@@ -217,21 +287,20 @@ TEST_F(IDEInstInteractionAnalysisTest, FieldSensStructConstruction_01) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, FieldSensStructConstruction_02) {
-  initializeIR("struct_02_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("struct_02_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{12, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 6);
+  Inst = getInst(LineColFun{13, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 7);
+  Inst = getInst(LineColFun{13, 7, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
-  Inst = getNthInstruction(Main, 9);
+  Inst = getInst(LineColFun{14, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << FlowFact << '\n';
@@ -239,87 +308,98 @@ TEST_F(IDEInstInteractionAnalysisTest, FieldSensStructConstruction_02) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, ArrayEquality_01) {
-  initializeIR("array_01_cpp.ll");
+  initializeIR("array_01_cpp_dbg.ll");
 
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  const auto *Inst = getInst(LineColFun{2, 7, "main"});
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, FlowFact);
 
-  Inst = getNthInstruction(Main, 4);
+  Inst = getInst(LineColFun{4, 7, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 13);
+  Inst = getInst(LineColFun{5, 3, "main"});
   auto OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_NE(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 13);
-
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 18);
+  Inst = getInst(LineColFun{7, 11, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 16);
+  Inst = getInst(LineColFun{6, 3, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 21);
+  Inst = getInst(LineColFun{8, 11, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, ArrayEquality_02) {
-  initializeIR("array_02_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("array_02_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{2, 7, "main"});
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, FlowFact);
 
-  Inst = getNthInstruction(Main, 5);
+  const auto *FirstGep = getInst(LineColFun{3, 3, "main"});
+  Inst = FirstGep;
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 8);
+  Inst = getInst(LineColFun{4, 11, "main"});
   auto OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 6);
+  const auto *SecondGep = getInst(OperandOf{
+      llvm::StoreInst::getPointerOperandIndex(), LineColFun{3, 16, "main"}});
+  Inst = SecondGep;
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 9);
+  Inst = llvm::cast<llvm::Instruction>(
+      getInst(LineColFunOp{4, 11, "main", llvm::Instruction::Load})
+          ->getOperand(0));
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 5);
+  Inst = FirstGep;
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 6);
+  Inst = SecondGep;
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_NE(FlowFact, OtherFlowFact);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, ArrayEquality_03) {
-  initializeIR("array_03_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("array_03_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{2, 7, "main"});
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, FlowFact);
 
-  Inst = getNthInstruction(Main, 5);
+  Inst = getInst(LineColFun{3, 3, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 9);
+  Inst = getInst(LineColFun{4, 11, "main"});
   auto OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 6);
+  const auto *GepStore =
+      llvm::cast<llvm::StoreInst>(getInst(LineColFun{3, 19, "main"}));
+  const auto *GepLoad =
+      getInst(LineColFunOp{4, 11, "main", llvm::Instruction::Load});
+
+  Inst = llvm::cast<llvm::Instruction>(
+      llvm::cast<llvm::GetElementPtrInst>(GepStore->getPointerOperand())
+          ->getPointerOperand());
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 10);
+  Inst = llvm::cast<llvm::Instruction>(
+      llvm::cast<llvm::GetElementPtrInst>(GepLoad->getOperand(0))
+          ->getPointerOperand());
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 7);
+  Inst = llvm::cast<llvm::Instruction>(GepStore->getPointerOperand());
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 11);
+  Inst = llvm::cast<llvm::Instruction>(GepLoad->getOperand(0));
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 6);
+  Inst = llvm::cast<llvm::Instruction>(
+      llvm::cast<llvm::GetElementPtrInst>(GepStore->getPointerOperand())
+          ->getPointerOperand());
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 11);
+  Inst = llvm::cast<llvm::Instruction>(GepLoad->getOperand(0));
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   // For K-limit of 2, this should be considered equal
   if (IDEIIAFlowFact::KLimit <= 2) {
@@ -330,33 +410,32 @@ TEST_F(IDEInstInteractionAnalysisTest, ArrayEquality_03) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, StructEquality_01) {
-  initializeIR("struct_01_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("struct_01_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{8, 7, "main"});
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, FlowFact);
 
-  Inst = getNthInstruction(Main, 14);
+  Inst = getInst(LineColFun{12, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 22);
+  Inst = getInst(LineColFun{15, 13, "main"});
   auto OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 17);
+  Inst = getInst(LineColFun{13, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 25);
+  Inst = getInst(LineColFun{16, 13, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 20);
+  Inst = getInst(LineColFun{14, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 28);
+  Inst = getInst(LineColFun{17, 13, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 17);
+  Inst = getInst(LineColFun{13, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 20);
+  Inst = getInst(LineColFun{14, 5, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   llvm::outs() << "Compare:\n";
   llvm::outs() << FlowFact << '\n';
@@ -366,40 +445,39 @@ TEST_F(IDEInstInteractionAnalysisTest, StructEquality_01) {
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, StructEquality_02) {
-  initializeIR("struct_02_cpp.ll");
-  const auto *Main = IRDB->getFunction("main");
-  const auto *Inst = getNthInstruction(Main, 2);
+  initializeIR("struct_02_cpp_dbg.ll");
+  const auto *Inst = getInst(LineColFun{12, 5, "main"});
   auto FlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, FlowFact);
 
-  Inst = getNthInstruction(Main, 6);
+  Inst = getInst(LineColFun{13, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 11);
+  Inst = getInst(LineColFun{15, 13, "main"});
   auto OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 6);
+  Inst = getInst(LineColFun{13, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 7);
+  Inst = getInst(LineColFun{13, 7, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_NE(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 7);
+  Inst = getInst(LineColFun{13, 7, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 12);
+  Inst = getInst(LineColFun{15, 15, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 9);
+  Inst = getInst(LineColFun{14, 5, "main"});
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 15);
+  Inst = getInst(LineColFun{16, 13, "main"});
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_EQ(FlowFact, OtherFlowFact);
 
-  Inst = getNthInstruction(Main, 6);
+  Inst = getInst(LineColFun{13, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from: " << *Inst << '\n';
   FlowFact = IDEIIAFlowFact::create(Inst);
-  Inst = getNthInstruction(Main, 9);
+  Inst = getInst(LineColFun{14, 5, "main"});
   llvm::outs() << "Instruction to create flow fact from 2: " << *Inst << '\n';
   OtherFlowFact = IDEIIAFlowFact::create(Inst);
   ASSERT_NE(FlowFact, OtherFlowFact);
@@ -426,454 +504,683 @@ TEST_F(IDEInstInteractionAnalysisTest, StructEquality_02) {
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 9, "i", {"4"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 9, "j", {"4", "5", "6", "7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 9, "retval", {"3"}));
-  doAnalysisAndCompareResults("basic_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main9 = LineColFun{4, 3, "main"};
+  GroundTruth.emplace(Main9, "i", TaintSetT{LineColFun{2, 7, "main"}});
+  GroundTruth.emplace(Main9, "j",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{3, 11, "main"},
+                          LineColFun{3, 13, "main"},
+                          LineColFun{3, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "retval", {"6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "argc.addr", {"7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "argv.addr", {"8"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "i", {"16", "18"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "j", {"9", "10", "11", "12"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "k", {"21", "16", "18", "20"}));
-  doAnalysisAndCompareResults("basic_02_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main24 = LineColFun{10, 3, "main"};
+
+  GroundTruth.emplace(Main24, "argc", TaintSetT{LineColFun{1, 14, "main"}});
+  GroundTruth.emplace(Main24, "argv", TaintSetT{LineColFun{1, 27, "main"}});
+  GroundTruth.emplace(Main24, "i",
+                      TaintSetT{
+                          LineColFun{5, 7, "main"},
+                          LineColFun{7, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "j",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{3, 11, "main"},
+                          LineColFun{3, 13, "main"},
+                          LineColFun{3, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "k",
+                      TaintSetT{
+                          LineColFun{5, 7, "main"},
+                          LineColFun{7, 7, "main"},
+                          LineColFun{9, 11, "main"},
+                          LineColFun{9, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_02_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "retval", {"3"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "i", {"4", "10", "11", "12"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "x", {"5", "14", "15", "16"}));
-  doAnalysisAndCompareResults("basic_03_cpp.ll", {"main"}, GroundTruth, false);
-}
-
-PHASAR_SKIP_TEST(TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_04) {
-  // If we use libcxx this won't work since internal implementation is different
+
+  auto Main20 = LineColFun{6, 3, "main"};
+
+  GroundTruth.emplace(Main20, "i",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{4, 5, "main"},
+                      });
+  GroundTruth.emplace(Main20, "x",
+                      TaintSetT{
+                          LineColFun{3, 12, "main"},
+                          LineColFun{3, 28, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_03_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
+}
+
+TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_04) {
+
   LIBCPP_GTEST_SKIP;
 
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "retval", {"7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "argc.addr", {"8"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "argv.addr", {"9"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "i", {"10"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "j", {"10", "11", "12", "13"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 23, "k", {"10", "11", "12", "13", "14", "18", "19"}));
-  doAnalysisAndCompareResults("basic_04_cpp.ll", {"main"}, GroundTruth, false);
-})
+  auto Main23 = LineColFun{11, 3, "main"};
+
+  GroundTruth.emplace(Main23, "argc",
+                      TaintSetT{
+                          LineColFun{3, 14, "main"},
+                      });
+  GroundTruth.emplace(Main23, "argv",
+                      TaintSetT{
+                          LineColFun{3, 27, "main"},
+                      });
+  GroundTruth.emplace(Main23, "i",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                      });
+  GroundTruth.emplace(Main23, "j",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main23, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{8, 9, "main"},
+                          LineColFun{8, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_04_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
+}
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_05) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 11, "i", {"5", "7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 11, "retval", {"2"}));
-  doAnalysisAndCompareResults("basic_05_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main11 = LineColFun{10, 3, "main"};
+  GroundTruth.emplace(Main11, "i",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                          LineColFun{8, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_05_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_06) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 19, "retval", {"5"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 19, "i", {"15", "6", "13"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 19, "j", {"15", "6", "13"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 19, "k", {"6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 19, "p", {"1", "2", "9", "11"}));
-  doAnalysisAndCompareResults("basic_06_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main19 = LineColFun{14, 3, "main"};
+
+  GroundTruth.emplace(Main19, "i",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                          LineColFun{13, 8, "main"},
+                          LineColFun{13, 6, "main"},
+                      });
+  GroundTruth.emplace(Main19, "j",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                          LineColFun{13, 8, "main"},
+                          LineColFun{13, 6, "main"},
+                      });
+  GroundTruth.emplace(Main19, "k",
+                      TaintSetT{
+                          LineColFun{6, 7, "main"},
+                      });
+  GroundTruth.emplace(Main19, "p",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{9, 7, "main"},
+                          LineColFun{11, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_06_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_07) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 15, "retval", {"5"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 15, "argc.addr", {"6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 15, "argv.addr", {"7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 15, "i", {"12"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 15, "j", {"8", "9", "10", "11"}));
-  doAnalysisAndCompareResults("basic_07_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main15 = LineColFun{5, 3, "main"};
+
+  GroundTruth.emplace(Main15, "argc",
+                      TaintSetT{
+                          LineColFun{1, 14, "main"},
+                      });
+  GroundTruth.emplace(Main15, "argv",
+                      TaintSetT{
+                          LineColFun{1, 27, "main"},
+                      });
+  // strong update on i
+  GroundTruth.emplace(Main15, "i",
+                      TaintSetT{
+                          LineColFun{4, 5, "main"},
+                      });
+  GroundTruth.emplace(Main15, "j",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                          LineColFun{3, 11, "main"},
+                          LineColFun{3, 13, "main"},
+                          LineColFun{3, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_07_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_08) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "retval", {"2"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "i", {"9"}));
-  doAnalysisAndCompareResults("basic_08_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main12 = LineColFun{11, 3, "main"};
+
+  // strong update on i
+  GroundTruth.emplace(Main12, "i",
+                      TaintSetT{
+                          LineColFun{10, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_08_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_09) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "i", {"4"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "j", {"4", "6", "7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "retval", {"3"}));
-  doAnalysisAndCompareResults("basic_09_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = LineColFun{6, 3, "main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{3, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{3, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{5, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_09_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_10) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "i", {"3"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "retval", {"2"}));
-  doAnalysisAndCompareResults("basic_10_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main6 = LineColFun{4, 3, "main"};
+  GroundTruth.emplace(Main6, "i",
+                      TaintSetT{
+                          LineColFun{3, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_10_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_11) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "FeatureSelector", {"5", "7", "8"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "retval", {"11", "16"}));
-  doAnalysisAndCompareResults("basic_11_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main20 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main20, "FeatureSelector",
+                      TaintSetT{
+                          LineColFun{3, 14, "main"},
+                          LineColFun{4, 25, "main"},
+                          LineColFun{4, 7, "main"},
+                      });
+
+  GroundTruth.emplace(Main20, RetVal{"main"},
+                      TaintSetT{
+                          LineColFun{7, 5, "main"},
+                          LineColFun{15, 3, "main"},
+                          LineColFun{16, 1, "main"},
+                      });
+
+  doAnalysisAndCompareResults("basic_11_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 14, "retval", {"8"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 14, "i", {"9"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 14, "j", {"12", "9", "10", "11"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 14, "k", {"15", "1", "2", "13", "12", "9", "10", "11"}));
-  doAnalysisAndCompareResults("call_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main14 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main14, "i",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                      });
+  GroundTruth.emplace(Main14, "j",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main14, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 11, "main"},
+                          LineColFun{5, 13, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{6, 14, "main"},
+                          LineColFun{1, 12, "_Z2idi"},
+                          LineColFun{1, 24, "_Z2idi"},
+                      });
+
+  doAnalysisAndCompareResults("call_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 13, "retval", {"12"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 13, "i", {"13"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 13, "j", {"14"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 13, "k",
-          {"4", "5", "15", "6", "3", "14", "2", "13", "16", "18"}));
-  doAnalysisAndCompareResults("call_02_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main13 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main13, "i",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                      });
+  GroundTruth.emplace(Main13, "j",
+                      TaintSetT{
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main13, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{6, 15, "main"},
+                          LineColFun{6, 18, "main"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{1, 13, "_Z3sumii"},
+                          LineColFun{1, 20, "_Z3sumii"},
+                          LineColFun{1, 32, "_Z3sumii"},
+                          LineColFun{1, 36, "_Z3sumii"},
+                          LineColFun{1, 34, "_Z3sumii"},
+                      });
+
+  doAnalysisAndCompareResults("call_02_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "retval", {"20"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "i", {"21"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "j",
-          {"22", "15", "6", "21", "2", "13", "8", "9", "12", "10", "24"}));
-  doAnalysisAndCompareResults("call_03_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{9, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{9, 7, "main"},
+                          LineColFun{10, 21, "main"},
+                          LineColFun{6, 1, "_Z9factorialj"},
+                          LineColFun{3, 5, "_Z9factorialj"},
+                          LineColFun{9, 7, "main"},
+                          LineColFun{1, 29, "_Z9factorialj"},
+                          LineColFun{5, 3, "_Z9factorialj"},
+                          LineColFun{5, 10, "_Z9factorialj"},
+                          LineColFun{5, 24, "_Z9factorialj"},
+                          LineColFun{5, 12, "_Z9factorialj"},
+                          LineColFun{5, 26, "_Z9factorialj"},
+                          LineColFun{10, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_03_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_04) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "retval", {"33"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "i", {"34"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "j",
-          {"15", "6", "2", "13", "8", "9", "12", "10", "35", "34", "37"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 20, "k",
-          {"41", "19", "15", "6",  "44", "2",  "13", "8",  "45",
-           "18", "9",  "12", "10", "46", "24", "25", "35", "27",
-           "23", "26", "38", "34", "37", "42", "40"}));
-  doAnalysisAndCompareResults("call_04_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{13, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{6, 1, "_Z9factorialj"},
+                          LineColFun{3, 5, "_Z9factorialj"},
+                          LineColFun{1, 29, "_Z9factorialj"},
+                          LineColFun{5, 3, "_Z9factorialj"},
+                          LineColFun{5, 10, "_Z9factorialj"},
+                          LineColFun{5, 24, "_Z9factorialj"},
+                          LineColFun{5, 12, "_Z9factorialj"},
+                          LineColFun{5, 26, "_Z9factorialj"},
+                          LineColFun{14, 21, "main"},
+                          LineColFun{13, 7, "main"},
+                          LineColFun{14, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "k",
+                      TaintSetT{
+                          LineColFun{16, 12, "main"},
+                          LineColFun{8, 24, "_Z2idi"},
+                          LineColFun{6, 1, "_Z9factorialj"},
+                          LineColFun{3, 5, "_Z9factorialj"},
+                          LineColFun{16, 5, "main"},
+                          LineColFun{1, 29, "_Z9factorialj"},
+                          LineColFun{5, 3, "_Z9factorialj"},
+                          LineColFun{5, 10, "_Z9factorialj"},
+                          LineColFun{16, 5, "main"},
+                          LineColFun{8, 12, "_Z2idi"},
+                          LineColFun{5, 24, "_Z9factorialj"},
+                          LineColFun{5, 12, "_Z9factorialj"},
+                          LineColFun{5, 26, "_Z9factorialj"},
+                          LineColFun{16, 5, "main"},
+                          LineColFun{10, 20, "_Z3sumii"},
+                          LineColFun{10, 32, "_Z3sumii"},
+                          LineColFun{14, 21, "main"},
+                          LineColFun{10, 34, "_Z3sumii"},
+                          LineColFun{10, 36, "_Z3sumii"},
+                          LineColFun{10, 13, "_Z3sumii"},
+                          LineColFun{15, 14, "main"},
+                          LineColFun{13, 7, "main"},
+                          LineColFun{14, 7, "main"},
+                          LineColFun{16, 15, "main"},
+                          LineColFun{15, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_04_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_05) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "retval", {"8"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "i", {"3", "11", "9"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 10, "j", {"3", "10", "12"}));
-  doAnalysisAndCompareResults("call_05_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main10 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main10, "i",
+                      TaintSetT{
+                          LineColFun{2, 38, "_Z18setValueToFortyTwoPi"},
+                          LineColFun{7, 3, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main10, "j",
+                      TaintSetT{
+                          LineColFun{2, 38, "_Z18setValueToFortyTwoPi"},
+                          LineColFun{6, 7, "main"},
+                          LineColFun{8, 3, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_05_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_06) {
   // NOTE: Here we are suffering from IntraProceduralAliasesOnly
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "retval", {"11"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "i", {"3", "1", "2", "16", "18", "12"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "j", {"19", "21", "3", "1", "2", "13"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "k", {"22", "3", "14", "1", "2", "24"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 24, "l", {"15", "3", "1", "2", "25", "27"}));
-  doAnalysisAndCompareResults("call_06_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main24 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main24, "i",
+                      TaintSetT{
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{9, 17, "main"},
+                          LineColFun{9, 5, "main"},
+                          LineColFun{5, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "j",
+                      TaintSetT{
+                          LineColFun{10, 17, "main"},
+                          LineColFun{10, 5, "main"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{6, 7, "main"},
+                      });
+  GroundTruth.emplace(Main24, "k",
+                      TaintSetT{
+                          LineColFun{11, 17, "main"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{7, 7, "main"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{11, 5, "main"},
+                      });
+  GroundTruth.emplace(Main24, "l",
+                      TaintSetT{
+                          LineColFun{8, 7, "main"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{2, 19, "_Z9incrementi"},
+                          LineColFun{2, 31, "_Z9incrementi"},
+                          LineColFun{12, 17, "main"},
+                          LineColFun{12, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("call_06_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleCallTest_07) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "retval", {"7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "VarIR", {"6", "3", "8"}));
-  doAnalysisAndCompareResults("call_07_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main6 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main6, "VarIR",
+                      TaintSetT{
+                          LineColFun{7, 7, "main"},
+                          LineColFun{3, 6, "_Z13inputRefParamRi"},
+                          LineColFun{8, 3, "main"},
+                      });
+  doAnalysisAndCompareResults("call_07_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleGlobalTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 9, "retval", {"3"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 9, "i", {"7"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 9, "j", {"0", "5", "6"}));
-  doAnalysisAndCompareResults("global_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main9 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main9, "i",
+                      TaintSetT{
+                          LineColFun{6, 5, "main"},
+                      });
+  GroundTruth.emplace(Main9, "j",
+                      TaintSetT{
+                          GlobalVar{"i"},
+                          LineColFun{5, 7, "main"},
+                          LineColFun{5, 5, "main"},
+                      });
+
+  doAnalysisAndCompareResults("global_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleGlobalTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "_Z5initBv", 2, "a", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "_Z5initBv", 2, "b", {"2"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "a", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "b", {"2"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "retval", {"6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "c", {"1", "8", "7"}));
-  doAnalysisAndCompareResults("global_02_cpp.ll", {"main"}, GroundTruth, false);
+
+  auto Main12 = RetStmt{"main"};
+  auto Init2 = RetStmt{"_Z5initBv"};
+
+  GroundTruth.emplace(Init2, "a",
+                      TaintSetT{
+                          GlobalVar{"a"},
+                      });
+  GroundTruth.emplace(Init2, "b",
+                      TaintSetT{
+                          LineColFun{4, 18, "_Z5initBv"},
+                      });
+
+  GroundTruth.emplace(Main12, "a",
+                      TaintSetT{
+                          GlobalVar{"a"},
+                      });
+  GroundTruth.emplace(Main12, "b",
+                      TaintSetT{
+                          LineColFun{4, 18, "_Z5initBv"},
+                      });
+  GroundTruth.emplace(Main12, "c",
+                      TaintSetT{
+                          GlobalVar{"b"},
+                          LineColFun{7, 7, "main"},
+                          LineColFun{7, 11, "main"},
+                      });
+
+  doAnalysisAndCompareResults("global_02_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleGlobalTest_03) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 1, "GlobalFeature", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 2, "GlobalFeature", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 17, "GlobalFeature", {"0"}));
-  doAnalysisAndCompareResults("global_03_cpp.ll", {"main"}, GroundTruth, false);
+  GroundTruth.emplace(LineColFun{6, 11, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{6, 25, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(RetStmt{"main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+
+  doAnalysisAndCompareResults("global_03_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleGlobalTest_04) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 1, "GlobalFeature", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 2, "GlobalFeature", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 17, "GlobalFeature", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "_Z7doStuffi", 1, "GlobalFeature", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "_Z7doStuffi", 2, "GlobalFeature", {"0"}));
-  doAnalysisAndCompareResults("global_04_cpp.ll", {"main", "_Z7doStuffi"},
+  GroundTruth.emplace(LineColFun{8, 11, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{8, 25, "main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(RetStmt{"main"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{3, 31, "_Z7doStuffi"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+  GroundTruth.emplace(LineColFun{3, 22, "_Z7doStuffi"}, "GlobalFeature",
+                      TaintSetT{
+                          GlobalVar{"GlobalFeature"},
+                      });
+
+  doAnalysisAndCompareResults("global_04_cpp_dbg.ll", {"main", "_Z7doStuffi"},
                               GroundTruth, false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, KillTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "retval", {"4"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "i", {"5"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "j", {"10"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "k", {"9", "8", "5"}));
-  doAnalysisAndCompareResults("KillTest_01_cpp.ll", {"main"}, GroundTruth,
+  auto Main12 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main12, "i",
+                      TaintSetT{
+                          LineColFun{2, 7, "main"},
+                      });
+  GroundTruth.emplace(Main12, "j",
+                      TaintSetT{
+                          LineColFun{5, 5, "main"},
+                      });
+  GroundTruth.emplace(Main12, "k",
+                      TaintSetT{
+                          LineColFun{4, 7, "main"},
+                          LineColFun{4, 11, "main"},
+                          LineColFun{2, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("KillTest_01_cpp_dbg.ll", {"main"}, GroundTruth,
                               false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, KillTest_02) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "retval", {"6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "A", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "B", {"2"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 12, "C", {"1", "7", "8"}));
-  doAnalysisAndCompareResults("KillTest_02_cpp.ll", {"main"}, GroundTruth,
+  auto Main12 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main12, "A",
+                      TaintSetT{
+                          GlobalVar{"A"},
+                      });
+  GroundTruth.emplace(Main12, "B",
+                      TaintSetT{
+                          LineColFun{4, 18, "_Z5initBv"},
+                      });
+  GroundTruth.emplace(Main12, "C",
+                      TaintSetT{
+                          GlobalVar{"B"},
+                          LineColFun{7, 11, "main"},
+                          LineColFun{7, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("KillTest_02_cpp_dbg.ll", {"main"}, GroundTruth,
                               false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleReturnTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "retval", {"3"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "localVar", {"4"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 6, "call", {"0"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 8, "localVar", {"0", "6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 8, "call", {"0"}));
-  doAnalysisAndCompareResults("return_01_cpp.ll", {"main"}, GroundTruth, false);
+  auto Main6 = LineColFun{7, 12, "main"};
+  auto Main8 = RetStmt{"main"};
+
+  GroundTruth.emplace(Main6, "localVar",
+                      TaintSetT{
+                          LineColFun{6, 12, "main"},
+                      });
+  GroundTruth.emplace(Main8, "localVar",
+                      TaintSetT{
+                          LineColFun{2, 30, "_Z20returnIntegerLiteralv"},
+                          LineColFun{7, 12, "main"},
+                      });
+
+  doAnalysisAndCompareResults("return_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleHeapTest_01) {
   std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 17, "retval", {"3"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 17, "i", {"5", "6"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 17, "j", {"5", "6", "7", "8", "9"}));
-  doAnalysisAndCompareResults("heap_01_cpp.ll", {"main"}, GroundTruth, false);
-}
-
-PHASAR_SKIP_TEST(TEST_F(IDEInstInteractionAnalysisTest, HandleRVOTest_01) {
-  GTEST_SKIP() << "This test heavily depends on the used stdlib version. TODO: "
-                  "add a better one";
 
-  std::set<IIACompactResult_t> GroundTruth;
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 16, "retval", {"75", "76"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 16, "str", {"70", "65", "72", "74", "77"}));
-  GroundTruth.emplace(
-      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
-          "main", 16, "ref.tmp", {"66", "9", "72", "73", "71"}));
-  doAnalysisAndCompareResults("rvo_01_cpp.ll", {"main"}, GroundTruth, false);
-})
+  auto Main17 = RetStmt{"main"};
+  GroundTruth.emplace(Main17, "i",
+                      TaintSetT{
+                          LineColFun{3, 12, "main"},
+                          LineColFun{3, 8, "main"},
+                      });
+  GroundTruth.emplace(Main17, "j",
+                      TaintSetT{
+                          LineColFun{3, 12, "main"},
+                          LineColFun{3, 8, "main"},
+                          LineColFun{4, 12, "main"},
+                          LineColFun{4, 11, "main"},
+                          LineColFun{4, 7, "main"},
+                      });
+
+  doAnalysisAndCompareResults("heap_01_cpp_dbg.ll", {"main"}, GroundTruth,
+                              false);
+}
+
+// PHASAR_SKIP_TEST(TEST_F(IDEInstInteractionAnalysisTest, HandleRVOTest_01) {
+//   GTEST_SKIP() << "This test heavily depends on the used stdlib version.
+//   TODO: "
+//                   "add a better one";
+
+//   std::set<IIACompactResult_t> GroundTruth;
+//   GroundTruth.emplace(
+//       std::tuple<std::string, size_t, std::string,
+//       BitVectorSet<std::string>>(
+//           "main", 16, "retval", {"75", "76"}));
+//   GroundTruth.emplace(
+//       std::tuple<std::string, size_t, std::string,
+//       BitVectorSet<std::string>>(
+//           "main", 16, "str", {"70", "65", "72", "74", "77"}));
+//   GroundTruth.emplace(
+//       std::tuple<std::string, size_t, std::string,
+//       BitVectorSet<std::string>>(
+//           "main", 16, "ref.tmp", {"66", "9", "72", "73", "71"}));
+//   doAnalysisAndCompareResults("rvo_01_cpp.ll", {"main"}, GroundTruth, false);
+// })
 
 // TEST_F(IDEInstInteractionAnalysisTest, HandleStruct_01) {
 //   std::set<IIACompactResult_t> GroundTruth;
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisSwiftTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisSwiftTest.cpp
index 5b2bd36241..35f070a2ab 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisSwiftTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisSwiftTest.cpp
@@ -3,7 +3,6 @@
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -12,10 +11,10 @@
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
 #include <tuple>
 
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDELinearConstantAnalysisSwiftTest : public ::testing::Test {
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
index 7a7a20b80c..a84d1d55eb 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysisTest.cpp
@@ -4,7 +4,6 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -13,10 +12,10 @@
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
 #include <tuple>
 
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDELinearConstantAnalysisTest : public ::testing::Test {
@@ -29,8 +28,6 @@ class IDELinearConstantAnalysisTest : public ::testing::Test {
   using LCACompactResult_t = std::tuple<std::string, std::size_t, std::string,
                                         IDELinearConstantAnalysisDomain::l_t>;
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
   IDELinearConstantAnalysis::lca_results_t
   doAnalysis(llvm::StringRef LlvmFilePath, bool PrintDump = false) {
     HelperAnalyses HA(PathToLlFiles + LlvmFilePath, EntryPoints);
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
index 8f14daced7..d755dce01c 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis_DotTest.cpp
@@ -1,20 +1,16 @@
 #include "phasar/DataFlow/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDELinearConstantAnalysis.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
 #include <tuple>
 
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDELinearConstantAnalysisTest : public ::testing::Test {
@@ -28,8 +24,6 @@ class IDELinearConstantAnalysisTest : public ::testing::Test {
   using LCACompactResult_t = std::tuple<std::string, std::size_t, std::string,
                                         IDELinearConstantAnalysisDomain::l_t>;
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
   IDELinearConstantAnalysis::lca_results_t
   doAnalysis(llvm::StringRef LlvmFilePath, bool PrintDump = false,
              bool EmitESG = false) {
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
index 0b2d4fa52e..79f09ab423 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisFileIOTest.cpp
@@ -13,20 +13,24 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Utils/DebugOutput.h"
 
+#include "llvm/IR/Instruction.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/ErrorHandling.h"
+
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
 #include <optional>
 
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDETSAnalysisFileIOTest : public ::testing::Test {
@@ -58,9 +62,28 @@ class IDETSAnalysisFileIOTest : public ::testing::Test {
         *HA, &CSTDFILEIODesc, EntryPoints);
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
-  void TearDown() override {}
+  using GroundTruthMapTy =
+      std::map<TestingSrcLocation, std::map<TestingSrcLocation, int>>;
+
+  [[nodiscard]] static inline auto convertTestingLocationMapMapInIR(
+      const GroundTruthMapTy &Locs,
+      const ProjectIRDBBase<LLVMProjectIRDB> &IRDB) {
+    std::map<const llvm::Instruction *, std::map<const llvm::Value *, int>> Ret;
+    llvm::transform(
+        Locs, std::inserter(Ret, Ret.end()), [&](const auto &LocAndSet) {
+          const auto &[InstLoc, InnerMap] = LocAndSet;
+          const auto *LocVal = llvm::dyn_cast_if_present<llvm::Instruction>(
+              testingLocInIR(InstLoc, IRDB));
+          std::map<const llvm::Value *, int> ConvMap;
+          for (const auto &[FactLoc, Val] : InnerMap) {
+            if (const auto *Fact = testingLocInIR(FactLoc, IRDB)) {
+              ConvMap.try_emplace(Fact, Val);
+            }
+          }
+          return std::make_pair(LocVal, std::move(ConvMap));
+        });
+    return Ret;
+  }
 
   /**
    * We map instruction id to value for the ground truth. ID has to be
@@ -69,483 +92,489 @@ class IDETSAnalysisFileIOTest : public ::testing::Test {
    * @param solver provides the results
    */
   void compareResults(
-      const std::map<std::size_t, std::map<std::string, int>> &GroundTruth,
+      const GroundTruthMapTy &GroundTruth,
       IDESolver_P<IDETypeStateAnalysis<CSTDFILEIOTypeStateDescription>>
           &Solver) {
-    for (const auto &InstToGroundTruth : GroundTruth) {
-      const auto *Inst =
-          HA->getProjectIRDB().getInstruction(InstToGroundTruth.first);
-      // std::cout << "Handle results at " << InstToGroundTruth.first <<
-      // std::endl;
-      auto GT = InstToGroundTruth.second;
-      std::map<std::string, int> Results;
-      for (auto Result : Solver.resultsAt(Inst, true)) {
-        if (GT.find(getMetaDataID(Result.first)) != GT.end()) {
-          Results.insert(std::pair<std::string, int>(
-              getMetaDataID(Result.first), int(Result.second)));
+    auto GroundTruthEntries =
+        convertTestingLocationMapMapInIR(GroundTruth, HA->getProjectIRDB());
+
+    for (const auto &[CurrInst, GT] : GroundTruthEntries) {
+      std::map<const llvm::Value *, int> Results;
+
+      for (const auto &[ResFact, ResState] : Solver.resultsAt(CurrInst, true)) {
+        if (GT.count(ResFact)) {
+          Results.try_emplace(ResFact, int(ResState));
         }
       }
-      EXPECT_EQ(Results, GT) << "At " << llvmIRToShortString(Inst);
+
+      EXPECT_EQ(Results, GT)
+          << "At " << llvmIRToShortString(CurrInst) << ": Expected "
+          << PrettyPrinter{GT} << "; got: " << PrettyPrinter{Results};
     }
   }
 }; // Test Fixture
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_01) {
-  initialize({PathToLlFiles + "typestate_01_c.ll"});
+  initialize({PathToLlFiles + "typestate_01_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      {5, {{"3", IOSTATE::UNINIT}}},
-      {9, {{"3", IOSTATE::CLOSED}}},
-      {7, {{"3", IOSTATE::OPENED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto File = LineColFun{4, 9, "main"};
+  const auto Entry = LineColFun{5, 7, "main"};
+  const auto EntryTwo = LineColFun{6, 3, "main"};
+  const auto EntryThree = LineColFun{7, 3, "main"};
+  GroundTruth.insert({Entry, {{File, IOSTATE::UNINIT}}});
+  GroundTruth.insert({EntryTwo, {{File, IOSTATE::OPENED}}});
+  GroundTruth.insert({EntryThree, {{File, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_02) {
-  initialize({PathToLlFiles + "typestate_02_c.ll"});
+  initialize({PathToLlFiles + "typestate_02_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      {7, {{"3", IOSTATE::OPENED}, {"5", IOSTATE::OPENED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto File = LineColFun{4, 9, "main"};
+  const auto Entry = LineColFun{6, 3, "main"};
+  GroundTruth.insert({Entry, {{File, IOSTATE::OPENED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_03) {
-  initialize({PathToLlFiles + "typestate_03_c.ll"});
+  initialize({PathToLlFiles + "typestate_03_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  // llvmtssolver.printReport();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // Entry in foo()
-      {2, {{"foo.0", IOSTATE::OPENED}}},
-      // Exit in foo()
-      {6,
-       {
-           {"foo.0", IOSTATE::CLOSED},
-           {"2", IOSTATE::CLOSED},
-           {"4", IOSTATE::CLOSED},
-           //{"8", IOSTATE::CLOSED} // 6 is before 8; so no info avaliable
-           // before ret FF
-       }},
-      // Exit in main()
-      {14,
-       {{"2", IOSTATE::CLOSED},
-        {"8", IOSTATE::CLOSED},
-        {"12", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  // %f = alloca ptr, align 8
+  const auto MainFile = LineColFun{6, 9, "main"};
+  // %f.addr = alloca ptr, align 8
+  //   const auto FooFile = LineColFun{3, 16, "foo"};
+  // const auto FooFClose =
+  //     LineColFun{3, 21, "foo"};
+  // %0 = load ptr, ptr %f
+  const auto PassFToFClose = LineColFun{3, 28, "foo"};
+  // ret void
+  const auto FooRet = LineColFun{3, 32, "foo"};
+  // %0 = load ptr, ptr %f, align 8
+  const auto PassFToFoo = LineColFun{9, 7, "main"};
+  // ret i32 0
+  const auto Return = LineColFun{11, 3, "main"};
+  // Entry in foo()
+  // GroundTruth.insert({FooFClose, {{FooFile, IOSTATE::OPENED}}});
+  // Exit in foo()
+  GroundTruth.insert({FooRet,
+                      {// {FooFile, IOSTATE::CLOSED},
+                       {PassFToFClose, IOSTATE::CLOSED}}});
+  // Exit in main()
+  GroundTruth.insert({Return,
+                      {// {FooFClose, IOSTATE::CLOSED},
+                       {MainFile, IOSTATE::CLOSED},
+                       {PassFToFoo, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_04) {
-  initialize({PathToLlFiles + "typestate_04_c.ll"});
+  initialize({PathToLlFiles + "typestate_04_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
 
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in foo()
-      {6,
-       {
-           {"2", IOSTATE::OPENED},
-           //{"8", IOSTATE::OPENED} // 6 is before 8, so no info available
-           // before retFF
-       }},
-      // Before closing in main()
-      {12, {{"2", IOSTATE::UNINIT}, {"8", IOSTATE::UNINIT}}},
-      // At exit in main()
-      {14, {{"2", IOSTATE::ERROR}, {"8", IOSTATE::ERROR}}}};
-
-  compareResults(Gt, Llvmtssolver);
+  GroundTruthMapTy GroundTruth;
+  const auto FooArg = LineColFun{4, 16, "foo"};
+  const auto FooRet = LineColFun{4, 49, "foo"};
+  const auto File = LineColFun{7, 9, "main"};
+  const auto FClose = LineColFun{9, 3, "main"};
+  const auto Return = LineColFun{10, 3, "main"};
+  GroundTruth.insert({FooRet, {{FooArg, IOSTATE::OPENED}}});
+  GroundTruth.insert({FClose, {{File, IOSTATE::UNINIT}}});
+  GroundTruth.insert({Return, {{File, IOSTATE::ERROR}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_05) {
-  initialize({PathToLlFiles + "typestate_05_c.ll"});
+  initialize({PathToLlFiles + "typestate_05_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // Before if statement
-      {10, {{"4", IOSTATE::OPENED}, {"6", IOSTATE::OPENED}}},
-      // Inside if statement at last instruction
-      {13,
-       {{"4", IOSTATE::CLOSED},
-        {"6", IOSTATE::CLOSED},
-        {"11", IOSTATE::CLOSED}}},
-      // After if statement
-      {14, {{"4", IOSTATE::BOT}, {"6", IOSTATE::BOT}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto File = LineColFun{6, 9, "main"};
+  const auto CallFOpen = LineColFun{7, 7, "main"};
+  const auto AfterFOpen = LineColFun{8, 7, "main"};
+  const auto LoadFile = LineColFun{9, 12, "main"};
+  const auto AfterFClose = LineColFun{10, 3, "main"};
+  const auto Return = LineColFun{11, 3, "main"};
+  GroundTruth.insert(
+      {AfterFOpen, {{File, IOSTATE::OPENED}, {CallFOpen, IOSTATE::OPENED}}});
+  GroundTruth.insert({AfterFClose,
+                      {{File, IOSTATE::CLOSED},
+                       {CallFOpen, IOSTATE::CLOSED},
+                       {LoadFile, IOSTATE::CLOSED}}});
+  GroundTruth.insert(
+      {Return, {{File, IOSTATE::BOT}, {CallFOpen, IOSTATE::BOT}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, DISABLED_HandleTypeState_06) {
   // This test fails due to imprecise points-to information
-  initialize({PathToLlFiles + "typestate_06_c.ll"});
+  initialize({PathToLlFiles + "typestate_06_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // Before first fopen()
-      {8, {{"5", IOSTATE::UNINIT}, {"6", IOSTATE::UNINIT}}},
-      // Before storing the result of the first fopen()
-      {9,
-       {{"5", IOSTATE::UNINIT},
-        {"6", IOSTATE::UNINIT},
-        // Return value of first fopen()
-        {"8", IOSTATE::OPENED}}},
-      // Before second fopen()
-      {10,
-       {{"5", IOSTATE::OPENED},
-        {"6", IOSTATE::UNINIT},
-        {"8", IOSTATE::OPENED}}},
-      // Before storing the result of the second fopen()
-      {11,
-       {{"5", IOSTATE::OPENED},
-        {"6", IOSTATE::UNINIT},
-        // Return value of second fopen()
-        {"10", IOSTATE::OPENED}}},
-      // Before fclose()
-      {13,
-       {{"5", IOSTATE::OPENED},
-        {"6", IOSTATE::OPENED},
-        {"12", IOSTATE::OPENED}}},
-      // After if statement
-      {14, {{"5", IOSTATE::CLOSED}, {"6", IOSTATE::OPENED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+
+  // %f = alloca ptr, align 8
+  const auto FileF = LineColFun{5, 9, "main"};
+  // %d = alloca ptr, align 8
+  const auto FileD = LineColFun{6, 9, "main"};
+  // %call = call noalias ptr @fopen(ptr noundef @.str, ptr noundef @.str.1)
+  const auto FirstFOpenCall = LineColFun{7, 7, "main"};
+  // store ptr %call, ptr %f, align 8
+  const auto StoreFirstFOpenRetVal = LineColFun{7, 5, "main"};
+  // %call1 = call noalias ptr @fopen(ptr noundef @.str.2, ptr noundef @.str.3)
+  const auto SecondFOpenCall = LineColFun{8, 7, "main"};
+  // store ptr %call1, ptr %d, align 8
+  const auto StoreSecondFOpenRetVal = LineColFun{8, 5, "main"};
+  // %0 = load ptr, ptr %f, align 8
+  const auto LoadFileF = LineColFun{10, 10, "main"};
+  // %call2 = call i32 @fclose(ptr noundef %0)
+  const auto CallFClose = LineColFun{10, 3, "main"};
+  // ret i32 0
+  const auto Return = LineColFun{12, 3, "main"};
+
+  GroundTruth.insert({FirstFOpenCall, {{FileF, IOSTATE::UNINIT}}});
+  GroundTruth.insert({FirstFOpenCall, {{FileD, IOSTATE::UNINIT}}});
+
+  GroundTruth.insert({StoreFirstFOpenRetVal, {{FileF, IOSTATE::UNINIT}}});
+  GroundTruth.insert({StoreFirstFOpenRetVal, {{FileD, IOSTATE::UNINIT}}});
+  GroundTruth.insert(
+      {StoreFirstFOpenRetVal, {{FirstFOpenCall, IOSTATE::OPENED}}});
+
+  GroundTruth.insert({SecondFOpenCall, {{FileF, IOSTATE::OPENED}}});
+  GroundTruth.insert({SecondFOpenCall, {{FileD, IOSTATE::UNINIT}}});
+  GroundTruth.insert({SecondFOpenCall, {{FirstFOpenCall, IOSTATE::OPENED}}});
+
+  GroundTruth.insert({StoreSecondFOpenRetVal, {{FileF, IOSTATE::OPENED}}});
+  GroundTruth.insert({StoreSecondFOpenRetVal, {{FileD, IOSTATE::UNINIT}}});
+  GroundTruth.insert(
+      {StoreSecondFOpenRetVal, {{SecondFOpenCall, IOSTATE::OPENED}}});
+
+  GroundTruth.insert({CallFClose, {{FileF, IOSTATE::OPENED}}});
+  GroundTruth.insert({CallFClose, {{FileD, IOSTATE::UNINIT}}});
+  GroundTruth.insert({CallFClose, {{LoadFileF, IOSTATE::OPENED}}});
+
+  GroundTruth.insert({Return, {{FileF, IOSTATE::OPENED}}});
+  GroundTruth.insert({Return, {{FileD, IOSTATE::UNINIT}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_07) {
-  initialize({PathToLlFiles + "typestate_07_c.ll"});
+  initialize({PathToLlFiles + "typestate_07_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // In foo()
-      {6,
-       {
-           {"foo.0", IOSTATE::CLOSED}, {"2", IOSTATE::CLOSED},
-           //{"8", IOSTATE::CLOSED}// 6 is before 8, so no info available
-           // before retFF
-       }},
-      // At fclose()
-      {11, {{"8", IOSTATE::UNINIT}, {"10", IOSTATE::UNINIT}}},
-      // After fclose()
-      {12, {{"8", IOSTATE::ERROR}, {"10", IOSTATE::ERROR}}},
-      // After fopen()
-      {13,
-       {{"8", IOSTATE::ERROR},
-        {"10", IOSTATE::ERROR},
-        {"12", IOSTATE::OPENED}}},
-      // After store
-      {14,
-       {{"8", IOSTATE::OPENED},
-        {"10", IOSTATE::ERROR},
-        {"12", IOSTATE::OPENED}}},
-      // At exit in main()
-      {16, {{"2", IOSTATE::CLOSED}, {"8", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  // %f.addr = alloca ptr, align 8
+  const auto FooFile = LineColFun{3, 16, "foo"};
+  // ret void
+  const auto FooRet = LineColFun{3, 32, "foo"};
+  //  %f = alloca ptr, align 8
+  const auto MainFile = LineColFun{6, 9, "main"};
+  // %0 = load ptr, ptr %f, align 8
+  const auto MainFileLoad = LineColFun{7, 10, "main"};
+  // %call = call i32 @fclose(ptr noundef %0)
+  const auto CallFClose = LineColFun{7, 3, "main"};
+  // %call1 = call noalias ptr @fopen(ptr noundef @.str, ptr noundef @.str.1)
+  const auto Call1FOpen = LineColFun{8, 7, "main"};
+  // store ptr %call1, ptr %f, align 8
+  const auto StoreOfCall1 = LineColFun{8, 5, "main"};
+  // %1 = load ptr, ptr %f, align 8
+  const auto LoadMainFile = LineColFun{10, 7, "main"};
+  // ret i32 0
+  const auto MainReturn = LineColFun{12, 3, "main"};
+
+  GroundTruth.insert({FooRet, {{FooFile, IOSTATE::CLOSED}}});
+  GroundTruth.insert(
+      {CallFClose,
+       {{MainFile, IOSTATE::UNINIT}, {MainFileLoad, IOSTATE::UNINIT}}});
+  GroundTruth.insert(
+      {Call1FOpen,
+       {{MainFile, IOSTATE::ERROR}, {MainFileLoad, IOSTATE::ERROR}}});
+  GroundTruth.insert({StoreOfCall1,
+                      {{MainFile, IOSTATE::ERROR},
+                       {MainFileLoad, IOSTATE::ERROR},
+                       {Call1FOpen, IOSTATE::OPENED}}});
+  GroundTruth.insert({LoadMainFile,
+                      {{MainFile, IOSTATE::OPENED},
+                       {MainFileLoad, IOSTATE::ERROR},
+                       {Call1FOpen, IOSTATE::OPENED}}});
+  GroundTruth.insert(
+      {MainReturn, {{MainFile, IOSTATE::CLOSED}, {FooFile, IOSTATE::CLOSED}}});
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_08) {
-  initialize({PathToLlFiles + "typestate_08_c.ll"});
+  initialize({PathToLlFiles + "typestate_08_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in foo()
-      {6, {{"2", IOSTATE::OPENED}}},
-      // At exit in main()
-      {11, {{"2", IOSTATE::OPENED}, {"8", IOSTATE::UNINIT}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto FooFile = LineColFun{5, 9, "foo"};
+  const auto FooRet = LineColFun{7, 3, "foo"};
+  const auto MainFile = LineColFun{11, 9, "main"};
+  const auto MainReturn = LineColFun{13, 3, "main"};
+  GroundTruth.insert({FooRet, {{FooFile, IOSTATE::OPENED}}});
+  GroundTruth.insert(
+      {MainReturn, {{FooFile, IOSTATE::OPENED}, {MainFile, IOSTATE::UNINIT}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_09) {
-  initialize({PathToLlFiles + "typestate_09_c.ll"});
+  initialize({PathToLlFiles + "typestate_09_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in foo()
-      {8,
-       {
-           {"4", IOSTATE::OPENED},
-           //{"10", IOSTATE::OPENED}// 8 is before 10, so no info available
-           // before retFF
-       }},
-      // At exit in main()
-      {18, {{"4", IOSTATE::CLOSED}, {"10", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto FooFile = LineColFun{5, 9, "foo"};
+  const auto FooRet = LineColFun{7, 3, "foo"};
+  const auto MainFile = LineColFun{11, 9, "main"};
+  const auto MainReturn = LineColFun{15, 3, "main"};
+  GroundTruth.insert({FooRet, {{FooFile, IOSTATE::OPENED}}});
+  GroundTruth.insert(
+      {MainReturn, {{FooFile, IOSTATE::CLOSED}, {MainFile, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_10) {
-  initialize({PathToLlFiles + "typestate_10_c.ll"});
+  initialize({PathToLlFiles + "typestate_10_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in bar()
-      {4, {{"2", IOSTATE::UNINIT}}},
-      // At exit in foo()
-      {11,
-       {//{"2", IOSTATE::OPENED},
-        //{"13", IOSTATE::OPENED}, // 2 and 13 are in different functions, so
-        // results are not available before retFF
-        {"5", IOSTATE::OPENED}}},
-      // At exit in main()
-      {19,
-       {{"2", IOSTATE::CLOSED},
-        {"5", IOSTATE::CLOSED},
-        {"13", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto BarFile = LineColFun{5, 9, "bar"};
+  const auto BarRet = LineColFun{6, 3, "bar"};
+  const auto FooFile = LineColFun{10, 9, "foo"};
+  const auto FooRet = LineColFun{12, 3, "foo"};
+  const auto MainFile = LineColFun{16, 9, "main"};
+  const auto MainReturn = LineColFun{20, 3, "main"};
+  GroundTruth.insert({BarRet, {{BarFile, IOSTATE::UNINIT}}});
+  GroundTruth.insert({FooRet, {{FooFile, IOSTATE::OPENED}}});
+  GroundTruth.insert({MainReturn,
+                      {{BarFile, IOSTATE::CLOSED},
+                       {FooFile, IOSTATE::CLOSED},
+                       {MainFile, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_11) {
-  initialize({PathToLlFiles + "typestate_11_c.ll"});
+  initialize({PathToLlFiles + "typestate_11_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in bar(): closing uninitialized file-handle gives error-state
-      {6,
-       {
-           {"2", IOSTATE::ERROR},
-           //{"7", IOSTATE::ERROR},
-           //{"13", IOSTATE::ERROR} // 7 and 13 not yet reached
-       }},
-      // At exit in foo()
-      {11,
-       {
-           //{"2", IOSTATE::OPENED}, // 2 is in different function
-           {"7", IOSTATE::OPENED},
-           //{"13", IOSTATE::OPENED}  // 13 is after 11
-       }},
-      // At exit in main(): due to aliasing the error-state from bar is
-      // propagated back to main
-      {19,
-       {{"2", IOSTATE::ERROR}, {"7", IOSTATE::ERROR}, {"13", IOSTATE::ERROR}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto BarFile = LineColFun{4, 16, "bar"};
+  const auto BarRet = LineColFun{4, 32, "bar"};
+  const auto FooFile = LineColFun{6, 16, "foo"};
+  const auto FooRet = LineColFun{6, 49, "foo"};
+  const auto MainFile = LineColFun{9, 9, "main"};
+  const auto MainReturn = LineColFun{13, 3, "main"};
+  GroundTruth.insert({BarRet, {{BarFile, IOSTATE::ERROR}}});
+  GroundTruth.insert({FooRet, {{FooFile, IOSTATE::OPENED}}});
+  GroundTruth.insert({MainReturn,
+                      {{BarFile, IOSTATE::ERROR},
+                       {FooFile, IOSTATE::ERROR},
+                       {MainFile, IOSTATE::ERROR}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_12) {
-  initialize({PathToLlFiles + "typestate_12_c.ll"});
+  initialize({PathToLlFiles + "typestate_12_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in bar()
-      {6,
-       {
-           {"2", IOSTATE::OPENED},
-           //{"10", IOSTATE::OPENED} // 6 has no information about 10, as it
-           // always completes before
-       }},
-      // At exit in foo()
-      {8, {{"2", IOSTATE::OPENED}, {"10", IOSTATE::OPENED}}},
-      // At exit in main()
-      {16, {{"2", IOSTATE::CLOSED}, {"10", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto BarFile = LineColFun{5, 9, "bar"};
+  const auto BarRet = LineColFun{7, 3, "bar"};
+  const auto AfterFoo = LineColFun{15, 3, "main"};
+  const auto MainFile = LineColFun{13, 9, "main"};
+  const auto MainReturn = LineColFun{17, 3, "main"};
+  GroundTruth.insert({BarRet, {{BarFile, IOSTATE::OPENED}}});
+  GroundTruth.insert(
+      {AfterFoo, {{MainFile, IOSTATE::OPENED}, {BarFile, IOSTATE::OPENED}}});
+  GroundTruth.insert(
+      {MainReturn, {{MainFile, IOSTATE::CLOSED}, {BarFile, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_13) {
-  initialize({PathToLlFiles + "typestate_13_c.ll"});
+  initialize({PathToLlFiles + "typestate_13_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // Before first fclose()
-      {8, {{"3", IOSTATE::OPENED}}},
-      // Before second fclose()
-      {10, {{"3", IOSTATE::CLOSED}}},
-      // At exit in main()
-      {11, {{"3", IOSTATE::ERROR}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto File = LineColFun{4, 9, "main"};
+  const auto BeforeFirstFClose = LineColFun{7, 3, "main"};
+  const auto BeforeSecondFClose = LineColFun{8, 3, "main"};
+  const auto Return = LineColFun{10, 3, "main"};
+  GroundTruth.insert({BeforeFirstFClose, {{File, IOSTATE::OPENED}}});
+  GroundTruth.insert({BeforeSecondFClose, {{File, IOSTATE::CLOSED}}});
+  GroundTruth.insert({Return, {{File, IOSTATE::ERROR}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_14) {
-  initialize({PathToLlFiles + "typestate_14_c.ll"});
+  initialize({PathToLlFiles + "typestate_14_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // Before first fopen()
-      {7, {{"5", IOSTATE::UNINIT}}},
-      // Before second fopen()
-      {9, {{"5", IOSTATE::OPENED}}},
-      // After second store
-      {11,
-       {{"5", IOSTATE::OPENED},
-        {"7", IOSTATE::OPENED},
-        {"9", IOSTATE::OPENED}}},
-      // At exit in main()
-      {11,
-       {{"5", IOSTATE::CLOSED},
-        {"7", IOSTATE::CLOSED},
-        {"9", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto File = LineColFun{4, 9, "main"};
+  const auto BeforeFirstFOpen = LineColFun{5, 5, "main"};
+  const auto BeforeSecondFOpen = LineColFun{6, 5, "main"};
+  const auto BeforeFClose = LineColFun{7, 3, "main"};
+  const auto Return = LineColFun{9, 3, "main"};
+  GroundTruth.insert({BeforeFirstFOpen, {{File, IOSTATE::UNINIT}}});
+  GroundTruth.insert({BeforeSecondFOpen, {{File, IOSTATE::OPENED}}});
+  GroundTruth.insert({BeforeFClose,
+                      {{File, IOSTATE::OPENED},
+                       {LineColFun{5, 7, "main"}, IOSTATE::OPENED},
+                       {LineColFun{6, 7, "main"}, IOSTATE::OPENED}}});
+  GroundTruth.insert({Return,
+                      {{File, IOSTATE::CLOSED},
+                       {LineColFun{5, 7, "main"}, IOSTATE::CLOSED},
+                       {LineColFun{6, 7, "main"}, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_15) {
-  initialize({PathToLlFiles + "typestate_15_c.ll"});
+  initialize({PathToLlFiles + "typestate_15_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // After store of ret val of first fopen()
-      {9,
-       {
-           {"5", IOSTATE::OPENED}, {"7", IOSTATE::OPENED},
-           // for 9, 11, 13 state is top
-           // {"9", IOSTATE::OPENED},
-           // {"11", IOSTATE::OPENED},
-           // {"13", IOSTATE::OPENED}
-       }},
-      // After first fclose()
-      {11,
-       {
-           {"5", IOSTATE::CLOSED},
-           {"7", IOSTATE::CLOSED},
-           {"9", IOSTATE::CLOSED},
-           // for 11 and 13 state is top
-           // {"11", IOSTATE::CLOSED},
-           // {"13", IOSTATE::CLOSED}
-       }},
-      // After second fopen() but before storing ret val
-      {12,
-       {
-           {"5", IOSTATE::CLOSED},
-           {"7", IOSTATE::CLOSED},
-           {"9", IOSTATE::CLOSED},
-           {"11", IOSTATE::OPENED},
-           // for 13 state is top
-           //{"13", IOSTATE::CLOSED}
-       }},
-      // After storing ret val of second fopen()
-      {13,
-       {
-           {"5", IOSTATE::OPENED},
-           {"7", IOSTATE::CLOSED}, // 7 and 9 do not alias 11
-           {"9", IOSTATE::CLOSED},
-           {"11", IOSTATE::OPENED},
-           // for 13 state is top
-           //{"13", IOSTATE::OPENED}
-       }},
-      // At exit in main()
-      {15,
-       {{"5", IOSTATE::CLOSED},
-        // Due to flow-insensitive alias information, the
-        // closed file-handle (which has ID 13) may alias
-        // the closed file handles 7 and 9. Hence closed
-        // + closed gives error for 7 and 9 => false positive
-        {"7", IOSTATE::ERROR},
-        {"9", IOSTATE::ERROR},
-        {"11", IOSTATE::CLOSED},
-        {"13", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  // 5: %f = alloca ptr, align 8
+  const auto File = LineColFun{4, 9, "main"};
+  // %call = call noalias ptr @fopen
+  const auto FOpen = LineColFun{5, 7, "main"};
+  // %0 = load ptr, ptr %f, align 8
+  const auto LoadFile = LineColFun{6, 10, "main"};
+  // %call2 = call noalias ptr @fopen
+  const auto SecondFOpen = LineColFun{7, 7, "main"};
+  // store ptr %call2, ptr %f, align 8
+  const auto StoreSecondFOpen = LineColFun{7, 5, "main"};
+  // %1 = load ptr, ptr %f, align 8
+  const auto SecondLoadFile = LineColFun{8, 10, "main"};
+  // ret i32 0
+  const auto Return = LineColFun{10, 3, "main"};
+
+  GroundTruth.insert(
+      {LoadFile, {{File, IOSTATE::OPENED}, {FOpen, IOSTATE::OPENED}}});
+  GroundTruth.insert({SecondFOpen,
+                      {{File, IOSTATE::CLOSED},
+                       {FOpen, IOSTATE::CLOSED},
+                       {LoadFile, IOSTATE::CLOSED}}});
+  GroundTruth.insert({StoreSecondFOpen,
+                      {{File, IOSTATE::CLOSED},
+                       {FOpen, IOSTATE::CLOSED},
+                       {LoadFile, IOSTATE::CLOSED},
+                       {SecondFOpen, IOSTATE::OPENED}}});
+  GroundTruth.insert({SecondLoadFile,
+                      {{File, IOSTATE::OPENED},
+                       {FOpen, IOSTATE::CLOSED},
+                       {LoadFile, IOSTATE::CLOSED},
+                       {SecondFOpen, IOSTATE::OPENED}}});
+  GroundTruth.insert({Return,
+                      {{File, IOSTATE::CLOSED},
+                       {FOpen, IOSTATE::ERROR},
+                       {LoadFile, IOSTATE::ERROR},
+                       {SecondFOpen, IOSTATE::CLOSED},
+                       {SecondLoadFile, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_16) {
 
   /// TODO: After the EF fix everything is BOT; --> Make the TSA more precise!
 
-  initialize({PathToLlFiles + "typestate_16_c.ll"});
+  initialize({PathToLlFiles + "typestate_16_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  // Llvmtssolver.dumpResults();
-
-  // auto Pts = PT->getAliasSet(IRDB->getInstruction(2));
-  // std::cout << "Alias(2) = {";
-  // bool Frst = true;
-  // for (const auto *P : *Pts) {
-  //   if (Frst) {
-  //     Frst = false;
-  //   } else {
-  //     std::cout << ", ";
-  //   }
-  //   std::cout << llvmIRToShortString(P);
-  // }
-  // std::cout << "}" << std::endl;
-
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in foo()
-      {16,
-       {
-           //{"2", IOSTATE::CLOSED},
-           {"2", IOSTATE::BOT} // Overapproximation due to too flat lattice!
-           // {"18", IOSTATE::CLOSED} // pointsTo information is not sufficient
-       }},
-      // At exit in main()
-      {24,
-       {{"2", IOSTATE::BOT},
-        {"18", IOSTATE::BOT}}}}; // Overapproximation due to too flat lattice
-                                 // (would expect CLOSED for both)!
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto FooFile = LineColFun{4, 16, "foo"};
+  const auto FooExit = LineColFun{11, 1, "foo"};
+  const auto MainFile = LineColFun{14, 9, "main"};
+  const auto MainReturn = LineColFun{19, 3, "main"};
+  // At exit in foo()
+  GroundTruth.insert({FooExit, {{FooFile, IOSTATE::BOT}}});
+  // At exit in main()
+  GroundTruth.insert(
+      {MainReturn, {{FooFile, IOSTATE::BOT}, {MainFile, IOSTATE::BOT}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
-// TODO: Check this case again!
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_17) {
-  initialize({PathToLlFiles + "typestate_17_c.ll"});
+  initialize({PathToLlFiles + "typestate_17_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
 
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // Before loop
-      {15,
-       {{"2", IOSTATE::CLOSED},
-        {"9", IOSTATE::CLOSED},
-        {"13", IOSTATE::CLOSED}}},
-      // Before fgetc() // fgetc(CLOSED)=ERROR   join  CLOSED  = BOT
-      {17,
-       {
-           {"2", IOSTATE::BOT}, {"9", IOSTATE::BOT}, {"13", IOSTATE::BOT},
-           // {"16", IOSTATE::BOT} // at 16 we now have ERROR (actually, this is
-           // correct as well as BOT)
-       }},
-      // At exit in main()
-      {22,
-       {
-           {"2", IOSTATE::BOT}, {"9", IOSTATE::BOT}, {"13", IOSTATE::BOT},
-           //{"16", IOSTATE::BOT} // at 16 we now have ERROR (actually, this is
-           // correct as well as BOT)
-       }}};
-  compareResults(Gt, Llvmtssolver);
+  GroundTruthMapTy GroundTruth;
+  const auto FooFile = LineColFun{4, 16, "foo"};
+  const auto File = LineColFun{8, 9, "main"};
+  const auto FOpenFile = LineColFun{8, 9, "main"};
+  const auto BeforeLoop = LineColFun{14, 3, "main"};
+  const auto BeforeFGetC = LineColFun{14, 13, "main"};
+  const auto MainReturn = LineColFun{17, 3, "main"};
+  GroundTruth.insert({BeforeLoop,
+                      {{FooFile, IOSTATE::CLOSED},
+                       {File, IOSTATE::CLOSED},
+                       {FOpenFile, IOSTATE::CLOSED}}});
+  GroundTruth.insert({BeforeFGetC,
+                      {{FooFile, IOSTATE::BOT},
+                       {File, IOSTATE::BOT},
+                       {FOpenFile, IOSTATE::BOT}}});
+  GroundTruth.insert({MainReturn,
+                      {{FooFile, IOSTATE::BOT},
+                       {File, IOSTATE::BOT},
+                       {FOpenFile, IOSTATE::BOT}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_18) {
   /// TODO: After the EF fix everything is BOT; --> Make the TSA more precise!
 
-  initialize({PathToLlFiles + "typestate_18_c.ll"});
+  initialize({PathToLlFiles + "typestate_18_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      // At exit in foo()
-      {17,
-       {
-           //{"2", IOSTATE::CLOSED},
-           {"2", IOSTATE::BOT}, // Overapproximation due to too flat lattice!
-           // {"19", IOSTATE::CLOSED} // pointsTo information not sufficient
-       }},
-      // At exit in main()
-      {25,
-       {{"2", IOSTATE::BOT},
-        {"19", IOSTATE::BOT}}}}; // Overapproximation due to too flat lattice
-                                 // (would expect CLOSED for both)!
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto FooReturn = LineColFun{11, 1, "foo"};
+  const auto FooFile = LineColFun{4, 16, "foo"};
+  const auto MainFile = LineColFun{14, 9, "main"};
+  const auto MainReturn = LineColFun{19, 3, "main"};
+  GroundTruth.insert({FooReturn, {{FooFile, IOSTATE::BOT}}});
+  GroundTruth.insert(
+      {MainReturn, {{MainFile, IOSTATE::BOT}, {FooFile, IOSTATE::BOT}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
-// TODO: Check this case again!
 TEST_F(IDETSAnalysisFileIOTest, HandleTypeState_19) {
-  initialize({PathToLlFiles + "typestate_19_c.ll"});
+  initialize({PathToLlFiles + "typestate_19_c_dbg.ll"});
   IDESolver Llvmtssolver(*TSProblem, &HA->getICFG());
-
   Llvmtssolver.solve();
-  const std::map<std::size_t, std::map<std::string, int>> Gt = {
-      {11, {{"8", IOSTATE::UNINIT}}},
-      {14, {{"8", IOSTATE::BOT}}},
-      // At exit in main()
-      {25, {{"2", IOSTATE::CLOSED}, {"8", IOSTATE::CLOSED}}}};
-  compareResults(Gt, Llvmtssolver);
+
+  GroundTruthMapTy GroundTruth;
+  const auto FooFile = LineColFun{4, 16, "foo"};
+  const auto MainFile = LineColFun{7, 9, "main"};
+  const auto WhileCond = LineColFun{11, 3, "main"};
+  const auto StoreCall = LineColFun{11, 13, "main"};
+  const auto MainReturn = LineColFun{18, 3, "main"};
+
+  GroundTruth.insert({WhileCond, {{MainFile, IOSTATE::UNINIT}}});
+  GroundTruth.insert({StoreCall, {{MainFile, IOSTATE::BOT}}});
+  GroundTruth.insert(
+      {MainReturn, {{FooFile, IOSTATE::CLOSED}, {MainFile, IOSTATE::CLOSED}}});
+  compareResults(GroundTruth, Llvmtssolver);
 }
 
 // main function for the test case
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
index bc74fadfda..c801682777 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLEVPKDFTest.cpp
@@ -14,7 +14,6 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -25,8 +24,8 @@
 
 #include <memory>
 
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDETSAnalysisOpenSSLEVPKDFTest : public ::testing::Test {
@@ -40,9 +39,11 @@ class IDETSAnalysisOpenSSLEVPKDFTest : public ::testing::Test {
   OpenSSLEVPKDFDescription OpenSSLEVPKDFDesc{};
   std::optional<IDETypeStateAnalysis<OpenSSLEVPKDFCTXDescription>> TSProblem;
   std::optional<IDETypeStateAnalysis<OpenSSLEVPKDFDescription>> TSKDFProblem;
-  unique_ptr<IDESolver<IDETypeStateAnalysisDomain<OpenSSLEVPKDFCTXDescription>>>
+  std::unique_ptr<
+      IDESolver<IDETypeStateAnalysisDomain<OpenSSLEVPKDFCTXDescription>>>
       Llvmtssolver;
-  unique_ptr<IDESolver<IDETypeStateAnalysisDomain<OpenSSLEVPKDFDescription>>>
+  std::unique_ptr<
+      IDESolver<IDETypeStateAnalysisDomain<OpenSSLEVPKDFDescription>>>
       KdfSolver;
 
   // enum OpenSSLEVPKDFCTXState {
@@ -54,8 +55,6 @@ class IDETSAnalysisOpenSSLEVPKDFTest : public ::testing::Test {
   //   ERROR = 4,
   //   BOT = 0
   // };
-  IDETSAnalysisOpenSSLEVPKDFTest() = default;
-  ~IDETSAnalysisOpenSSLEVPKDFTest() override = default;
 
   void initialize(const llvm::Twine &IRFile) {
     HA.emplace(PathToLlFiles + IRFile, EntryPoints);
@@ -64,7 +63,7 @@ class IDETSAnalysisOpenSSLEVPKDFTest : public ::testing::Test {
         createAnalysisProblem<IDETypeStateAnalysis<OpenSSLEVPKDFDescription>>(
             *HA, &OpenSSLEVPKDFDesc, EntryPoints);
 
-    KdfSolver = make_unique<
+    KdfSolver = std::make_unique<
         IDESolver<IDETypeStateAnalysisDomain<OpenSSLEVPKDFDescription>>>(
         *TSKDFProblem, &HA->getICFG());
 
@@ -74,17 +73,13 @@ class IDETSAnalysisOpenSSLEVPKDFTest : public ::testing::Test {
         IDETypeStateAnalysis<OpenSSLEVPKDFCTXDescription>>(
         *HA, &*OpenSSLEVPKeyDerivationDesc, EntryPoints);
 
-    Llvmtssolver = make_unique<
+    Llvmtssolver = std::make_unique<
         IDESolver<IDETypeStateAnalysisDomain<OpenSSLEVPKDFCTXDescription>>>(
         *TSProblem, &HA->getICFG());
     KdfSolver->solve();
     Llvmtssolver->solve();
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
-  void TearDown() override {}
-
   /**
    * We map instruction id to value for the ground truth. ID has to be
    * a string since Argument ID's are not integer type (e.g. main.0 for
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
index a4cc5eb869..92a05db2a3 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureHeapTest.cpp
@@ -14,7 +14,6 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -28,8 +27,8 @@
 #include <memory>
 #include <optional>
 
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDETSAnalysisOpenSSLSecureHeapTest : public ::testing::Test {
@@ -43,10 +42,10 @@ class IDETSAnalysisOpenSSLSecureHeapTest : public ::testing::Test {
   std::optional<OpenSSLSecureHeapDescription> Desc;
   std::optional<IDETypeStateAnalysis<OpenSSLSecureHeapDescription>> TSProblem;
   std::optional<IDESecureHeapPropagation> SecureHeapPropagationProblem;
-  unique_ptr<
+  std::unique_ptr<
       IDESolver<IDETypeStateAnalysisDomain<OpenSSLSecureHeapDescription>>>
       Llvmtssolver;
-  unique_ptr<IDESolver<IDESecureHeapPropagationAnalysisDomain>>
+  std::unique_ptr<IDESolver<IDESecureHeapPropagationAnalysisDomain>>
       SecureHeapPropagationResults;
   enum OpenSSLSecureHeapState {
     TOP = 42,
@@ -57,8 +56,6 @@ class IDETSAnalysisOpenSSLSecureHeapTest : public ::testing::Test {
     FREED = 4,
     ERROR = 5
   };
-  IDETSAnalysisOpenSSLSecureHeapTest() = default;
-  ~IDETSAnalysisOpenSSLSecureHeapTest() override = default;
 
   void initialize(const llvm::Twine &IRFile) {
     HA.emplace(IRFile, EntryPoints);
@@ -66,14 +63,14 @@ class IDETSAnalysisOpenSSLSecureHeapTest : public ::testing::Test {
     SecureHeapPropagationProblem =
         createAnalysisProblem<IDESecureHeapPropagation>(*HA, EntryPoints);
     SecureHeapPropagationResults =
-        make_unique<IDESolver<IDESecureHeapPropagationAnalysisDomain>>(
+        std::make_unique<IDESolver<IDESecureHeapPropagationAnalysisDomain>>(
             *SecureHeapPropagationProblem, &HA->getICFG());
 
     Desc.emplace(*SecureHeapPropagationResults);
     TSProblem = createAnalysisProblem<
         IDETypeStateAnalysis<OpenSSLSecureHeapDescription>>(*HA, &*Desc,
                                                             EntryPoints);
-    Llvmtssolver = make_unique<
+    Llvmtssolver = std::make_unique<
         IDESolver<IDETypeStateAnalysisDomain<OpenSSLSecureHeapDescription>>>(
         *TSProblem, &HA->getICFG());
 
@@ -81,10 +78,6 @@ class IDETSAnalysisOpenSSLSecureHeapTest : public ::testing::Test {
     Llvmtssolver->solve();
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
-  void TearDown() override {}
-
   /**
    * We map instruction id to value for the ground truth. ID has to be
    * a string since Argument ID's are not integer type (e.g. main.0 for
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
index 558c8007c4..c8e7bd9369 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETSAnalysisOpenSSLSecureMemoryTest.cpp
@@ -13,7 +13,6 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
@@ -25,8 +24,8 @@
 #include <memory>
 #include <optional>
 
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 class IDETSAnalysisOpenSSLSecureMemoryTest : public ::testing::Test {
@@ -38,7 +37,8 @@ class IDETSAnalysisOpenSSLSecureMemoryTest : public ::testing::Test {
   std::optional<HelperAnalyses> HA;
   OpenSSLSecureMemoryDescription Desc{};
   std::optional<IDETypeStateAnalysis<OpenSSLSecureMemoryDescription>> TSProblem;
-  unique_ptr<IDESolver_P<IDETypeStateAnalysis<OpenSSLSecureMemoryDescription>>>
+  std::unique_ptr<
+      IDESolver_P<IDETypeStateAnalysis<OpenSSLSecureMemoryDescription>>>
       Llvmtssolver;
 
   enum OpenSSLSecureMemoryState {
@@ -49,8 +49,6 @@ class IDETSAnalysisOpenSSLSecureMemoryTest : public ::testing::Test {
     ERROR = 3,
     ALLOCATED = 4
   };
-  IDETSAnalysisOpenSSLSecureMemoryTest() = default;
-  ~IDETSAnalysisOpenSSLSecureMemoryTest() override = default;
 
   void initialize(const llvm::Twine &&IRFile) {
     HA.emplace(IRFile, EntryPoints);
@@ -58,17 +56,13 @@ class IDETSAnalysisOpenSSLSecureMemoryTest : public ::testing::Test {
     TSProblem = createAnalysisProblem<
         IDETypeStateAnalysis<OpenSSLSecureMemoryDescription>>(*HA, &Desc,
                                                               EntryPoints);
-    Llvmtssolver = make_unique<
+    Llvmtssolver = std::make_unique<
         IDESolver_P<IDETypeStateAnalysis<OpenSSLSecureMemoryDescription>>>(
         *TSProblem, &HA->getICFG());
 
     Llvmtssolver->solve();
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
-  void TearDown() override {}
-
   /**
    * We map instruction id to value for the ground truth. ID has to be
    * a string since Argument ID's are not integer type (e.g. main.0 for
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
index b36430c3c6..04f564ac70 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSConstAnalysisTest.cpp
@@ -5,21 +5,23 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
+#include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
+#include "llvm/Support/Casting.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
+#include <initializer_list>
 
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 
@@ -33,16 +35,11 @@ class IFDSConstAnalysisTest : public ::testing::Test {
   std::optional<IFDSConstAnalysis> Constproblem;
   std::vector<const llvm::Instruction *> RetOrResInstructions;
 
-  IFDSConstAnalysisTest() = default;
-  ~IFDSConstAnalysisTest() override = default;
-
   void initialize(const llvm::Twine &IRFile) {
     HA.emplace(IRFile, EntryPoints);
     Constproblem = createAnalysisProblem<IFDSConstAnalysis>(*HA, EntryPoints);
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
   llvm::ArrayRef<const llvm::Instruction *> getRetOrResInstructions() {
     if (!RetOrResInstructions.empty()) {
       return RetOrResInstructions;
@@ -59,26 +56,38 @@ class IFDSConstAnalysisTest : public ::testing::Test {
     return RetOrResInstructions;
   }
 
-  void compareResults(const std::set<unsigned long> &GroundTruth,
-                      IFDSSolver_P<IFDSConstAnalysis> &Solver) {
+  void compareResultsImpl(const std::set<const llvm::Value *> &GroundTruth,
+                          IFDSSolver_P<IFDSConstAnalysis> &Solver) {
     std::set<const llvm::Value *> AllMutableAllocas;
+
     for (const auto *RR : getRetOrResInstructions()) {
       std::set<const llvm::Value *> Facts = Solver.ifdsResultsAt(RR);
       for (const auto *Fact : Facts) {
         if (isAllocaInstOrHeapAllocaFunction(Fact) ||
             (llvm::isa<llvm::GlobalValue>(Fact) &&
              !Constproblem->isZeroValue(Fact))) {
-
+          llvm::outs() << "Found *Fact: " << *Fact << "\n";
           AllMutableAllocas.insert(Fact);
         }
       }
     }
-    std::set<unsigned long> MutableIDs;
-    for (const auto *Memloc : AllMutableAllocas) {
-      std::cerr << "> Is Mutable: " << llvmIRToShortString(Memloc) << "\n";
-      MutableIDs.insert(std::stoul(getMetaDataID(Memloc)));
-    }
-    EXPECT_EQ(GroundTruth, MutableIDs);
+
+    EXPECT_EQ(GroundTruth, AllMutableAllocas);
+  }
+
+  void compareResults(const std::set<TestingSrcLocation> &GroundTruth,
+                      IFDSSolver_P<IFDSConstAnalysis> &Solver) {
+    auto GroundTruthEntries =
+        convertTestingLocationSetInIR(GroundTruth, HA->getProjectIRDB());
+
+    compareResultsImpl(GroundTruthEntries, Solver);
+  }
+  void compareResults(std::initializer_list<TestingSrcLocation> GroundTruth,
+                      IFDSSolver_P<IFDSConstAnalysis> &Solver) {
+    auto GroundTruthEntries =
+        convertTestingLocationSetInIR(GroundTruth, HA->getProjectIRDB());
+
+    compareResultsImpl(GroundTruthEntries, Solver);
   }
 };
 
@@ -87,28 +96,35 @@ TEST_F(IFDSConstAnalysisTest, HandleBasicTest_01) {
   initialize({PathToLlFiles + "basic/basic_01_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({}, Llvmconstsolver);
+  std::set<TestingSrcLocation> GroundTruth;
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleBasicTest_02) {
   initialize({PathToLlFiles + "basic/basic_02_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleBasicTest_03) {
   initialize({PathToLlFiles + "basic/basic_03_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleBasicTest_04) {
   initialize({PathToLlFiles + "basic/basic_04_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== CONTROL FLOW TESTS ============== */
@@ -116,35 +132,44 @@ TEST_F(IFDSConstAnalysisTest, HandleCFForTest_01) {
   initialize({PathToLlFiles + "control_flow/cf_for_01_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 12, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCFForTest_02) {
   initialize({PathToLlFiles + "control_flow/cf_for_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{4, 12, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCFIfTest_01) {
   initialize({PathToLlFiles + "control_flow/cf_if_01_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{4, 12, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCFIfTest_02) {
   initialize({PathToLlFiles + "control_flow/cf_if_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({}, Llvmconstsolver);
+  std::set<TestingSrcLocation> GroundTruth{};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCFWhileTest_01) {
   initialize({PathToLlFiles + "control_flow/cf_while_01_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{5, 12, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== POINTER TESTS ============== */
@@ -152,14 +177,18 @@ TEST_F(IFDSConstAnalysisTest, HandlePointerTest_01) {
   initialize({PathToLlFiles + "pointer/pointer_01_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandlePointerTest_02) {
   initialize({PathToLlFiles + "pointer/pointer_02_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, DISABLED_HandlePointerTest_03) {
@@ -168,14 +197,18 @@ TEST_F(IFDSConstAnalysisTest, DISABLED_HandlePointerTest_03) {
   initialize({PathToLlFiles + "pointer/pointer_03_cpp_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({2, 3}, Llvmconstsolver);
+  auto Entry = LineColFun{4, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandlePointerTest_04) {
   initialize({PathToLlFiles + "pointer/pointer_04_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({3}, Llvmconstsolver);
+  auto Entry = LineColFun{5, 7, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== GLOBAL TESTS ============== */
@@ -183,14 +216,19 @@ TEST_F(IFDSConstAnalysisTest, HandleGlobalTest_01) {
   initialize({PathToLlFiles + "global/global_01_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0}, Llvmconstsolver);
+  auto Entry = GlobalVar{"g1"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleGlobalTest_02) {
   initialize({PathToLlFiles + "global/global_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0, 1}, Llvmconstsolver);
+  auto Entry = GlobalVar{"g"};
+  auto EntryTwo = LineColFun{4, 7, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry, EntryTwo};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleGlobalTest_03) {
@@ -198,8 +236,11 @@ TEST_F(IFDSConstAnalysisTest, HandleGlobalTest_03) {
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
 
-  /// The @llvm.global_ctors global variable is never immutable
-  compareResults({0, /*1,*/ 2}, Llvmconstsolver);
+  auto Entry = LineColFun{6, 10, "__cxx_global_var_init"};
+  auto EntryTwo = GlobalVar{"g"};
+
+  std::set<TestingSrcLocation> GroundTruth{Entry, EntryTwo};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, DISABLED_HandleGlobalTest_04) {
@@ -208,7 +249,9 @@ TEST_F(IFDSConstAnalysisTest, DISABLED_HandleGlobalTest_04) {
   initialize({PathToLlFiles + "global/global_04_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0, 4}, Llvmconstsolver);
+  auto Entry = GlobalVar{"g1"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== CALL TESTS ============== */
@@ -216,21 +259,28 @@ TEST_F(IFDSConstAnalysisTest, HandleCallParamTest_01) {
   initialize({PathToLlFiles + "call/param/call_param_01_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({5}, Llvmconstsolver);
+  auto Entry = LineColFun{5, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCallParamTest_02) {
   initialize({PathToLlFiles + "call/param/call_param_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({5}, Llvmconstsolver);
+  auto Entry = LineColFun{5, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCallParamTest_03) {
   initialize({PathToLlFiles + "call/param/call_param_03_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({}, Llvmconstsolver);
+  // auto Entry = LineColFun{, , "main"};
+  // std::set<TestingSrcLocation> GroundTruth{Entry};
+  std::set<TestingSrcLocation> GroundTruth{};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, DISABLED_HandleCallParamTest_04) {
@@ -248,7 +298,7 @@ TEST_F(IFDSConstAnalysisTest, DISABLED_HandleCallParamTest_05) {
   initialize({PathToLlFiles + "call/param/call_param_05_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({2}, Llvmconstsolver);
+  compareResults({}, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCallParamTest_06) {
@@ -262,14 +312,18 @@ TEST_F(IFDSConstAnalysisTest, HandleCallParamTest_07) {
   initialize({PathToLlFiles + "call/param/call_param_07_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({6}, Llvmconstsolver);
+  auto Entry = LineColFun{6, 12, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCallParamTest_08) {
   initialize({PathToLlFiles + "call/param/call_param_08_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({4}, Llvmconstsolver);
+  auto Entry = LineColFun{9, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCallReturnTest_01) {
@@ -283,14 +337,18 @@ TEST_F(IFDSConstAnalysisTest, HandleCallReturnTest_02) {
   initialize({PathToLlFiles + "call/return/call_ret_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 12, "_Z3foov"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleCallReturnTest_03) {
   initialize({PathToLlFiles + "call/return/call_ret_03_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 12, "_Z3foov"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== ARRAY TESTS ============== */
@@ -328,7 +386,9 @@ TEST_F(IFDSConstAnalysisTest, HandleArrayTest_05) {
   initialize({PathToLlFiles + "array/array_05_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, HandleArrayTest_06) {
@@ -336,7 +396,9 @@ TEST_F(IFDSConstAnalysisTest, HandleArrayTest_06) {
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
   HA->getAliasInfo().print(llvm::errs());
-  compareResults({1}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 TEST_F(IFDSConstAnalysisTest, DISABLED_HandleArrayTest_07) {
@@ -359,7 +421,9 @@ TEST_F(IFDSConstAnalysisTest, HandleArrayTest_09) {
   initialize({PathToLlFiles + "array/array_09_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0}, Llvmconstsolver);
+  auto Entry = LineColFun{3, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== STL ARRAY TESTS ============== */
@@ -374,7 +438,12 @@ TEST_F(IFDSConstAnalysisTest, HandleSTLArrayTest_02) {
   initialize({PathToLlFiles + "array/stl_array/stl_array_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0, 1}, Llvmconstsolver);
+  std::set<TestingSrcLocation> GroundTruth = {
+      LineColFun{4, 0, "main"},
+      GlobalVar{"__const.main.a"},
+  };
+
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 PHASAR_SKIP_TEST(TEST_F(IFDSConstAnalysisTest, HandleSTLArrayTest_03) {
@@ -384,7 +453,13 @@ PHASAR_SKIP_TEST(TEST_F(IFDSConstAnalysisTest, HandleSTLArrayTest_03) {
   initialize({PathToLlFiles + "array/stl_array/stl_array_03_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({0, 1, 2}, Llvmconstsolver);
+  compareResults(
+      {
+          GlobalVar{"__const.main.a"},
+          GlobalVar{".str"},
+          LineColFun{4, 0, "main"},
+      },
+      Llvmconstsolver);
 })
 
 TEST_F(IFDSConstAnalysisTest, DISABLED_HandleSTLArrayTest_04) {
@@ -407,7 +482,9 @@ TEST_F(IFDSConstAnalysisTest, HandleSTLArrayTest_06) {
   initialize({PathToLlFiles + "array/stl_array/stl_array_06_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({2}, Llvmconstsolver);
+  auto Entry = LineColFun{4, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== CSTRING TESTS ============== */
@@ -424,7 +501,9 @@ TEST_F(IFDSConstAnalysisTest, DISABLED_HandleCStringTest_02) {
   initialize({PathToLlFiles + "array/cstring/cstring_02_cpp_m2r_dbg.ll"});
   IFDSSolver Llvmconstsolver(*Constproblem, &HA->getICFG());
   Llvmconstsolver.solve();
-  compareResults({2}, Llvmconstsolver);
+  auto Entry = LineColFun{4, 0, "main"};
+  std::set<TestingSrcLocation> GroundTruth{Entry};
+  compareResults(GroundTruth, Llvmconstsolver);
 }
 
 /* ============== STRUCTURE TESTS ============== */
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
index e050acc5dc..8b60573548 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSTaintAnalysisTest.cpp
@@ -2,22 +2,25 @@
 
 #include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
 #include "phasar/PhasarLLVM/TaintConfig/LLVMTaintConfig.h"
 #include "phasar/PhasarLLVM/TaintConfig/TaintConfigBase.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/Utils/DebugOutput.h"
 
+#include "llvm/ADT/StringRef.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Value.h"
+
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
-
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 
@@ -32,9 +35,6 @@ class IFDSTaintAnalysisTest : public ::testing::Test {
   std::optional<IFDSTaintAnalysis> TaintProblem;
   std::optional<LLVMTaintConfig> TSF;
 
-  IFDSTaintAnalysisTest() = default;
-  ~IFDSTaintAnalysisTest() override = default;
-
   static LLVMTaintConfig getDefaultConfig() {
     auto SourceCB = [](const llvm::Instruction *Inst) {
       std::set<const llvm::Value *> Ret;
@@ -78,113 +78,120 @@ class IFDSTaintAnalysisTest : public ::testing::Test {
     if (!TSF) {
       TSF = getDefaultConfig();
     }
+
     TaintProblem =
         createAnalysisProblem<IFDSTaintAnalysis>(*HA, &*TSF, EntryPoints);
   }
 
-  static void doAnalysis(const llvm::Twine &IRFile,
-                         const LLVMTaintConfig &Config,
-                         const map<int, set<string>> &GroundTruth) {
-    HelperAnalyses HA(PathToLlFiles + IRFile, EntryPoints);
-
-    auto TaintProblem =
-        createAnalysisProblem<IFDSTaintAnalysis>(HA, &Config, EntryPoints);
-
-    IFDSSolver TaintSolver(TaintProblem, &HA.getICFG());
-    TaintSolver.solve();
-
-    TaintSolver.dumpResults();
-
-    compare(TaintProblem.Leaks, GroundTruth);
+  void initialize(const llvm::Twine &IRFile, const LLVMTaintConfig *Config) {
+    HA.emplace(IRFile, EntryPoints);
+    TaintProblem =
+        createAnalysisProblem<IFDSTaintAnalysis>(*HA, Config, EntryPoints);
   }
 
-  static void doAnalysis(const llvm::Twine &IRFile,
-                         const map<int, set<string>> &GroundTruth) {
-    doAnalysis(IRFile, getDefaultConfig(), GroundTruth);
-  }
+  using GroundTruthTy =
+      std::map<TestingSrcLocation, std::set<TestingSrcLocation>>;
 
   template <typename LeaksTy>
-  static void compare(const LeaksTy &Leaks,
-                      const map<int, set<string>> &GroundTruth) {
-    map<int, set<string>> FoundLeaks;
-    for (const auto &Leak : Leaks) {
-      int SinkId = stoi(getMetaDataID(Leak.first));
-      set<string> LeakedValueIds;
-      for (const auto *LV : Leak.second) {
-        LeakedValueIds.insert(getMetaDataID(LV));
-      }
-      FoundLeaks.insert(make_pair(SinkId, LeakedValueIds));
-    }
-    EXPECT_EQ(FoundLeaks, GroundTruth);
+  void compare(const LeaksTy &Leaks, const GroundTruthTy &GroundTruth) {
+    auto GroundTruthEntries =
+        convertTestingLocationSetMapInIR(GroundTruth, HA->getProjectIRDB());
+
+    EXPECT_EQ(Leaks, GroundTruthEntries)
+        << "Taint Leaks do not match:\n  Expected: "
+        << PrettyPrinter{GroundTruthEntries}
+        << "\n  Got: " << PrettyPrinter{Leaks};
   }
 
-  void compareResults(const map<int, set<string>> &GroundTruth) noexcept {
-    compare(TaintProblem->Leaks, GroundTruth);
-  }
 }; // Test Fixture
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_01) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_01_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[13] = set<string>{"12"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{6, 3, "main"};
+  auto EntryTwo = LineColFun{6, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_01_m2r) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_01_cpp_m2r_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[4] = set<string>{"2"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{6, 3, "main"};
+  auto EntryTwo = LineColFun{5, 11, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_02) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_02_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[9] = set<string>{"8"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{5, 3, "main"};
+  auto EntryTwo = LineColFun{5, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_03) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_03_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[18] = set<string>{"17"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{6, 3, "main"};
+  auto EntryTwo = LineColFun{6, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_04) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_04_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[19] = set<string>{"18"};
-  GroundTruth[24] = set<string>{"23"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{6, 3, "main"};
+  auto EntryTwo = LineColFun{6, 8, "main"};
+  auto EntryThree = LineColFun{8, 3, "main"};
+  auto EntryFour = LineColFun{8, 8, "main"};
+  GroundTruthTy GroundTruth{
+      {Entry, {EntryTwo}},
+      {EntryThree, {EntryFour}},
+  };
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_05) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_05_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[22] = set<string>{"21"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{6, 3, "main"};
+  auto EntryTwo = LineColFun{6, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_06) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_06_cpp_m2r_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[5] = set<string>{"main.0"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{5, 3, "main"};
+  auto Main0 = ArgInFun{0, "main"};
+  GroundTruthTy GroundTruth{{Entry, {Main0}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_01) {
@@ -192,9 +199,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_01) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_01_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[14] = set<string>{"13"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{12, 3, "main"};
+  auto EntryTwo = LineColFun{12, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_01_m2r) {
@@ -202,9 +212,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_01_m2r) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_01_cpp_m2r_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[5] = set<string>{"0"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{12, 3, "main"};
+  auto EntryTwo = LineColFun{10, 14, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_02) {
@@ -212,9 +225,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_02) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_02_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[16] = set<string>{"15"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{11, 3, "main"};
+  auto EntryTwo = LineColFun{11, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_03) {
@@ -222,10 +238,17 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_03) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_03_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[11] = set<string>{"10"};
-  GroundTruth[20] = set<string>{"19"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{11, 3, "main"};
+  auto EntryTwo = LineColFun{11, 8, "main"};
+  auto EntryThree = LineColFun{14, 3, "main"};
+  auto EntryFour = LineColFun{14, 8, "main"};
+  GroundTruthTy GroundTruth{
+      {Entry, {EntryTwo}},
+      {EntryThree, {EntryFour}},
+  };
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_04) {
@@ -233,9 +256,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_04) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_04_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[32] = set<string>{"31"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{16, 3, "main"};
+  auto EntryTwo = LineColFun{16, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_05) {
@@ -244,9 +270,11 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_05) {
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
 
-  map<int, set<string>> GroundTruth;
-  GroundTruth[32] = set<string>{"31"};
-  compareResults(GroundTruth);
+  auto Entry = LineColFun{16, 3, "main"};
+  auto EntryTwo = LineColFun{16, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_06) {
@@ -254,9 +282,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_06) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_06_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[14] = set<string>{"13"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{13, 5, "main"};
+  auto EntryTwo = LineColFun{13, 10, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_07) {
@@ -264,9 +295,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_07) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_07_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[30] = set<string>{"29"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{14, 5, "main"};
+  auto EntryTwo = LineColFun{14, 10, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_08) {
@@ -274,9 +308,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_08) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_08_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[32] = set<string>{"31"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{19, 3, "main"};
+  auto EntryTwo = LineColFun{19, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_09) {
@@ -284,9 +321,12 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_09) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_09_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[62] = set<string>{"61"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{20, 3, "main"};
+  auto EntryTwo = LineColFun{20, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_10) {
@@ -294,32 +334,50 @@ TEST_F(IFDSTaintAnalysisTest, TaintTest_ExceptionHandling_10) {
       {PathToLlFiles + "dummy_source_sink/taint_exception_10_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[60] = set<string>{"59"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{19, 5, "main"};
+  auto EntryTwo = LineColFun{19, 10, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_DoubleFree_01) {
-  doAnalysis("double_free_01_c.ll", getDoubleFreeConfig(),
-             {
-                 {6, {"5"}},
-             });
+  auto DoubleFreeConf = getDoubleFreeConfig();
+  initialize({PathToLlFiles + "double_free_01_c_dbg.ll"}, &DoubleFreeConf);
+  IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
+  TaintSolver.solve();
+
+  auto Entry = LineColFun{6, 3, "main"};
+  auto EntryTwo = LineColFun{6, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_DoubleFree_02) {
-  doAnalysis("double_free_02_c.ll", getDoubleFreeConfig(),
-             {
-                 {11, {"10"}},
-             });
+  auto DoubleFreeConf = getDoubleFreeConfig();
+  initialize({PathToLlFiles + "double_free_02_c_dbg.ll"}, &DoubleFreeConf);
+  IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
+  TaintSolver.solve();
+
+  auto Entry = LineColFun{8, 3, "main"};
+  auto EntryTwo = LineColFun{8, 8, "main"};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 TEST_F(IFDSTaintAnalysisTest, TaintTest_LibSummary_01) {
   initialize({PathToLlFiles + "dummy_source_sink/taint_lib_sum_01_cpp_dbg.ll"});
   IFDSSolver TaintSolver(*TaintProblem, &HA->getICFG());
   TaintSolver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[20] = {"19"};
-  compareResults(GroundTruth);
+
+  auto Entry = LineColFun{8, 3, "main"};
+  auto EntryTwo = LineColFunOp{8, 8, "main", llvm::Instruction::FPToSI};
+  GroundTruthTy GroundTruth{{Entry, {EntryTwo}}};
+
+  compare(TaintProblem->Leaks, GroundTruth);
 }
 
 int main(int Argc, char **Argv) {
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
index 51d7b04649..c3b1be5260 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
@@ -3,23 +3,23 @@
 
 #include "phasar/DataFlow/IfdsIde/Solver/IFDSSolver.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
-#include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/SimpleAnalysisConstructor.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
+#include "phasar/Utils/DebugOutput.h"
 
-#include "llvm/IR/Module.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Value.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
-#include <memory>
 #include <optional>
 
-using namespace std;
 using namespace psr;
+using namespace psr::unittest;
 
 /* ============== TEST FIXTURE ============== */
 
@@ -33,41 +33,34 @@ class IFDSUninitializedVariablesTest : public ::testing::Test {
 
   std::optional<IFDSUninitializedVariables> UninitProblem;
 
-  IFDSUninitializedVariablesTest() = default;
-  ~IFDSUninitializedVariablesTest() override = default;
-
   void initialize(const llvm::Twine &IRFile) {
     HA.emplace(IRFile, EntryPoints);
     UninitProblem =
         createAnalysisProblem<IFDSUninitializedVariables>(*HA, EntryPoints);
   }
 
-  void SetUp() override { ValueAnnotationPass::resetValueID(); }
-
-  void TearDown() override {}
-
-  void compareResults(map<int, set<string>> &GroundTruth) {
+  using GroundTruthTy =
+      std::map<TestingSrcLocation, std::set<TestingSrcLocation>>;
 
-    map<int, set<string>> FoundUninitUses;
-    for (const auto &Kvp : UninitProblem->getAllUndefUses()) {
-      auto InstID = stoi(getMetaDataID(Kvp.first));
-      set<string> UndefValueIds;
-      for (const auto *UV : Kvp.second) {
-        UndefValueIds.insert(getMetaDataID(UV));
-      }
-      FoundUninitUses[InstID] = UndefValueIds;
-    }
+  void compareResults(const GroundTruthTy &GroundTruthEntries) {
+    auto ConvGroundTruth = convertTestingLocationSetMapInIR(
+        GroundTruthEntries, HA->getProjectIRDB());
 
-    EXPECT_EQ(FoundUninitUses, GroundTruth);
+    EXPECT_EQ(UninitProblem->getAllUndefUses(), ConvGroundTruth)
+        << "UndefUses do not match:\n  Expected: "
+        << PrettyPrinter{ConvGroundTruth}
+        << "\n  Got: " << PrettyPrinter{UninitProblem->getAllUndefUses()};
   }
+
 }; // Test Fixture
 
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_01_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "all_uninit_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
+
   // all_uninit.cpp does not contain undef-uses
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
   compareResults(GroundTruth);
 }
 
@@ -77,32 +70,36 @@ TEST_F(IFDSUninitializedVariablesTest, UninitTest_02_SHOULD_LEAK) {
   Solver.solve();
 
   // binop_uninit uses uninitialized variable i in 'int j = i + 10;'
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
+
   // %4 = load i32, i32* %2, ID: 6 ;  %2 is the uninitialized variable i
-  GroundTruth[6] = {"1"};
   // %5 = add nsw i32 %4, 10 ;        %4 is undef, since it is loaded from
   // undefined alloca; not sure if it is necessary to report again
-  GroundTruth[7] = {"6"};
+  const auto Entry = LineColFun{2, 0, "main"};
+  const auto EntryTwo = LineColFun{3, 11, "main"};
+  const auto EntryThree = LineColFun{3, 13, "main"};
+  GroundTruth.insert({EntryTwo, {Entry}});
+  GroundTruth.insert({EntryThree, {EntryTwo}});
+
   compareResults(GroundTruth);
 }
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_03_SHOULD_LEAK) {
   initialize({PathToLlFiles + "callnoret_c_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
 
   // callnoret uses uninitialized variable a in 'return a + 10;' of addTen(int)
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
 
-  // %4 = load i32, i32* %2 ; %2 is the parameter a of addTen(int) containing
-  // undef
-  GroundTruth[5] = {"0"};
-  // The same as in test2: is it necessary to report again?
-  GroundTruth[6] = {"5"};
-  // %5 = load i32, i32* %2 ; %2 is the uninitialized variable a
-  GroundTruth[16] = {"9"};
-  // The same as in test2: is it necessary to report again? (the analysis does
-  // not)
-  // GroundTruth[17] = {"16"};
+  const auto IntA = LineColFun{7, 7, "main"};
+  const auto CopyA = LineColFun{9, 10, "main"};
+  const auto ArgA = LineColFun{1, 16, "addTen"};
+  const auto LoadA = LineColFun{3, 10, "addTen"};
+  const auto Add = LineColFun{3, 12, "addTen"};
+  GroundTruth.insert({CopyA, {IntA}});
+  GroundTruth.insert({Add, {LoadA}});
+  GroundTruth.insert({LoadA, {ArgA}});
 
   compareResults(GroundTruth);
 }
@@ -111,25 +108,31 @@ TEST_F(IFDSUninitializedVariablesTest, UninitTest_04_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "ctor_default_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
+
   // ctor.cpp does not contain undef-uses
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
+
   compareResults(GroundTruth);
 }
-
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_05_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "struct_member_init_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
+
   // struct_member_init.cpp does not contain undef-uses
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
+
   compareResults(GroundTruth);
 }
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_06_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "struct_member_uninit_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
+
   // struct_member_uninit.cpp does not contain undef-uses
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
+
   compareResults(GroundTruth);
 }
 /****************************************************************************************
@@ -151,12 +154,15 @@ Solver(*UninitProblem, false); Solver.solve();
   compareResults(GroundTruth);
 }
 *****************************************************************************************/
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_08_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "global_variable_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
+
   // global_variable.cpp does not contain undef-uses
-  map<int, set<string>> GroundTruth;
+  GroundTruthTy GroundTruth;
+
   compareResults(GroundTruth);
 }
 /****************************************************************************************
@@ -176,17 +182,19 @@ Solver(*UninitProblem, false); Solver.solve();
   compareResults(GroundTruth);
 }
 *****************************************************************************************/
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_10_SHOULD_LEAK) {
   initialize({PathToLlFiles + "return_uninit_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
-  UninitProblem->emitTextReport(Solver.getSolverResults(), llvm::outs());
-  map<int, set<string>> GroundTruth;
-  //%2 = load i32, i32 %1
-  GroundTruth[2] = {"0"};
-  // What about this call?
-  // %3 = call i32 @_Z3foov()
-  // GroundTruth[8] = {""};
+
+  GroundTruthTy GroundTruth;
+
+  const auto IntI = LineColFun{2, 7, "_Z3foov"};
+  const auto UseOfI = LineColFun{3, 10, "_Z3foov"};
+
+  GroundTruth.insert({UseOfI, {IntI}});
+
   compareResults(GroundTruth);
 }
 
@@ -195,15 +203,21 @@ TEST_F(IFDSUninitializedVariablesTest, UninitTest_11_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "sanitizer_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
-  map<int, set<string>> GroundTruth;
+
+  GroundTruthTy GroundTruth;
   // all undef-uses are sanitized;
   // However, the uninitialized variable j is read, which causes the analysis to
   // report an undef-use
   // 6 => {2}
 
-  GroundTruth[6] = {"2"};
+  const auto IntI = LineColFun{3, 7, "main"};
+  const auto UseOfI = LineColFun{4, 7, "main"};
+
+  GroundTruth.insert({UseOfI, {IntI}});
+
   compareResults(GroundTruth);
 }
+
 //---------------------------------------------------------------------
 // Not relevant any more; Test case covered by UninitTest_11
 //---------------------------------------------------------------------
@@ -225,23 +239,40 @@ TEST_F(IFDSUninitializedVariablesTest, UninitTest_13_SHOULD_NOT_LEAK) {
   initialize({PathToLlFiles + "sanitizer2_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
+
   // The undef-uses do not affect the program behaviour, but are of course still
   // found and reported
-  map<int, set<string>> GroundTruth;
-  GroundTruth[9] = {"2"};
+  GroundTruthTy GroundTruth;
+
+  const auto IntJ = LineColFun{3, 7, "main"};
+  const auto LoadJ = LineColFun{5, 7, "main"};
+
+  GroundTruth.insert({LoadJ, {IntJ}});
+
   compareResults(GroundTruth);
 }
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_14_SHOULD_LEAK) {
 
   initialize({PathToLlFiles + "uninit_c_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
-  map<int, set<string>> GroundTruth;
-  GroundTruth[14] = {"1"};
-  GroundTruth[15] = {"2"};
-  GroundTruth[16] = {"14", "15"};
+
+  GroundTruthTy GroundTruth;
+
+  const auto IntA = LineColFun{2, 7, "main"};
+  const auto IntB = LineColFun{3, 7, "main"};
+  const auto LoadA = LineColFun{6, 11, "main"};
+  const auto Multiply = LineColFun{6, 13, "main"};
+  const auto LoadB = LineColFun{6, 15, "main"};
+
+  GroundTruth.insert({LoadA, {IntA}});
+  GroundTruth.insert({LoadB, {IntB}});
+  GroundTruth.insert({Multiply, {LoadA, LoadB}});
+
   compareResults(GroundTruth);
 }
+
 /****************************************************************************************
  * Fails probably due to field-insensitivity
  *
@@ -275,20 +306,28 @@ GroundTruth;
   compareResults(GroundTruth);
 }
 *****************************************************************************************/
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_16_SHOULD_LEAK) {
 
   initialize({PathToLlFiles + "growing_example_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
 
-  map<int, set<string>> GroundTruth;
-  // TODO remove GT[11]
-  GroundTruth[11] = {"0"};
-
-  GroundTruth[16] = {"2"};
-  GroundTruth[18] = {"16"};
-  GroundTruth[34] = {"24"};
-
+  GroundTruthTy GroundTruth;
+
+  const auto ArgX = LineColFun{1, 18, "_Z8functionii"};
+  const auto IntI = LineColFun{2, 7, "_Z8functionii"};
+  const auto LoadX = LineColFun{3, 11, "_Z8functionii"};
+  const auto LoadI = LineColFun{5, 10, "_Z8functionii"};
+  const auto Add = LineColFun{5, 12, "_Z8functionii"};
+  const auto IntJ = LineColFun{10, 7, "main"};
+  const auto LoadJ = LineColFun{12, 16, "main"};
+
+  // TODO remove GroundTruth.insert({LoadX, ArgX}) below
+  GroundTruth.insert({LoadX, {ArgX}});
+  GroundTruth.insert({LoadI, {IntI}});
+  GroundTruth.insert({Add, {LoadI}});
+  GroundTruth.insert({LoadJ, {IntJ}});
   compareResults(GroundTruth);
 }
 
@@ -345,42 +384,109 @@ Solver(*UninitProblem, false); Solver.solve();
   compareResults(GroundTruth);
 }
 *****************************************************************************************/
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_20_SHOULD_LEAK) {
 
   initialize({PathToLlFiles + "recursion_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
 
-  map<int, set<string>> GroundTruth;
-  // Leaks at 11 and 14 due to field-insensitivity
-  GroundTruth[11] = {"2"};
-  GroundTruth[14] = {"2"};
+  GroundTruthTy GroundTruth;
+
+  // Leaks due to field-insensitivity
+
+  // %1 = load ptr, ptr %x.addr, align 8, !dbg !240, !psr.id !241 | ID: 11
+  LineColFun LoadX{4, 12, "_Z3fooRii"};
+  // %x.addr = alloca ptr, align 8
+  LineColFun ArgAddrX{2, 15, "_Z3fooRii"};
+  GroundTruth.insert({LoadX, {ArgAddrX}});
+  // %2 = load ptr, ptr %x.addr
+  LineColFun LoadXTwo{5, 14, "_Z3fooRii"};
+  GroundTruth.insert({LoadXTwo, {ArgAddrX}});
+
+  // Load uninitialized variable
+
+  // %1 = load i32, ptr %j, align 4, !dbg !274, !psr.id !275 | ID: 31
+  LineColFun LoadJ{11, 18, "main"};
+  // %j = alloca i32, align 4
+  LineColFun IntJ{10, 7, "main"};
+  GroundTruth.insert({LoadJ, {IntJ}});
 
-  // Load uninitialized variable i
-  GroundTruth[31] = {"24"};
   // Load recursive return-value for returning it
-  GroundTruth[20] = {"1"};
+
+  // %4 = load ptr, ptr %retval
+  LineColFun FooExit{6, 1, "_Z3fooRii"};
+  GroundTruth.insert({FooExit, {OperandOf{0, FooExit}}});
   // Load return-value of foo in main
-  GroundTruth[29] = {"28"};
-  // Analysis does not check uninit on actualparameters
-  // GroundTruth[32] = {"31"};
+  // %0 = load i32, ptr %call, align 4
+  LineColFunOp Load0{10, 11, "main", llvm::Instruction::Load};
+  // %call = call noundef nonnull align 4 dereferenceable(4) ptr @_Z3fooRii(ptr
+  // noundef nonnull align 4 dereferenceable(4) %i, i32 noundef 10)
+  LineColFunOp CallFooRec{10, 11, "main", llvm::Instruction::Call};
+  GroundTruth.insert({Load0, {CallFooRec}});
+  // // Load return-value of foo in main
+  // GroundTruth.insert({FooExit, IntJ});
+
+  // ***********
+  // Load recursive return-value for returning it
+  // GroundTruth.insert({RetOfFoo, IntJ});
+  // ***********
+
+  // Load return-value of foo in main
+  // GroundTruth.insert({IntJ, RetOfFoo});
+
   compareResults(GroundTruth);
 }
+
 TEST_F(IFDSUninitializedVariablesTest, UninitTest_21_SHOULD_LEAK) {
 
   initialize({PathToLlFiles + "virtual_call_cpp_dbg.ll"});
   IFDSSolver Solver(*UninitProblem, &HA->getICFG());
   Solver.solve();
 
-  map<int, set<string>> GroundTruth = {
-      {3, {"0"}}, {8, {"5"}}, {10, {"5"}}, {35, {"34"}}, {37, {"17"}}};
+  GroundTruthTy GroundTruth;
+  // %x.addr = alloca ptr, align 8
+  const auto FooXAddr = LineColFun{3, 15, "_Z3fooRi"};
+  // %0 = load ptr, ptr %x.addr, align 8
+  const auto FooXLoad = LineColFun{3, 27, "_Z3fooRi"};
+  // %x.addr = alloca ptr, align 8
+  const auto BarXAddr = LineColFun{4, 15, "_Z3barRi"};
+  // %0 = load ptr, ptr %x.addr, align 8
+  const auto Load = LineColFun{5, 3, "_Z3barRi"};
+  // %1 = load ptr, ptr %x.addr, align 8
+  const auto LoadX = LineColFun{6, 10, "_Z3barRi"};
+
+  // %j = alloca i32, align 4
+  const auto IntJ = LineColFun{16, 7, "main"};
+  // %call = call noundef nonnull align 4 dereferenceable(4) ptr %1
+  const auto BazCall = LineColFunOp{16, 11, "main", llvm::Instruction::Call};
+
+  // %2 = load i32, ptr %call, align 4
+  const auto SecondLoadInIfEnd = OperandOf{
+      // The value operand of the store
+      1 - llvm::StoreInst::getPointerOperandIndex(),
+      LineColFunOp{16, 7, "main", llvm::Instruction::Store},
+  };
+  // %3 = load i32, ptr %j, align 4
+  const auto LoadJ = LineColFun{17, 10, "main"};
+  // is passed as a reference, so I isn't being loaded here
+  // const auto LoadI =
+  //     LineColFun{16, 15, "main"};
+
   // 3  => {0}; due to field-insensitivity
+  GroundTruth.insert({FooXLoad, {FooXAddr}});
   // 8  => {5}; due to field-insensitivity
+  GroundTruth.insert({Load, {BarXAddr}});
   // 10 => {5}; due to alias-unawareness
+  GroundTruth.insert({LoadX, {BarXAddr}});
   // 35 => {34}; actual leak
+  GroundTruth.insert({SecondLoadInIfEnd, {BazCall}});
   // 37 => {17}; actual leak
+  GroundTruth.insert({LoadJ, {IntJ}});
+
   compareResults(GroundTruth);
 }
+
 int main(int Argc, char **Argv) {
   ::testing::InitGoogleTest(&Argc, Argv);
   return RUN_ALL_TESTS();
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/SparseIDESolverTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/SparseIDESolverTest.cpp
index 060f438271..ee0353254a 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/SparseIDESolverTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/SparseIDESolverTest.cpp
@@ -194,8 +194,8 @@ static constexpr std::string_view LCATestFiles[] = {
 };
 
 static constexpr std::string_view TaintTestFiles[] = {
-    "double_free_01_c.ll",
-    "double_free_02_c.ll",
+    "double_free_01_c_dbg.ll",
+    "double_free_02_c_dbg.ll",
 };
 
 INSTANTIATE_TEST_SUITE_P(SparseIDETest, LinearConstant,
diff --git a/unittests/PhasarLLVM/Pointer/FilteredLLVMAliasSetTest.cpp b/unittests/PhasarLLVM/Pointer/FilteredLLVMAliasSetTest.cpp
index ccfb76b605..d7a2eff826 100644
--- a/unittests/PhasarLLVM/Pointer/FilteredLLVMAliasSetTest.cpp
+++ b/unittests/PhasarLLVM/Pointer/FilteredLLVMAliasSetTest.cpp
@@ -123,8 +123,8 @@ static constexpr std::string_view TaintTestFiles[] = {
     "dummy_source_sink/taint_exception_09_cpp_dbg.ll",
     "dummy_source_sink/taint_exception_10_cpp_dbg.ll",
     // -- double-free
-    "double_free_01_c.ll",
-    "double_free_02_c.ll",
+    "double_free_01_c_dbg.ll",
+    "double_free_02_c_dbg.ll",
 };
 
 INSTANTIATE_TEST_SUITE_P(InteractiveIDESolverTest, TaintAnalysis,
diff --git a/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt b/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt
index fc190151ac..75f52a91d5 100644
--- a/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt
+++ b/unittests/PhasarLLVM/TypeHierarchy/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(PointerSources
-    DIBasedTypeHierarchySerializationTest.cpp
+  DIBasedTypeHierarchySerializationTest.cpp
 	DIBasedTypeHierarchyTest.cpp
 	LLVMTypeHierarchySerializationTest.cpp
 	LLVMTypeHierarchyTest.cpp
diff --git a/unittests/TestUtils/SrcCodeLocationEntry.h b/unittests/TestUtils/SrcCodeLocationEntry.h
new file mode 100644
index 0000000000..c13ca7f8d4
--- /dev/null
+++ b/unittests/TestUtils/SrcCodeLocationEntry.h
@@ -0,0 +1,450 @@
+#ifndef PHASAR_UNITTESTS_TESTUTILS_SRCCODELOCATIONENTRY_H
+#define PHASAR_UNITTESTS_TESTUTILS_SRCCODELOCATIONENTRY_H
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Utils/Utilities.h"
+
+#include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/IR/Function.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/InstIterator.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
+
+#include <cstdint>
+#include <functional>
+#include <iterator>
+#include <ostream>
+#include <set>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <variant>
+
+namespace psr::unittest {
+
+struct GlobalVar {
+  llvm::StringRef Name;
+
+  friend bool operator<(GlobalVar G1, GlobalVar G2) noexcept {
+    return G1.Name < G2.Name;
+  }
+  friend bool operator==(GlobalVar G1, GlobalVar G2) noexcept {
+    return G1.Name == G2.Name;
+  }
+
+  [[nodiscard]] std::string str() const {
+    return std::string("GlobalVar { Name: ") + Name.str() + " }";
+  }
+};
+struct LineCol {
+  uint32_t Line{};
+  uint32_t Col{};
+
+  friend bool operator<(LineCol LC1, LineCol LC2) noexcept {
+    return std::tie(LC1.Line, LC1.Col) < std::tie(LC2.Line, LC2.Col);
+  }
+  friend bool operator==(LineCol LC1, LineCol LC2) noexcept {
+    return std::tie(LC1.Line, LC1.Col) == std::tie(LC2.Line, LC2.Col);
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("LineCol { Line: ") + std::to_string(Line) +
+           "; Col: " + std::to_string(Col) + " }";
+  }
+};
+
+struct LineColFunOp {
+  uint32_t Line{};
+  uint32_t Col{};
+  llvm::StringRef InFunction{};
+  uint32_t OpCode{};
+
+  friend bool operator<(LineColFunOp LC1, LineColFunOp LC2) noexcept {
+    return std::tie(LC1.InFunction, LC1.Line, LC1.Col, LC1.OpCode) <
+           std::tie(LC2.InFunction, LC2.Line, LC2.Col, LC2.OpCode);
+  }
+  friend bool operator==(LineColFunOp LC1, LineColFunOp LC2) noexcept {
+    return std::tie(LC1.Line, LC1.Col, LC1.InFunction, LC1.OpCode) ==
+           std::tie(LC2.Line, LC2.Col, LC2.InFunction, LC2.OpCode);
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("LineColFunOp { Line: ") + std::to_string(Line) +
+           "; Col: " + std::to_string(Col) +
+           "; InFunction: " + InFunction.str() +
+           "; OpCode: " + llvm::Instruction::getOpcodeName(OpCode) + " }";
+  }
+};
+
+struct LineColFun {
+  uint32_t Line{};
+  uint32_t Col{};
+  llvm::StringRef InFunction{};
+
+  friend bool operator<(LineColFun LC1, LineColFun LC2) noexcept {
+    return std::tie(LC1.InFunction, LC1.Line, LC1.Col) <
+           std::tie(LC2.InFunction, LC2.Line, LC2.Col);
+  }
+  friend bool operator==(LineColFun LC1, LineColFun LC2) noexcept {
+    return std::tie(LC1.Line, LC1.Col, LC1.InFunction) ==
+           std::tie(LC2.Line, LC2.Col, LC2.InFunction);
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("LineColFun { Line: ") + std::to_string(Line) +
+           "; Col: " + std::to_string(Col) +
+           "; InFunction: " + InFunction.str() + " }";
+  }
+
+  constexpr operator LineColFunOp() const noexcept {
+    // 0 is the wildcard opcode
+    return {Line, Col, InFunction, 0};
+  }
+};
+
+struct ArgNo {
+  uint32_t Idx{};
+
+  friend bool operator<(ArgNo A1, ArgNo A2) noexcept { return A1.Idx < A2.Idx; }
+  friend bool operator==(ArgNo A1, ArgNo A2) noexcept {
+    return A1.Idx == A2.Idx;
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("ArgNo { Idx: ") + std::to_string(Idx) + " }";
+  }
+};
+struct ArgInFun {
+  uint32_t Idx{};
+  llvm::StringRef InFunction{};
+
+  friend bool operator<(ArgInFun A1, ArgInFun A2) noexcept {
+    return std::tie(A1.InFunction, A1.Idx) < std::tie(A2.InFunction, A2.Idx);
+  }
+  friend bool operator==(ArgInFun A1, ArgInFun A2) noexcept {
+    return std::tie(A1.Idx, A1.InFunction) == std::tie(A2.Idx, A2.InFunction);
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("ArgInFun { Idx: ") + std::to_string(Idx) +
+           "; InFunction: " + InFunction.str() + " }";
+  }
+};
+
+struct RetVal {
+  llvm::StringRef InFunction;
+
+  friend bool operator<(RetVal R1, RetVal R2) noexcept {
+    return R1.InFunction < R2.InFunction;
+  }
+  friend bool operator==(RetVal R1, RetVal R2) noexcept {
+    return R1.InFunction == R2.InFunction;
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("RetVal { InFunction: ") + InFunction.str() + " }";
+  }
+};
+struct RetStmt {
+  llvm::StringRef InFunction;
+
+  friend bool operator<(RetStmt R1, RetStmt R2) noexcept {
+    return R1.InFunction < R2.InFunction;
+  }
+  friend bool operator==(RetStmt R1, RetStmt R2) noexcept {
+    return R1.InFunction == R2.InFunction;
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("RetStmt { InFunction: ") + InFunction.str() + " }";
+  }
+};
+
+struct OperandOf {
+  uint32_t OperandIndex{};
+  LineColFunOp Inst{};
+
+  friend bool operator<(OperandOf R1, OperandOf R2) noexcept {
+    return std::tie(R1.OperandIndex, R2.Inst) <
+           std::tie(R2.OperandIndex, R2.Inst);
+  }
+  friend bool operator==(OperandOf R1, OperandOf R2) noexcept {
+    return R1.OperandIndex == R2.OperandIndex && R1.Inst == R2.Inst;
+  }
+  [[nodiscard]] std::string str() const {
+    return std::string("OperandOf { OperandIndex: ") +
+           std::to_string(OperandIndex) + "; Inst: " + Inst.str() + " }";
+  }
+};
+
+struct TestingSrcLocation
+    : public std::variant<LineCol, LineColFun, LineColFunOp, GlobalVar, ArgNo,
+                          ArgInFun, RetVal, RetStmt, OperandOf> {
+  using VarT = std::variant<LineCol, LineColFun, LineColFunOp, GlobalVar, ArgNo,
+                            ArgInFun, RetVal, RetStmt, OperandOf>;
+  using VarT::variant;
+
+  template <typename T> [[nodiscard]] constexpr bool isa() const noexcept {
+    return std::holds_alternative<T>(*this);
+  }
+  template <typename T>
+  [[nodiscard]] constexpr const T *dyn_cast() const noexcept {
+    return std::get_if<T>(this);
+  }
+  template <typename T> [[nodiscard]] constexpr T *dyn_cast() noexcept {
+    return std::get_if<T>(this);
+  }
+  [[nodiscard]] std::string str() const {
+    return std::visit([](const auto &Val) { return Val.str(); }, *this);
+  }
+
+  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                       const TestingSrcLocation &Loc) {
+    return OS << Loc.str();
+  }
+  friend std::ostream &operator<<(std::ostream &OS,
+                                  const TestingSrcLocation &Loc) {
+    return OS << Loc.str();
+  }
+};
+
+} // namespace psr::unittest
+
+namespace std {
+template <> struct hash<psr::unittest::LineCol> {
+  size_t operator()(psr::unittest::LineCol LC) const noexcept {
+    return llvm::hash_value(std::make_pair(LC.Line, LC.Col));
+  }
+};
+template <> struct hash<psr::unittest::LineColFun> {
+  size_t operator()(psr::unittest::LineColFun LCF) const noexcept {
+    return llvm::hash_combine(
+        llvm::hash_value(std::make_pair(LCF.Line, LCF.Col)), LCF.InFunction);
+  }
+};
+
+template <> struct hash<psr::unittest::LineColFunOp> {
+  size_t operator()(psr::unittest::LineColFunOp LCF) const noexcept {
+    return llvm::hash_combine(
+        llvm::hash_value(std::make_pair(LCF.Line, LCF.Col)), LCF.InFunction,
+        LCF.OpCode);
+  }
+};
+template <> struct hash<psr::unittest::GlobalVar> {
+  size_t operator()(psr::unittest::GlobalVar GV) const noexcept {
+    return llvm::hash_value(GV.Name);
+  }
+};
+template <> struct hash<psr::unittest::ArgNo> {
+  size_t operator()(psr::unittest::ArgNo Arg) const noexcept {
+    return llvm::hash_value(Arg.Idx);
+  }
+};
+template <> struct hash<psr::unittest::ArgInFun> {
+  size_t operator()(psr::unittest::ArgInFun Arg) const noexcept {
+    return llvm::hash_combine(Arg.Idx, Arg.InFunction);
+  }
+};
+
+template <> struct hash<psr::unittest::RetVal> {
+  size_t operator()(psr::unittest::RetVal Ret) const noexcept {
+    return llvm::hash_value(Ret.InFunction);
+  }
+};
+
+template <> struct hash<psr::unittest::RetStmt> {
+  size_t operator()(psr::unittest::RetStmt Ret) const noexcept {
+    return llvm::hash_value(Ret.InFunction);
+  }
+};
+
+template <> struct hash<psr::unittest::OperandOf> {
+  size_t operator()(psr::unittest::OperandOf Op) const noexcept {
+    return llvm::hash_combine(Op.OperandIndex,
+                              hash<psr::unittest::LineColFunOp>{}(Op.Inst));
+  }
+};
+
+template <> struct hash<psr::unittest::TestingSrcLocation> {
+  size_t
+  operator()(const psr::unittest::TestingSrcLocation &Loc) const noexcept {
+    return std::hash<psr::unittest::TestingSrcLocation::VarT>{}(Loc);
+  }
+};
+} // namespace std
+
+namespace psr::unittest {
+
+template <typename PredFn = psr::TrueFn>
+[[nodiscard]] inline const llvm::Instruction *
+getInstAtOrNull(const llvm::Function *F, uint32_t ReqLine,
+                uint32_t ReqColumn = 0, PredFn Pred = {}) {
+  assert(F != nullptr);
+  for (const auto &I : llvm::instructions(F)) {
+    if (I.isDebugOrPseudoInst()) {
+      continue;
+    }
+
+    auto [Line, Column] = psr::getLineAndColFromIR(&I);
+    if (Line == ReqLine && (ReqColumn == 0 || ReqColumn == Column) &&
+        std::invoke(Pred, &I)) {
+      return &I;
+    }
+  }
+  return nullptr;
+}
+
+[[nodiscard]] inline const llvm::Value *
+testingLocInIR(TestingSrcLocation Loc,
+               const ProjectIRDBBase<LLVMProjectIRDB> &IRDB,
+               const llvm::Function *InterestingFunction = nullptr) {
+  const auto GetFunction = [&IRDB](llvm::StringRef Name) {
+    const auto *InFun = IRDB.getFunctionDefinition(Name);
+    if (!InFun) {
+      llvm::report_fatal_error("Required function '" + Name +
+                               "' does not exist in the IR!");
+    }
+    return InFun;
+  };
+  const auto *Ret = std::visit(
+      psr::Overloaded{
+          [=](LineCol LC) -> llvm ::Value const * {
+            if (!InterestingFunction) {
+              llvm::report_fatal_error(
+                  "You must provide an InterestingFunction as last parameter "
+                  "to testingLocInIR(), if trying to resolve a LineCol; "
+                  "alternatively use LineColFun instead.");
+            }
+
+            return getInstAtOrNull(InterestingFunction, LC.Line, LC.Col);
+          },
+          [&](LineColFun LC) -> llvm ::Value const * {
+            const auto *InFun = GetFunction(LC.InFunction);
+            return getInstAtOrNull(InFun, LC.Line, LC.Col);
+          },
+          [&](LineColFunOp LC) -> llvm ::Value const * {
+            const auto *InFun = GetFunction(LC.InFunction);
+            return getInstAtOrNull(
+                InFun, LC.Line, LC.Col,
+                [Op = LC.OpCode](const llvm::Instruction *Inst) {
+                  // According to LLVM's doc on llvm::Value::getValueID(), there
+                  // cannot be any opcode==0, so we use it as wildcard here
+                  return Op == 0 || Inst->getOpcode() == Op;
+                });
+          },
+          [&IRDB](GlobalVar GV) -> llvm ::Value const * {
+            return IRDB.getModule()->getGlobalVariable(GV.Name, true);
+          },
+          [=](ArgNo A) -> llvm ::Value const * {
+            if (!InterestingFunction) {
+              llvm::report_fatal_error(
+                  "You must provide an InterestingFunction as last parameter "
+                  "to testingLocInIR(), if trying to resolve an ArgNo; "
+                  "alternatively use ArgInFun instead.");
+            }
+            if (InterestingFunction->arg_size() <= A.Idx) {
+              llvm::report_fatal_error(
+                  "Argument index " + llvm::Twine(A.Idx) +
+                  " is out of range (" +
+                  llvm::Twine(InterestingFunction->arg_size()) + ")!");
+            }
+            return InterestingFunction->getArg(A.Idx);
+          },
+          [&](ArgInFun A) -> llvm ::Value const * {
+            const auto *InFun = GetFunction(A.InFunction);
+            if (InFun->arg_size() <= A.Idx) {
+              llvm::report_fatal_error("Argument index " + llvm::Twine(A.Idx) +
+                                       " is out of range (" +
+                                       llvm::Twine(InFun->arg_size()) + ")!");
+            }
+            return InFun->getArg(A.Idx);
+          },
+          [&](RetVal R) -> llvm::Value const * {
+            const auto *InFun = GetFunction(R.InFunction);
+            for (const auto &BB : llvm::reverse(InFun->getBasicBlockList())) {
+              if (const auto *Ret =
+                      llvm::dyn_cast<llvm::ReturnInst>(BB.getTerminator())) {
+                return Ret->getReturnValue();
+              }
+            }
+            llvm::report_fatal_error("No return stmt in function " +
+                                     R.InFunction);
+          },
+          [&](RetStmt R) -> llvm::Value const * {
+            const auto *InFun = GetFunction(R.InFunction);
+            for (const auto &BB : llvm::reverse(InFun->getBasicBlockList())) {
+              if (const auto *Ret =
+                      llvm::dyn_cast<llvm::ReturnInst>(BB.getTerminator())) {
+                return Ret;
+              }
+            }
+            llvm::report_fatal_error("No return stmt in function " +
+                                     R.InFunction);
+          },
+          [&](OperandOf Op) -> llvm::Value const * {
+            const auto *Inst = llvm::dyn_cast_if_present<llvm::User>(
+                testingLocInIR(Op.Inst, IRDB));
+            if (!Inst) {
+              return nullptr;
+            }
+
+            if (Inst->getNumOperands() <= Op.OperandIndex) {
+              llvm::report_fatal_error("Requested operand index " +
+                                       llvm::Twine(Op.OperandIndex) +
+                                       " is out of bounds for instruction " +
+                                       llvm::Twine(llvmIRToString(Inst)));
+            }
+
+            return Inst->getOperand(Op.OperandIndex);
+          },
+      },
+      Loc);
+  if (!Ret) {
+    llvm::report_fatal_error("Cannot convert " + llvm::Twine(Loc.str()) +
+                             " to LLVM");
+  }
+  return Ret;
+}
+
+template <typename SetTy>
+[[nodiscard]] inline std::set<const llvm::Value *>
+convertTestingLocationSetInIR(
+    const SetTy &Locs, const ProjectIRDBBase<LLVMProjectIRDB> &IRDB,
+    const llvm::Function *InterestingFunction = nullptr) {
+  std::set<const llvm::Value *> Ret;
+  llvm::transform(Locs, std::inserter(Ret, Ret.end()),
+                  [&](TestingSrcLocation Loc) {
+                    return testingLocInIR(Loc, IRDB, InterestingFunction);
+                  });
+  return Ret;
+}
+
+template <typename MapTy>
+[[nodiscard]] inline auto convertTestingLocationSetMapInIR(
+    const MapTy &Locs, const ProjectIRDBBase<LLVMProjectIRDB> &IRDB,
+    const llvm::Function *InterestingFunction = nullptr) {
+  std::map<const llvm::Instruction *, std::set<const llvm::Value *>> Ret;
+  llvm::transform(
+      Locs, std::inserter(Ret, Ret.end()), [&](const auto &LocAndSet) {
+        const auto &[InstLoc, Set] = LocAndSet;
+        const auto *LocVal = testingLocInIR(InstLoc, IRDB, InterestingFunction);
+        const auto *LocInst =
+            llvm::dyn_cast_if_present<llvm::Instruction>(LocVal);
+        if (!LocInst) {
+          llvm::report_fatal_error(
+              "Cannot convert " + llvm::Twine(InstLoc.str()) +
+              (LocVal ? " aka. " + llvmIRToString(LocVal) : "") +
+              " to an LLVM instruction");
+        }
+        auto ConvSet =
+            convertTestingLocationSetInIR(Set, IRDB, InterestingFunction);
+        return std::make_pair(LocInst, std::move(ConvSet));
+      });
+  return Ret;
+}
+
+} // namespace psr::unittest
+
+#endif // PHASAR_UNITTESTS_TESTUTILS_SRCCODELOCATIONENTRY_H
diff --git a/unittests/Utils/AnalysisPrinterTest.cpp b/unittests/Utils/AnalysisPrinterTest.cpp
index f189afef29..c51ccb862d 100644
--- a/unittests/Utils/AnalysisPrinterTest.cpp
+++ b/unittests/Utils/AnalysisPrinterTest.cpp
@@ -11,12 +11,16 @@
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/DefaultAnalysisPrinter.h"
 
-#include "llvm/ADT/DenseMap.h"
+#include "llvm/IR/Instruction.h"
+#include "llvm/Support/raw_ostream.h"
 
+#include "SrcCodeLocationEntry.h"
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
 using namespace psr;
+using namespace psr::unittest;
+
 using CallBackPairTy = std::pair<IDEExtendedTaintAnalysis<>::config_callback_t,
                                  IDEExtendedTaintAnalysis<>::config_callback_t>;
 
@@ -30,36 +34,47 @@ class GroundTruthCollector
 
 public:
   // constructor init Groundtruth in each fixture
-  GroundTruthCollector(llvm::DenseMap<int, std::set<std::string>> &GroundTruth)
-      : GroundTruth(GroundTruth) {};
-
-  void findAndRemove(llvm::DenseMap<int, std::set<std::string>> &Map1,
-                     llvm::DenseMap<int, std::set<std::string>> &Map2) {
-    for (auto Entry = Map1.begin(); Entry != Map1.end();) {
-      auto Iter = Map2.find(Entry->first);
-      if (Iter != Map2.end() && Iter->second == Entry->second) {
-        Map2.erase(Iter);
-      }
-      ++Entry;
-    }
-  }
+  GroundTruthCollector(
+      const LLVMProjectIRDB &IRDB,
+      const std::map<TestingSrcLocation, std::set<TestingSrcLocation>>
+          &GroundTruth)
+      : GroundTruth(convertTestingLocationSetMapInIR(GroundTruth, IRDB)) {};
 
 private:
   void doOnResult(n_t Instr, d_t DfFact, l_t /*LatticeElement*/,
                   DataFlowAnalysisType /*AnalysisType*/) override {
-    llvm::DenseMap<int, std::set<std::string>> FoundLeak;
-    int SinkId = stoi(getMetaDataID(Instr));
-    std::set<std::string> LeakedValueIds;
-    LeakedValueIds.insert(getMetaDataID((DfFact)->base()));
-    FoundLeak.try_emplace(SinkId, LeakedValueIds);
-    findAndRemove(FoundLeak, GroundTruth);
+
+    auto It = GroundTruth.find(Instr);
+    EXPECT_TRUE(It != GroundTruth.end() && It->second.erase(DfFact->base()))
+        << "Did not expect finding a leak of " << DToString(DfFact) << " at "
+        << llvmIRToString(Instr) << '\n';
+    if (It != GroundTruth.end() && It->second.empty()) {
+      GroundTruth.erase(It);
+    }
+  }
+
+  std::string printGroundTruth() {
+    std::string Ret;
+    llvm::raw_string_ostream OS(Ret);
+    OS << "{\n";
+    for (const auto &[Inst, Facts] : GroundTruth) {
+      OS << "  " << llvmIRToString(Inst) << ": {\n";
+      for (const auto *Val : Facts) {
+        OS << "    " << llvmIRToString(Val) << '\n';
+      }
+    }
+    OS << "}\n";
+
+    return Ret;
   }
 
   void doOnFinalize(llvm::raw_ostream & /*OS*/) override {
-    EXPECT_TRUE(GroundTruth.empty());
+    EXPECT_TRUE(GroundTruth.empty())
+        << "Elements of GroundTruth not found: " << printGroundTruth();
   }
 
-  llvm::DenseMap<int, std::set<std::string>> GroundTruth{};
+  std::map<const llvm::Instruction *, std::set<const llvm::Value *>>
+      GroundTruth{};
 };
 
 class AnalysisPrinterTest : public ::testing::Test {
@@ -68,7 +83,8 @@ class AnalysisPrinterTest : public ::testing::Test {
   const std::vector<std::string> EntryPoints = {"main"};
 
   void doAnalysisTest(
-      llvm::StringRef IRFile, GroundTruthCollector &GTPrinter,
+      llvm::StringRef IRFile,
+      const std::map<TestingSrcLocation, std::set<TestingSrcLocation>> &GT,
       std::variant<std::monostate, TaintConfigData *, CallBackPairTy> Config) {
     HelperAnalyses Helpers(PathToLlFiles + IRFile, EntryPoints);
 
@@ -89,7 +105,8 @@ class AnalysisPrinterTest : public ::testing::Test {
     auto TaintProblem = createAnalysisProblem<IDEExtendedTaintAnalysis<>>(
         Helpers, TConfig, EntryPoints);
 
-    TaintProblem.setAnalysisPrinter(&GTPrinter);
+    GroundTruthCollector GTCollector(Helpers.getProjectIRDB(), GT);
+    TaintProblem.setAnalysisPrinter(&GTCollector);
     IDESolver Solver(TaintProblem, &Helpers.getICFG());
     Solver.solve();
 
@@ -100,8 +117,10 @@ class AnalysisPrinterTest : public ::testing::Test {
 /* ============== BASIC TESTS ============== */
 
 TEST_F(AnalysisPrinterTest, HandleBasicTest_01) {
-  llvm::DenseMap<int, std::set<std::string>> GroundTruth;
-  GroundTruth[7] = {"0"};
+  std::map<TestingSrcLocation, std::set<TestingSrcLocation>> GroundTruth;
+  GroundTruth[LineColFun{8, 3, "main"}] = {
+      LineColFun{4, 14, "main"},
+  };
 
   TaintConfigData Config;
 
@@ -116,16 +135,16 @@ TEST_F(AnalysisPrinterTest, HandleBasicTest_01) {
   Config.Functions.push_back(std::move(FuncDataMain));
   Config.Functions.push_back(std::move(FuncDataPrint));
 
-  GroundTruthCollector GroundTruthPrinter = {GroundTruth};
-  doAnalysisTest("xtaint01_json_cpp_dbg.ll", GroundTruthPrinter, &Config);
+  doAnalysisTest("xtaint01_json_cpp_dbg.ll", GroundTruth, &Config);
 }
 
 TEST_F(AnalysisPrinterTest, XTaint01) {
-  llvm::DenseMap<int, std::set<std::string>> GroundTruth;
+  std::map<TestingSrcLocation, std::set<TestingSrcLocation>> GroundTruth;
 
-  GroundTruth[13] = {"7"};
-  GroundTruthCollector GroundTruthPrinter = {GroundTruth};
-  doAnalysisTest("xtaint01_cpp.ll", GroundTruthPrinter, std::monostate{});
+  GroundTruth[LineColFun{8, 3, "main"}] = {
+      LineColFun{7, 48, "main"},
+  };
+  doAnalysisTest("xtaint01_cpp_dbg.ll", GroundTruth, std::monostate{});
 }
 
 // main function for the test case

From 1e857b1c36be14e62d7703be04bf4a52cccfd2cd Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 8 Sep 2025 15:20:44 +0200
Subject: [PATCH 17/24] Call-Graph Improvements (#785)

* minor fix in CHA and RTA resolvers

* Several small improvements for call-graph resolving

* Fix out-of-bounds access in getVarTypeFromIR()

* Add address-taken functions caching in base resolver

* Some cleanup in resolvers

* pre-commit

* Fix bug in the overloads of buildLLVMBasedCallGraph() that takes a CallGraphAnalysisType
---
 .../ControlFlow/Resolver/CHAResolver.h        |   4 -
 .../ControlFlow/Resolver/NOResolver.h         |   4 -
 .../ControlFlow/Resolver/OTFResolver.h        |  23 +---
 .../ControlFlow/Resolver/RTAResolver.h        |   2 -
 .../ControlFlow/Resolver/Resolver.h           |  65 ++++++----
 .../ControlFlow/LLVMBasedCallGraphBuilder.cpp |   9 +-
 .../ControlFlow/Resolver/CHAResolver.cpp      |   5 -
 .../ControlFlow/Resolver/NOResolver.cpp       |   6 -
 .../ControlFlow/Resolver/OTFResolver.cpp      | 113 ++++++++----------
 .../ControlFlow/Resolver/Resolver.cpp         | 101 +++++++++++++++-
 10 files changed, 194 insertions(+), 138 deletions(-)

diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
index 8186bdba16..f4b73965cb 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h
@@ -20,10 +20,6 @@
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
 #include "phasar/Utils/MaybeUniquePtr.h"
 
-namespace llvm {
-class CallBase;
-} // namespace llvm
-
 namespace psr {
 class DIBasedTypeHierarchy;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
index 044815e287..439afd2a72 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h
@@ -12,10 +12,6 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
 
-namespace llvm {
-class CallBase;
-} // namespace llvm
-
 namespace psr {
 
 /// \brief A resolver that doesn't resolve indirect- and virtual calls
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
index 41b3f6e878..ee0265a38d 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/OTFResolver.h
@@ -20,22 +20,8 @@
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-namespace llvm {
-class CallBase;
-class Function;
-class Type;
-class Value;
-} // namespace llvm
-
 namespace psr {
 
-class DIBasedTypeHierarchy;
-
 /// \brief A resolver that uses alias information to resolve indirect and
 /// virtual calls
 class OTFResolver : public Resolver {
@@ -54,18 +40,11 @@ class OTFResolver : public Resolver {
   void resolveFunctionPointer(FunctionSetTy &PossibleTargets,
                               const llvm::CallBase *CallSite) override;
 
-  static std::set<const llvm::Type *>
-  getReachableTypes(const LLVMAliasInfo::AliasSetTy &Values);
-
-  static std::vector<std::pair<const llvm::Value *, const llvm::Value *>>
-  getActualFormalPointerPairs(const llvm::CallBase *CallSite,
-                              const llvm::Function *CalleeTarget);
-
   [[nodiscard]] std::string str() const override;
 
   [[nodiscard]] bool
   mutatesHelperAnalysisInformation() const noexcept override {
-    return true;
+    return !PT.isInterProcedural();
   }
 
 protected:
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
index 6e89063a9d..f9165a7d96 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h
@@ -22,12 +22,10 @@
 #include <vector>
 
 namespace llvm {
-class CallBase;
 class DICompositeType;
 } // namespace llvm
 
 namespace psr {
-class DIBasedTypeHierarchy;
 
 /// \brief A resolver that performs Rapid Type Analysis to resolve calls
 /// to C++ virtual functions. Requires debug information.
diff --git a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
index 09b8147424..cc1e31100a 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h
@@ -20,6 +20,7 @@
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
 #include "llvm/ADT/DenseSet.h"
+#include "llvm/ADT/SmallVector.h"
 #include "llvm/IR/DerivedTypes.h"
 
 #include <memory>
@@ -44,6 +45,10 @@ enum class CallGraphAnalysisType;
 [[nodiscard]] std::optional<unsigned>
 getVFTIndex(const llvm::CallBase *CallSite);
 
+/// Similar to getVFTIndex(), but also returns a pointer to the vtable
+[[nodiscard]] std::optional<std::pair<const llvm::Value *, uint64_t>>
+getVFTIndexAndVT(const llvm::CallBase *CallSite);
+
 /// Assuming that `CallSite` is a call to a non-static member function,
 /// retrieves the type of the receiver. Returns nullptr, if the receiver-type
 /// could not be extracted
@@ -67,25 +72,16 @@ getReceiverType(const llvm::CallBase *CallSite);
 [[nodiscard]] bool isVirtualCall(const llvm::Instruction *Inst,
                                  const LLVMVFTableProvider &VTP);
 
+/// A variant of F->hasAddressTaken() that is better suited for our use cases.
+///
+/// Especially, it filteres out global aliases.
+[[nodiscard]] bool isAddressTakenFunction(const llvm::Function *F);
+
 /// \brief A base class for call-target resolvers. Used to build call graphs.
 ///
 /// Create a specific resolver by making a new class, inheriting this resolver
 /// class and implementing the virtual functions as needed.
 class Resolver {
-protected:
-  const LLVMProjectIRDB *IRDB;
-  const LLVMVFTableProvider *VTP;
-
-  const llvm::Function *
-  getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
-                            const llvm::CallBase *CallSite,
-                            const llvm::DIType *ReceiverType) {
-    if (!VTP) {
-      return nullptr;
-    }
-    return psr::getNonPureVirtualVFTEntry(T, Idx, CallSite, *VTP, ReceiverType);
-  }
-
 public:
   using FunctionSetTy = llvm::SmallDenseSet<const llvm::Function *, 4>;
 
@@ -93,17 +89,23 @@ class Resolver {
 
   virtual ~Resolver() = default;
 
-  virtual void preCall(const llvm::Instruction *Inst);
+  [[deprecated("With the removal of DTAResolver, this is not used "
+               "anymore")]] virtual void
+  preCall(const llvm::Instruction *Inst);
 
   virtual void handlePossibleTargets(const llvm::CallBase *CallSite,
                                      FunctionSetTy &PossibleTargets);
 
-  virtual void postCall(const llvm::Instruction *Inst);
+  [[deprecated("With the removal of DTAResolver, this is not used "
+               "anymore")]] virtual void
+  postCall(const llvm::Instruction *Inst);
 
   [[nodiscard]] FunctionSetTy
   resolveIndirectCall(const llvm::CallBase *CallSite);
 
-  virtual void otherInst(const llvm::Instruction *Inst);
+  [[deprecated("With the removal of DTAResolver, this is not used "
+               "anymore")]] virtual void
+  otherInst(const llvm::Instruction *Inst);
 
   [[nodiscard]] virtual std::string str() const = 0;
 
@@ -115,11 +117,30 @@ class Resolver {
     // Conservatively returns true. Override if possible
     return true;
   }
-  static std::unique_ptr<Resolver> create(CallGraphAnalysisType Ty,
-                                          const LLVMProjectIRDB *IRDB,
-                                          const LLVMVFTableProvider *VTP,
-                                          const DIBasedTypeHierarchy *TH,
-                                          LLVMAliasInfoRef PT = nullptr);
+
+  [[nodiscard]] llvm::ArrayRef<const llvm::Function *>
+  getAddressTakenFunctions();
+
+  [[nodiscard]] static std::unique_ptr<Resolver>
+  create(CallGraphAnalysisType Ty, const LLVMProjectIRDB *IRDB,
+         const LLVMVFTableProvider *VTP, const DIBasedTypeHierarchy *TH,
+         LLVMAliasInfoRef PT = nullptr);
+
+protected:
+  const llvm::Function *
+  getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
+                            const llvm::CallBase *CallSite,
+                            const llvm::DIType *ReceiverType) {
+    if (!VTP) {
+      return nullptr;
+    }
+    return psr::getNonPureVirtualVFTEntry(T, Idx, CallSite, *VTP, ReceiverType);
+  }
+
+  const LLVMProjectIRDB *IRDB{};
+  const LLVMVFTableProvider *VTP{};
+  std::optional<llvm::SmallVector<const llvm::Function *, 0>>
+      AddressTakenFunctions{};
 
 protected:
   virtual void resolveVirtualCall(FunctionSetTy &PossibleTargets,
diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
index e3f65c00ec..492176a510 100644
--- a/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
+++ b/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
@@ -153,13 +153,9 @@ bool Builder::processFunction(const llvm::Function *F) {
   for (const auto &I : llvm::instructions(F)) {
     const auto *CS = llvm::dyn_cast<llvm::CallBase>(&I);
     if (!CS) {
-      Res->otherInst(&I);
       continue;
     }
 
-    Res->preCall(&I);
-    scope_exit PostCall = [&] { Res->postCall(&I); };
-
     FixpointReached &=
         fillPossibleTargets(PossibleTargets, *Res, CS, IndirectCalls);
 
@@ -203,9 +199,6 @@ bool Builder::constructDynamicCall(const llvm::Instruction *CS) {
                        "Looking into dynamic call-site: ");
   PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMBasedICFG", "  " << llvmIRToString(CS));
 
-  Res->preCall(CallSite);
-  scope_exit PostCall = [&] { Res->postCall(CallSite); };
-
   // call the resolve routine
 
   auto PossibleTargets = Res->resolveIndirectCall(CallSite);
@@ -275,7 +268,7 @@ auto psr::buildLLVMBasedCallGraph(
     PT = PTOwn.asRef();
   }
 
-  auto Res = Resolver::create(CGType, &IRDB, &VTP, &TH);
+  auto Res = Resolver::create(CGType, &IRDB, &VTP, &TH, PT);
   return buildLLVMBasedCallGraph(IRDB, *Res, EntryPoints, S);
 }
 
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
index 393e810fb1..56b9565a80 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp
@@ -21,15 +21,10 @@
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Module.h"
 
 #include <memory>
 
-using namespace std;
 using namespace psr;
 
 CHAResolver::CHAResolver(const LLVMProjectIRDB *IRDB,
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp
index 9dc6a56c28..7b962135eb 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/NOResolver.cpp
@@ -16,12 +16,8 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/NOResolver.h"
 
-#include <set>
-
 using namespace psr;
 
-namespace psr {
-
 NOResolver::NOResolver(const LLVMProjectIRDB *IRDB,
                        const LLVMVFTableProvider *VTP)
     : Resolver(IRDB, VTP) {}
@@ -33,5 +29,3 @@ void NOResolver::resolveFunctionPointer(FunctionSetTy & /*PossibleTargets*/,
                                         const llvm::CallBase * /*CallSite*/) {}
 
 std::string NOResolver::str() const { return "NOResolver"; }
-
-} // namespace psr
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
index c4168649c9..5adf72192c 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
@@ -22,7 +22,6 @@
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/Module.h"
 #include "llvm/Support/Casting.h"
@@ -34,6 +33,55 @@ OTFResolver::OTFResolver(const LLVMProjectIRDB *IRDB,
                          const LLVMVFTableProvider *VTP, LLVMAliasInfoRef PT)
     : Resolver(IRDB, VTP), PT(PT) {}
 
+static std::vector<std::pair<const llvm::Value *, const llvm::Value *>>
+getActualFormalPointerPairs(const llvm::CallBase *CallSite,
+                            const llvm::Function *CalleeTarget) {
+  std::vector<std::pair<const llvm::Value *, const llvm::Value *>> Pairs;
+  Pairs.reserve(CallSite->arg_size());
+  // ordinary case
+
+  unsigned Idx = 0;
+  for (; Idx < CallSite->arg_size() && Idx < CalleeTarget->arg_size(); ++Idx) {
+    // only collect pointer typed pairs
+    if (CallSite->getArgOperand(Idx)->getType()->isPointerTy() &&
+        CalleeTarget->getArg(Idx)->getType()->isPointerTy()) {
+      Pairs.emplace_back(CallSite->getArgOperand(Idx),
+                         CalleeTarget->getArg(Idx));
+    }
+  }
+
+  if (CalleeTarget->isVarArg()) {
+    // in case of vararg, we can pair-up incoming pointer parameters with the
+    // vararg pack of the callee target. the vararg pack will alias
+    // (intra-procedurally) with any pointer values loaded from the pack
+    const llvm::AllocaInst *VarArgs = nullptr;
+
+    for (const auto &I : llvm::instructions(CalleeTarget)) {
+      if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(&I)) {
+        if (const auto *AT =
+                llvm::dyn_cast<llvm::ArrayType>(Alloca->getAllocatedType())) {
+          if (const auto *ST =
+                  llvm::dyn_cast<llvm::StructType>(AT->getArrayElementType())) {
+            if (ST->hasName() && ST->getName() == "struct.__va_list_tag") {
+              VarArgs = Alloca;
+              break;
+            }
+          }
+        }
+      }
+    }
+
+    if (VarArgs) {
+      for (; Idx < CallSite->arg_size(); ++Idx) {
+        if (CallSite->getArgOperand(Idx)->getType()->isPointerTy()) {
+          Pairs.emplace_back(CallSite->getArgOperand(Idx), VarArgs);
+        }
+      }
+    }
+  }
+  return Pairs;
+}
+
 void OTFResolver::handlePossibleTargets(const llvm::CallBase *CallSite,
                                         FunctionSetTy &CalleeTargets) {
   // if we have no inter-procedural points-to information, use call-graph
@@ -71,7 +119,7 @@ void OTFResolver::resolveVirtualCall(FunctionSetTy &PossibleTargets,
   PHASAR_LOG_LEVEL(DEBUG,
                    "Call virtual function: " << llvmIRToString(CallSite));
 
-  auto RetrievedVtableIndex = getVFTIndex(CallSite);
+  auto RetrievedVtableIndex = getVFTIndexAndVT(CallSite);
   if (!RetrievedVtableIndex.has_value()) {
     // An error occured
     PHASAR_LOG_LEVEL(DEBUG,
@@ -81,11 +129,12 @@ void OTFResolver::resolveVirtualCall(FunctionSetTy &PossibleTargets,
     return;
   }
 
-  auto VtableIndex = RetrievedVtableIndex.value();
+  auto [VtablePtr, VtableIndex] = RetrievedVtableIndex.value();
 
   PHASAR_LOG_LEVEL(DEBUG, "Virtual function table entry is: " << VtableIndex);
 
-  auto PTS = PT.getAliasSet(CallSite->getCalledOperand(), CallSite);
+  auto PTS = PT.getAliasSet(VtablePtr, CallSite);
+
   for (const auto *P : *PTS) {
     if (const auto *PGV = llvm::dyn_cast<llvm::GlobalVariable>(P)) {
       if (PGV->hasName() &&
@@ -201,60 +250,4 @@ void OTFResolver::resolveFunctionPointer(FunctionSetTy &PossibleTargets,
   }
 }
 
-std::set<const llvm::Type *>
-OTFResolver::getReachableTypes(const LLVMAliasInfo::AliasSetTy &Values) {
-  std::set<const llvm::Type *> Types;
-  // an allocation site can either be an AllocaInst or a call to an
-  // allocating function
-  for (const auto *V : Values) {
-    if (const auto *Alloc = llvm::dyn_cast<llvm::AllocaInst>(V)) {
-      Types.insert(Alloc->getAllocatedType());
-    } else {
-      // usually if an allocating function is called, it is immediately
-      // bit-casted
-      // to the desired allocated value and hence we can determine it from
-      // the destination type of that cast instruction.
-      for (const auto *User : V->users()) {
-        if (const auto *Cast = llvm::dyn_cast<llvm::BitCastInst>(User)) {
-          Types.insert(Cast->getDestTy());
-        }
-      }
-    }
-  }
-  return Types;
-}
-
-std::vector<std::pair<const llvm::Value *, const llvm::Value *>>
-OTFResolver::getActualFormalPointerPairs(const llvm::CallBase *CallSite,
-                                         const llvm::Function *CalleeTarget) {
-  std::vector<std::pair<const llvm::Value *, const llvm::Value *>> Pairs;
-  Pairs.reserve(CallSite->arg_size());
-  // ordinary case
-
-  unsigned Idx = 0;
-  for (; Idx < CallSite->arg_size() && Idx < CalleeTarget->arg_size(); ++Idx) {
-    // only collect pointer typed pairs
-    if (CallSite->getArgOperand(Idx)->getType()->isPointerTy() &&
-        CalleeTarget->getArg(Idx)->getType()->isPointerTy()) {
-      Pairs.emplace_back(CallSite->getArgOperand(Idx),
-                         CalleeTarget->getArg(Idx));
-    }
-  }
-
-  if (CalleeTarget->isVarArg()) {
-    // in case of vararg, we can pair-up incoming pointer parameters with the
-    // vararg pack of the callee target. the vararg pack will alias
-    // (intra-procedurally) with any pointer values loaded from the pack
-
-    if (const auto *VarArgs = getVaListTagOrNull(*CalleeTarget)) {
-      for (; Idx < CallSite->arg_size(); ++Idx) {
-        if (CallSite->getArgOperand(Idx)->getType()->isPointerTy()) {
-          Pairs.emplace_back(CallSite->getArgOperand(Idx), VarArgs);
-        }
-      }
-    }
-  }
-  return Pairs;
-}
-
 std::string OTFResolver::str() const { return "OTF"; }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
index f97fc8c1f1..a1d8bd5b1c 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
@@ -35,6 +35,7 @@
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
+#include "llvm/IR/IntrinsicInst.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
@@ -42,6 +43,8 @@
 #include <memory>
 #include <optional>
 
+using namespace psr;
+
 std::optional<unsigned> psr::getVFTIndex(const llvm::CallBase *CallSite) {
   // deal with a virtual member function
   // retrieve the vtable entry that is called
@@ -61,6 +64,29 @@ std::optional<unsigned> psr::getVFTIndex(const llvm::CallBase *CallSite) {
   return std::nullopt;
 }
 
+std::optional<std::pair<const llvm::Value *, uint64_t>>
+psr::getVFTIndexAndVT(const llvm::CallBase *CallSite) {
+  // deal with a virtual member function
+  // retrieve the vtable entry that is called
+  const auto *Load =
+      llvm::dyn_cast<llvm::LoadInst>(CallSite->getCalledOperand());
+  if (Load == nullptr) {
+    return std::nullopt;
+  }
+
+  const auto *GEP =
+      llvm::dyn_cast<llvm::GetElementPtrInst>(Load->getPointerOperand());
+  if (GEP == nullptr) {
+    return std::nullopt;
+  }
+
+  if (auto *CI = llvm::dyn_cast<llvm::ConstantInt>(GEP->getOperand(1))) {
+    return {{GEP->getPointerOperand(), CI->getZExtValue()}};
+  }
+
+  return std::nullopt;
+}
+
 static const llvm::DIType *stripPointerTypes(const llvm::DIType *DITy) {
   while (const auto *DerivedTy =
              llvm::dyn_cast_if_present<llvm::DIDerivedType>(DITy)) {
@@ -155,7 +181,59 @@ bool psr::isVirtualCall(const llvm::Instruction *Inst,
   return getVFTIndex(CallSite) >= 0;
 }
 
-namespace psr {
+// Derived from LLVM's llvm::Function::hasAddressTaken()
+static bool isAddressTakenImpl(const llvm::Value *F) {
+  if (!F) {
+    return false;
+  }
+
+  for (const auto &Use : F->uses()) {
+    const auto *User = Use.getUser();
+
+    if (llvm::isa<llvm::GlobalAlias>(User)) {
+      if (isAddressTakenImpl(User)) {
+        return true;
+      }
+
+      continue;
+    }
+
+    if (const auto *Glob = llvm::dyn_cast<llvm::GlobalVariable>(User)) {
+      if (Glob->getName() == "llvm.compiler.used" ||
+          Glob->getName() == "llvm.used") {
+        continue;
+      }
+
+      return true;
+    }
+
+    const auto *Call = llvm::dyn_cast<llvm::CallBase>(User);
+    if (!Call) {
+      return true;
+    }
+
+    if (Call->isDebugOrPseudoInst()) {
+      continue;
+    }
+
+    const auto *Intrinsic = llvm::dyn_cast<llvm::IntrinsicInst>(Call);
+    if (Intrinsic && Intrinsic->isAssumeLikeIntrinsic()) {
+      continue;
+    }
+
+    if (Call->isCallee(&Use)) {
+      continue;
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+bool psr::isAddressTakenFunction(const llvm::Function *F) {
+  return isAddressTakenImpl(F);
+}
 
 Resolver::Resolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP)
     : IRDB(IRDB), VTP(VTP) {
@@ -183,6 +261,21 @@ auto Resolver::resolveIndirectCall(const llvm::CallBase *CallSite)
   return PossibleTargets;
 }
 
+llvm::ArrayRef<const llvm::Function *> Resolver::getAddressTakenFunctions() {
+  if (!AddressTakenFunctions) {
+    auto &ATF = AddressTakenFunctions.emplace();
+    // XXX: Find better heuristic
+    ATF.reserve(IRDB->getNumFunctions() / 2);
+    for (const auto *F : IRDB->getAllFunctions()) {
+      if (isAddressTakenFunction(F)) {
+        ATF.push_back(F);
+      }
+    }
+  }
+
+  return *AddressTakenFunctions;
+}
+
 void Resolver::resolveFunctionPointer(FunctionSetTy &PossibleTargets,
                                       const llvm::CallBase *CallSite) {
   // we may wish to optimise this function
@@ -191,8 +284,8 @@ void Resolver::resolveFunctionPointer(FunctionSetTy &PossibleTargets,
   PHASAR_LOG_LEVEL(DEBUG,
                    "Call function pointer: " << llvmIRToString(CallSite));
 
-  for (const auto *F : IRDB->getAllFunctions()) {
-    if (F->hasAddressTaken() && isConsistentCall(CallSite, F)) {
+  for (const auto *F : getAddressTakenFunctions()) {
+    if (isConsistentCall(CallSite, F)) {
       PossibleTargets.insert(F);
     }
   }
@@ -230,5 +323,3 @@ std::unique_ptr<Resolver> Resolver::create(CallGraphAnalysisType Ty,
   llvm_unreachable("All possible callgraph algorithms should be handled in the "
                    "above switch");
 }
-
-} // namespace psr

From 814ae82e4cfcedb6416265a500c613a3d6d246d6 Mon Sep 17 00:00:00 2001
From: Maximilian Leo Huber <huber.maximilian.leo@gmail.com>
Date: Mon, 8 Sep 2025 13:48:26 +0000
Subject: [PATCH 18/24] Dbg-Info based Type Matching (#791)

* moved stripPointerTypes() + debug prints

* MetadataKind approach

* I think we don't get around using getName()

* unittests still fail

* bugfix + cleanup

* Some cleanup

* Implement allocated-types collection in terms of debug info

* Fix libdeps

* Remove some unneeded includes

---------

Co-authored-by: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Co-authored-by: Fabian Schiebel <fabian.schiebel@iem.fraunhofer.de>
---
 .../IfdsIde/Problems/IDETypeStateAnalysis.h   | 14 ++--
 .../CSTDFILEIOTypeStateDescription.h          |  1 -
 .../OpenSSLEVPKDFDescription.h                |  1 -
 .../TypeStateDescription.h                    |  6 +-
 .../Passes/GeneralStatisticsAnalysis.h        |  4 +-
 .../phasar/PhasarLLVM/Utils/AllocatedTypes.h  | 23 +++++++
 .../phasar/PhasarLLVM/Utils/LLVMShorthands.h  | 10 +++
 .../ControlFlow/Resolver/RTAResolver.cpp      | 51 +-------------
 .../ControlFlow/Resolver/Resolver.cpp         |  9 ---
 .../IfdsIde/Problems/IDETypeStateAnalysis.cpp | 69 ++++---------------
 .../CSTDFILEIOTypeStateDescription.cpp        |  4 +-
 .../OpenSSLEVPKDFCTXDescription.cpp           |  4 +-
 .../OpenSSLEVPKDFDescription.cpp              |  4 +-
 .../OpenSSLSecureHeapDescription.cpp          |  2 +-
 .../OpenSSLSecureMemoryDescription.cpp        |  2 +-
 .../Passes/GeneralStatisticsAnalysis.cpp      | 35 ++--------
 lib/PhasarLLVM/Utils/AllocatedTypes.cpp       | 62 +++++++++++++++++
 lib/PhasarLLVM/Utils/LLVMShorthands.cpp       | 37 ++++++++++
 18 files changed, 170 insertions(+), 168 deletions(-)
 create mode 100644 include/phasar/PhasarLLVM/Utils/AllocatedTypes.h
 create mode 100644 lib/PhasarLLVM/Utils/AllocatedTypes.cpp

diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
index 0b68a4f7ac..a09c1a63b1 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
@@ -15,6 +15,7 @@
 #include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 #include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
@@ -35,9 +36,6 @@
 
 namespace psr {
 
-class LLVMBasedICFG;
-class LLVMTypeHierarchy;
-
 namespace detail {
 
 class IDETypeStateAnalysisBaseCommon : public LLVMAnalysisDomainDefault {
@@ -123,7 +121,7 @@ class IDETypeStateAnalysisBase
   container_type getLocalAliasesAndAllocas(d_t V, llvm::StringRef Fname);
 
   /**
-   * @brief Checks if the type machtes the type of interest.
+   * @brief Checks if the type matches the type of interest.
    */
   bool hasMatchingType(d_t V);
 
@@ -132,7 +130,7 @@ class IDETypeStateAnalysisBase
     return generateFlow(FactToGenerate, LLVMZeroValue::getInstance());
   }
 
-  bool hasMatchingTypeName(const llvm::Type *Ty);
+  bool hasMatchingTypeName(const llvm::DIType *DITy);
 
   std::map<const llvm::Value *, LLVMAliasInfo::AliasSetTy> AliasCache;
   LLVMAliasInfoRef PT{};
@@ -283,11 +281,7 @@ class IDETypeStateAnalysis
     template <typename LL = l_t,
               typename = std::enable_if_t<HasJoinLatticeTraits<LL>>>
     TSConstant(l_t Value, EmptyType /*unused*/ = {}) noexcept
-        : ConstantEdgeFunction<l_t>{Value} {
-      if constexpr (!HasJoinLatticeTraits<l_t>) {
-        this->TSD = TSD;
-      }
-    }
+        : ConstantEdgeFunction<l_t>{Value} {}
 
     /// XXX: Cannot default compose() and join(), because l_t does not implement
     /// JoinLatticeTraits (because bottom value is not constant)
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
index 9c4da46d74..d5a9b4f869 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h
@@ -15,7 +15,6 @@
 
 #include "llvm/Support/raw_ostream.h"
 
-#include <map>
 #include <set>
 #include <string>
 
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
index 324333c623..27eed099ea 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h
@@ -12,7 +12,6 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
 
-#include <map>
 #include <set>
 #include <string>
 
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
index 0e6865686b..169b2b8f1e 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h
@@ -12,11 +12,13 @@
 
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
 
-#include "llvm/IR/InstrTypes.h"
-
 #include <set>
 #include <string>
 
+namespace llvm {
+class CallBase;
+} // namespace llvm
+
 namespace psr {
 
 struct TypeStateDescriptionBase {
diff --git a/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h b/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
index fddf1e98d5..fce1a4103b 100644
--- a/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
+++ b/include/phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h
@@ -20,6 +20,7 @@
 #include "llvm/IR/PassManager.h"
 
 #include <set>
+#include <vector>
 
 namespace llvm {
 class Type;
@@ -27,6 +28,7 @@ class Value;
 class Instruction;
 class AnalysisUsage;
 class Module;
+class DICompositeType;
 } // namespace llvm
 
 namespace psr {
@@ -67,7 +69,7 @@ struct GeneralStatistics {
   size_t NumInstWithMultipleUses = 0;
   size_t NumInstsUsedOutsideBB = 0;
   size_t NonVoidInsts = 0;
-  std::set<const llvm::Type *> AllocatedTypes;
+  std::vector<const llvm::DICompositeType *> AllocatedTypes;
   std::set<const llvm::Instruction *> AllocaInstructions;
   std::set<const llvm::Instruction *> RetResInstructions;
   std::string ModuleName{};
diff --git a/include/phasar/PhasarLLVM/Utils/AllocatedTypes.h b/include/phasar/PhasarLLVM/Utils/AllocatedTypes.h
new file mode 100644
index 0000000000..eeba5632ee
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Utils/AllocatedTypes.h
@@ -0,0 +1,23 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_UTILS_ALLOCATEDTYPES_H
+#define PHASAR_PHASARLLVM_UTILS_ALLOCATEDTYPES_H
+
+#include "llvm/IR/DebugInfoMetadata.h"
+#include "llvm/IR/Module.h"
+
+#include <vector>
+
+namespace psr {
+[[nodiscard]] std::vector<const llvm::DICompositeType *>
+collectAllocatedTypes(const llvm::Module &Mod);
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_UTILS_ALLOCATEDTYPES_H
diff --git a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
index f4fad2d4cb..582fef9500 100644
--- a/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
+++ b/include/phasar/PhasarLLVM/Utils/LLVMShorthands.h
@@ -104,6 +104,14 @@ std::string llvmIRToShortString(const llvm::Value *V);
 [[nodiscard]] std::string llvmTypeToString(const llvm::Type *Ty,
                                            bool Shorten = false);
 
+/**
+ * @brief Returns a string-representation of a LLVM Debug-Info type.
+ *
+ * @param Shorten Tries to shorten the output
+ */
+[[nodiscard]] std::string llvmTypeToString(const llvm::DIType *Ty,
+                                           bool Shorten = false);
+
 LLVM_DUMP_METHOD void dumpIRValue(const llvm::Value *V);
 LLVM_DUMP_METHOD void dumpIRValue(const llvm::Instruction *V);
 LLVM_DUMP_METHOD void dumpIRValue(const llvm::Function *V);
@@ -283,6 +291,8 @@ class ModulesToSlotTracker {
 getVaListTagOrNull(const llvm::Function &Fun);
 
 [[nodiscard]] bool isVaListAlloca(const llvm::AllocaInst &Alloc);
+
+[[nodiscard]] const llvm::DIType *stripPointerTypes(const llvm::DIType *DITy);
 } // namespace psr
 
 #endif
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
index 33afea40c2..8924999e22 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp
@@ -18,17 +18,12 @@
 
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
-#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
+#include "phasar/PhasarLLVM/Utils/AllocatedTypes.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
-#include "llvm/BinaryFormat/Dwarf.h"
-#include "llvm/IR/DebugInfoMetadata.h"
-#include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/InstrTypes.h"
-#include "llvm/IR/Instructions.h"
-#include "llvm/Support/Casting.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace psr;
@@ -85,52 +80,10 @@ void RTAResolver::resolveVirtualCall(FunctionSetTy &PossibleTargets,
 
 std::string RTAResolver::str() const { return "RTA"; }
 
-static const llvm::DICompositeType *
-isCompositeStructType(const llvm::DIType *Ty) {
-  if (const auto *CompTy = llvm::dyn_cast_if_present<llvm::DICompositeType>(Ty);
-      CompTy && (CompTy->getTag() == llvm::dwarf::DW_TAG_structure_type ||
-                 CompTy->getTag() == llvm::dwarf::DW_TAG_class_type)) {
-
-    return CompTy;
-  }
-
-  return nullptr;
-}
-
 void RTAResolver::resolveAllocatedCompositeTypes() {
   if (!AllocatedCompositeTypes.empty()) {
     return;
   }
 
-  llvm::DenseSet<const llvm::DICompositeType *> AllocatedTypes;
-
-  for (const auto *Inst : IRDB->getAllInstructions()) {
-    if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(Inst)) {
-      if (const auto *Ty = isCompositeStructType(getVarTypeFromIR(Alloca))) {
-        AllocatedTypes.insert(Ty);
-      }
-    } else if (const auto *Call = llvm::dyn_cast<llvm::CallBase>(Inst)) {
-      if (const auto *Callee = llvm::dyn_cast<llvm::Function>(
-              Call->getCalledOperand()->stripPointerCastsAndAliases())) {
-        if (psr::isHeapAllocatingFunction(Callee)) {
-          const auto *MDNode = Call->getMetadata("heapallocsite");
-          if (const auto *CompTy = llvm::
-#if LLVM_VERSION_MAJOR >= 15
-                  dyn_cast_if_present
-#else
-                  dyn_cast_or_null
-#endif
-              <llvm::DICompositeType>(MDNode);
-              isCompositeStructType(CompTy)) {
-
-            AllocatedTypes.insert(CompTy);
-          }
-        }
-      }
-    }
-  }
-
-  AllocatedCompositeTypes.reserve(AllocatedTypes.size());
-  AllocatedCompositeTypes.insert(AllocatedCompositeTypes.end(),
-                                 AllocatedTypes.begin(), AllocatedTypes.end());
+  AllocatedCompositeTypes = collectAllocatedTypes(*IRDB->getModule());
 }
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
index a1d8bd5b1c..b80fe475eb 100644
--- a/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
+++ b/lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp
@@ -87,15 +87,6 @@ psr::getVFTIndexAndVT(const llvm::CallBase *CallSite) {
   return std::nullopt;
 }
 
-static const llvm::DIType *stripPointerTypes(const llvm::DIType *DITy) {
-  while (const auto *DerivedTy =
-             llvm::dyn_cast_if_present<llvm::DIDerivedType>(DITy)) {
-    // get rid of the pointer
-    DITy = DerivedTy->getBaseType();
-  }
-  return DITy;
-}
-
 const llvm::DIType *psr::getReceiverType(const llvm::CallBase *CallSite) {
   if (!CallSite || CallSite->arg_empty() ||
       (CallSite->hasStructRetAttr() && CallSite->arg_size() < 2)) {
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
index 2ad21cc686..03e287e869 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.cpp
@@ -9,10 +9,7 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h"
 
-#include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
-#include "phasar/DataFlow/IfdsIde/FlowFunctions.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
@@ -21,17 +18,17 @@
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 
-#include "llvm/ADT/DenseMap.h"
 #include "llvm/Demangle/Demangle.h"
-#include "llvm/IR/AbstractCallSite.h"
+#include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instruction.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/IR/Metadata.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <algorithm>
 #include <utility>
 
 namespace psr::detail {
@@ -284,59 +281,23 @@ auto IDETypeStateAnalysisBase::getLocalAliasesAndAllocas(
   return AliasAndAllocas;
 }
 
-bool IDETypeStateAnalysisBase::hasMatchingTypeName(const llvm::Type *Ty) {
-  if (const auto *StructTy = llvm::dyn_cast<llvm::StructType>(Ty);
-      StructTy && StructTy->hasName()) {
-    return isTypeNameOfInterest(StructTy->getName());
+bool IDETypeStateAnalysisBase::hasMatchingTypeName(const llvm::DIType *DITy) {
+  if (llvm::isa<llvm::DICompositeType>(DITy) && !DITy->getName().empty()) {
+    return isTypeNameOfInterest(DITy->getName());
   }
-  // primitive type
-  std::string Str;
-  llvm::raw_string_ostream S(Str);
-  S << *Ty;
-  S.flush();
-  return isTypeNameOfInterest(Str);
+
+  return true; // Conservatively return true
 }
 
 bool IDETypeStateAnalysisBase::hasMatchingType(d_t V) {
-  // General case
-  if (V->getType()->isPointerTy() && !V->getType()->isOpaquePointerTy()) {
-    if (hasMatchingTypeName(V->getType()->getNonOpaquePointerElementType())) {
-      return true;
-    }
-    // fallthrough
-  }
-  if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(V)) {
-    if (Alloca->getAllocatedType()->isPointerTy()) {
-      if (Alloca->getAllocatedType()->isOpaquePointerTy() ||
-          hasMatchingTypeName(
-              Alloca->getAllocatedType()->getNonOpaquePointerElementType())) {
-        return true;
-      }
-    }
-    return false;
-  }
-  if (const auto *Load = llvm::dyn_cast<llvm::LoadInst>(V)) {
-    if (Load->getType()->isPointerTy()) {
-      if (Load->getType()->isOpaquePointerTy() ||
-          hasMatchingTypeName(
-              Load->getType()->getNonOpaquePointerElementType())) {
-        return true;
-      }
+  if (const auto *VarTy = getVarTypeFromIR(V)) {
+    if (const auto *BaseTy = stripPointerTypes(VarTy)) {
+      return hasMatchingTypeName(BaseTy);
     }
-    return false;
-  }
-  if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(V)) {
-    if (Store->getValueOperand()->getType()->isPointerTy()) {
-      if (Store->getValueOperand()->getType()->isOpaquePointerTy() ||
-          hasMatchingTypeName(Store->getValueOperand()
-                                  ->getType()
-                                  ->getNonOpaquePointerElementType())) {
-        return true;
-      }
-    }
-    return false;
+
+    return isTypeNameOfInterest(VarTy->getName());
   }
-  return false;
-}
 
+  return true;
+}
 } // namespace psr::detail
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
index 018ac4d93b..c00c1f2cbe 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.cpp
@@ -9,8 +9,6 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/CSTDFILEIOTypeStateDescription.h"
 
-#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
-
 #include "llvm/ADT/StringMap.h"
 #include "llvm/Support/ErrorHandling.h"
 
@@ -127,7 +125,7 @@ CSTDFILEIOTypeStateDescription::getNextState(llvm::StringRef Tok,
 }
 
 std::string CSTDFILEIOTypeStateDescription::getTypeNameOfInterest() const {
-  return "struct._IO_FILE";
+  return "_IO_FILE";
 }
 
 std::set<int>
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
index 38a4e22af1..c46ec6d775 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.cpp
@@ -11,8 +11,6 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
 
-#include "llvm/IR/Instruction.h"
-#include "llvm/IR/Value.h"
 #include "llvm/Support/ErrorHandling.h"
 
 #include <set>
@@ -125,7 +123,7 @@ OpenSSLEVPKDFCTXState OpenSSLEVPKDFCTXDescription::getNextState(
 }
 
 std::string OpenSSLEVPKDFCTXDescription::getTypeNameOfInterest() const {
-  return "struct.evp_kdf_ctx_st";
+  return "evp_kdf_ctx_st";
 }
 
 std::set<int>
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
index d881af8ad6..beeebd9b81 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.cpp
@@ -9,8 +9,6 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFDescription.h"
 
-#include "phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/TypeStateDescription.h"
-
 #include "llvm/Support/ErrorHandling.h"
 
 #include <map>
@@ -74,7 +72,7 @@ OpenSSLEVPKDFDescription::getNextState(llvm::StringRef Tok,
 }
 
 std::string OpenSSLEVPKDFDescription::getTypeNameOfInterest() const {
-  return "struct.evp_kdf_st";
+  return "evp_kdf_st";
 }
 
 std::set<int>
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
index 716f682a4f..fcdcb70324 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureHeapDescription.cpp
@@ -107,7 +107,7 @@ OpenSSLSecureHeapState OpenSSLSecureHeapDescription::getNextState(
 }
 
 std::string OpenSSLSecureHeapDescription::getTypeNameOfInterest() const {
-  return "i8";
+  return {};
 }
 
 set<int>
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
index a67f17e42b..f836b5d0e2 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/TypeStateDescriptions/OpenSSLSecureMemoryDescription.cpp
@@ -110,7 +110,7 @@ OpenSSLSecureMemoryState OpenSSLSecureMemoryDescription::getNextState(
 }
 
 std::string OpenSSLSecureMemoryDescription::getTypeNameOfInterest() const {
-  return "i8"; // NOT SURE WHAT TO DO WITH THIS
+  return {};
 }
 
 set<int>
diff --git a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
index 4575fa59ea..9b5befda55 100644
--- a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
+++ b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
@@ -9,6 +9,7 @@
 
 #include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
 
+#include "phasar/PhasarLLVM/Utils/AllocatedTypes.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/NlohmannLogging.h"
@@ -41,31 +42,6 @@ static bool isAddressTaken(const llvm::Function &Fun) noexcept {
   return false;
 }
 
-template <typename Set>
-static void collectAllocatedTypes(const llvm::CallBase *CallSite, Set &Into) {
-  for (const auto *User : CallSite->users()) {
-    if (const auto *Cast = llvm::dyn_cast<llvm::BitCastInst>(User);
-        Cast && Cast->getDestTy()->isPointerTy() &&
-        !Cast->getDestTy()->isOpaquePointerTy()) {
-      const auto *ElemTy = Cast->getDestTy()->getNonOpaquePointerElementType();
-      if (ElemTy->isStructTy()) {
-        // finally check for ctor call
-        for (const auto *User : Cast->users()) {
-          if (llvm::isa<llvm::CallBase>(User)) {
-            // potential call to the structures ctor
-            const auto *CTor = llvm::cast<llvm::CallBase>(User);
-            if (CTor->getCalledFunction() &&
-                CTor->getCalledFunction()->getArg(0)->getType() ==
-                    Cast->getDestTy()) {
-              Into.insert(ElemTy);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 llvm::AnalysisKey GeneralStatisticsAnalysis::Key; // NOLINT
 GeneralStatistics GeneralStatisticsAnalysis::runOnModule(llvm::Module &M) {
   PHASAR_LOG_LEVEL(INFO, "Running GeneralStatisticsAnalysis");
@@ -131,7 +107,6 @@ GeneralStatistics GeneralStatisticsAnalysis::runOnModule(llvm::Module &M) {
         // check for alloca instruction for possible types
         if (const llvm::AllocaInst *Alloc =
                 llvm::dyn_cast<llvm::AllocaInst>(&I)) {
-          Stats.AllocatedTypes.insert(Alloc->getAllocatedType());
           // do not add allocas from llvm internal functions
           Stats.AllocaInstructions.insert(&I);
           ++Stats.AllocationSites;
@@ -186,9 +161,6 @@ GeneralStatistics GeneralStatisticsAnalysis::runOnModule(llvm::Module &M) {
               // do not add allocas from llvm internal functions
               Stats.AllocaInstructions.insert(&I);
               ++Stats.AllocationSites;
-              // check if an instance of a user-defined type is allocated on the
-              // heap
-              collectAllocatedTypes(CallSite, Stats.AllocatedTypes);
             }
           } else {
             ++Stats.IndCalls;
@@ -197,6 +169,9 @@ GeneralStatistics GeneralStatisticsAnalysis::runOnModule(llvm::Module &M) {
       }
     }
   }
+
+  Stats.AllocatedTypes = collectAllocatedTypes(M);
+
   // check for global pointers
   for (const auto &Global : M.globals()) {
     ++Stats.Globals;
@@ -323,7 +298,7 @@ template <typename T> struct AlignNum {
   }
 };
 template <typename T> AlignNum(llvm::StringRef, T) -> AlignNum<T>;
-AlignNum(llvm::StringRef, size_t, size_t)->AlignNum<double>;
+AlignNum(llvm::StringRef, size_t, size_t) -> AlignNum<double>;
 } // namespace
 
 llvm::raw_ostream &psr::operator<<(llvm::raw_ostream &OS,
diff --git a/lib/PhasarLLVM/Utils/AllocatedTypes.cpp b/lib/PhasarLLVM/Utils/AllocatedTypes.cpp
new file mode 100644
index 0000000000..f8e4f03ff3
--- /dev/null
+++ b/lib/PhasarLLVM/Utils/AllocatedTypes.cpp
@@ -0,0 +1,62 @@
+#include "phasar/PhasarLLVM/Utils/AllocatedTypes.h"
+
+#include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
+#include "phasar/PhasarLLVM/Utils/LLVMIRToSrc.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+
+#include "llvm/ADT/DenseSet.h"
+#include "llvm/BinaryFormat/Dwarf.h"
+#include "llvm/IR/InstIterator.h"
+#include "llvm/IR/InstrTypes.h"
+#include "llvm/IR/Instructions.h"
+
+static const llvm::DICompositeType *
+isCompositeStructType(const llvm::DIType *Ty) {
+  if (const auto *CompTy = llvm::dyn_cast_if_present<llvm::DICompositeType>(Ty);
+      CompTy && (CompTy->getTag() == llvm::dwarf::DW_TAG_structure_type ||
+                 CompTy->getTag() == llvm::dwarf::DW_TAG_class_type)) {
+
+    return CompTy;
+  }
+
+  return nullptr;
+}
+
+std::vector<const llvm::DICompositeType *>
+psr::collectAllocatedTypes(const llvm::Module &Mod) {
+  llvm::DenseSet<const llvm::DICompositeType *> AllocatedTypes;
+
+  for (const auto &Fun : Mod) {
+    for (const auto &Inst : llvm::instructions(Fun)) {
+      if (const auto *Alloca = llvm::dyn_cast<llvm::AllocaInst>(&Inst)) {
+        if (const auto *Ty = isCompositeStructType(getVarTypeFromIR(Alloca))) {
+          AllocatedTypes.insert(Ty);
+        }
+      } else if (const auto *Call = llvm::dyn_cast<llvm::CallBase>(&Inst)) {
+        if (const auto *Callee = llvm::dyn_cast<llvm::Function>(
+                Call->getCalledOperand()->stripPointerCastsAndAliases())) {
+          if (psr::isHeapAllocatingFunction(Callee)) {
+            const auto *MDNode = Call->getMetadata("heapallocsite");
+            if (const auto *CompTy = llvm::
+#if LLVM_VERSION_MAJOR >= 15
+                    dyn_cast_if_present
+#else
+                    dyn_cast_or_null
+#endif
+                <llvm::DICompositeType>(MDNode);
+                isCompositeStructType(CompTy)) {
+
+              AllocatedTypes.insert(CompTy);
+            }
+          }
+        }
+      }
+    }
+  }
+
+  std::vector<const llvm::DICompositeType *> AllocatedCompositeTypes;
+  AllocatedCompositeTypes.reserve(AllocatedTypes.size());
+  AllocatedCompositeTypes.insert(AllocatedCompositeTypes.end(),
+                                 AllocatedTypes.begin(), AllocatedTypes.end());
+  return AllocatedCompositeTypes;
+}
diff --git a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
index 18cb20c97e..eb991a8ffa 100644
--- a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
@@ -235,6 +235,34 @@ std::string psr::llvmTypeToString(const llvm::Type *Ty, bool Shorten) {
   return IRBuffer;
 }
 
+std::string psr::llvmTypeToString(const llvm::DIType *Ty, bool Shorten) {
+  if (!Ty) {
+    return "<null>";
+  }
+
+  std::string Ret;
+
+  if (Shorten) {
+    Ret = Ty->getName().str();
+    if (!Ret.empty()) {
+      // Try to get a fully-qualified name
+
+      const auto *Scope = Ty->getScope();
+      while (llvm::isa_and_nonnull<llvm::DINamespace, llvm::DISubprogram,
+                                   llvm::DIType>(Scope)) {
+        // XXX: Optimize this
+        Ret = Scope->getName().str().append("::").append(Ret);
+        Scope = Scope->getScope();
+      }
+      return Ret;
+    }
+  }
+
+  llvm::raw_string_ostream RSO(Ret);
+  Ty->print(RSO);
+  return Ret;
+}
+
 void psr::dumpIRValue(const llvm::Value *V) {
   llvm::outs() << llvmIRToString(V) << '\n';
 }
@@ -617,3 +645,12 @@ bool psr::isVaListAlloca(const llvm::AllocaInst &Alloc) {
 
   return false;
 }
+
+const llvm::DIType *psr::stripPointerTypes(const llvm::DIType *DITy) {
+  while (const auto *DerivedTy =
+             llvm::dyn_cast_if_present<llvm::DIDerivedType>(DITy)) {
+    // get rid of the pointer
+    DITy = DerivedTy->getBaseType();
+  }
+  return DITy;
+}

From 776600f8fc2fbbb9027a9fb3b8a469e2fd5325c9 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 8 Sep 2025 16:06:07 +0200
Subject: [PATCH 19/24] Some fixes in the IterativeIDESolver (#782)

* Fix the IterativeIDESolver by allowing to analyze problems that override extend() and combine()

* Use the logger in the IterativeIDESolver

* Make it possible to solve the IDEFeatureTaintAnalysis with the IterativeIDESolver

* Fix errors introduced by merge
---
 .../IfdsIde/Solver/IterativeIDESolver.h       | 40 ++++++++++---------
 .../Problems/IDEFeatureTaintAnalysis.h        |  9 +++++
 .../Problems/IDEFeatureTaintAnalysisTest.cpp  | 22 +++++-----
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
index 68ee40cb80..9ae1b0a2db 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/IterativeIDESolver.h
@@ -474,7 +474,7 @@ class IterativeIDESolver
       return true;
     }
 
-    auto NewEF = EF.joinWith(std::move(LocalEF));
+    auto NewEF = Problem.combine(EF, std::move(LocalEF));
     assert(NewEF != nullptr);
 
     if (NewEF != EF) {
@@ -540,7 +540,7 @@ class IterativeIDESolver
       return;
     }
 
-    auto NewEF = EF.joinWith(std::move(LocalEF));
+    auto NewEF = Problem.combine(EF, std::move(LocalEF));
     assert(NewEF != nullptr);
 
     if (NewEF != EF) {
@@ -622,10 +622,11 @@ class IterativeIDESolver
         auto FactId = FactCompressor.getOrInsert(Fact);
         auto EF = [&] {
           if constexpr (ComputeValues) {
-            return SourceEF.composeWith(FECache.getNormalEdgeFunction(
+            auto NEF = FECache.getNormalEdgeFunction(
                 Problem, AtInstruction, CSFact, Succ, Fact,
                 combineIds(AtInstructionId, SuccId),
-                combineIds(PropagatedFactId, FactId)));
+                combineIds(PropagatedFactId, FactId));
+            return Problem.extend(SourceEF, std::move(NEF));
           } else {
             return EdgeFunctionPtrType{};
           }
@@ -694,10 +695,11 @@ class IterativeIDESolver
 
         auto EF = [&] {
           if constexpr (ComputeValues) {
-            return SourceEF.composeWith(FECache.getCallToRetEdgeFunction(
+            auto CEF = FECache.getCallToRetEdgeFunction(
                 Problem, AtInstruction, CSFact, RetSite, Fact, Callees /*Vec*/,
                 combineIds(AtInstructionId, RetSiteId),
-                combineIds(PropagatedFactId, FactId)));
+                combineIds(PropagatedFactId, FactId));
+            return Problem.extend(SourceEF, std::move(CEF));
           } else {
             return EdgeFunctionPtrType{};
           }
@@ -835,10 +837,11 @@ class IterativeIDESolver
 
         auto CallEF = [&] {
           if constexpr (ComputeValues) {
-            return SourceEF.composeWith(FECache.getCallEdgeFunction(
+            auto CEF = FECache.getCallEdgeFunction(
                 Problem, AtInstruction, CSFact, Callee, Fact,
                 combineIds(AtInstructionId, CalleeId),
-                combineIds(CSFactId, FactId)));
+                combineIds(CSFactId, FactId));
+            return Problem.extend(SourceEF, std::move(CEF));
           } else {
             return EdgeFunctionPtrType{};
           }
@@ -900,7 +903,7 @@ class IterativeIDESolver
                 Problem, AtInstruction, CSFact, RetSite, Fact,
                 combineIds(AtInstructionId, RetSiteId),
                 combineIds(CSFactId, FactId));
-            return EF ? SourceEF.composeWith(std::move(EF)) : SourceEF;
+            return EF ? Problem.extend(SourceEF, std::move(EF)) : SourceEF;
           } else {
             return EdgeFunctionPtrType{};
           }
@@ -939,8 +942,8 @@ class IterativeIDESolver
                   Problem, CallSite, Callee, ExitInst, SummaryFact, RetSite,
                   RetFact, ExitId, combineIds(CSId, RSId),
                   combineIds(SummaryFactId, RetFactId));
-              return CallEF.composeWith(Summary.second)
-                  .composeWith(std::move(RetEF));
+              return Problem.extend(Problem.extend(CallEF, Summary.second),
+                                    std::move(RetEF));
             } else {
               return EdgeFunctionPtrType{};
             }
@@ -954,16 +957,15 @@ class IterativeIDESolver
   }
 
   void processInterJobs() {
-
-    llvm::errs() << "processInterJobs: " << CallWL.size()
-                 << " relevant calls\n";
+    PHASAR_LOG_LEVEL(INFO, "processInterJobs: " << CallWL.size()
+                                                << " relevant calls");
 
     /// Here, no other job is running concurrently, so we save and reset the
     /// CallWL, such that we can start concurrent jobs in the loop below
     std::vector<uint64_t> RelevantCalls(CallWL.begin(), CallWL.end());
 
     scope_exit FinishedInterCalls = [] {
-      llvm::errs() << "> end inter calls\n";
+      PHASAR_LOG_LEVEL(INFO, "> end inter calls");
     };
 
     if constexpr (EnableStatistics) {
@@ -1250,14 +1252,14 @@ class IterativeIDESolver
   }
 
   void runGC() {
-    llvm::errs() << "runGC() with " << CandidateFunctionsForGC.count()
-                 << " candidates\n";
+    PHASAR_LOG_LEVEL(INFO, "runGC() with " << CandidateFunctionsForGC.count()
+                                           << " candidates");
 
     size_t NumCollectedFuns = 0;
 
     scope_exit FinishGC = [&NumCollectedFuns] {
-      llvm::errs() << "> Finished GC run (collected " << NumCollectedFuns
-                   << " functions)\n";
+      PHASAR_LOG_LEVEL(INFO, "> Finished GC run (collected " << NumCollectedFuns
+                                                             << " functions)");
     };
 
     auto FinalCandidates = getCollectableFunctions();
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h
index 9cca9dc15e..b021f7b5af 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.h
@@ -374,4 +374,13 @@ class IDEFeatureTaintAnalysis
 
 } // namespace psr
 
+namespace std {
+template <> struct hash<psr::IDEFeatureTaintEdgeFact> {
+  size_t
+  operator()(const psr::IDEFeatureTaintEdgeFact &EdgeFact) const noexcept {
+    return hash_value(EdgeFact);
+  }
+};
+} // namespace std
+
 #endif // PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_PROBLEMS_IDEFEATURETAINTANALYSIS_H
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
index 2b98d117b1..bce6226662 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysisTest.cpp
@@ -129,7 +129,8 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
         *HA, EntryPoints, Generator);
 
     IDESolver IIASolver(IIAProblem, &HA->getICFG());
-    IIASolver.solve();
+    // IterativeIDESolver IIASolver(&IIAProblem, &HA->getICFG());
+    auto Results = IIASolver.solve();
 
     // do the comparison
     for (const auto &[InstLoc, VarName, ExpectedVal] : GroundTruth) {
@@ -157,7 +158,7 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
       IIASolver.dumpResults(llvm::errs());
       llvm::errs()
           << "\n======================================================\n";
-      printDump(HA->getProjectIRDB(), IIASolver.getSolverResults());
+      printDump(HA->getProjectIRDB(), Results);
     }
   }
 
@@ -166,10 +167,10 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
   }
 
   // See vara::PhasarTaintAnalysis::taintsForInst
-  [[nodiscard]] inline TaintSetT
-  taintsForInst(const llvm::Instruction *Inst,
-                SolverResults<const llvm::Instruction *, const llvm::Value *,
-                              IDEFeatureTaintEdgeFact> SR) {
+  [[nodiscard]] inline TaintSetT taintsForInst(
+      const llvm::Instruction *Inst,
+      GenericSolverResults<const llvm::Instruction *, const llvm::Value *,
+                           IDEFeatureTaintEdgeFact> SR) {
 
     if (const auto *Ret = llvm::dyn_cast<llvm::ReturnInst>(Inst)) {
       if (Ret->getNumOperands() == 0) {
@@ -205,10 +206,11 @@ class IDEFeatureTaintAnalysisTest : public ::testing::Test {
     return AggregatedTaints;
   }
 
-  void printDump(const LLVMProjectIRDB &IRDB,
-                 SolverResults<const llvm::Instruction *, const llvm::Value *,
-                               IDEFeatureTaintEdgeFact>
-                     SR) {
+  void
+  printDump(const LLVMProjectIRDB &IRDB,
+            GenericSolverResults<const llvm::Instruction *, const llvm::Value *,
+                                 IDEFeatureTaintEdgeFact>
+                SR) {
     const llvm::Function *CurrFun = nullptr;
     for (const auto *Inst : IRDB.getAllInstructions()) {
       if (CurrFun != Inst->getFunction()) {

From 010d706f63674722181889c195567d4b876b9108 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Mon, 8 Sep 2025 17:15:04 +0200
Subject: [PATCH 20/24] Bump dependencies (#784)

---
 CMakeLists.txt | 2 +-
 external/json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58083e3b98..fbf3b5d9fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,7 +284,7 @@ if (NOT PHASAR_IN_TREE)
     FetchContent_Declare(
         googletest
         GIT_REPOSITORY https://github.com/google/googletest.git
-        GIT_TAG v1.16.0
+        GIT_TAG v1.17.0
     )
     FetchContent_MakeAvailable(googletest)
   endif()
diff --git a/external/json b/external/json
index 9cca280a4d..55f93686c0 160000
--- a/external/json
+++ b/external/json
@@ -1 +1 @@
-Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
+Subproject commit 55f93686c01528224f448c19128836e7df245f72

From 10483a384d162f28cd4734a3c462ae9457db3504 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Thu, 11 Sep 2025 18:03:36 +0200
Subject: [PATCH 21/24] Remove boost from BitVectorSet (#788)

* Remove boost from BitVectorSet

* Minor deboostifying

* Apply review comment on Bit-index-inbounds check + simplify operator<<
---
 .../DataFlow/IfdsIde/Solver/Compressor.h      | 148 +----------
 .../DataFlow/Mono/Contexts/CallStringCTX.h    |  11 +-
 include/phasar/Utils/BitVectorSet.h           | 246 ++++++------------
 include/phasar/Utils/Compressor.h             | 179 +++++++++++++
 include/phasar/Utils/Fn.h                     |   4 +-
 lib/Utils/Utilities.cpp                       |  17 +-
 unittests/Utils/BitVectorSetTest.cpp          |   6 +-
 7 files changed, 274 insertions(+), 337 deletions(-)
 create mode 100644 include/phasar/Utils/Compressor.h

diff --git a/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h b/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
index d0f9472d9c..29c900e0bb 100644
--- a/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
+++ b/include/phasar/DataFlow/IfdsIde/Solver/Compressor.h
@@ -3,158 +3,12 @@
 
 #include "phasar/DB/ProjectIRDBBase.h"
 #include "phasar/Utils/ByRef.h"
-#include "phasar/Utils/TypeTraits.h"
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseMapInfo.h"
-#include "llvm/ADT/SmallVector.h"
+#include "phasar/Utils/Compressor.h"
 
 #include <cstdint>
-#include <deque>
-#include <functional>
-#include <optional>
 #include <type_traits>
 
 namespace psr {
-template <typename T, typename Enable = void> class Compressor;
-
-/// \brief A utility class that assigns a sequential Id to every inserted
-/// object.
-///
-/// This specialization handles types that can be efficiently passed by value
-template <typename T>
-class Compressor<T, std::enable_if_t<CanEfficientlyPassByValue<T>>> {
-public:
-  void reserve(size_t Capacity) {
-    assert(Capacity <= UINT32_MAX);
-    ToInt.reserve(Capacity);
-    FromInt.reserve(Capacity);
-  }
-
-  uint32_t getOrInsert(T Elem) {
-    auto [It, Inserted] = ToInt.try_emplace(Elem, ToInt.size());
-    if (Inserted) {
-      FromInt.push_back(Elem);
-    }
-    return It->second;
-  }
-
-  std::optional<uint32_t> getOrNull(T Elem) const {
-    if (auto It = ToInt.find(Elem); It != ToInt.end()) {
-      return It->second;
-    }
-    return std::nullopt;
-  }
-
-  T operator[](size_t Idx) const noexcept {
-    assert(Idx < FromInt.size());
-    return FromInt[Idx];
-  }
-
-  [[nodiscard]] size_t size() const noexcept { return FromInt.size(); }
-  [[nodiscard]] size_t capacity() const noexcept {
-    return FromInt.capacity() +
-           ToInt.getMemorySize() / sizeof(typename decltype(ToInt)::value_type);
-  }
-
-  auto begin() const noexcept { return FromInt.begin(); }
-  auto end() const noexcept { return FromInt.end(); }
-
-private:
-  llvm::DenseMap<T, uint32_t> ToInt;
-  llvm::SmallVector<T, 0> FromInt;
-};
-
-/// \brief A utility class that assigns a sequential Id to every inserted
-/// object.
-///
-/// This specialization handles types that cannot be efficiently passed by value
-template <typename T>
-class Compressor<T, std::enable_if_t<!CanEfficientlyPassByValue<T>>> {
-public:
-  void reserve(size_t Capacity) {
-    assert(Capacity <= UINT32_MAX);
-    ToInt.reserve(Capacity);
-  }
-
-  /// Returns the index of the given element in the compressors storage. If the
-  /// element isn't present yet, it will be added first and its index will
-  /// then be returned.
-  uint32_t getOrInsert(const T &Elem) {
-    if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
-      return It->second;
-    }
-    auto Ret = FromInt.size();
-    auto *Ins = &FromInt.emplace_back(Elem);
-    ToInt[Ins] = Ret;
-    return Ret;
-  }
-
-  /// Returns the index of the given element in the compressors storage. If the
-  /// element isn't present yet, it will be added first and its index will
-  /// then be returned.
-  uint32_t getOrInsert(T &&Elem) {
-    if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
-      return It->second;
-    }
-    auto Ret = FromInt.size();
-    auto *Ins = &FromInt.emplace_back(std::move(Elem));
-    ToInt[Ins] = Ret;
-    return Ret;
-  }
-
-  /// Returns the index of the given element in the compressors storage. If the
-  /// element isn't present, std::nullopt will be returned
-  std::optional<uint32_t> getOrNull(const T &Elem) const {
-    if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
-      return It->second;
-    }
-    return std::nullopt;
-  }
-
-  const T &operator[](size_t Idx) const noexcept {
-    assert(Idx < FromInt.size());
-    return FromInt[Idx];
-  }
-
-  [[nodiscard]] size_t size() const noexcept { return FromInt.size(); }
-  [[nodiscard]] size_t capacity() const noexcept {
-    return FromInt.size() +
-           ToInt.getMemorySize() / sizeof(typename decltype(ToInt)::value_type);
-  }
-
-  auto begin() const noexcept { return FromInt.begin(); }
-  auto end() const noexcept { return FromInt.end(); }
-
-private:
-  struct DSI : llvm::DenseMapInfo<const T *> {
-    static auto getHashValue(const T *Elem) noexcept {
-      assert(Elem != nullptr);
-      if constexpr (has_llvm_dense_map_info<T>) {
-        return llvm::DenseMapInfo<T>::getHashValue(*Elem);
-      } else {
-        return std::hash<T>{}(*Elem);
-      }
-    }
-    static auto isEqual(const T *LHS, const T *RHS) noexcept {
-      if (LHS == RHS) {
-        return true;
-      }
-      if (LHS == DSI::getEmptyKey() || LHS == DSI::getTombstoneKey() ||
-          RHS == DSI::getEmptyKey() || RHS == DSI::getTombstoneKey()) {
-        return false;
-      }
-      if constexpr (has_llvm_dense_map_info<T>) {
-        return llvm::DenseMapInfo<T>::isEqual(*LHS, *RHS);
-      } else {
-        return *LHS == *RHS;
-      }
-    }
-  };
-
-  std::deque<T> FromInt;
-  llvm::DenseMap<const T *, uint32_t, DSI> ToInt;
-};
 
 struct NoneCompressor final {
   constexpr NoneCompressor() noexcept = default;
diff --git a/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h b/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
index c7326729b8..42ac02b425 100644
--- a/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
+++ b/include/phasar/DataFlow/Mono/Contexts/CallStringCTX.h
@@ -3,10 +3,9 @@
 
 #include "phasar/Utils/Printer.h"
 
+#include "llvm/ADT/Hashing.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "boost/functional/hash.hpp"
-
 #include <deque>
 #include <functional>
 #include <initializer_list>
@@ -94,11 +93,9 @@ namespace std {
 
 template <typename N, unsigned K> struct hash<psr::CallStringCTX<N, K>> {
   size_t operator()(const psr::CallStringCTX<N, K> &CS) const noexcept {
-    boost::hash<std::deque<N>> HashDeque;
-    std::hash<unsigned> HashUnsigned;
-    size_t U = HashUnsigned(K);
-    size_t H = HashDeque(CS.CallString);
-    return U ^ (H << 1);
+    auto H =
+        llvm::hash_combine_range(CS.CallString.begin(), CS.CallString.end());
+    return llvm::hash_combine(K, H);
   }
 };
 
diff --git a/include/phasar/Utils/BitVectorSet.h b/include/phasar/Utils/BitVectorSet.h
index b11786e847..3ed4fe474b 100644
--- a/include/phasar/Utils/BitVectorSet.h
+++ b/include/phasar/Utils/BitVectorSet.h
@@ -7,22 +7,25 @@
  *     Philipp Schubert and Richard Leer
  *****************************************************************************/
 
-#ifndef PHASAR_UTILS_BITVECTORSET_H_
-#define PHASAR_UTILS_BITVECTORSET_H_
+#ifndef PHASAR_UTILS_BITVECTORSET_H
+#define PHASAR_UTILS_BITVECTORSET_H
+
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/Compressor.h"
+#include "phasar/Utils/Fn.h"
 
 #include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/Hashing.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "boost/bimap.hpp"
-#include "boost/bimap/unordered_set_of.hpp"
-
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <initializer_list>
+#include <iterator>
 
 namespace psr {
 namespace internal {
@@ -61,122 +64,68 @@ inline llvm::ArrayRef<uintptr_t> getWords(const llvm::SmallBitVector &BV,
 }
 } // namespace internal
 
-/**
- * BitVectorSet implements a set that requires minimal space. Elements are
- * kept in a static map and the set itself only stores a vector of bits which
- * indicate whether elements are contained in the set.
- *
- * @brief Implements a set that requires minimal space.
- */
+/// BitVectorSet implements a set that requires minimal space. Elements are
+/// kept in a static map and the set itself only stores a vector of bits which
+/// indicate whether elements are contained in the set.
+///
+/// \brief Implements a set that requires minimal space.
+/// \attention This data-structure is NOT thread-safe, since it relies on static
+/// storage!
+///
 template <typename T, typename BitVectorTy = llvm::BitVector>
 class BitVectorSet {
-public:
-  // Using boost::hash<T> causes ambiguity for hash_value():
-  //  -<llvm/ADT/Hashing.h>
-  //  -<boost/functional/hash/extensions.hpp>
-  //  -<boost/graph/adjacency_list.hpp>
-  using bimap_t = boost::bimap<boost::bimaps::unordered_set_of<T, std::hash<T>>,
-                               boost::bimaps::unordered_set_of<size_t>>;
 
-private:
-  inline static bimap_t Position; // NOLINT
-  BitVectorTy Bits;
+  static ByConstRef<T> iterTransform(uint32_t Idx) {
+    assert(Position.inbounds(Idx));
+    return Position[Idx];
+  }
 
-  template <typename D> class BitVectorSetIterator {
-    BitVectorTy Bits;
+  // using IteratorTy =
+  //     llvm::mapped_iterator<typename BitVectorTy::const_set_bits_iterator,
+  //                           fn_t<iterTransform>>;
 
+  // Unfortunately cannot use llvm::mapped_iterator, since the
+  // const_set_bits_iterator does not properly implement the iterator interface
+  // (typename iterator_category is missing)
+  class IteratorTy {
   public:
+    using value_type = T;
+    using reference = ByConstRef<T>;
+    using pointer = const T *;
+    using difference_type = ptrdiff_t;
     using iterator_category = std::forward_iterator_tag;
-    using value_type = D;
-    using difference_type = std::ptrdiff_t;
-    using pointer = D *;
-    using reference = D &;
-    BitVectorSetIterator(D Ptr = nullptr) : PosPtr(Ptr) {}
-
-    BitVectorSetIterator<D> &operator=(D *Ptr) {
-      PosPtr = Ptr;
-      return *this;
-    }
-
-    void setBits(const BitVectorTy &OtherBits) { Bits = OtherBits; }
 
-    bool operator==(const BitVectorSetIterator<D> &OtherIterator) const {
-      return PosPtr == OtherIterator.getPtr();
-    }
-
-    bool operator!=(const BitVectorSetIterator<D> &OtherIterator) const {
-      return !(*this == OtherIterator);
-    }
-
-    BitVectorSetIterator<D> &operator+=(const difference_type &Movement) {
-      for (difference_type I = 0; I < Movement; I++) {
-        PosPtr++;
-      }
-      return *this;
-    }
-
-    BitVectorSetIterator<D> &operator++() {
-      do {
-        int NextIdx = Bits.find_next(PosPtr->first);
-
-        if (NextIdx <= static_cast<int>(PosPtr->first)) {
-          PosPtr = Position.right.find(Bits.size());
-          break;
-        }
-
-        PosPtr = Position.right.find(NextIdx);
-
-        assert(PosPtr->first < Bits.size() &&
-               "pos_ptr->first index into BitVector out of range");
-      } while (!Bits[PosPtr->first]);
+    constexpr IteratorTy(typename BitVectorTy::const_set_bits_iterator It,
+                         fn_t<iterTransform> Txn = {}) noexcept
+        : It(std::move(It)), Txn(Txn) {}
 
+    IteratorTy &operator++() {
+      ++It;
       return *this;
     }
-
-    BitVectorSetIterator<D> operator++(int) {
-      auto Temp(*this);
+    IteratorTy operator++(int) {
+      auto Cpy = *this;
       ++*this;
-      return Temp;
+      return Cpy;
     }
 
-    BitVectorSetIterator<D> operator+(const difference_type &Movement) {
-      auto OldPtr = PosPtr;
-      for (difference_type I = 0; I < Movement; I++) {
-        PosPtr++;
-      }
-      auto Temp(*this);
-      PosPtr = OldPtr;
-      return Temp;
-    }
+    [[nodiscard]] reference operator*() const { return Txn(*It); }
 
-    difference_type operator-(const BitVectorSetIterator<D> &OtherIterator) {
-      return std::distance(OtherIterator.getPtr(), this->getPtr());
+    [[nodiscard]] bool operator==(const IteratorTy &Other) const {
+      return It == Other.It;
+    }
+    [[nodiscard]] bool operator!=(const IteratorTy &Other) const {
+      return !(*this == Other);
     }
-
-    // T& operator*(){return pos_ptr->second;}
-
-    const T &operator*() const { return PosPtr->second; }
-
-    D *operator->() { return PosPtr; }
-
-    [[nodiscard]] D getPtr() const { return PosPtr; }
-
-    // const D* getConstPtr()const{return pos_ptr;}
-
-    // T getPos() {return pos_ptr->first;}
-
-    // T getVal() {return pos_ptr->second;}
-
-    [[nodiscard]] const BitVectorTy &getBits() const { return Bits; }
 
   private:
-    D PosPtr;
+    typename BitVectorTy::const_set_bits_iterator It;
+    [[no_unique_address]] fn_t<iterTransform> Txn;
   };
 
 public:
-  using iterator = BitVectorSetIterator<typename bimap_t::right_iterator>;
-  using const_iterator =
-      BitVectorSetIterator<typename bimap_t::right_const_iterator>;
+  using const_iterator = IteratorTy;
+  using iterator = const_iterator;
   using value_type = T;
 
   BitVectorSet() = default;
@@ -187,11 +136,12 @@ class BitVectorSet {
     insert(IList.begin(), IList.end());
   }
 
-  template <typename InputIt> BitVectorSet(InputIt First, InputIt Last) {
+  template <typename InputIt>
+  explicit BitVectorSet(InputIt First, InputIt Last) {
     insert(First, Last);
   }
 
-  static BitVectorSet fromBits(BitVectorTy Bits) {
+  [[nodiscard]] static BitVectorSet fromBits(BitVectorTy Bits) {
     BitVectorSet Ret;
     Ret.Bits = std::move(Bits);
     return Ret;
@@ -225,22 +175,13 @@ class BitVectorSet {
   }
 
   void insert(const T &Data) {
-    auto Search = Position.left.find(Data);
-    // Data already known
-    if (Search != Position.left.end()) {
-      if (Bits.size() <= Search->second) {
-        Bits.resize(Search->second + 1);
-      }
-      Bits.set(Search->second);
-    } else {
-      // Data unknown
-      size_t Idx = Position.left.size();
-      Position.left.insert(std::make_pair(Data, Position.left.size()));
-      if (Bits.size() <= Position.left.size()) {
-        Bits.resize(Position.left.size());
-      }
-      Bits.set(Idx);
+    uint32_t Idx = Position.getOrInsert(Data);
+
+    if (Idx >= Bits.size()) {
+      Bits.resize(Idx + 1);
     }
+
+    Bits.set(Idx);
   }
 
   void insert(const BitVectorSet<T> &Other) { Bits |= Other.Bits; }
@@ -253,10 +194,9 @@ class BitVectorSet {
   }
 
   void erase(const T &Data) noexcept {
-    auto Search = Position.left.find(Data);
-    if (Search != Position.left.end()) {
-      if (Bits.size() > Search->second) {
-        Bits.reset(Search->second);
+    if (auto Idx = Position.getOrNull(Data)) {
+      if (*Idx < Bits.size()) {
+        Bits.reset(*Idx);
       }
     }
   }
@@ -281,12 +221,10 @@ class BitVectorSet {
   [[nodiscard]] bool find(const T &Data) const noexcept { return count(Data); }
 
   [[nodiscard]] size_t count(const T &Data) const noexcept {
-    auto Search = Position.left.find(Data);
-    if (Search != Position.left.end()) {
-      if (Bits.size() > Search->second) {
-        return Bits[Search->second];
-      }
+    if (auto Idx = Position.getOrNull(Data)) {
+      return (*Idx < Bits.size() && Bits.test(*Idx)) ? 1 : 0;
     }
+
     return 0;
   }
 
@@ -347,56 +285,28 @@ class BitVectorSet {
   friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
                                        const BitVectorSet &B) {
     OS << '<';
-    size_t Idx = 0;
-    for (auto &Position : B.Position.left) {
-      if (Position.second < B.Bits.size() && B.Bits[Position.second]) {
-        ++Idx;
-        OS << Position.first;
-        if (Idx < B.size()) {
-          OS << ", ";
-        }
-      }
-    }
-    OS << '>';
-    return OS;
+    llvm::interleaveComma(B, OS);
+    return OS << '>';
   }
 
-  [[nodiscard]] iterator begin() {
-    int Index = Bits.find_first();
-    if (Index == -1) {
-      Index = Bits.size();
-    }
-    iterator BeginIter(Position.right.find(Index));
-    BeginIter.setBits(Bits);
-    return BeginIter;
+  [[nodiscard]] const_iterator begin() const noexcept {
+    return {Bits.set_bits_begin(), {}};
   }
-
-  [[nodiscard]] iterator end() {
-    iterator EndIter(Position.right.find(Bits.size()));
-    EndIter.setBits(Bits);
-    return EndIter;
+  [[nodiscard]] const_iterator end() const noexcept {
+    return {Bits.set_bits_end(), {}};
   }
 
-  [[nodiscard]] const_iterator begin() const {
-    int Index = Bits.find_first();
-    if (Index == -1) {
-      Index = Bits.size();
-    }
-    const_iterator BeginIter(Position.right.find(Index));
-    BeginIter.setBits(Bits);
-    return BeginIter;
+  [[nodiscard]] iterator begin() noexcept {
+    return {Bits.set_bits_begin(), {}};
   }
+  [[nodiscard]] iterator end() noexcept { return {Bits.set_bits_end(), {}}; }
 
-  [[nodiscard]] const_iterator end() const {
-    const_iterator EndIter(Position.right.find(Bits.size()));
-    EndIter.setBits(Bits);
-    return EndIter;
-  }
+  static void clearPosition() noexcept { Position.clear(); }
 
-  static void clearPosition() {
-    Position.left.clear();
-    Position.right.clear();
-  }
+private:
+  inline static Compressor<T> Position;
+
+  BitVectorTy Bits;
 };
 
 // Overloads with the other intersectWith functions from Utilities.h
diff --git a/include/phasar/Utils/Compressor.h b/include/phasar/Utils/Compressor.h
new file mode 100644
index 0000000000..296dee5e08
--- /dev/null
+++ b/include/phasar/Utils/Compressor.h
@@ -0,0 +1,179 @@
+#ifndef PHASAR_UTILS_COMPRESSOR_H
+#define PHASAR_UTILS_COMPRESSOR_H
+
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/TypeTraits.h"
+
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/ADT/SmallVector.h"
+
+#include <cstdint>
+#include <deque>
+#include <functional>
+#include <optional>
+#include <type_traits>
+
+namespace psr {
+template <typename T, typename IdT = uint32_t, typename Enable = void>
+class Compressor;
+
+/// \brief A utility class that assigns a sequential Id to every inserted
+/// object.
+///
+/// This specialization handles types that can be efficiently passed by value
+template <typename T, typename IdT>
+class Compressor<T, IdT, std::enable_if_t<CanEfficientlyPassByValue<T>>> {
+public:
+  void reserve(size_t Capacity) {
+    assert(Capacity <= UINT32_MAX);
+    ToInt.reserve(Capacity);
+    FromInt.reserve(Capacity);
+  }
+
+  IdT getOrInsert(T Elem) {
+    auto [It, Inserted] = ToInt.try_emplace(Elem, IdT(ToInt.size()));
+    if (Inserted) {
+      FromInt.push_back(Elem);
+    }
+    return It->second;
+  }
+
+  std::optional<IdT> getOrNull(T Elem) const {
+    if (auto It = ToInt.find(Elem); It != ToInt.end()) {
+      return It->second;
+    }
+    return std::nullopt;
+  }
+
+  [[nodiscard]] bool inbounds(IdT Idx) const noexcept {
+    return size_t(Idx) < FromInt.size();
+  }
+
+  T operator[](IdT Idx) const noexcept {
+    assert(inbounds(Idx));
+    return FromInt[size_t(Idx)];
+  }
+
+  [[nodiscard]] size_t size() const noexcept { return FromInt.size(); }
+  [[nodiscard]] size_t capacity() const noexcept {
+    return FromInt.capacity() +
+           ToInt.getMemorySize() / sizeof(typename decltype(ToInt)::value_type);
+  }
+
+  auto begin() const noexcept { return FromInt.begin(); }
+  auto end() const noexcept { return FromInt.end(); }
+
+  void clear() noexcept {
+    ToInt.clear();
+    FromInt.clear();
+  }
+
+private:
+  llvm::DenseMap<T, IdT> ToInt;
+  llvm::SmallVector<T, 0> FromInt;
+};
+
+/// \brief A utility class that assigns a sequential Id to every inserted
+/// object.
+///
+/// This specialization handles types that cannot be efficiently passed by value
+template <typename T, typename IdT>
+class Compressor<T, IdT, std::enable_if_t<!CanEfficientlyPassByValue<T>>> {
+public:
+  void reserve(size_t Capacity) {
+    assert(Capacity <= UINT32_MAX);
+    ToInt.reserve(Capacity);
+  }
+
+  /// Returns the index of the given element in the compressors storage. If the
+  /// element isn't present yet, it will be added first and its index will
+  /// then be returned.
+  IdT getOrInsert(const T &Elem) {
+    if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
+      return It->second;
+    }
+    auto Ret = IdT(FromInt.size());
+    auto *Ins = &FromInt.emplace_back(Elem);
+    ToInt[Ins] = Ret;
+    return Ret;
+  }
+
+  /// Returns the index of the given element in the compressors storage. If the
+  /// element isn't present yet, it will be added first and its index will
+  /// then be returned.
+  IdT getOrInsert(T &&Elem) {
+    if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
+      return It->second;
+    }
+    auto Ret = IdT(FromInt.size());
+    auto *Ins = &FromInt.emplace_back(std::move(Elem));
+    ToInt[Ins] = Ret;
+    return Ret;
+  }
+
+  /// Returns the index of the given element in the compressors storage. If the
+  /// element isn't present, std::nullopt will be returned
+  std::optional<IdT> getOrNull(const T &Elem) const {
+    if (auto It = ToInt.find(&Elem); It != ToInt.end()) {
+      return It->second;
+    }
+    return std::nullopt;
+  }
+
+  [[nodiscard]] bool inbounds(IdT Idx) const noexcept {
+    return size_t(Idx) < FromInt.size();
+  }
+
+  const T &operator[](IdT Idx) const noexcept {
+    assert(inbounds(Idx));
+    return FromInt[size_t(Idx)];
+  }
+
+  [[nodiscard]] size_t size() const noexcept { return FromInt.size(); }
+  [[nodiscard]] size_t capacity() const noexcept {
+    return FromInt.size() +
+           ToInt.getMemorySize() / sizeof(typename decltype(ToInt)::value_type);
+  }
+
+  auto begin() const noexcept { return FromInt.begin(); }
+  auto end() const noexcept { return FromInt.end(); }
+
+  void clear() noexcept {
+    ToInt.clear();
+    FromInt.clear();
+  }
+
+private:
+  struct DSI : llvm::DenseMapInfo<const T *> {
+    static auto getHashValue(const T *Elem) noexcept {
+      assert(Elem != nullptr);
+      if constexpr (has_llvm_dense_map_info<T>) {
+        return llvm::DenseMapInfo<T>::getHashValue(*Elem);
+      } else {
+        return std::hash<T>{}(*Elem);
+      }
+    }
+    static auto isEqual(const T *LHS, const T *RHS) noexcept {
+      if (LHS == RHS) {
+        return true;
+      }
+      if (LHS == DSI::getEmptyKey() || LHS == DSI::getTombstoneKey() ||
+          RHS == DSI::getEmptyKey() || RHS == DSI::getTombstoneKey()) {
+        return false;
+      }
+      if constexpr (has_llvm_dense_map_info<T>) {
+        return llvm::DenseMapInfo<T>::isEqual(*LHS, *RHS);
+      } else {
+        return *LHS == *RHS;
+      }
+    }
+  };
+
+  std::deque<T> FromInt;
+  llvm::DenseMap<const T *, IdT, DSI> ToInt;
+};
+
+} // namespace psr
+
+#endif // PHASAR_DATAFLOW_IFDSIDE_SOLVER_COMPRESSOR_H
diff --git a/include/phasar/Utils/Fn.h b/include/phasar/Utils/Fn.h
index 55cc644149..060a2f7b77 100644
--- a/include/phasar/Utils/Fn.h
+++ b/include/phasar/Utils/Fn.h
@@ -24,8 +24,8 @@ namespace psr {
 template <auto F> struct fn_t { // NOLINT(readability-identifier-naming)
   template <typename... ArgsT>
   constexpr std::invoke_result_t<decltype(F), ArgsT...>
-  operator()(ArgsT &&...Args) noexcept(
-      std::is_nothrow_invocable_v<decltype(F), ArgsT...>) {
+  operator()(ArgsT &&...Args) const
+      noexcept(std::is_nothrow_invocable_v<decltype(F), ArgsT...>) {
     return std::invoke(F, PSR_FWD(Args)...);
   }
 };
diff --git a/lib/Utils/Utilities.cpp b/lib/Utils/Utilities.cpp
index 0c2aeedaca..0689e09d70 100644
--- a/lib/Utils/Utilities.cpp
+++ b/lib/Utils/Utilities.cpp
@@ -12,11 +12,10 @@
 #include "phasar/Utils/Logger.h"
 
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Demangle/Demangle.h"
 #include "llvm/IR/DerivedTypes.h"
 
-#include "boost/algorithm/string/find.hpp"
-
 #include <algorithm>
 #include <chrono>
 
@@ -43,21 +42,19 @@ bool isConstructor(llvm::StringRef MangledName) {
   // see https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling
 
   // This version will not work in some edge cases
-  auto Constructor = boost::algorithm::find_last(MangledName, "C2E");
 
-  if (Constructor.begin() != Constructor.end()) {
+  auto Constructor = MangledName.rfind("C2E");
+  if (Constructor != llvm::StringRef::npos) {
     return true;
   }
 
-  Constructor = boost::algorithm::find_last(MangledName, "C1E");
-
-  if (Constructor.begin() != Constructor.end()) {
+  Constructor = MangledName.rfind("C1E");
+  if (Constructor != llvm::StringRef::npos) {
     return true;
   }
 
-  Constructor = boost::algorithm::find_last(MangledName, "C2E");
-
-  if (Constructor.begin() != Constructor.end()) {
+  Constructor = MangledName.rfind("C3E");
+  if (Constructor != llvm::StringRef::npos) {
     return true;
   }
 
diff --git a/unittests/Utils/BitVectorSetTest.cpp b/unittests/Utils/BitVectorSetTest.cpp
index 9f9a073b03..f85dba2d8b 100644
--- a/unittests/Utils/BitVectorSetTest.cpp
+++ b/unittests/Utils/BitVectorSetTest.cpp
@@ -6,6 +6,7 @@
 
 #include "gtest/gtest.h"
 
+#include <iterator>
 #include <set>
 #include <unordered_set>
 #include <utility>
@@ -345,8 +346,8 @@ TEST(BitVectorSet, iterator_movement) {
   auto IteratorA = A.begin();
   auto IteratorB = B.begin();
 
-  IteratorA += 4;
-  IteratorB += 2;
+  std::advance(IteratorA, 4);
+  std::advance(IteratorB, 2);
   EXPECT_EQ(*IteratorA, *IteratorB);
   EXPECT_EQ(A.count(*IteratorA), 1U);
   IteratorB++;
@@ -382,7 +383,6 @@ TEST(BitVectorSet, rangeFor) {
   const BitVectorSet<int> D({5, 6, 7, 8, 42, 13});
   std::set<int> DS;
   std::set<int> DSGT = {5, 6, 7, 8, 42, 13};
-  auto I = D.begin();
   for (auto I : D) {
     DS.insert(I);
   }

From a5c611ab0e5702191b101d7e09f96702aeacd68f Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Sun, 12 Oct 2025 10:17:41 +0200
Subject: [PATCH 22/24] GCC Compatibility (#787)

* Make phasar compile with gcc (g++-11) and uncover (and fix) two bugs related to json ser/de with LLVMAliasSet and LLVMBasedICFG that were not detected untio now, because of nlohmann's implicit conversions feature

* Address review comments

* Simplify isLLVMZeroValue according to the discussion in #787
---
 include/phasar/ControlFlow/CallGraphBase.h    |  4 +-
 .../phasar/DataFlow/IfdsIde/EdgeFunction.h    | 21 +++++++---
 .../phasar/DataFlow/IfdsIde/FlowFunctions.h   |  2 +-
 .../ControlFlow/LLVMBasedBackwardICFG.h       |  3 ++
 .../PhasarLLVM/ControlFlow/LLVMBasedICFG.h    |  3 ++
 .../ControlFlow/SparseLLVMBasedCFG.h          |  2 +
 .../ControlFlow/SparseLLVMBasedICFG.h         |  5 ++-
 .../ControlFlow/SparseLLVMBasedICFGView.h     |  3 ++
 .../IfdsIde/DefaultAliasAwareIDEProblem.h     |  9 ++++
 .../IfdsIde/DefaultNoAliasIDEProblem.h        | 10 +++++
 ...efaultReachableAllocationSitesIDEProblem.h | 10 +++++
 .../DataFlow/IfdsIde/LLVMZeroValue.h          | 20 ++++++---
 .../Problems/IDEInstInteractionAnalysis.h     | 42 +++++++++++--------
 .../IfdsIde/Problems/IDETypeStateAnalysis.h   |  5 ++-
 include/phasar/PhasarLLVM/HelperAnalyses.h    | 13 +++---
 .../phasar/PhasarLLVM/HelperAnalysisConfig.h  | 10 ++---
 .../phasar/PhasarLLVM/Pointer/LLVMAliasSet.h  |  2 +-
 lib/AnalysisStrategy/Strategies.cpp           |  2 +
 lib/ControlFlow/CallGraphAnalysisType.cpp     |  1 +
 .../ControlFlow/SparseLLVMBasedICFG.cpp       |  3 +-
 .../Problems/IDEFeatureTaintAnalysis.cpp      |  4 +-
 lib/PhasarLLVM/HelperAnalyses.cpp             |  5 ++-
 .../Passes/GeneralStatisticsAnalysis.cpp      |  2 +
 lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp       | 21 +++-------
 lib/Utils/NlohmannLogging.cpp                 |  2 +-
 tools/phasar-cli/phasar-cli.cpp               | 10 +++--
 .../IfdsIde/DefaultFlowFunctionTest.cpp       |  4 ++
 .../Pointer/LLVMAliasSetSerializationTest.cpp |  4 +-
 28 files changed, 149 insertions(+), 73 deletions(-)

diff --git a/include/phasar/ControlFlow/CallGraphBase.h b/include/phasar/ControlFlow/CallGraphBase.h
index 67bfb0cc94..1bc44b603c 100644
--- a/include/phasar/ControlFlow/CallGraphBase.h
+++ b/include/phasar/ControlFlow/CallGraphBase.h
@@ -37,7 +37,7 @@ template <typename Derived> class CallGraphBase : public CRTPBase<Derived> {
   /// NOTE: This function is typically called in a hot part of the analysis and
   /// should therefore be very fast
   [[nodiscard]] decltype(auto) getCalleesOfCallAt(ByConstRef<n_t> Inst) const
-      noexcept(noexcept(self().getCalleesOfCallAtImpl(Inst))) {
+      noexcept(noexcept(this->self().getCalleesOfCallAtImpl(Inst))) {
     static_assert(
         is_iterable_over_v<decltype(self().getCalleesOfCallAtImpl(Inst)), f_t>);
     return self().getCalleesOfCallAtImpl(Inst);
@@ -47,7 +47,7 @@ template <typename Derived> class CallGraphBase : public CRTPBase<Derived> {
   /// call the given function induced by the used call-graph.
   [[nodiscard]] decltype(auto) getCallersOf(ByConstRef<f_t> Fun) const {
     static_assert(
-        is_iterable_over_v<decltype(self().getCallersOfImpl(Fun)), n_t>);
+        is_iterable_over_v<decltype(this->self().getCallersOfImpl(Fun)), n_t>);
     return self().getCallersOfImpl(Fun);
   }
 };
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
index 0559e17afe..5e06b89e12 100644
--- a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
+++ b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
@@ -442,21 +442,32 @@ class [[clang::trivial_abi]] EdgeFunction final : EdgeFunctionBase {
             typename = std::enable_if_t<
                 !std::is_same_v<EdgeFunction, std::decay_t<ConcreteEF>> &&
                 IsEdgeFunction<ConcreteEF>>>
-  [[nodiscard]] friend bool operator==(EdgeFunctionRef<ConcreteEF> LHS,
-                                       const EdgeFunction &RHS) noexcept {
-    if (!RHS.template isa<ConcreteEF>()) {
+  [[nodiscard]] bool equals(EdgeFunctionRef<ConcreteEF> Other) const noexcept {
+    // NOTE: Workaround issue in g++ that does not allow transitive friends: If
+    // putting this code in the operator== below, we cannot access
+    // Other.Instance, although it is friended...
+    if (!isa<ConcreteEF>()) {
       return false;
     }
-    if (LHS.Instance == RHS.EF) {
+    if (Other.Instance == EF) {
       return true;
     }
     if constexpr (IsEqualityComparable<ConcreteEF>) {
-      return *LHS == *getPtr<ConcreteEF>(RHS.EF);
+      return *Other == *getPtr<ConcreteEF>(EF);
     } else {
       return true;
     }
   }
 
+  template <typename ConcreteEF,
+            typename = std::enable_if_t<
+                !std::is_same_v<EdgeFunction, std::decay_t<ConcreteEF>> &&
+                IsEdgeFunction<ConcreteEF>>>
+  [[nodiscard]] friend bool operator==(EdgeFunctionRef<ConcreteEF> LHS,
+                                       const EdgeFunction &RHS) noexcept {
+    return RHS.equals(LHS);
+  }
+
   template <typename ConcreteEF,
             typename = std::enable_if_t<
                 !std::is_same_v<EdgeFunction, std::decay_t<ConcreteEF>> &&
diff --git a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
index 6e54fe3936..783a5a3e91 100644
--- a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
+++ b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
@@ -73,7 +73,7 @@ template <typename D, typename Container = std::set<D>> class FlowFunction {
 template <typename FF> struct IsFlowFunction {
   template <typename D, typename Container>
   static std::true_type test(const FlowFunction<D, Container> &);
-  static std::false_type test(...) {}
+  static std::false_type test(...);
 
   static constexpr bool value = // NOLINT
       std::is_same_v<std::true_type,
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
index 670a6a6c9d..dedd1fd32b 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h
@@ -52,6 +52,9 @@ class LLVMBasedBackwardICFG : public LLVMBasedBackwardCFG,
   LLVMBasedBackwardICFG(LLVMBasedICFG *ForwardICFG);
 
 private:
+  using typename ICFGBase::f_t;
+  using typename ICFGBase::n_t;
+
   [[nodiscard]] FunctionRange getAllFunctionsImpl() const;
   [[nodiscard]] f_t getFunctionImpl(llvm::StringRef Fun) const;
 
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
index b14ca90f75..43e8e96d83 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
@@ -48,6 +48,9 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   friend ICFGBase;
 
 public:
+  using typename ICFGBase::f_t;
+  using typename ICFGBase::n_t;
+
   // For backward compatibility
   static constexpr llvm::StringLiteral GlobalCRuntimeModelName =
       GlobalCtorsDtorsModel::ModelName;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
index 6524bfad04..b4e41c2c44 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedCFG.h
@@ -30,6 +30,8 @@ class SparseLLVMBasedCFG : public LLVMBasedCFG,
   friend struct SVFGCache;
   friend SparseCFGBase<SparseLLVMBasedCFG>;
 
+  using typename LLVMBasedCFG::n_t;
+
 public:
   using vgraph_t =
       llvm::SmallDenseMap<const llvm::Instruction *, const llvm::Instruction *>;
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
index d9a1d9a931..f2fc45c0b5 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h
@@ -33,6 +33,9 @@ class SparseLLVMBasedICFG
   friend SparseLLVMBasedCFGProvider<SparseLLVMBasedICFG>;
 
 public:
+  using typename LLVMBasedICFG::f_t;
+  using typename LLVMBasedICFG::n_t;
+
   /// Constructor that delegates all arguments to the ctor of LLVMBasedICFG
   explicit SparseLLVMBasedICFG(LLVMProjectIRDB *IRDB,
                                CallGraphAnalysisType CGType,
@@ -47,7 +50,7 @@ class SparseLLVMBasedICFG
                                LLVMAliasInfoRef PT);
 
   explicit SparseLLVMBasedICFG(LLVMProjectIRDB *IRDB,
-                               const nlohmann::json &SerializedCG,
+                               const CallGraphData &SerializedCG,
                                LLVMAliasInfoRef PT);
 
   ~SparseLLVMBasedICFG();
diff --git a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
index 25b773d675..303bee8fb3 100644
--- a/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
+++ b/include/phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFGView.h
@@ -45,6 +45,9 @@ class SparseLLVMBasedICFGView
   friend SparseLLVMBasedCFGProvider<SparseLLVMBasedICFGView>;
 
 public:
+  using typename LLVMBasedCFG::f_t;
+  using typename LLVMBasedCFG::n_t;
+
   explicit SparseLLVMBasedICFGView(const LLVMBasedICFG *ICF,
                                    LLVMAliasInfoRef PT);
 
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
index aac4390f97..0f1214504d 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
@@ -65,6 +65,10 @@ class DefaultAliasAwareIDEProblem
       protected detail::IDEAliasAwareDefaultFlowFunctionsImpl {
 public:
   using typename IDETabulationProblem<AnalysisDomainTy>::db_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::n_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::f_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::d_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::FlowFunctionPtrType;
 
   using detail::IDEAliasAwareDefaultFlowFunctionsImpl::getAliasInfo;
 
@@ -110,6 +114,11 @@ class DefaultAliasAwareIFDSProblem
     : public IFDSTabulationProblem<LLVMAnalysisDomainDefault>,
       protected detail::IDEAliasAwareDefaultFlowFunctionsImpl {
 public:
+  using typename IFDSTabulationProblem::d_t;
+  using typename IFDSTabulationProblem::f_t;
+  using typename IFDSTabulationProblem::FlowFunctionPtrType;
+  using typename IFDSTabulationProblem::n_t;
+
   /// Constructs an IFDSTabulationProblem with the usual arguments + alias
   /// information.
   ///
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
index 3bb35b42ca..19c00ac008 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h
@@ -59,6 +59,10 @@ class DefaultNoAliasIDEProblem
 public:
   using IDETabulationProblem<AnalysisDomainTy>::IDETabulationProblem;
 
+  using typename IDETabulationProblem<AnalysisDomainTy>::f_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::FlowFunctionPtrType;
+  using typename IDETabulationProblem<AnalysisDomainTy>::n_t;
+
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
                                                           n_t Succ) override {
     return getNormalFlowFunctionImpl(Curr, Succ);
@@ -89,6 +93,12 @@ class DefaultNoAliasIFDSProblem
 public:
   using IFDSTabulationProblem::IFDSTabulationProblem;
 
+  using typename IFDSTabulationProblem::d_t;
+  using typename IFDSTabulationProblem::f_t;
+  using typename IFDSTabulationProblem::FlowFunctionPtrType;
+  using typename IFDSTabulationProblem::l_t;
+  using typename IFDSTabulationProblem::n_t;
+
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunction(n_t Curr,
                                                           n_t Succ) override {
     return getNormalFlowFunctionImpl(Curr, Succ);
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
index eac661ccd4..2f127432c4 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
@@ -66,6 +66,10 @@ class DefaultReachableAllocationSitesIDEProblem
       protected detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl {
 public:
   using typename IDETabulationProblem<AnalysisDomainTy>::db_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::d_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::f_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::n_t;
+  using typename IDETabulationProblem<AnalysisDomainTy>::FlowFunctionPtrType;
 
   /// Constructs an IDETabulationProblem with the usual arguments + alias
   /// information.
@@ -109,6 +113,12 @@ class DefaultReachableAllocationSitesIFDSProblem
     : public IFDSTabulationProblem<LLVMIFDSAnalysisDomainDefault>,
       protected detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl {
 public:
+  using typename IFDSTabulationProblem::d_t;
+  using typename IFDSTabulationProblem::db_t;
+  using typename IFDSTabulationProblem::f_t;
+  using typename IFDSTabulationProblem::FlowFunctionPtrType;
+  using typename IFDSTabulationProblem::n_t;
+
   /// Constructs an IFDSTabulationProblem with the usual arguments + alias
   /// information.
   ///
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
index 729e3c44a5..2d3b2ae27c 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h
@@ -17,6 +17,8 @@
 #ifndef PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LLVMZEROVALUE_H
 #define PHASAR_PHASARLLVM_DATAFLOW_IFDSIDE_LLVMZEROVALUE_H
 
+#include "phasar/Utils/Fn.h"
+
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/GlobalVariable.h"
 
@@ -36,6 +38,9 @@ class LLVMZeroValue : public llvm::GlobalVariable {
   LLVMZeroValue(llvm::Module &Mod);
 
   static constexpr llvm::StringLiteral LLVMZeroValueInternalName = "zero_value";
+  static bool isZeroValueImpl(const llvm::Value *V) noexcept {
+    return V == getInstance();
+  }
 
 public:
   LLVMZeroValue(const LLVMZeroValue &Z) = delete;
@@ -48,13 +53,18 @@ class LLVMZeroValue : public llvm::GlobalVariable {
     return LLVMZeroValueInternalName;
   }
 
-  // Do not specify a destructor (at all)!
-  static const LLVMZeroValue *getInstance();
+  /// Gets the singleton instance of the special zero value (aka. Λ).
+  [[nodiscard]] static const LLVMZeroValue *getInstance();
 
+  /// Checks, whether the given llvm::Value * is the special zero-value (aka.
+  /// Λ).
+  ///
+  /// You can use this as follows:
+  /// \code
+  /// return strongUpdateStore(Store, LLVMZeroValue::isLLVMZeroValue);
+  /// \endcode
   // NOLINTNEXTLINE(readability-identifier-naming)
-  static constexpr auto isLLVMZeroValue = [](const llvm::Value *V) noexcept {
-    return V == getInstance();
-  };
+  static constexpr auto isLLVMZeroValue = fn<isZeroValueImpl>;
 };
 } // namespace psr
 
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h
index 4bfe3ecccd..01518d555e 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysis.h
@@ -969,17 +969,6 @@ class IDEInstInteractionAnalysisT
 
     [[nodiscard]] bool isConstant() const noexcept { return true; }
 
-    friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                         const IIAAKillOrReplaceEF &EF) {
-      OS << "EF: (IIAAKillOrReplaceEF)<->";
-      if (EF.isKillAll()) {
-        OS << "(KillAll";
-      } else {
-        IDEInstInteractionAnalysisT::printEdgeFactImpl(OS, EF.Replacement);
-      }
-      return OS << ")";
-    }
-
     [[nodiscard]] bool isKillAll() const noexcept {
       if (auto *RSet = std::get_if<BitVectorSet<e_t>>(&Replacement)) {
         return RSet->empty();
@@ -993,6 +982,20 @@ class IDEInstInteractionAnalysisT
     }
   };
 
+  // Note: Having this operator a friend of the IDEInstInteractionAnalysisT
+  // (instead of IIAAKillOrReplaceEF) is required for gcc; otherwise, it cannot
+  // call the protected function printEdgeFactImpl.
+  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                       const IIAAKillOrReplaceEF &EF) {
+    OS << "EF: (IIAAKillOrReplaceEF)<->";
+    if (EF.isKillAll()) {
+      OS << "(KillAll";
+    } else {
+      IDEInstInteractionAnalysisT::printEdgeFactImpl(OS, EF.Replacement);
+    }
+    return OS << ")";
+  }
+
   // Edge function that adds the given labels to existing labels
   // add all labels provided by Data.
   struct IIAAAddLabelsEF {
@@ -1018,19 +1021,22 @@ class IDEInstInteractionAnalysisT
       return Data == Other.Data;
     }
 
-    friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
-                                         const IIAAAddLabelsEF &EF) {
-      OS << "EF: (IIAAAddLabelsEF: ";
-      IDEInstInteractionAnalysisT::printEdgeFactImpl(OS, EF.Data);
-      return OS << ")";
-    }
-
     // NOLINTNEXTLINE(readability-identifier-naming) -- needed for ADL
     friend llvm::hash_code hash_value(const IIAAAddLabelsEF &EF) {
       return hash_value(EF.Data);
     }
   };
 
+  // Note: Having this operator a friend of the IDEInstInteractionAnalysisT
+  // (instead of IIAAAddLabelsEF) is required for gcc; otherwise, it cannot
+  // call the protected function printEdgeFactImpl.
+  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                       const IIAAAddLabelsEF &EF) {
+    OS << "EF: (IIAAAddLabelsEF: ";
+    IDEInstInteractionAnalysisT::printEdgeFactImpl(OS, EF.Data);
+    return OS << ")";
+  }
+
   const auto &getData(const EdgeFunction<l_t> &EF) {
     if (const auto *AddLabels = llvm::dyn_cast<IIAAAddLabelsEF>(EF)) {
       return AddLabels->Data;
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
index a09c1a63b1..2ad53bb9a2 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/Problems/IDETypeStateAnalysis.h
@@ -19,6 +19,7 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMZeroValue.h"
 #include "phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/JoinLattice.h"
 #include "phasar/Utils/Logger.h"
 #include "phasar/Utils/Printer.h"
@@ -41,7 +42,7 @@ namespace detail {
 class IDETypeStateAnalysisBaseCommon : public LLVMAnalysisDomainDefault {
 public:
   using container_type = std::set<d_t>;
-  using FlowFunctionPtrType = FlowFunctionPtrType<d_t, container_type>;
+  using FlowFunctionPtrType = psr::FlowFunctionPtrType<d_t, container_type>;
 };
 
 class IDETypeStateAnalysisBase
@@ -217,7 +218,7 @@ class IDETypeStateAnalysis
   };
 
   struct TSEdgeFunction {
-    using l_t = l_t;
+    using l_t = IDETypeStateAnalysis::l_t;
     const TypeStateDescriptionTy *TSD{};
     // XXX: Do we really need a string here? Can't we just use an integer or sth
     // else that is cheap?
diff --git a/include/phasar/PhasarLLVM/HelperAnalyses.h b/include/phasar/PhasarLLVM/HelperAnalyses.h
index 2c6f06000b..c3287ffe94 100644
--- a/include/phasar/PhasarLLVM/HelperAnalyses.h
+++ b/include/phasar/PhasarLLVM/HelperAnalyses.h
@@ -11,13 +11,12 @@
 #define PHASAR_PHASARLLVM_HELPERANALYSES_H
 
 #include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphData.h"
 #include "phasar/PhasarLLVM/HelperAnalysisConfig.h"
-
-#include "nlohmann/json.hpp"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
 
 #include <memory>
 #include <optional>
-#include <set>
 #include <vector>
 
 namespace llvm {
@@ -34,10 +33,10 @@ class LLVMAliasSet;
 class HelperAnalyses { // NOLINT(cppcoreguidelines-special-member-functions)
 public:
   explicit HelperAnalyses(std::string IRFile,
-                          std::optional<nlohmann::json> PrecomputedPTS,
+                          std::optional<LLVMAliasSetData> PrecomputedPTS,
                           AliasAnalysisType PTATy, bool AllowLazyPTS,
                           std::vector<std::string> EntryPoints,
-                          std::optional<nlohmann::json> PrecomputedCG,
+                          std::optional<CallGraphData> PrecomputedCG,
                           CallGraphAnalysisType CGTy, Soundness SoundnessLevel,
                           bool AutoGlobalSupport) noexcept;
 
@@ -75,12 +74,12 @@ class HelperAnalyses { // NOLINT(cppcoreguidelines-special-member-functions)
   std::string IRFile;
 
   // PTS
-  std::optional<nlohmann::json> PrecomputedPTS;
+  std::optional<LLVMAliasSetData> PrecomputedPTS;
   AliasAnalysisType PTATy{};
   bool AllowLazyPTS{};
 
   // ICF
-  std::optional<nlohmann::json> PrecomputedCG;
+  std::optional<CallGraphData> PrecomputedCG;
   std::vector<std::string> EntryPoints;
   CallGraphAnalysisType CGTy{};
   Soundness SoundnessLevel{};
diff --git a/include/phasar/PhasarLLVM/HelperAnalysisConfig.h b/include/phasar/PhasarLLVM/HelperAnalysisConfig.h
index df59c41c52..be3427667b 100644
--- a/include/phasar/PhasarLLVM/HelperAnalysisConfig.h
+++ b/include/phasar/PhasarLLVM/HelperAnalysisConfig.h
@@ -11,17 +11,17 @@
 #define PHASAR_PHASARLLVM_HELPERANALYSISCONFIG_H
 
 #include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphData.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
 #include "phasar/Utils/Soundness.h"
 
-#include "nlohmann/json.hpp"
-
 #include <optional>
 
 namespace psr {
 struct HelperAnalysisConfig {
-  std::optional<nlohmann::json> PrecomputedPTS = std::nullopt;
-  std::optional<nlohmann::json> PrecomputedCG = std::nullopt;
+  std::optional<LLVMAliasSetData> PrecomputedPTS = std::nullopt;
+  std::optional<CallGraphData> PrecomputedCG = std::nullopt;
   AliasAnalysisType PTATy = AliasAnalysisType::CFLAnders;
   CallGraphAnalysisType CGTy = CallGraphAnalysisType::OTF;
   Soundness SoundnessLevel = Soundness::Soundy;
@@ -31,7 +31,7 @@ struct HelperAnalysisConfig {
   /// existing llvm::Module
   bool PreprocessExistingModule = true;
 
-  HelperAnalysisConfig &&withCGType(CallGraphAnalysisType CGTy) &&noexcept {
+  HelperAnalysisConfig &&withCGType(CallGraphAnalysisType CGTy) && noexcept {
     this->CGTy = CGTy;
     return std::move(*this);
   }
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
index eeffe7412a..5b99be1654 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
@@ -63,7 +63,7 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
 
   /// Loads alias sets from JSON
   explicit LLVMAliasSet(LLVMProjectIRDB *IRDB,
-                        const nlohmann::json &SerializedPTS);
+                        const LLVMAliasSetData &SerializedPTS);
 
   [[nodiscard]] inline bool isInterProcedural() const noexcept {
     return false;
diff --git a/lib/AnalysisStrategy/Strategies.cpp b/lib/AnalysisStrategy/Strategies.cpp
index 844b4e650c..9b99ef33be 100644
--- a/lib/AnalysisStrategy/Strategies.cpp
+++ b/lib/AnalysisStrategy/Strategies.cpp
@@ -10,6 +10,7 @@
 #include "phasar/AnalysisStrategy/Strategies.h"
 
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace psr {
@@ -24,6 +25,7 @@ std::string toString(const AnalysisStrategy &S) {
   case AnalysisStrategy::None:
     return "None";
   }
+  llvm_unreachable("All alternatives should be handled by the switch above");
 }
 
 AnalysisStrategy toAnalysisStrategy(llvm::StringRef S) {
diff --git a/lib/ControlFlow/CallGraphAnalysisType.cpp b/lib/ControlFlow/CallGraphAnalysisType.cpp
index 64473cc95e..e244e28a86 100644
--- a/lib/ControlFlow/CallGraphAnalysisType.cpp
+++ b/lib/ControlFlow/CallGraphAnalysisType.cpp
@@ -21,6 +21,7 @@ std::string psr::toString(CallGraphAnalysisType CGA) {
   case CallGraphAnalysisType::Invalid:
     return "Invalid";
   }
+  llvm_unreachable("All alternatives should be handled by the switch above");
 }
 
 psr::CallGraphAnalysisType psr::toCallGraphAnalysisType(llvm::StringRef S) {
diff --git a/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.cpp b/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.cpp
index ccaf80b2cf..2ef09c1a3d 100644
--- a/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.cpp
+++ b/lib/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.cpp
@@ -1,5 +1,6 @@
 #include "phasar/PhasarLLVM/ControlFlow/SparseLLVMBasedICFG.h"
 
+#include "phasar/ControlFlow/CallGraphData.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
 #include "SVFGCache.h"
@@ -32,7 +33,7 @@ SparseLLVMBasedICFG::SparseLLVMBasedICFG(CallGraph<n_t, f_t> CG,
       AliasAnalysis(PT) {}
 
 SparseLLVMBasedICFG::SparseLLVMBasedICFG(LLVMProjectIRDB *IRDB,
-                                         const nlohmann::json &SerializedCG,
+                                         const CallGraphData &SerializedCG,
                                          LLVMAliasInfoRef PT)
     : LLVMBasedICFG(IRDB, SerializedCG), SparseCFGCache(new SVFGCache{}),
       AliasAnalysis(PT) {}
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.cpp
index 1941ba9ef6..729a493b67 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEFeatureTaintAnalysis.cpp
@@ -357,11 +357,11 @@ struct IDEFeatureTaintAnalysis::GenerateEF {
     llvm::report_fatal_error("Implemented in 'combine'");
   }
 
-  constexpr friend bool operator==(const GenerateEF &L, const GenerateEF &R) {
+  friend bool operator==(const GenerateEF &L, const GenerateEF &R) {
     return L.Facts == R.Facts;
   }
 
-  constexpr friend llvm::hash_code hash_value(const GenerateEF &EF) {
+  friend llvm::hash_code hash_value(const GenerateEF &EF) {
     return hash_value(EF.Facts);
   }
 };
diff --git a/lib/PhasarLLVM/HelperAnalyses.cpp b/lib/PhasarLLVM/HelperAnalyses.cpp
index ce9b2f095f..721a313db3 100644
--- a/lib/PhasarLLVM/HelperAnalyses.cpp
+++ b/lib/PhasarLLVM/HelperAnalyses.cpp
@@ -3,6 +3,7 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 
 #include <memory>
@@ -10,10 +11,10 @@
 
 namespace psr {
 HelperAnalyses::HelperAnalyses(std::string IRFile,
-                               std::optional<nlohmann::json> PrecomputedPTS,
+                               std::optional<LLVMAliasSetData> PrecomputedPTS,
                                AliasAnalysisType PTATy, bool AllowLazyPTS,
                                std::vector<std::string> EntryPoints,
-                               std::optional<nlohmann::json> PrecomputedCG,
+                               std::optional<CallGraphData> PrecomputedCG,
                                CallGraphAnalysisType CGTy,
                                Soundness SoundnessLevel,
                                bool AutoGlobalSupport) noexcept
diff --git a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
index 9b5befda55..c18afd258b 100644
--- a/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
+++ b/lib/PhasarLLVM/Passes/GeneralStatisticsAnalysis.cpp
@@ -328,6 +328,8 @@ llvm::raw_ostream &psr::operator<<(llvm::raw_ostream &OS,
          << AlignNum("Debug Intrinsics", Statistics.DebugIntrinsics)
          << AlignNum("Switches", Statistics.Switches)
          << AlignNum("GetElementPtrs", Statistics.GetElementPtrs)
+         << AlignNum("Loads", Statistics.LoadInstructions)
+         << AlignNum("Stores", Statistics.StoreInstructions)
          << AlignNum("Phi Nodes", Statistics.PhiNodes)
          << AlignNum("LandingPads", Statistics.LandingPads)
          << AlignNum("Basic Blocks", Statistics.BasicBlocks)
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
index 7b216842c2..d66b161618 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
@@ -97,7 +97,7 @@ LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB, bool UseLazyEvaluation,
 }
 
 LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB,
-                           const nlohmann::json &SerializedPTS)
+                           const LLVMAliasSetData &SerializedPTS)
     : PTA(AliasAnalysisView::create(*IRDB, true, AliasAnalysisType::Basic)) {
   assert(IRDB != nullptr);
   // Assume, we already have validated the json schema
@@ -105,23 +105,19 @@ LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB,
   PHASAR_LOG_LEVEL_CAT(DEBUG, "LLVMAliasSet",
                        "Load precomputed points-to info from JSON");
 
-  const auto &Sets = SerializedPTS.at("AliasSets");
-  assert(Sets.is_array());
-  const auto &Fns = SerializedPTS.at("AnalyzedFunctions");
-  assert(Fns.is_array());
+  const auto &Sets = SerializedPTS.AliasSets;
+  const auto &Fns = SerializedPTS.AnalyzedFunctions;
 
   /// Deserialize the AliasSets - an array of arrays (both are to be
   /// interpreted as sets of metadata-ids)
 
   Owner.reserve(Sets.size());
   for (const auto &PtsJson : Sets) {
-    assert(PtsJson.is_array());
     auto PTS = Owner.acquire();
     for (const auto &Alias : PtsJson) {
-      const auto AliasStr = Alias.get<std::string>();
-      const auto *Inst = fromMetaDataId(*IRDB, AliasStr);
+      const auto *Inst = fromMetaDataId(*IRDB, Alias);
       if (!Inst) {
-        PHASAR_LOG_LEVEL(WARNING, "Invalid Value-Id: " << AliasStr);
+        PHASAR_LOG_LEVEL(WARNING, "Invalid Value-Id: " << Alias);
         continue;
       }
 
@@ -135,12 +131,7 @@ LLVMAliasSet::LLVMAliasSet(LLVMProjectIRDB *IRDB,
 
   AnalyzedFunctions.reserve(Fns.size());
   for (const auto &F : Fns) {
-    if (!F.is_string()) {
-      PHASAR_LOG_LEVEL(WARNING, "Invalid Function Name: " << F);
-      continue;
-    }
-
-    const auto *IRFn = IRDB->getFunction(F.get<std::string>());
+    const auto *IRFn = IRDB->getFunction(F);
 
     if (!IRFn) {
       PHASAR_LOG_LEVEL(WARNING, "Function: " << F << " not in the IRDB");
diff --git a/lib/Utils/NlohmannLogging.cpp b/lib/Utils/NlohmannLogging.cpp
index e84d97c44a..c145e9df5f 100644
--- a/lib/Utils/NlohmannLogging.cpp
+++ b/lib/Utils/NlohmannLogging.cpp
@@ -43,7 +43,7 @@ class LLVMOutputAdapter {
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const nlohmann::json &J) {
   // do the actual serialization
-  nlohmann::detail::serializer<nlohmann::json> S(LLVMOutputAdapter(OS), ' ');
+  nlohmann::detail::serializer<nlohmann::json> S{LLVMOutputAdapter(OS), ' '};
   S.dump(J, true, false, 4);
   return OS;
 }
diff --git a/tools/phasar-cli/phasar-cli.cpp b/tools/phasar-cli/phasar-cli.cpp
index c3addbb994..0169441aae 100644
--- a/tools/phasar-cli/phasar-cli.cpp
+++ b/tools/phasar-cli/phasar-cli.cpp
@@ -10,8 +10,10 @@
 #include "phasar/AnalysisStrategy/Strategies.h"
 #include "phasar/Config/Configuration.h"
 #include "phasar/ControlFlow/CallGraphAnalysisType.h"
+#include "phasar/ControlFlow/CallGraphData.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
 #include "phasar/Utils/IO.h"
@@ -442,16 +444,16 @@ int main(int Argc, const char **Argv) {
   SolverConfig.setComputePersistedSummaries(PersistedSummariesOpt);
   SolverConfig.setEmitESG(EmitESGAsDotOpt);
 
-  std::optional<nlohmann::json> PrecomputedAliasSet;
+  std::optional<LLVMAliasSetData> PrecomputedAliasSet;
   if (!LoadPTAFromJsonOpt.empty()) {
     PHASAR_LOG_LEVEL(INFO, "Load AliasInfo from file: " << LoadCGFromJsonOpt);
-    PrecomputedAliasSet = readJsonFile(LoadPTAFromJsonOpt);
+    PrecomputedAliasSet = LLVMAliasSetData::deserializeJson(LoadPTAFromJsonOpt);
   }
 
-  std::optional<nlohmann::json> PrecomputedCallGraph;
+  std::optional<CallGraphData> PrecomputedCallGraph;
   if (!LoadCGFromJsonOpt.empty()) {
     PHASAR_LOG_LEVEL(INFO, "Load CallGraph from file: " << LoadCGFromJsonOpt);
-    PrecomputedCallGraph = readJsonFile(LoadCGFromJsonOpt);
+    PrecomputedCallGraph = CallGraphData::deserializeJson(LoadCGFromJsonOpt);
   }
 
   if (EntryOpt.empty()) {
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
index 619617ccd0..4edb035297 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
@@ -37,6 +37,10 @@ class IDEAliasImpl : public DefaultAliasAwareIFDSProblem {
 
 class IDENoAliasImpl : public DefaultNoAliasIFDSProblem {
 public:
+  using typename DefaultNoAliasIFDSProblem::d_t;
+  using typename DefaultNoAliasIFDSProblem::l_t;
+  using typename DefaultNoAliasIFDSProblem::n_t;
+
   IDENoAliasImpl(LLVMProjectIRDB *IRDB)
       : DefaultNoAliasIFDSProblem(IRDB, {}, {}) {};
 
diff --git a/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp b/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp
index 7d55448ea8..496aeff6b1 100644
--- a/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp
+++ b/unittests/PhasarLLVM/Pointer/LLVMAliasSetSerializationTest.cpp
@@ -3,6 +3,7 @@
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/Utils/Logger.h"
 
@@ -87,7 +88,8 @@ static void analyze(llvm::StringRef File, const GroundTruthTy &Gt,
   nlohmann::json PrintAsJsonSer = nlohmann::json::parse(SerString);
   checkSer(PrintAsJsonSer, Gt);
 
-  LLVMAliasSet PrintAsJsonDeser(&IRDB, PrintAsJsonSer);
+  LLVMAliasSet PrintAsJsonDeser(&IRDB,
+                                LLVMAliasSetData::loadJsonString(SerString));
   checkDeser(*IRDB.getModule(), PTS, PrintAsJsonDeser);
 }
 

From 17491f6cd37dd7c362122b79fa7b8951868213da Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Thu, 23 Oct 2025 17:56:59 +0200
Subject: [PATCH 23/24] Alias Iterator (#783)

* Add AliasIterator

* Add alias() check as optional member to AliasIterator

* Integrate AliasIterator into Default[IFDS/IDE]AliasAwareFlowFunctions

* Some restructure

* Add PointsToIterator and integrate it with SVFBasedPointsToInfo

* Integrate reachableAllocationSites with PointsToIterator

* Add boilerplate + some comments

* Start adding SVFAliasInfo for SVF-DDA(WIP)

* Fill missing functions for SVFAliasInfoImpl

* minor

* Fix FilteredLLVMAliasSet

* Fix example

* Fix some bugs in aliasiterator and pointstoiterator

* minor fix

* Remove AliasIterator::alias as it is probably not needed and makes the API more complex and harder to adopt

* Add FilteredLLVMAliasIterator

* Implement FilteredLLVMAliasSet in terms of FilteredLLVMAliasIterator

* Add CachedLLVMAliasIterator and implement FilteredLLVMAliasSet in terms of it

* Make AliasIterator more convenient to use by reducing the requirement of typedefs v_t and n_t

* Attempt to fix install in CI

Apparently, cmake does not like relative paths on the commandline anymore...

* Add find_package_message to Config.cmake.in

* minor
---
 .github/workflows/ci.yml                      |   3 +-
 Config.cmake.in                               |  17 +-
 .../how-to/07-write-ifds-analysis/simple.cpp  |  19 +-
 .../IfdsIde/DefaultAliasAwareIDEProblem.h     |  17 +-
 ...efaultReachableAllocationSitesIDEProblem.h |  16 +-
 include/phasar/PhasarLLVM/Pointer.h           |   5 +
 .../Pointer/CachedLLVMAliasIterator.h         | 129 +++++++
 .../Pointer/FilteredLLVMAliasIterator.h       |  40 ++
 .../PhasarLLVM/Pointer/FilteredLLVMAliasSet.h | 141 +------
 .../phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h |   4 +
 .../phasar/PhasarLLVM/Pointer/LLVMAliasSet.h  |  24 +-
 .../PhasarLLVM/Pointer/LLVMPointsToInfo.h     |  31 ++
 .../PhasarLLVM/Pointer/SVF/SVFPointsToSet.h   |  34 ++
 include/phasar/Pointer.h                      |   2 +
 include/phasar/Pointer/AliasAnalysisType.def  |   3 +
 include/phasar/Pointer/AliasAnalysisType.h    |   3 +
 include/phasar/Pointer/AliasInfo.h            |  58 ++-
 include/phasar/Pointer/AliasInfoBase.h        |   1 +
 include/phasar/Pointer/AliasIterator.h        | 169 ++++++++
 include/phasar/Pointer/AliasSetOwner.h        |   2 +-
 include/phasar/Pointer/PointsToInfo.h         |  80 ++--
 include/phasar/Pointer/PointsToIterator.h     | 365 ++++++++++++++++++
 include/phasar/Utils/PointerUtils.h           |  41 ++
 include/phasar/Utils/TypeErasureUtils.h       |  64 +++
 include/phasar/Utils/Utilities.h              |   4 +-
 .../DefaultAliasAwareIDEFlowFunctions.cpp     |  23 +-
 ...aultReachableAllocationSitesIDEProblem.cpp |  46 ++-
 lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp  |  13 +-
 .../Pointer/CachedLLVMAliasIterator.cpp       | 143 +++++++
 lib/PhasarLLVM/Pointer/FilteredAliasesUtils.h |  68 ++++
 .../Pointer/FilteredLLVMAliasIterator.cpp     |  60 +++
 .../Pointer/FilteredLLVMAliasSet.cpp          | 287 --------------
 lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp       |  27 +-
 lib/PhasarLLVM/Pointer/Pointer.cppm           |   5 +
 lib/PhasarLLVM/Pointer/SVF/PhasarSVFUtils.h   |  51 +++
 .../Pointer/SVF/SVFBasedAliasAnalysis.cpp     | 248 +++++++++++-
 lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp | 103 ++++-
 lib/PhasarLLVM/Utils/LLVMShorthands.cpp       |   3 +
 lib/Pointer/PhasarPointer.cppm                |   7 +
 test/llvm_test_code/pointers/call_01.cpp      |   4 +-
 .../IfdsIde/DefaultFlowFunctionTest.cpp       |  11 +-
 .../PhasarLLVM/Pointer/LLVMAliasSetTest.cpp   |  12 +
 .../PhasarLLVM/Pointer/SVFAliasSetTest.cpp    |  46 +++
 43 files changed, 1858 insertions(+), 571 deletions(-)
 create mode 100644 include/phasar/PhasarLLVM/Pointer/CachedLLVMAliasIterator.h
 create mode 100644 include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.h
 create mode 100644 include/phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h
 create mode 100644 include/phasar/Pointer/AliasIterator.h
 create mode 100644 include/phasar/Pointer/PointsToIterator.h
 create mode 100644 include/phasar/Utils/TypeErasureUtils.h
 create mode 100644 lib/PhasarLLVM/Pointer/CachedLLVMAliasIterator.cpp
 create mode 100644 lib/PhasarLLVM/Pointer/FilteredAliasesUtils.h
 create mode 100644 lib/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.cpp
 delete mode 100644 lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
 create mode 100644 lib/PhasarLLVM/Pointer/SVF/PhasarSVFUtils.h

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0031d9ef5d..2b7f22bad6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,6 +73,7 @@ jobs:
         shell: bash
         run: |
           cmake -DCMAKE_INSTALL_PREFIX=./INSTALL -P ./build/cmake_install.cmake
+          PHASAR_ROOT_DIR=$(pwd)
           cd ./examples/how-to
-          cmake -S . -B build -Dphasar_ROOT=../../INSTALL
+          cmake -S . -B build -Dphasar_ROOT="$PHASAR_ROOT_DIR/INSTALL"
           cmake --build ./build --target run_sample_programs
diff --git a/Config.cmake.in b/Config.cmake.in
index ecdb47dbc9..0af87e19b9 100644
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -54,17 +54,30 @@ include("${CMAKE_CURRENT_LIST_DIR}/PhasarExports.cmake")
 
 foreach(component ${phasar_FIND_COMPONENTS})
   if(NOT ${component} IN_LIST PHASAR_COMPONENTS)
-    set(phasar_FOUND false)
+    set(phasar_FOUND FALSE)
     set(phasar_NOT_FOUND_MESSAGE "Unsupported component: ${component}. Valid components are: ${PHASAR_COMPONENTS}")
   endif()
 
   list(APPEND PHASAR_NEEDED_LIBS phasar::${component})
 endforeach()
 
-if (NOT DEFINED phasar_FOUND OR phasar_FOUND EQUAL TRUE)
+if (NOT DEFINED phasar_FOUND)
+  set(phasar_FOUND TRUE)
+endif()
+
+include(FindPackageHandleStandardArgs)
+
+if (phasar_FOUND)
   if (NOT phasar_FIND_COMPONENTS)
     list(APPEND PHASAR_NEEDED_LIBS phasar::phasar)
     # Default target
     add_library(phasar ALIAS phasar::phasar)
   endif()
+
+  find_package_message(phasar
+    "Found phasar: ${PHASAR_LIBRARY_DIR} (found version \"${PHASAR_VERSION}\")"
+    "[${PHASAR_LIBRARY_DIR}][${PHASAR_INCLUDE_DIR}]"
+  )
+else()
+  message(STATUS "Could NOT find phasar")
 endif()
diff --git a/examples/how-to/07-write-ifds-analysis/simple.cpp b/examples/how-to/07-write-ifds-analysis/simple.cpp
index 0a87764e9d..34ea367b47 100644
--- a/examples/how-to/07-write-ifds-analysis/simple.cpp
+++ b/examples/how-to/07-write-ifds-analysis/simple.cpp
@@ -7,8 +7,9 @@
 
 namespace {
 
-void populateWithMayAliases(psr::LLVMAliasInfoRef AS,
-                            std::set<const llvm::Value *> &Facts);
+void populateWithMayAliases(psr::LLVMAliasIteratorRef AS,
+                            std::set<const llvm::Value *> &Facts,
+                            const llvm::Instruction *At);
 
 /// To create a custom IFDS analysis, we must create a subclass of the
 /// IFDSTabulationProblem.
@@ -23,7 +24,7 @@ class ExampleTaintAnalysis : public psr::DefaultAliasAwareIFDSProblem {
   /// The last parameter of the base-ctor denotes the special zero-value of the
   /// IFDS problem. We use LLVMZeroValue for this.
   explicit ExampleTaintAnalysis(const psr::LLVMProjectIRDB *IRDB,
-                                psr::LLVMAliasInfoRef AS,
+                                psr::LLVMAliasIteratorRef AS,
                                 const psr::LLVMTaintConfig *Config,
                                 std::vector<std::string> EntryPoints)
       : psr::DefaultAliasAwareIFDSProblem(IRDB, AS, std::move(EntryPoints),
@@ -63,8 +64,8 @@ class ExampleTaintAnalysis : public psr::DefaultAliasAwareIFDSProblem {
     }
 
     // Since our analysis is alias-aware, we must handle aliasing here:
-    populateWithMayAliases(getAliasInfo(), Gen);
-    populateWithMayAliases(getAliasInfo(), Leak);
+    populateWithMayAliases(getAliasInfo(), Gen, CallSite);
+    populateWithMayAliases(getAliasInfo(), Leak, CallSite);
 
     // We have special behavior to communicate to the analysis solver, so create
     // a flow-function that captures this behavior:
@@ -101,12 +102,12 @@ class ExampleTaintAnalysis : public psr::DefaultAliasAwareIFDSProblem {
 };
 
 // For all given facts, we add their aliases:
-void populateWithMayAliases(psr::LLVMAliasInfoRef AS,
-                            std::set<const llvm::Value *> &Facts) {
+void populateWithMayAliases(psr::LLVMAliasIteratorRef AS,
+                            std::set<const llvm::Value *> &Facts,
+                            const llvm::Instruction *At) {
   auto Tmp = Facts;
   for (const auto *Fact : Facts) {
-    auto Aliases = AS.getAliasSet(Fact);
-    Tmp.insert(Aliases->begin(), Aliases->end());
+    AS.forallAliasesOf(Fact, At, [&](const auto *Alias) { Tmp.insert(Alias); });
   }
 
   Facts = std::move(Tmp);
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
index 0f1214504d..fbe5e3d14e 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEProblem.h
@@ -36,14 +36,13 @@ class IDEAliasAwareDefaultFlowFunctionsImpl
 
   using IDENoAliasDefaultFlowFunctionsImpl::isFunctionModeled;
 
-  [[nodiscard]] constexpr LLVMAliasInfoRef getAliasInfo() const noexcept {
+  [[nodiscard]] constexpr LLVMAliasIteratorRef getAliasInfo() const noexcept {
     return AS;
   }
 
-  constexpr IDEAliasAwareDefaultFlowFunctionsImpl(LLVMAliasInfoRef AS) noexcept
-      : AS(AS) {
-    assert(AS && "You must provide an alias information handle!");
-  }
+  constexpr IDEAliasAwareDefaultFlowFunctionsImpl(
+      LLVMAliasIteratorRef AS) noexcept
+      : AS(AS) {}
 
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunctionImpl(n_t Curr,
                                                               n_t /*Succ*/);
@@ -54,8 +53,8 @@ class IDEAliasAwareDefaultFlowFunctionsImpl
   using IDENoAliasDefaultFlowFunctionsImpl::getCallFlowFunctionImpl;
   using IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl;
 
-protected:
-  LLVMAliasInfoRef AS;
+private:
+  LLVMAliasIteratorRef AS;
 };
 } // namespace detail
 
@@ -78,7 +77,7 @@ class DefaultAliasAwareIDEProblem
   /// \note It is useful to use an instance of FilteredAliasSet for the alias
   /// information to lower suprious aliases
   explicit DefaultAliasAwareIDEProblem(
-      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasIteratorRef AS,
       std::vector<std::string> EntryPoints,
       std::optional<d_t>
           ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
@@ -125,7 +124,7 @@ class DefaultAliasAwareIFDSProblem
   /// \note It is useful to use an instance of FilteredAliasSet for the alias
   /// information to lower suprious aliases
   explicit DefaultAliasAwareIFDSProblem(
-      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasIteratorRef AS,
       std::vector<std::string> EntryPoints,
       d_t ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
       : IFDSTabulationProblem(IRDB, std::move(EntryPoints), ZeroValue),
diff --git a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
index 2f127432c4..783df3c193 100644
--- a/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
+++ b/include/phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h
@@ -12,6 +12,7 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultNoAliasIDEProblem.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
 
 // Forward declaration of types for which we only use its pointer or ref type
 namespace llvm {
@@ -34,15 +35,14 @@ class IDEReachableAllocationSitesDefaultFlowFunctionsImpl
 
   using IDENoAliasDefaultFlowFunctionsImpl::isFunctionModeled;
 
-  [[nodiscard]] constexpr LLVMAliasInfoRef getAliasInfo() const noexcept {
+  [[nodiscard]] constexpr LLVMPointsToIteratorRef
+  getPointsToInfo() const noexcept {
     return AS;
   }
 
   constexpr IDEReachableAllocationSitesDefaultFlowFunctionsImpl(
-      LLVMAliasInfoRef AS) noexcept
-      : AS(AS) {
-    assert(AS && "You must provide an alias information handle!");
-  }
+      LLVMPointsToIteratorRef AS) noexcept
+      : AS(AS) {}
 
   [[nodiscard]] FlowFunctionPtrType getNormalFlowFunctionImpl(n_t Curr,
                                                               n_t /*Succ*/);
@@ -56,7 +56,7 @@ class IDEReachableAllocationSitesDefaultFlowFunctionsImpl
   using IDENoAliasDefaultFlowFunctionsImpl::getCallToRetFlowFunctionImpl;
 
 protected:
-  LLVMAliasInfoRef AS;
+  LLVMPointsToIteratorRef AS;
 };
 } // namespace detail
 
@@ -77,7 +77,7 @@ class DefaultReachableAllocationSitesIDEProblem
   /// \note It is useful to use an instance of FilteredAliasSet for the alias
   /// information to lower suprious aliases
   explicit DefaultReachableAllocationSitesIDEProblem(
-      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      const ProjectIRDBBase<db_t> *IRDB, LLVMPointsToIteratorRef AS,
       std::vector<std::string> EntryPoints,
       std::optional<d_t>
           ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
@@ -125,7 +125,7 @@ class DefaultReachableAllocationSitesIFDSProblem
   /// \note It is useful to use an instance of FilteredAliasSet for the alias
   /// information to lower suprious aliases
   explicit DefaultReachableAllocationSitesIFDSProblem(
-      const ProjectIRDBBase<db_t> *IRDB, LLVMAliasInfoRef AS,
+      const ProjectIRDBBase<db_t> *IRDB, LLVMPointsToIteratorRef AS,
       std::vector<std::string> EntryPoints,
       d_t ZeroValue) noexcept(std::is_nothrow_move_constructible_v<d_t>)
       : IFDSTabulationProblem(IRDB, std::move(EntryPoints), ZeroValue),
diff --git a/include/phasar/PhasarLLVM/Pointer.h b/include/phasar/PhasarLLVM/Pointer.h
index 8025df0f4d..be473838bc 100644
--- a/include/phasar/PhasarLLVM/Pointer.h
+++ b/include/phasar/PhasarLLVM/Pointer.h
@@ -10,10 +10,15 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_H
 #define PHASAR_PHASARLLVM_POINTER_H
 
+#include "phasar/Config/phasar-config.h" // for PHASAR_USE_SVF
 #include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 #include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 
+#ifdef PHASAR_USE_SVF
+#include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
+#endif
+
 #endif // PHASAR_PHASARLLVM_POINTER_H
diff --git a/include/phasar/PhasarLLVM/Pointer/CachedLLVMAliasIterator.h b/include/phasar/PhasarLLVM/Pointer/CachedLLVMAliasIterator.h
new file mode 100644
index 0000000000..130c11f8f8
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Pointer/CachedLLVMAliasIterator.h
@@ -0,0 +1,129 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_POINTER_CACHEDLLVMALIASITERATOR_H
+#define PHASAR_PHASARLLVM_POINTER_CACHEDLLVMALIASITERATOR_H
+
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasSetOwner.h"
+
+#include "llvm/IR/Function.h"
+
+namespace psr {
+
+class CachedLLVMAliasIterator;
+
+template <>
+struct AliasInfoTraits<CachedLLVMAliasIterator>
+    : DefaultAATraits<const llvm::Value *, const llvm::Instruction *> {};
+
+/// \brief A wrapper over a LLVMAliasIteratorRef that adds caching to make it
+/// conform to the LLVMAliasInfoRef interface
+///
+/// \note Currently assumes that the underlying alias information is
+/// flow-insensitive and the granularity of different alias-information per
+/// instruction is actually at function-level
+class CachedLLVMAliasIterator {
+public:
+  using alias_traits_t = AliasInfoTraits<CachedLLVMAliasIterator>;
+  using n_t = alias_traits_t::n_t;
+  using v_t = alias_traits_t::v_t;
+  using AliasSetTy = alias_traits_t::AliasSetTy;
+  using AliasSetPtrTy = alias_traits_t::AliasSetPtrTy;
+  using AllocationSiteSetPtrTy = alias_traits_t::AllocationSiteSetPtrTy;
+
+  CachedLLVMAliasIterator(LLVMAliasIteratorRef AS) noexcept;
+
+  // --- API Functions:
+
+  [[nodiscard]] inline bool isInterProcedural() const noexcept {
+    return false; // No idea, so be conservative here
+  };
+
+  [[nodiscard]] AliasAnalysisType getAliasAnalysisType() const noexcept {
+    return AliasAnalysisType::Invalid; // No idea
+  }
+
+  [[nodiscard]] AliasResult alias(const llvm::Value *V1, const llvm::Value *V2,
+                                  const llvm::Instruction *I);
+
+  [[nodiscard]] AliasSetPtrTy getAliasSet(const llvm::Value *V,
+                                          const llvm::Instruction *I);
+
+  [[nodiscard]] AllocationSiteSetPtrTy
+  getReachableAllocationSites(const llvm::Value *V, bool IntraProcOnly = false,
+                              const llvm::Instruction *I = nullptr);
+
+  // Checks if PotentialValue is in the reachable allocation sites of V.
+  [[nodiscard]] bool isInReachableAllocationSites(
+      const llvm::Value *V, const llvm::Value *PotentialValue,
+      bool IntraProcOnly = false, const llvm::Instruction *I = nullptr);
+
+  void mergeWith(const CachedLLVMAliasIterator & /*OtherPTI*/) {
+    llvm::report_fatal_error("Not Supported");
+  }
+
+  void introduceAlias(const llvm::Value * /*V1*/, const llvm::Value * /*V2*/,
+                      const llvm::Instruction * /*I*/ = nullptr,
+                      AliasResult /*Kind*/ = AliasResult::MustAlias) {
+    llvm::report_fatal_error("Not Supported");
+  }
+
+  void print(llvm::raw_ostream &OS = llvm::outs()) const;
+
+  [[nodiscard]] nlohmann::json getAsJson() const;
+
+  void printAsJson(llvm::raw_ostream &OS = llvm::outs()) const;
+
+  [[nodiscard]] AnalysisProperties getAnalysisProperties() const noexcept {
+    return AnalysisProperties::None;
+  }
+
+  [[nodiscard]] LLVMAliasIteratorRef getUnderlying() const noexcept {
+    return AS;
+  }
+
+private:
+  struct ReachableAllocationSitesKey {
+    llvm::PointerIntPair<const llvm::Function *, 1, bool> FunAndIntraProcOnly;
+    v_t Value{};
+  };
+
+  struct ReachableAllocationSitesKeyDMI {
+    inline static ReachableAllocationSitesKey getEmptyKey() noexcept {
+      return {{}, llvm::DenseMapInfo<v_t>::getEmptyKey()};
+    }
+    inline static ReachableAllocationSitesKey getTombstoneKey() noexcept {
+      return {{}, llvm::DenseMapInfo<v_t>::getTombstoneKey()};
+    }
+    inline static auto getHashValue(ReachableAllocationSitesKey Key) noexcept {
+      return llvm::hash_combine(Key.FunAndIntraProcOnly.getOpaqueValue(),
+                                Key.Value);
+    }
+    inline static bool isEqual(ReachableAllocationSitesKey Key1,
+                               ReachableAllocationSitesKey Key2) noexcept {
+      return Key1.FunAndIntraProcOnly == Key2.FunAndIntraProcOnly &&
+             Key1.Value == Key2.Value;
+    }
+  };
+
+  LLVMAliasIteratorRef AS;
+  AliasSetOwner<AliasSetTy>::memory_resource_type MRes;
+  AliasSetOwner<AliasSetTy> Owner;
+  llvm::DenseMap<std::pair<const llvm::Function *, v_t>, AliasSetPtrTy>
+      AliasSetMap;
+  llvm::DenseMap<ReachableAllocationSitesKey, std::unique_ptr<AliasSetTy>,
+                 ReachableAllocationSitesKeyDMI>
+      ReachableAllocationSitesMap;
+};
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_CACHEDALIASITERATOR_H
diff --git a/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.h b/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.h
new file mode 100644
index 0000000000..0974575d58
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_POINTER_FILTEREDLLVMALIASITERATOR_H
+#define PHASAR_PHASARLLVM_POINTER_FILTEREDLLVMALIASITERATOR_H
+
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+
+#include "llvm/ADT/STLFunctionalExtras.h"
+
+namespace psr {
+class FilteredLLVMAliasIterator {
+public:
+  using n_t = const llvm::Instruction *;
+  using v_t = const llvm::Value *;
+
+  constexpr FilteredLLVMAliasIterator(LLVMAliasIteratorRef Underlying) noexcept
+      : Underlying(Underlying) {}
+
+  void forallAliasesOf(const llvm::Value *V, const llvm::Function *Fun,
+                       llvm::function_ref<void(const llvm::Value *)> WithAlias);
+  void forallAliasesOf(const llvm::Value *V, const llvm::Instruction *At,
+                       llvm::function_ref<void(const llvm::Value *)> WithAlias);
+
+  [[nodiscard]] LLVMAliasIteratorRef getUnderlying() const noexcept {
+    return Underlying;
+  }
+
+private:
+  LLVMAliasIteratorRef Underlying;
+};
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_FILTEREDLLVMALIASITERATOR_H
diff --git a/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
index b18cadbecb..eef61ca4c2 100644
--- a/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h
@@ -10,24 +10,8 @@
 #ifndef PHASAR_PHASARLLVM_POINTER_FILTEREDLLVMALIASSET_H
 #define PHASAR_PHASARLLVM_POINTER_FILTEREDLLVMALIASSET_H
 
-#include "phasar/Pointer/AliasAnalysisType.h"
-#include "phasar/Pointer/AliasInfoTraits.h"
-#include "phasar/Pointer/AliasResult.h"
-#include "phasar/Pointer/AliasSetOwner.h"
-#include "phasar/Utils/AnalysisProperties.h"
-#include "phasar/Utils/MaybeUniquePtr.h"
-
-#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/DenseMapInfo.h"
-#include "llvm/ADT/Hashing.h"
-#include "llvm/ADT/PointerIntPair.h"
-#include "llvm/IR/Function.h"
-#include "llvm/Support/ErrorHandling.h"
-
-#include "nlohmann/json_fwd.hpp"
-
-#include <type_traits>
-#include <utility>
+#include "phasar/PhasarLLVM/Pointer/CachedLLVMAliasIterator.h"
+#include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.h"
 
 namespace llvm {
 class Value;
@@ -36,120 +20,29 @@ class Instruction;
 
 namespace psr {
 
-class LLVMAliasSet;
 class FilteredLLVMAliasSet;
 
 template <>
 struct AliasInfoTraits<FilteredLLVMAliasSet>
     : DefaultAATraits<const llvm::Value *, const llvm::Instruction *> {};
 
-class FilteredLLVMAliasSet {
+class FilteredLLVMAliasSet : private FilteredLLVMAliasIterator,
+                             public CachedLLVMAliasIterator {
 public:
-  using alias_traits_t = AliasInfoTraits<FilteredLLVMAliasSet>;
-  using n_t = alias_traits_t::n_t;
-  using v_t = alias_traits_t::v_t;
-  using AliasSetTy = alias_traits_t::AliasSetTy;
-  using AliasSetPtrTy = alias_traits_t::AliasSetPtrTy;
-  using AllocationSiteSetPtrTy = alias_traits_t::AllocationSiteSetPtrTy;
-
-  FilteredLLVMAliasSet(LLVMAliasSet *AS) noexcept;
-
-  FilteredLLVMAliasSet(const FilteredLLVMAliasSet &) = delete;
-  FilteredLLVMAliasSet &operator=(const FilteredLLVMAliasSet &) = delete;
-  FilteredLLVMAliasSet &operator=(FilteredLLVMAliasSet &&) noexcept = delete;
-
-  FilteredLLVMAliasSet(FilteredLLVMAliasSet &&) noexcept = default;
-
-  ~FilteredLLVMAliasSet();
-
-  template <typename... ArgsT,
-            typename = std::enable_if_t<
-                std::is_constructible_v<LLVMAliasSet, ArgsT...>>>
-  explicit FilteredLLVMAliasSet(ArgsT &&...Args)
-      : FilteredLLVMAliasSet(
-            std::make_unique<LLVMAliasSet>(std::forward<ArgsT>(Args)...)) {}
-
-  // --- API Functions:
-
-  [[nodiscard]] inline bool isInterProcedural() const noexcept {
-    return false;
-  };
-
-  [[nodiscard]] AliasAnalysisType getAliasAnalysisType() const noexcept;
-
-  [[nodiscard]] AliasResult alias(const llvm::Value *V1, const llvm::Value *V2,
-                                  const llvm::Instruction *I);
-  [[nodiscard]] AliasResult alias(const llvm::Value *V1, const llvm::Value *V2,
-                                  const llvm::Function *Fun);
-
-  [[nodiscard]] AliasSetPtrTy getAliasSet(const llvm::Value *V,
-                                          const llvm::Instruction *I);
-  [[nodiscard]] AliasSetPtrTy getAliasSet(const llvm::Value *V,
-                                          const llvm::Function *Fun);
-
-  [[nodiscard]] AllocationSiteSetPtrTy
-  getReachableAllocationSites(const llvm::Value *V, bool IntraProcOnly = false,
-                              const llvm::Instruction *I = nullptr);
-
-  // Checks if PotentialValue is in the reachable allocation sites of V.
-  [[nodiscard]] bool isInReachableAllocationSites(
-      const llvm::Value *V, const llvm::Value *PotentialValue,
-      bool IntraProcOnly = false, const llvm::Instruction *I = nullptr);
-
-  void mergeWith(const FilteredLLVMAliasSet & /*OtherPTI*/) {
-    llvm::report_fatal_error("Not Supported");
-  }
-
-  void introduceAlias(const llvm::Value * /*V1*/, const llvm::Value * /*V2*/,
-                      const llvm::Instruction * /*I*/ = nullptr,
-                      AliasResult /*Kind*/ = AliasResult::MustAlias) {
-    llvm::report_fatal_error("Not Supported");
-  }
-
-  void print(llvm::raw_ostream &OS = llvm::outs()) const;
-
-  [[nodiscard]] nlohmann::json getAsJson() const;
-
-  void printAsJson(llvm::raw_ostream &OS = llvm::outs()) const;
-
-  [[nodiscard]] AnalysisProperties getAnalysisProperties() const noexcept {
-    return AnalysisProperties::None;
-  }
-
-private:
-  struct ReachableAllocationSitesKey {
-    llvm::PointerIntPair<const llvm::Function *, 1, bool> FunAndIntraProcOnly;
-    v_t Value{};
-  };
-
-  struct ReachableAllocationSitesKeyDMI {
-    inline static ReachableAllocationSitesKey getEmptyKey() noexcept {
-      return {{}, llvm::DenseMapInfo<v_t>::getEmptyKey()};
-    }
-    inline static ReachableAllocationSitesKey getTombstoneKey() noexcept {
-      return {{}, llvm::DenseMapInfo<v_t>::getTombstoneKey()};
-    }
-    inline static auto getHashValue(ReachableAllocationSitesKey Key) noexcept {
-      return llvm::hash_combine(Key.FunAndIntraProcOnly.getOpaqueValue(),
-                                Key.Value);
-    }
-    inline static bool isEqual(ReachableAllocationSitesKey Key1,
-                               ReachableAllocationSitesKey Key2) noexcept {
-      return Key1.FunAndIntraProcOnly == Key2.FunAndIntraProcOnly &&
-             Key1.Value == Key2.Value;
-    }
-  };
-
-  FilteredLLVMAliasSet(MaybeUniquePtr<LLVMAliasSet, true> AS) noexcept;
-
-  MaybeUniquePtr<LLVMAliasSet, /*RequireAlignment=*/true> AS;
-  AliasSetOwner<AliasSetTy> Owner;
-  llvm::DenseMap<std::pair<const llvm::Function *, v_t>, AliasSetPtrTy>
-      AliasSetMap;
-  llvm::DenseMap<ReachableAllocationSitesKey, std::unique_ptr<AliasSetTy>,
-                 ReachableAllocationSitesKeyDMI>
-      ReachableAllocationSitesMap;
+  using typename CachedLLVMAliasIterator::alias_traits_t;
+  using typename CachedLLVMAliasIterator::AliasSetPtrTy;
+  using typename CachedLLVMAliasIterator::AliasSetTy;
+  using typename CachedLLVMAliasIterator::AllocationSiteSetPtrTy;
+  using typename CachedLLVMAliasIterator::n_t;
+  using typename CachedLLVMAliasIterator::v_t;
+
+  FilteredLLVMAliasSet(LLVMAliasIteratorRef Underlying) noexcept
+      : FilteredLLVMAliasIterator(Underlying),
+        CachedLLVMAliasIterator(
+            static_cast<FilteredLLVMAliasIterator *>(this)) {}
 };
+
+static_assert(std::is_convertible_v<FilteredLLVMAliasSet *, LLVMAliasInfoRef>);
 } // namespace psr
 
 #endif // PHASAR_PHASARLLVM_POINTER_FILTEREDLLVMALIASSET_H
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
index 43d83a1f68..bbe69a0f74 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h
@@ -11,6 +11,7 @@
 #define PHASAR_PHASARLLVM_POINTER_LLVMALIASINFO_H_
 
 #include "phasar/Pointer/AliasInfo.h"
+#include "phasar/Pointer/AliasIterator.h"
 
 namespace llvm {
 class Function;
@@ -20,6 +21,9 @@ class Value;
 
 namespace psr {
 
+using LLVMAliasIteratorRef =
+    AliasIteratorRef<const llvm::Value *, const llvm::Instruction *>;
+
 using LLVMAliasInfoRef =
     AliasInfoRef<const llvm::Value *, const llvm::Instruction *>;
 
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
index 5b99be1654..2aaa5fd1b9 100644
--- a/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMAliasSet.h
@@ -39,11 +39,15 @@ template <>
 struct AliasInfoTraits<LLVMAliasSet>
     : DefaultAATraits<const llvm::Value *, const llvm::Instruction *> {};
 
+/// Utility function to check whether PotentialValue may be in the reachable
+/// allocation-sites of V, if V and PotentialValue alias.
+[[nodiscard]] bool isInReachableAllocationSitesTy(
+    const llvm::Value *V, const llvm::Value *PotentialValue, bool IntraProcOnly,
+    const llvm::Function *VFun = nullptr,
+    const llvm::GlobalObject *VG = nullptr);
+
 class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
                      public AliasInfoBaseUtils {
-  // For int*IsReachableAllocationSiteTy:
-  friend class FilteredLLVMAliasSet;
-
 public:
   using traits_t = AliasInfoTraits<LLVMAliasSet>;
   using n_t = traits_t::n_t;
@@ -120,6 +124,12 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
 
   [[nodiscard]] inline bool empty() const { return AnalyzedFunctions.empty(); }
 
+  friend bool isInReachableAllocationSitesTy(const llvm::Value *V,
+                                             const llvm::Value *PotentialValue,
+                                             bool IntraProcOnly,
+                                             const llvm::Function *VFun,
+                                             const llvm::GlobalObject *VG);
+
 private:
   void computeValuesAliasSet(const llvm::Value *V);
 
@@ -131,14 +141,6 @@ class LLVMAliasSet : public AnalysisPropertiesMixin<LLVMAliasSet>,
 
   void mergeAliasSets(BoxedPtr<AliasSetTy> PTS1, BoxedPtr<AliasSetTy> PTS2);
 
-  bool interIsReachableAllocationSiteTy(const llvm::Value *V,
-                                        const llvm::Value *P) const;
-
-  bool intraIsReachableAllocationSiteTy(const llvm::Value *V,
-                                        const llvm::Value *P,
-                                        const llvm::Function *VFun,
-                                        const llvm::GlobalObject *VG) const;
-
   /// Utility function used by computeFunctionsAliasSet(...)
   void addPointer(FunctionAliasView AA, const llvm::DataLayout &DL,
                   const llvm::Value *V, std::vector<const llvm::Value *> &Reps);
diff --git a/include/phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h b/include/phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h
new file mode 100644
index 0000000000..160d633580
--- /dev/null
+++ b/include/phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOINFO_H
+#define PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOINFO_H
+
+#include "phasar/Pointer/PointsToIterator.h"
+
+namespace llvm {
+class Instruction;
+class Value;
+} // namespace llvm
+
+namespace psr {
+
+using LLVMPointsToIteratorRef =
+    PointsToIteratorRef<const llvm::Value *, const llvm::Value *,
+                        const llvm::Instruction *>;
+
+using LLVMPointsToIterator =
+    PointsToIterator<const llvm::Value *, const llvm::Value *,
+                     const llvm::Instruction *>;
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_LLVMPOINTSTOINFO_H
diff --git a/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h b/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h
index 55c753222b..451d37b595 100644
--- a/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h
+++ b/include/phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h
@@ -10,11 +10,17 @@
 #define PHASAR_PHASARLLVM_POINTER_SVF_SVFPOINTSTOSET_H
 
 #include "phasar/Config/phasar-config.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
+#include "phasar/Pointer/AliasAnalysisType.h"
 #include "phasar/Pointer/PointsToInfo.h"
+#include "phasar/Pointer/PointsToIterator.h"
 
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/IR/Value.h"
 
+#include <cstdint>
+
 #ifndef PHASAR_USE_SVF
 #error                                                                         \
     "Don't include SVFPointsToSet.h when PhASAR is not configured to include SVF. Set the cmake variable PHASAR_USE_SVF and retry."
@@ -37,8 +43,18 @@ struct SVFPointsToInfoTraits {
   using PointsToSetPtrTy = PointsToSetTy;
 };
 
+enum class SVFPointsToAnalysisType {
+  DDA = int(AliasAnalysisType::SVFDDA),
+  VFS = int(AliasAnalysisType::SVFVFS),
+};
+
 using SVFBasedPointsToInfo = PointsToInfo<SVFPointsToInfoTraits>;
 using SVFBasedPointsToInfoRef = PointsToInfoRef<SVFPointsToInfoTraits>;
+using SVFBasedPointsToIterator =
+    PointsToIterator<const llvm::Value *, uint32_t, const llvm::Instruction *>;
+using SVFBasedPointsToIteratorRef =
+    PointsToIteratorRef<const llvm::Value *, uint32_t,
+                        const llvm::Instruction *>;
 
 /// Use SVF to perform a VersionedFlowSensitive pointer analysis and return the
 /// results compatible to psr::PointsToInfo and psr::PointsToInfoRef
@@ -50,6 +66,24 @@ createSVFVFSPointsToInfo(LLVMProjectIRDB &IRDB);
 [[nodiscard]] SVFBasedPointsToInfo
 createSVFDDAPointsToInfo(LLVMProjectIRDB &IRDB);
 
+/// Use SVF to perform the specified pointer analysis and return the results
+/// compatible to psr::PointsToInfo and psr::PointsToInfoRef
+[[nodiscard]] SVFBasedPointsToInfo
+createSVFPointsToInfo(LLVMProjectIRDB &IRDB, SVFPointsToAnalysisType PTATy);
+
+/// Use SVF to perform the specified pointer analysis and return the results
+/// compatible to psr::LLVMPointsToIterator, converting the points-to sets to
+/// LLVM allocation-sites
+[[nodiscard]] LLVMPointsToIterator
+createLLVMSVFPointsToIterator(LLVMProjectIRDB &IRDB,
+                              SVFPointsToAnalysisType PTATy);
+
+/// Use SVF to perform a ContextDDA pointer analysis and return the results
+/// compatible to psr::LLVMAliasInfo and psr::LLVMAliasInfoRef
+///
+/// \note Only support DDA for now, as VFS seems to not support getRevPts().
+[[nodiscard]] LLVMAliasInfo createLLVMSVFDDAAliasInfo(LLVMProjectIRDB &IRDB);
+
 } // namespace psr
 
 #endif // PHASAR_PHASARLLVM_POINTER_SVF_SVFPOINTSTOSET_H
diff --git a/include/phasar/Pointer.h b/include/phasar/Pointer.h
index def25c239d..fcf9f7555a 100644
--- a/include/phasar/Pointer.h
+++ b/include/phasar/Pointer.h
@@ -14,9 +14,11 @@
 #include "phasar/Pointer/AliasInfo.h"
 #include "phasar/Pointer/AliasInfoBase.h"
 #include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasIterator.h"
 #include "phasar/Pointer/AliasResult.h"
 #include "phasar/Pointer/AliasSetOwner.h"
 #include "phasar/Pointer/PointsToInfo.h"
 #include "phasar/Pointer/PointsToInfoBase.h"
+#include "phasar/Pointer/PointsToIterator.h"
 
 #endif // PHASAR_POINTER_H
diff --git a/include/phasar/Pointer/AliasAnalysisType.def b/include/phasar/Pointer/AliasAnalysisType.def
index dda81808ca..c65c28b105 100644
--- a/include/phasar/Pointer/AliasAnalysisType.def
+++ b/include/phasar/Pointer/AliasAnalysisType.def
@@ -15,7 +15,10 @@ ALIAS_ANALYSIS_TYPE(Basic, "basic", "Basic LLVM alias resolving based on simple,
 ALIAS_ANALYSIS_TYPE(CFLSteens, "cflsteens", "Steensgaard-style alias analysis (equality-based)")
 ALIAS_ANALYSIS_TYPE(CFLAnders, "cflanders", "Andersen-style alias analysis (subset-based) (default)")
 ALIAS_ANALYSIS_TYPE(PointsTo, "points-to", "Alias-information based on (external) points-to information")
+
+#ifdef PHASAR_USE_SVF
 ALIAS_ANALYSIS_TYPE(SVFDDA, "svf-dda", "Alias-information based on SVF's ContextDDA analysis. Requires SVF.")
 ALIAS_ANALYSIS_TYPE(SVFVFS, "svf-vfs", "Alias-information based on SVF's VersionedFlowSensitive analysis. Requires SVF.")
+#endif
 
 #undef ALIAS_ANALYSIS_TYPE
diff --git a/include/phasar/Pointer/AliasAnalysisType.h b/include/phasar/Pointer/AliasAnalysisType.h
index 7e8fb61b17..8a9fb35b15 100644
--- a/include/phasar/Pointer/AliasAnalysisType.h
+++ b/include/phasar/Pointer/AliasAnalysisType.h
@@ -1,12 +1,15 @@
 #ifndef PHASAR_POINTER_ALIASANALYSISTYPE_H
 #define PHASAR_POINTER_ALIASANALYSISTYPE_H
 
+#include "phasar/Config/phasar-config.h" // For PHASAR_USE_SVF in AliasAnalysisType.def
+
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
 
 #include <string>
 
 namespace psr {
+
 enum class AliasAnalysisType {
 #define ALIAS_ANALYSIS_TYPE(NAME, CMDFLAG, TYPE) NAME,
 #include "phasar/Pointer/AliasAnalysisType.def"
diff --git a/include/phasar/Pointer/AliasInfo.h b/include/phasar/Pointer/AliasInfo.h
index a5f2f5f577..179a533c5b 100644
--- a/include/phasar/Pointer/AliasInfo.h
+++ b/include/phasar/Pointer/AliasInfo.h
@@ -10,11 +10,12 @@
 #ifndef PHASAR_POINTER_ALIASINFO_H
 #define PHASAR_POINTER_ALIASINFO_H
 
+#include "phasar/Pointer/AliasInfoBase.h"
 #include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasIterator.h"
 #include "phasar/Pointer/AliasResult.h"
 #include "phasar/Utils/AnalysisProperties.h"
 #include "phasar/Utils/ByRef.h"
-#include "phasar/Utils/TypeTraits.h"
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"
@@ -51,14 +52,16 @@ struct AliasInfoTraits<AliasInfo<V, N>> : DefaultAATraits<V, N> {};
 /// Example:
 /// \code
 /// LLVMAliasSet ASet(...);
-/// AliasInfoRef AA = &ASet;
+/// LLVMAliasInfoRef AA = &ASet;
 /// \endcode
 ///
 /// NOTE: AliasInfoRef::mergeWith() only works if supplied with a compatible
 /// other AliasInfo. Otherwise, it asserts out
 template <typename V, typename N>
-class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
+class [[gsl::Pointer]] AliasInfoRef
+    : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
   friend class AliasInfo<V, N>;
+
   using traits_t = AliasInfoTraits<AliasInfoRef<V, N>>;
 
 public:
@@ -68,14 +71,14 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
   using n_t = typename traits_t::n_t;
   using v_t = typename traits_t::v_t;
 
-  AliasInfoRef() noexcept = default;
-  AliasInfoRef(std::nullptr_t) noexcept : AliasInfoRef() {}
+  constexpr AliasInfoRef() noexcept = default;
+  constexpr AliasInfoRef(std::nullptr_t) noexcept : AliasInfoRef() {}
   template <typename ConcreteAA,
             typename = std::enable_if_t<
                 !std::is_base_of_v<AliasInfoRef, ConcreteAA> &&
                 std::is_same_v<v_t, typename ConcreteAA::v_t> &&
                 std::is_same_v<n_t, typename ConcreteAA::n_t>>>
-  AliasInfoRef(ConcreteAA *AA) noexcept
+  constexpr AliasInfoRef(ConcreteAA *AA) noexcept
       : AA(AA), VT((std::is_empty_v<ConcreteAA> || AA) ? &VTableFor<ConcreteAA>
                                                        : nullptr) {}
 
@@ -84,12 +87,18 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
   AliasInfoRef(AliasInfo<V, N> &&) = delete;
   AliasInfoRef &operator=(AliasInfo<V, N> &&) = delete;
 
-  AliasInfoRef(const AliasInfoRef &) noexcept = default;
-  AliasInfoRef &operator=(const AliasInfoRef &) noexcept = default;
+  constexpr AliasInfoRef(const AliasInfoRef &) noexcept = default;
+  constexpr AliasInfoRef &operator=(const AliasInfoRef &) noexcept = default;
   ~AliasInfoRef() noexcept = default;
 
   explicit operator bool() const noexcept { return VT != nullptr; }
 
+  constexpr operator AliasIteratorRef<V, N>() const & noexcept {
+    assert(VT != nullptr);
+    return AliasIteratorRef<V, N>(AA, VT->ForallAliasesOf);
+  }
+  constexpr operator AliasIteratorRef<V, N>() && noexcept = delete;
+
   // -- Impl for IsAliasInfo:
 
   [[nodiscard]] bool isInterProcedural() const noexcept {
@@ -182,10 +191,12 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
 
 private:
   struct VTable {
+    typename AliasIteratorRef<V, N>::ForallAliasesOfFn ForallAliasesOf;
+    AliasResult (*Alias)(void *AA, ByConstRef<v_t> Pointer1,
+                         ByConstRef<v_t> Pointer2,
+                         ByConstRef<n_t> AtInstruction);
     bool (*IsInterProcedural)(const void *) noexcept;
     AliasAnalysisType (*GetAliasAnalysisType)(const void *) noexcept;
-    AliasResult (*Alias)(void *, ByConstRef<v_t>, ByConstRef<v_t>,
-                         ByConstRef<n_t>);
     AliasSetPtrTy (*GetAliasSet)(void *, ByConstRef<v_t>, ByConstRef<n_t>);
     AllocationSiteSetPtrTy (*GetReachableAllocationSites)(void *,
                                                           ByConstRef<v_t>, bool,
@@ -205,17 +216,29 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
 
   template <typename ConcreteAA>
   static constexpr VTable VTableFor = {
-      [](const void *AA) noexcept {
-        return static_cast<const ConcreteAA *>(AA)->isInterProcedural();
-      },
-      [](const void *AA) noexcept {
-        return static_cast<const ConcreteAA *>(AA)->getAliasAnalysisType();
+      [](void *AA, ByConstRef<v_t> Of, ByConstRef<n_t> At,
+         llvm::function_ref<void(v_t)> WithAlias) {
+        if constexpr (IsAliasIterator<ConcreteAA>) {
+          return static_cast<ConcreteAA *>(AA)->forallAliasesOf(Of, At,
+                                                                WithAlias);
+        } else {
+          auto AliasSetPtr = static_cast<ConcreteAA *>(AA)->getAliasSet(Of, At);
+          for (auto &&Alias : *AliasSetPtr) {
+            WithAlias(PSR_FWD(Alias));
+          }
+        }
       },
       [](void *AA, ByConstRef<v_t> Pointer1, ByConstRef<v_t> Pointer2,
          ByConstRef<n_t> AtInstruction) {
         return static_cast<ConcreteAA *>(AA)->alias(Pointer1, Pointer2,
                                                     AtInstruction);
       },
+      [](const void *AA) noexcept {
+        return static_cast<const ConcreteAA *>(AA)->isInterProcedural();
+      },
+      [](const void *AA) noexcept {
+        return static_cast<const ConcreteAA *>(AA)->getAliasAnalysisType();
+      },
       [](void *AA, ByConstRef<v_t> Pointer, ByConstRef<n_t> AtInstruction) {
         return static_cast<ConcreteAA *>(AA)->getAliasSet(Pointer,
                                                           AtInstruction);
@@ -252,7 +275,7 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
       [](const void *AA) noexcept {
         delete static_cast<const ConcreteAA *>(AA);
       },
-  };
+  }; // namespace psr
 
   // --
 
@@ -272,7 +295,8 @@ class AliasInfoRef : public AnalysisPropertiesMixin<AliasInfoRef<V, N>> {
 /// \endcode
 ///
 template <typename V, typename N>
-class [[clang::trivial_abi]] AliasInfo final : public AliasInfoRef<V, N> {
+class [[clang::trivial_abi, gsl::Owner]] AliasInfo final
+    : public AliasInfoRef<V, N> {
   using base_t = AliasInfoRef<V, N>;
 
 public:
diff --git a/include/phasar/Pointer/AliasInfoBase.h b/include/phasar/Pointer/AliasInfoBase.h
index 0775346d79..b0fff91fc8 100644
--- a/include/phasar/Pointer/AliasInfoBase.h
+++ b/include/phasar/Pointer/AliasInfoBase.h
@@ -72,6 +72,7 @@ struct IsAliasInfo<
         decltype(testAliasInfo(std::declval<T &>(),
                                std::declval<const T &>()))>>> : std::true_type {
 };
+
 } // namespace detail
 
 template <typename T> PSR_CONCEPT IsAliasInfo = detail::IsAliasInfo<T>::value;
diff --git a/include/phasar/Pointer/AliasIterator.h b/include/phasar/Pointer/AliasIterator.h
new file mode 100644
index 0000000000..26b744f9c4
--- /dev/null
+++ b/include/phasar/Pointer/AliasIterator.h
@@ -0,0 +1,169 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schíebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_POINTER_ALIASITERATOR_H
+#define PHASAR_POINTER_ALIASITERATOR_H
+
+#include "phasar/Pointer/AliasResult.h"
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/Macros.h"
+#include "phasar/Utils/TypeErasureUtils.h"
+#include "phasar/Utils/Utilities.h"
+
+#include "llvm/ADT/STLFunctionalExtras.h"
+
+#include <cassert>
+#include <type_traits>
+
+namespace psr {
+
+namespace detail {
+
+template <typename T, typename V, typename N, typename = void>
+struct IsAliasIteratorFor : std::false_type {};
+
+template <typename T, typename V, typename N>
+struct IsAliasIteratorFor<
+    T, V, N,
+    std::void_t<decltype(std::declval<T>().forallAliasesOf(
+        std::declval<V>(), std::declval<N>(),
+        std::declval<llvm::function_ref<void(V)>>()))>> : std::true_type {};
+
+template <typename T, typename = void>
+struct IsAliasIterator
+    : IsAliasIteratorFor<T, typename T::v_t, typename T::n_t> {};
+
+template <typename T, typename = AliasResult>
+struct HasAlias : std::false_type {};
+template <typename T>
+struct HasAlias<T, decltype(std::declval<T>().alias(
+                       std::declval<typename T::v_t>(),
+                       std::declval<typename T::v_t>(),
+                       std::declval<typename T::n_t>()))> : std::true_type {};
+
+template <typename T, typename = void>
+struct HasGetAliasSet : std::false_type {};
+template <typename T>
+struct HasGetAliasSet<
+    T, std::void_t<decltype(std::declval<T>().getAliasSet(
+           std::declval<typename T::v_t>(), std::declval<typename T::n_t>()))>>
+    : std::true_type {};
+
+} // namespace detail
+template <typename T>
+PSR_CONCEPT IsAliasIterator = detail::IsAliasIterator<T>::value;
+
+/// \brief A type-erased reference to any object implementing the
+/// IsAliasIterator interface. Use this, if your alias-aware analysis just needs
+/// a minimal interface to work with aliases and does not require the
+/// versatility of AliasInfoRef.
+///
+/// This is a *non-owning* reference similar to std::string_view and
+/// llvm::ArrayRef. Pass values of this type by value.
+///
+/// Example:
+/// \code
+/// LLVMAliasSet ASet(...);
+/// LLVMAliasIteratorRef AA = &ASet;
+/// \endcode
+template <typename V, typename N>
+class [[gsl::Pointer]] AliasIteratorRef : private TypeErasureUtils {
+public:
+  using n_t = N;
+  using v_t = V;
+
+  using ForallAliasesOfFn = void (*)(void *, ByConstRef<V>, ByConstRef<N>,
+                                     llvm::function_ref<void(V)>);
+
+  template <typename ConcreteAA,
+            typename = std::enable_if_t<
+                !std::is_base_of_v<AliasIteratorRef, ConcreteAA> &&
+                (detail::IsAliasIteratorFor<ConcreteAA, V, N>::value ||
+                 detail::HasGetAliasSet<ConcreteAA>::value)>>
+  constexpr AliasIteratorRef(ConcreteAA *AA) noexcept
+      : AA(getOpaquePtr(psr::assertNotNull(AA))), Fn(TypeErase<ConcreteAA>) {
+    static_assert(IsAliasIterator<AliasIteratorRef>);
+  }
+  template <typename ConcreteAA,
+            typename = std::enable_if_t<
+                !std::is_base_of_v<AliasIteratorRef, ConcreteAA> &&
+                (detail::IsAliasIteratorFor<ConcreteAA, V, N>::value ||
+                 detail::HasGetAliasSet<ConcreteAA>::value) &&
+                CanSSO<ConcreteAA>>>
+  constexpr AliasIteratorRef(ConcreteAA AA) noexcept
+      : AA(getOpaquePtr(AA)), Fn(TypeErase<ConcreteAA>) {
+    static_assert(IsAliasIterator<AliasIteratorRef>);
+  }
+
+  constexpr explicit AliasIteratorRef(void *AA, ForallAliasesOfFn Fn) noexcept
+      : AA(AA), Fn(Fn) {
+    assert(Fn != nullptr);
+  }
+
+  constexpr AliasIteratorRef(const AliasIteratorRef &) noexcept = default;
+  constexpr AliasIteratorRef &
+  operator=(const AliasIteratorRef &) noexcept = default;
+  ~AliasIteratorRef() = default;
+
+  /// \brief Invokes the callback WithAlias for all aliases of Of at the
+  /// instruction At.
+  ///
+  /// Note: The alias-relation is reflexive, so WithAlias is also called with
+  /// Of.
+  ///
+  /// \param Of The pointer, for which the aliases should be iterated
+  /// \param At The instruction, where the alias-query is raised.
+  /// Implementations may ignore this parameter
+  /// \param WithAlias Callback to invoke for each alias of Of
+  void forallAliasesOf(ByConstRef<v_t> Of, ByConstRef<n_t> At,
+                       llvm::function_ref<void(v_t)> WithAlias) {
+    assert(Fn != nullptr);
+    Fn(AA, Of, At, WithAlias);
+  }
+
+  /// \brief Convenience function to aggregate all aliases of Of in a set.
+  ///
+  /// \param Of The pointer, for which the aliases should be iterated
+  /// \param At The instruction, where the alias-query is raised.
+  /// Implementations may ignore this parameter
+  /// \tparam SetT The set-type of the set to create
+  /// \returns A set of type SetT containing all aliases of Of
+  template <typename SetT = std::set<v_t>>
+  [[nodiscard]] SetT asSet(ByConstRef<v_t> Of, ByConstRef<n_t> At) {
+    SetT Set;
+    forallAliasesOf(Of, At,
+                    [&Set](v_t Alias) { Set.insert(std::move(Alias)); });
+    return Set;
+  }
+
+private:
+  template <typename ConcreteAA>
+  static void aliasesOfThunk(void *AA, ByConstRef<v_t> Of, ByConstRef<n_t> At,
+                             llvm::function_ref<void(v_t)> WithAlias) {
+    auto *CAA = fromOpaquePtr<ConcreteAA>(AA);
+    if constexpr (detail::IsAliasIteratorFor<ConcreteAA, V, N>::value) {
+      return (void)CAA->forallAliasesOf(Of, At, WithAlias);
+    } else {
+      auto AliasSetPtr = CAA->getAliasSet(Of, At);
+      for (auto &&Alias : *AliasSetPtr) {
+        WithAlias(PSR_FWD(Alias));
+      }
+    }
+  }
+
+  template <typename ConcreteAA>
+  static constexpr ForallAliasesOfFn TypeErase = &aliasesOfThunk<ConcreteAA>;
+
+  void *AA{};
+  ForallAliasesOfFn Fn{};
+}; // namespace psr
+
+} // namespace psr
+
+#endif // PHASAR_POINTER_ALIASITERATOR_H
diff --git a/include/phasar/Pointer/AliasSetOwner.h b/include/phasar/Pointer/AliasSetOwner.h
index 405fca8c6a..30825c5266 100644
--- a/include/phasar/Pointer/AliasSetOwner.h
+++ b/include/phasar/Pointer/AliasSetOwner.h
@@ -102,7 +102,7 @@ template <typename AliasSetTy> class AliasSetOwner {
 #else
     Alloc->Deallocate(PTS);
 #endif
-    /// NOTE: Do not delete from AllPTS!
+    /// NOTE: Do not delete from AllPTS to keep the other pointers stable!
   }
 
   void reserve(size_t Capacity) { OwnedPTS.reserve(Capacity); }
diff --git a/include/phasar/Pointer/PointsToInfo.h b/include/phasar/Pointer/PointsToInfo.h
index af2f54d587..fd29a8e96b 100644
--- a/include/phasar/Pointer/PointsToInfo.h
+++ b/include/phasar/Pointer/PointsToInfo.h
@@ -11,6 +11,7 @@
 #define PHASAR_POINTER_POINTSTOINFO_H
 
 #include "phasar/Pointer/PointsToInfoBase.h"
+#include "phasar/Pointer/PointsToIterator.h"
 #include "phasar/Utils/ByRef.h"
 
 #include <cassert>
@@ -52,15 +53,15 @@ class PointsToInfoRef<PTATraits,
   using typename base_t::PointsToSetTy;
   using typename base_t::v_t;
 
-  PointsToInfoRef() noexcept = default;
-  PointsToInfoRef(std::nullptr_t) noexcept : PointsToInfoRef() {}
+  constexpr PointsToInfoRef() noexcept = default;
+  constexpr PointsToInfoRef(std::nullptr_t) noexcept : PointsToInfoRef() {}
 
   template <typename ConcretePTA,
             typename = std::enable_if_t<
                 !std::is_base_of_v<PointsToInfoRef, ConcretePTA> &&
                 is_equivalent_PointsToTraits_v<PTATraits,
                                                PointsToTraits<ConcretePTA>>>>
-  PointsToInfoRef(const ConcretePTA *PT) noexcept
+  constexpr PointsToInfoRef(const ConcretePTA *PT) noexcept
       : PT(PT), VT(&VTableFor<ConcretePTA>) {
     if constexpr (!std::is_empty_v<ConcretePTA>) {
       assert(PT != nullptr);
@@ -75,19 +76,22 @@ class PointsToInfoRef<PTATraits,
   PointsToInfoRef &operator=(const PointsToInfoRef &) noexcept = default;
   ~PointsToInfoRef() noexcept = default;
 
-  explicit operator bool() const noexcept { return VT != nullptr; }
+  constexpr explicit operator bool() const noexcept { return VT != nullptr; }
+
+  constexpr operator PointsToIteratorRef<v_t, o_t, n_t>() const & noexcept {
+    return PointsToIteratorRef<v_t, o_t, n_t>(PT, VT);
+  }
+
+  constexpr operator PointsToIteratorRef<v_t, o_t, n_t>() && noexcept = delete;
 
 private:
-  struct VTableBase {
-    o_t (*AsAbstractObject)(const void *, ByConstRef<v_t>) noexcept;
+  struct VTableBase : public PointsToIteratorRef<v_t, o_t, n_t>::VTable {
+
     std::optional<v_t> (*AsPointerOrNull)(const void *,
                                           ByConstRef<o_t>) noexcept;
-    bool (*MayPointsTo)(const void *, ByConstRef<o_t>, ByConstRef<o_t>,
-                        ByConstRef<n_t>);
+
     PointsToSetPtrTy (*GetPointsToSet)(const void *, ByConstRef<o_t>,
                                        ByConstRef<n_t>);
-
-    void (*Destroy)(const void *) noexcept; // Useful for the owning variant
   };
 
   template <typename V = v_t, typename = void> struct VTable : VTableBase {};
@@ -102,26 +106,42 @@ class PointsToInfoRef<PTATraits,
   template <typename ConcretePTA>
   constexpr static VTable<> makeVTableFor() noexcept {
     constexpr VTableBase Base = {
-        [](const void *PT, ByConstRef<v_t> Pointer) noexcept {
-          return static_cast<const ConcretePTA *>(PT)->asAbstractObject(
-              Pointer);
+        {
+            [](const void *PT, ByConstRef<v_t> Pointer) noexcept {
+              return static_cast<const ConcretePTA *>(PT)->asAbstractObject(
+                  Pointer);
+            },
+            [](const void *PT, ByConstRef<o_t> Pointer, ByConstRef<n_t> At,
+               llvm::function_ref<void(o_t)> WithPointee) {
+              const auto *CPT = static_cast<const ConcretePTA *>(PT);
+              if constexpr (detail::IsPointsToIterator<ConcretePTA>::value) {
+                return (void)CPT->forallPointeesOf(Pointer, At, WithPointee);
+              } else {
+                auto PointsToSet = CPT->getPointsToSet(Pointer, At);
+                // The PointsToSet can be a set or a pointer to a set
+                auto PointsToSetPtr = getPointerFrom(PointsToSet);
+                for (auto &&Pointee : *PointsToSetPtr) {
+                  WithPointee(PSR_FWD(Pointee));
+                }
+              }
+            },
+            [](const void *PT, ByConstRef<o_t> Pointer, ByConstRef<o_t> Obj,
+               ByConstRef<n_t> AtInstruction) {
+              return static_cast<const ConcretePTA *>(PT)->mayPointsTo(
+                  Pointer, Obj, AtInstruction);
+            },
+            [](const void *PT) noexcept {
+              delete static_cast<const ConcretePTA *>(PT);
+            },
         },
         [](const void *PT, ByConstRef<o_t> Obj) noexcept {
           return static_cast<const ConcretePTA *>(PT)->asPointerOrNull(Obj);
         },
-        [](const void *PT, ByConstRef<o_t> Pointer, ByConstRef<o_t> Obj,
-           ByConstRef<n_t> AtInstruction) {
-          return static_cast<const ConcretePTA *>(PT)->mayPointsTo(
-              Pointer, Obj, AtInstruction);
-        },
         [](const void *PT, ByConstRef<o_t> Pointer,
            ByConstRef<n_t> AtInstruction) {
           return static_cast<const ConcretePTA *>(PT)->getPointsToSet(
               Pointer, AtInstruction);
         },
-        [](const void *PT) noexcept {
-          delete static_cast<const ConcretePTA *>(PT);
-        },
     };
     if constexpr (std::is_same_v<o_t, v_t>) {
       return {Base};
@@ -214,34 +234,34 @@ class [[clang::trivial_abi]] PointsToInfo<
   using typename base_t::PointsToSetTy;
   using typename base_t::v_t;
 
-  PointsToInfo() noexcept = default;
-  PointsToInfo(std::nullptr_t) noexcept {};
+  constexpr PointsToInfo() noexcept = default;
+  constexpr PointsToInfo(std::nullptr_t) noexcept {};
 
   PointsToInfo(const PointsToInfo &) = delete;
   PointsToInfo &operator=(const PointsToInfo &) = delete;
 
-  PointsToInfo(PointsToInfo &&Other) noexcept { swap(Other); }
-  PointsToInfo &operator=(PointsToInfo &&Other) noexcept {
+  constexpr PointsToInfo(PointsToInfo &&Other) noexcept { swap(Other); }
+  constexpr PointsToInfo &operator=(PointsToInfo &&Other) noexcept {
     PointsToInfo(std::move(Other)).swap(*this);
     return *this;
   }
 
-  void swap(PointsToInfo &Other) noexcept {
+  constexpr void swap(PointsToInfo &Other) noexcept {
     std::swap(this->PT, Other.PT);
     std::swap(this->VT, Other.VT);
   }
-  friend void swap(PointsToInfo &LHS, PointsToInfo &RHS) noexcept {
+  constexpr friend void swap(PointsToInfo &LHS, PointsToInfo &RHS) noexcept {
     LHS.swap(RHS);
   }
 
   template <typename ConcretePTA, typename... ArgTys>
-  explicit PointsToInfo(std::in_place_type_t<ConcretePTA> /*unused*/,
-                        ArgTys &&...Args)
+  constexpr explicit PointsToInfo(std::in_place_type_t<ConcretePTA> /*unused*/,
+                                  ArgTys &&...Args)
       : PointsToInfoRef<PTATraits>(
             new ConcretePTA(std::forward<ArgTys>(Args)...)) {}
 
   template <typename ConcretePTA>
-  PointsToInfo(std::unique_ptr<ConcretePTA> PTA)
+  constexpr PointsToInfo(std::unique_ptr<ConcretePTA> PTA)
       : PointsToInfoRef<PTATraits>(PTA.release()) {}
 
   ~PointsToInfo() noexcept {
diff --git a/include/phasar/Pointer/PointsToIterator.h b/include/phasar/Pointer/PointsToIterator.h
new file mode 100644
index 0000000000..1edc667a60
--- /dev/null
+++ b/include/phasar/Pointer/PointsToIterator.h
@@ -0,0 +1,365 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schíebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_POINTER_POINTSTOITERATOR_H
+#define PHASAR_POINTER_POINTSTOITERATOR_H
+
+#include "phasar/Utils/ByRef.h"
+#include "phasar/Utils/Macros.h"
+#include "phasar/Utils/PointerUtils.h"
+#include "phasar/Utils/TypeErasureUtils.h"
+#include "phasar/Utils/Utilities.h"
+
+#include "llvm/ADT/STLFunctionalExtras.h"
+
+#include <type_traits>
+#include <utility>
+
+namespace psr {
+namespace detail {
+template <typename T, typename = void>
+struct IsPointsToIterator : std::false_type {};
+
+template <typename T>
+struct IsPointsToIterator<
+    T, std::void_t<decltype(std::declval<const T &>().forallPointeesOf(
+           std::declval<typename T::o_t>(), std::declval<typename T::n_t>(),
+           std::declval<llvm::function_ref<void(typename T::o_t)>>()))>>
+    : std::true_type {};
+
+template <typename T, typename = bool>
+struct HasMayPointsTo : std::false_type {};
+template <typename T>
+struct HasMayPointsTo<T, decltype(std::declval<const T &>().mayPointsTo(
+                             std::declval<typename T::o_t>(),
+                             std::declval<typename T::o_t>(),
+                             std::declval<typename T::n_t>()))>
+    : std::true_type {};
+
+template <typename T, typename = void>
+struct HasGetPointsToSet : std::false_type {};
+template <typename T>
+struct HasGetPointsToSet<T, decltype(std::declval<const T &>().getPointsToSet(
+                                std::declval<typename T::o_t>(),
+                                std::declval<typename T::n_t>()))>
+    : std::true_type {};
+
+template <typename T, typename = void>
+struct HasAsAbstractObject : std::false_type {};
+template <typename T>
+struct HasAsAbstractObject<T,
+                           decltype(std::declval<const T &>().asAbstractObject(
+                               std::declval<typename T::v_t>()))>
+    : std::true_type {};
+
+template <typename T, typename = void>
+struct HasReachableAllocationSites : std::false_type {};
+template <typename T>
+struct HasReachableAllocationSites<
+    T, std::void_t<decltype(std::declval<T &>().getReachableAllocationSites(
+                       std::declval<typename T::v_t>(), true,
+                       std::declval<typename T::n_t>())),
+                   decltype(std::declval<T &>().isInReachableAllocationSites(
+                       std::declval<typename T::v_t>(),
+                       std::declval<typename T::v_t>(), true,
+                       std::declval<typename T::n_t>()))>> : std::true_type {};
+} // namespace detail
+
+template <typename T>
+PSR_CONCEPT IsPointsToIterator = detail::IsPointsToIterator<T>::value;
+
+/// A type-erased reference to any object implementing the IsPointsToIterator
+/// interface. Use this, if your alias-aware analysis just needs
+/// a minimal interface to work with points-to relations and does not require
+/// the versatility of PointsToInfoRef.
+///
+/// This is a *non-owning* reference similar to std::string_view and
+/// llvm::ArrayRef. Pass values of this type by value.
+///
+/// \note You can also convert an AliasInfoRef to PointsToIteratorRef. In this
+/// case, it will use the getReachableAllocationSites() API.
+template <typename V, typename O, typename N>
+class [[gsl::Pointer]] PointsToIteratorRef : protected TypeErasureUtils {
+public:
+  using v_t = V;
+  using o_t = O;
+  using n_t = N;
+
+  struct VTable {
+    o_t (*AsAbstractObject)(const void *, ByConstRef<v_t>) noexcept;
+    void (*ForallPointeesOf)(const void *, ByConstRef<o_t>, ByConstRef<n_t>,
+                             llvm::function_ref<void(O)>);
+    bool (*MayPointsTo)(const void *, ByConstRef<o_t>, ByConstRef<o_t>,
+                        ByConstRef<n_t>);
+    void (*Destroy)(const void *) noexcept; // Useful for the owning variant
+  };
+
+  template <
+      typename ConcretePTA,
+      std::enable_if_t<!std::is_base_of_v<PointsToIteratorRef, ConcretePTA> &&
+                       std::is_same_v<v_t, typename ConcretePTA::v_t> &&
+                       std::is_same_v<o_t, typename ConcretePTA::o_t> &&
+                       std::is_same_v<n_t, typename ConcretePTA::n_t> &&
+                       !detail::HasReachableAllocationSites<ConcretePTA>::value>
+          * = nullptr>
+  constexpr PointsToIteratorRef(const ConcretePTA *PT) noexcept
+      : PT(getOpaquePtr(psr::assertNotNull(PT))), VT(&VTableFor<ConcretePTA>) {
+    static_assert(IsPointsToIterator<PointsToIteratorRef>);
+  }
+
+  template <
+      typename ConcretePTA,
+      std::enable_if_t<!std::is_base_of_v<PointsToIteratorRef, ConcretePTA> &&
+                       std::is_same_v<v_t, typename ConcretePTA::v_t> &&
+                       std::is_same_v<v_t, o_t> &&
+                       std::is_same_v<n_t, typename ConcretePTA::n_t> &&
+                       !std::is_const_v<ConcretePTA> && // Need non-const API
+                       detail::HasReachableAllocationSites<ConcretePTA>::value>
+          * = nullptr>
+  constexpr PointsToIteratorRef(ConcretePTA *PT) noexcept
+      : PT(getOpaquePtr(psr::assertNotNull(PT))),
+        VT(&ReachableAllocSitesVTFor<ConcretePTA>) {
+    static_assert(IsPointsToIterator<PointsToIteratorRef>);
+  }
+
+  template <typename ConcretePTA,
+            typename = std::enable_if_t<
+                !std::is_base_of_v<PointsToIteratorRef, ConcretePTA> &&
+                std::is_same_v<v_t, typename ConcretePTA::v_t> &&
+                std::is_same_v<o_t, typename ConcretePTA::o_t> &&
+                std::is_same_v<n_t, typename ConcretePTA::n_t> &&
+                CanSSO<ConcretePTA>>>
+  constexpr PointsToIteratorRef(ConcretePTA PT) noexcept
+      : PT(getOpaquePtr(PT)), VT(&VTableFor<ConcretePTA>) {
+    static_assert(detail::IsPointsToIterator<PointsToIteratorRef>::value);
+  }
+
+  constexpr explicit PointsToIteratorRef(const void *PT,
+                                         const VTable *VT) noexcept
+      : PT(PT), VT(VT) {
+    assert(VT != nullptr);
+  }
+
+  constexpr PointsToIteratorRef(const PointsToIteratorRef &) noexcept = default;
+  constexpr PointsToIteratorRef &
+  operator=(const PointsToIteratorRef &) noexcept = default;
+  ~PointsToIteratorRef() = default;
+
+  [[nodiscard]] o_t asAbstractObject(ByConstRef<v_t> Pointer) const noexcept {
+    assert(VT != nullptr);
+    return VT->AsAbstractObject(PT, Pointer);
+  }
+
+  void forallPointeesOf(ByConstRef<o_t> Pointer, ByConstRef<n_t> At,
+                        llvm::function_ref<void(O)> WithPointee) const {
+    assert(VT != nullptr);
+    VT->ForallPointeesOf(PT, Pointer, At, WithPointee);
+  }
+  template <typename SetT = std::set<o_t>>
+  [[nodiscard]] SetT asSet(ByConstRef<o_t> Pointer, ByConstRef<n_t> At) {
+    SetT Set;
+    forallPointeesOf(Pointer, At, [&Set](o_t Obj) { Set.insert(Obj); });
+    return Set;
+  }
+
+  [[nodiscard]] bool mayPointsTo(ByConstRef<o_t> Pointer, ByConstRef<o_t> Obj,
+                                 ByConstRef<n_t> At) const {
+    assert(VT != nullptr);
+    return VT->MayPointsTo(PT, Pointer, Obj, At);
+  }
+
+protected:
+  constexpr PointsToIteratorRef() noexcept = default;
+
+private:
+  template <typename ConcretePTA>
+  static o_t asAbstractObjectThunk(const void *PT,
+                                   ByConstRef<v_t> Pointer) noexcept {
+    if constexpr (detail::HasAsAbstractObject<ConcretePTA>::value) {
+      return fromOpaquePtr<ConcretePTA>(PT)->asAbstractObject(Pointer);
+    } else if constexpr (std::is_convertible_v<v_t, o_t>) {
+      return Pointer;
+    } else {
+      static_assert(detail::HasAsAbstractObject<ConcretePTA>::value);
+    }
+  }
+
+  template <typename ConcretePTA>
+  static void forallPointeesOfThunk(const void *PT, ByConstRef<o_t> Pointer,
+                                    ByConstRef<n_t> At,
+                                    llvm::function_ref<void(O)> WithPointee) {
+    const auto *CPT = fromOpaquePtr<ConcretePTA>(PT);
+    if constexpr (IsPointsToIterator<ConcretePTA>) {
+      return (void)CPT->forallPointeesOf(Pointer, At, WithPointee);
+    } else {
+      auto &&PointsToSet = CPT->getPointsToSet(Pointer, At);
+      // The PointsToSet can be a set or a pointer to a set
+      auto *PointsToSetPtr = getPointerFrom(PointsToSet);
+      for (auto &&Pointee : *PointsToSetPtr) {
+        WithPointee(PSR_FWD(Pointee));
+      }
+    }
+  }
+
+  template <typename ConcretePTA>
+  static void
+  forallReachableAllocationSitesThunk(const void *AS, ByConstRef<o_t> Pointer,
+                                      ByConstRef<n_t> At,
+                                      llvm::function_ref<void(O)> WithPointee) {
+    auto *CAS = fromOpaquePtr<ConcretePTA>(AS);
+    // Note: The getReachableAllocationSites() API requires non-const access to
+    // support lazy computation (if requested in the LLVMAliasSet ctor).
+    // The below should still be safe, as we restrict our PointsToInfoRef ctor
+    // to take a non-const pointer to an aliasinfo.
+    auto AliasSetPtr =
+        const_cast<ConcretePTA *>(CAS)->getReachableAllocationSites(Pointer,
+                                                                    true, At);
+
+    for (auto &&Alias : *AliasSetPtr) {
+      WithPointee(PSR_FWD(Alias));
+    }
+  }
+
+  template <typename ConcretePTA>
+  static bool mayPointsToThunk(const void *PT, ByConstRef<o_t> Pointer,
+                               ByConstRef<o_t> Obj, ByConstRef<n_t> At) {
+    const auto *CPT = fromOpaquePtr<ConcretePTA>(PT);
+    if constexpr (detail::HasMayPointsTo<ConcretePTA>::value) {
+      return CPT->mayPointsTo(Pointer, Obj, At);
+    } else if constexpr (detail::HasGetPointsToSet<ConcretePTA>::value) {
+      auto &&PointsToSet = CPT->getPointsToSet(Pointer, At);
+      // The PointsToSet can be a set or a pointer to a set
+      auto *PointsToSetPtr = getPointerFrom(PointsToSet);
+      return PointsToSetPtr->count(Obj);
+    } else {
+      bool Ret = false;
+      CPT->forallPointeesOf([&Ret, Obj](o_t Pointee) {
+        if (Pointee == Obj) {
+          Ret = true;
+        }
+      });
+      return Ret;
+    }
+  }
+
+  template <typename ConcretePTA>
+  static bool maybeInReachableAllocationSitesThunk(const void *AS,
+                                                   ByConstRef<o_t> Pointer,
+                                                   ByConstRef<o_t> Obj,
+                                                   ByConstRef<n_t> At) {
+    if (Pointer == Obj) {
+      return true;
+    }
+
+    auto *CAS = fromOpaquePtr<ConcretePTA>(AS);
+    // Note: Same as for getReachableAllocationSites() above.
+    return const_cast<ConcretePTA *>(CAS)->isInReachableAllocationSites(
+        Pointer, Obj, true, At);
+  }
+
+  template <typename ConcretePTA>
+  static void destroyThunk(const void *PT) noexcept {
+    if constexpr (!CanSSO<ConcretePTA>) {
+      delete fromOpaquePtr<ConcretePTA>(PT);
+    }
+  }
+
+  template <typename ConcretePTA>
+  static constexpr VTable VTableFor = {
+      &asAbstractObjectThunk<ConcretePTA>,
+      &forallPointeesOfThunk<ConcretePTA>,
+      &mayPointsToThunk<ConcretePTA>,
+      &destroyThunk<ConcretePTA>,
+  };
+
+  template <typename ConcreteAA>
+  static constexpr VTable ReachableAllocSitesVTFor = {
+      &asAbstractObjectThunk<ConcreteAA>,
+      &forallReachableAllocationSitesThunk<ConcreteAA>,
+      &maybeInReachableAllocationSitesThunk<ConcreteAA>,
+      &destroyThunk<ConcreteAA>,
+  };
+
+protected:
+  const void *PT{};
+  const VTable *VT{};
+};
+
+/// Owning version of PointsToIteratorRef
+template <typename V, typename O, typename N>
+class [[clang::trivial_abi, gsl::Owner]] PointsToIterator
+    : public PointsToIteratorRef<V, O, N> {
+  using base_t = PointsToIteratorRef<V, O, N>;
+
+public:
+  using v_t = typename base_t::v_t;
+  using o_t = typename base_t::o_t;
+  using n_t = typename base_t::n_t;
+
+  constexpr PointsToIterator() noexcept = default;
+  constexpr PointsToIterator(std::nullptr_t) noexcept {};
+
+  PointsToIterator(const PointsToIterator &) = delete;
+  PointsToIterator &operator=(const PointsToIterator &) = delete;
+
+  PointsToIterator(PointsToIterator &&Other) noexcept
+      : base_t(std::exchange((base_t &)Other, {})) {}
+  PointsToIterator &operator=(PointsToIterator &&Other) noexcept {
+    PointsToIterator(std::move(Other)).swap(*this);
+    return *this;
+  }
+
+  constexpr void swap(PointsToIterator &Other) noexcept {
+    std::swap(this->PT, Other.PT);
+    std::swap(this->VT, Other.VT);
+  }
+  constexpr friend void swap(PointsToIterator &LHS,
+                             PointsToIterator &RHS) noexcept {
+    LHS.swap(RHS);
+  }
+
+  template <typename ConcretePTA>
+  constexpr PointsToIterator(std::unique_ptr<ConcretePTA> PTA)
+      : base_t(PTA.get()) {
+    if constexpr (!base_t::template CanSSO<ConcretePTA>) {
+      PTA.release();
+    }
+  }
+
+  template <typename ConcretePTA, typename... ArgTys,
+            std::enable_if_t<!base_t::template CanSSO<ConcretePTA>>>
+  constexpr explicit PointsToIterator(
+      std::in_place_type_t<ConcretePTA> /*unused*/, ArgTys &&...Args)
+      : PointsToIterator(
+            std::make_unique<ConcretePTA>(std::forward<ArgTys>(Args)...)) {}
+
+  template <typename ConcretePTA, typename... ArgTys,
+            std::enable_if_t<base_t::template CanSSO<ConcretePTA>>>
+  constexpr explicit PointsToIterator(
+      std::in_place_type_t<ConcretePTA> /*unused*/, ArgTys &&...Args)
+      : base_t([&] {
+          if constexpr (std::is_aggregate_v<ConcretePTA>) {
+            return ConcretePTA{std::forward<ArgTys>(Args)...};
+          } else {
+            return ConcretePTA(std::forward<ArgTys>(Args)...);
+          }
+        }()) {}
+
+  ~PointsToIterator() noexcept {
+    if (this->VT != nullptr) {
+      this->VT->Destroy(this->PT);
+      this->PT = nullptr;
+      this->VT = nullptr;
+    }
+  }
+};
+
+} // namespace psr
+
+#endif // PHASAR_POINTER_POINTSTOITERATOR_H
diff --git a/include/phasar/Utils/PointerUtils.h b/include/phasar/Utils/PointerUtils.h
index 2023d9d693..88da749b84 100644
--- a/include/phasar/Utils/PointerUtils.h
+++ b/include/phasar/Utils/PointerUtils.h
@@ -1,6 +1,9 @@
 #ifndef PHASAR_UTILS_POINTERUTILS_H
 #define PHASAR_UTILS_POINTERUTILS_H
 
+#include "phasar/Utils/BoxedPointer.h"
+#include "phasar/Utils/MaybeUniquePtr.h"
+
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 
 #include <memory>
@@ -34,6 +37,22 @@ template <typename T>
 constexpr T *getPointerFrom(std::unique_ptr<T> &Ptr) noexcept {
   return Ptr.get();
 }
+template <typename T>
+constexpr T *getPointerFrom(std::unique_ptr<T> &&Ptr) noexcept = delete;
+
+template <typename T, bool RequireAlignment>
+constexpr T *
+getPointerFrom(const MaybeUniquePtr<T, RequireAlignment> &Ptr) noexcept {
+  return Ptr.get();
+}
+template <typename T, bool RequireAlignment>
+constexpr T *getPointerFrom(MaybeUniquePtr<T, RequireAlignment> &Ptr) noexcept {
+  return Ptr.get();
+}
+template <typename T, bool RequireAlignment>
+constexpr T *
+getPointerFrom(MaybeUniquePtr<T, RequireAlignment> &&Ptr) noexcept = delete;
+
 template <typename T>
 constexpr T *getPointerFrom(const std::shared_ptr<T> &Ptr) noexcept {
   return Ptr.get();
@@ -42,6 +61,9 @@ template <typename T>
 constexpr T *getPointerFrom(std::shared_ptr<T> &Ptr) noexcept {
   return Ptr.get();
 }
+template <typename T>
+constexpr T *getPointerFrom(std::shared_ptr<T> &&Ptr) noexcept = delete;
+
 template <typename T>
 constexpr T *getPointerFrom(const llvm::IntrusiveRefCntPtr<T> &Ptr) noexcept {
   return Ptr.get();
@@ -50,6 +72,25 @@ template <typename T>
 constexpr T *getPointerFrom(llvm::IntrusiveRefCntPtr<T> &Ptr) noexcept {
   return Ptr.get();
 }
+template <typename T>
+constexpr T *getPointerFrom(llvm::IntrusiveRefCntPtr<T> &&Ptr) noexcept;
+
+template <typename T>
+constexpr BoxedPtr<T> getPointerFrom(BoxedPtr<T> Ptr) noexcept {
+  return Ptr;
+}
+template <typename T>
+constexpr BoxedConstPtr<T> getPointerFrom(BoxedConstPtr<T> Ptr) noexcept {
+  return Ptr;
+}
+
+static_assert(
+    std::is_same_v<int *, decltype(getPointerFrom(
+                              std::declval<MaybeUniquePtr<int> &>()))>);
+
+static_assert(
+    std::is_same_v<BoxedPtr<int>,
+                   decltype(getPointerFrom(std::declval<BoxedPtr<int>>()))>);
 
 } // namespace psr
 
diff --git a/include/phasar/Utils/TypeErasureUtils.h b/include/phasar/Utils/TypeErasureUtils.h
new file mode 100644
index 0000000000..13ad2e27ae
--- /dev/null
+++ b/include/phasar/Utils/TypeErasureUtils.h
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * Copyright (c) 2025 Fabian Schíebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Fabian Schiebel and others
+ *****************************************************************************/
+
+#ifndef PHASAR_POINTER_TYPEERASUREUTILS_H
+#define PHASAR_POINTER_TYPEERASUREUTILS_H
+
+#include <type_traits>
+
+namespace psr {
+struct TypeErasureUtils {
+  template <typename ConcreteAA>
+  static constexpr bool CanSSO = std::is_trivially_copyable_v<ConcreteAA> &&
+                                 sizeof(ConcreteAA) <= sizeof(void *);
+
+  template <typename ConcreteAA>
+  constexpr static ConcreteAA *fromOpaquePtr(void *&EF) noexcept {
+    if constexpr (CanSSO<ConcreteAA>) {
+      return static_cast<ConcreteAA *>(static_cast<void *>(&EF));
+    } else {
+      return static_cast<ConcreteAA *>(EF);
+    }
+  }
+
+  template <typename ConcreteAA>
+  constexpr static const ConcreteAA *
+  fromOpaquePtr(const void *const &EF) noexcept {
+    if constexpr (CanSSO<ConcreteAA>) {
+      return static_cast<const ConcreteAA *>(static_cast<const void *>(&EF));
+    } else {
+      return static_cast<const ConcreteAA *>(EF);
+    }
+  }
+
+  template <typename ConcreteAA>
+  constexpr void *getOpaquePtr(ConcreteAA &AA) noexcept {
+    if constexpr (CanSSO<ConcreteAA>) {
+      void *Ret{};
+      ::new (&Ret) ConcreteAA(AA);
+      return Ret;
+    } else {
+      return &AA;
+    }
+  }
+
+  template <typename ConcreteAA>
+  constexpr const void *getOpaquePtr(const ConcreteAA &AA) noexcept {
+    if constexpr (CanSSO<ConcreteAA>) {
+      void *Ret{};
+      ::new (&Ret) ConcreteAA(AA);
+      return Ret;
+    } else {
+      return &AA;
+    }
+  }
+};
+} // namespace psr
+
+#endif // PHASAR_POINTER_TYPEERASUREUTILS_H
diff --git a/include/phasar/Utils/Utilities.h b/include/phasar/Utils/Utilities.h
index a4265d36fc..040dd18c03 100644
--- a/include/phasar/Utils/Utilities.h
+++ b/include/phasar/Utils/Utilities.h
@@ -288,7 +288,9 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
   return OS;
 }
 
-template <typename T> LLVM_ATTRIBUTE_ALWAYS_INLINE T &assertNotNull(T &Value) {
+template <typename T>
+LLVM_ATTRIBUTE_ALWAYS_INLINE std::enable_if_t<!std::is_pointer_v<T>, T &>
+assertNotNull(T &Value) {
   return Value;
 }
 
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
index 82725b65b1..3fce397f4e 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultAliasAwareIDEFlowFunctions.cpp
@@ -16,10 +16,7 @@ auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
     n_t Curr, n_t Succ) -> FlowFunctionPtrType {
 
   if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
-    container_type Gen;
-
-    auto AliasSet = AS.getAliasSet(Store->getPointerOperand(), Store);
-    Gen.insert(AliasSet->begin(), AliasSet->end());
+    auto Gen = AS.asSet<container_type>(Store->getPointerOperand(), Store);
     Gen.insert(Store->getValueOperand());
 
     return FFTemplates::lambdaFlow(
@@ -39,31 +36,29 @@ auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getNormalFlowFunctionImpl(
       Curr, Succ);
 }
 
-static void populateWithMayAliases(LLVMAliasInfoRef AS, container_type &Facts,
+static void populateWithMayAliases(LLVMAliasIteratorRef AS,
+                                   container_type &Facts,
                                    const llvm::Instruction *Context) {
   container_type Tmp = Facts;
-  for (const auto *Fact : Facts) {
-    auto Aliases = AS.getAliasSet(Fact, Context);
-    for (const auto *Alias : *Aliases) {
+  for (const auto *Fact : Tmp) {
+    AS.forallAliasesOf(Fact, Context, [&Facts, Context](const auto *Alias) {
       if (const auto *Inst = llvm::dyn_cast<llvm::Instruction>(Alias)) {
         if (Inst->getParent() == Context->getParent() &&
             Context->comesBefore(Inst)) {
           // We will see that inst later
-          continue;
+          return;
         }
       }
 
       if (const auto *Load = llvm::dyn_cast<llvm::LoadInst>(Alias)) {
         // Handle at least one level of indirection...
         const auto *PointerOp = Load->getPointerOperand()->stripPointerCasts();
-        Tmp.insert(PointerOp);
+        Facts.insert(PointerOp);
       }
 
-      Tmp.insert(Alias);
-    }
+      Facts.insert(Alias);
+    });
   }
-
-  Facts = std::move(Tmp);
 }
 
 auto detail::IDEAliasAwareDefaultFlowFunctionsImpl::getRetFlowFunctionImpl(
diff --git a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp
index f76f660ca8..522c7a53bc 100644
--- a/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp
+++ b/lib/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.cpp
@@ -2,6 +2,7 @@
 
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/LLVMFlowFunctions.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
 
 #include "llvm/IR/Instructions.h"
 #include "llvm/Support/Casting.h"
@@ -21,10 +22,7 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
 
   if (const auto *Store = llvm::dyn_cast<llvm::StoreInst>(Curr)) {
 
-    auto AliasSet =
-        AS.getReachableAllocationSites(Store->getPointerOperand(), true, Store);
-
-    container_type Gen(AliasSet->begin(), AliasSet->end());
+    auto Gen = AS.asSet<container_type>(Store->getPointerOperand(), Store);
 
     return FFTemplates::lambdaFlow(
         [Store, Gen{std::move(Gen)}, AS = AS](d_t Source) -> container_type {
@@ -32,8 +30,7 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
             return {};
           }
           if (Store->getValueOperand() == Source ||
-              AS.isInReachableAllocationSites(Store->getValueOperand(), Source,
-                                              true, Store)) {
+              AS.mayPointsTo(Store->getValueOperand(), Source, Store)) {
             auto Ret = Gen;
             Ret.insert(Source);
             return Ret;
@@ -47,8 +44,7 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
     return FFTemplates::lambdaFlow(
         [Load, AS = AS](d_t Source) -> container_type {
           if (Load->getPointerOperand() == Source ||
-              AS.isInReachableAllocationSites(Load->getPointerOperand(), Source,
-                                              true, Load)) {
+              AS.mayPointsTo(Load->getPointerOperand(), Source, Load)) {
             return {Source, Load};
           }
 
@@ -65,24 +61,26 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
         -> FlowFunctionPtrType {
   const auto *Call = llvm::cast<llvm::CallBase>(CallInst);
 
-  return mapFactsToCallee(
-      Call, CalleeFun, [Call, AS = AS](d_t Arg, d_t Source) -> bool {
-        if (Arg == Source) {
-          return true;
-        }
+  return mapFactsToCallee(Call, CalleeFun,
+                          [Call, AS = AS](d_t Arg, d_t Source) -> bool {
+                            if (Arg == Source) {
+                              return true;
+                            }
 
-        return Arg->getType()->isPointerTy() &&
-               Source->getType()->isPointerTy() &&
-               AS.isInReachableAllocationSites(Arg, Source, true, Call);
-      });
+                            return Arg->getType()->isPointerTy() &&
+                                   Source->getType()->isPointerTy() &&
+                                   AS.mayPointsTo(Arg, Source, Call);
+                          });
 }
 
-static void populateWithMayAliases(LLVMAliasInfoRef AS, container_type &Facts,
-                                   const llvm::Instruction *Context) {
+static void populateWithMayPointees(LLVMPointsToIteratorRef AS,
+                                    container_type &Facts,
+                                    const llvm::Instruction *Context) {
   container_type Tmp = Facts;
   for (const auto *Fact : Tmp) {
-    auto Aliases = AS.getReachableAllocationSites(Fact, true, Context);
-    Facts.insert(Aliases->begin(), Aliases->end());
+    AS.forallPointeesOf(Fact, Context, [&Facts](const auto *Pointee) {
+      Facts.insert(Pointee);
+    });
   }
 }
 
@@ -91,7 +89,7 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
                            n_t /*RetSite*/) -> FlowFunctionPtrType {
   const auto *Call = llvm::cast<llvm::CallBase>(CallSite);
   const auto PostProcessFacts = [AS = AS, Call](container_type &Facts) {
-    populateWithMayAliases(AS, Facts, Call);
+    populateWithMayPointees(AS, Facts, Call);
   };
 
   return mapFactsToCaller(
@@ -108,7 +106,7 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
         // Arguments are counted as allocation-sites, so we have generated them
         // as aliases
         return !llvm::isa<llvm::Argument>(Source) &&
-               AS.isInReachableAllocationSites(Param, Source, true, ExitInst);
+               AS.mayPointsTo(Param, Source, ExitInst);
       },
       [AS = AS, ExitInst](d_t Ret, d_t Source) {
         if (Ret == Source) {
@@ -117,7 +115,7 @@ auto detail::IDEReachableAllocationSitesDefaultFlowFunctionsImpl::
 
         return Ret->getType()->isPointerTy() &&
                Source->getType()->isPointerTy() &&
-               AS.isInReachableAllocationSites(Ret, Source, true, ExitInst);
+               AS.mayPointsTo(Ret, Source, ExitInst);
       },
       {}, true, true, PostProcessFacts);
 }
diff --git a/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp b/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp
index d4833b8c18..0ecf705e40 100644
--- a/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp
+++ b/lib/PhasarLLVM/Pointer/AliasAnalysisView.cpp
@@ -1,6 +1,6 @@
 #include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
 
-#include "phasar/Config/phasar-config.h"
+#include "phasar/Config/phasar-config.h" // for PHASAR_USE_SVF
 
 #ifdef PHASAR_USE_SVF
 #include "SVF/SVFBasedAliasAnalysis.h"
@@ -14,18 +14,11 @@ std::unique_ptr<AliasAnalysisView>
 AliasAnalysisView::create(LLVMProjectIRDB &IRDB, bool UseLazyEvaluation,
                           AliasAnalysisType PATy) {
   switch (PATy) {
+#ifdef PHASAR_USE_SVF
   case AliasAnalysisType::SVFDDA:
-#ifndef PHASAR_USE_SVF
-    throw std::runtime_error("AliasAnalysisType::SVFVFS requires SVF, which is "
-                             "not included in your PhASAR build!");
-#else
     return createSVFDDAAnalysis(IRDB);
-#endif
+
   case AliasAnalysisType::SVFVFS:
-#ifndef PHASAR_USE_SVF
-    throw std::runtime_error("AliasAnalysisType::SVFDDA requires SVF, which is "
-                             "not included in your PhASAR build!");
-#else
     return createSVFVFSAnalysis(IRDB);
 #endif
   default:
diff --git a/lib/PhasarLLVM/Pointer/CachedLLVMAliasIterator.cpp b/lib/PhasarLLVM/Pointer/CachedLLVMAliasIterator.cpp
new file mode 100644
index 0000000000..e7b24acd8b
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/CachedLLVMAliasIterator.cpp
@@ -0,0 +1,143 @@
+#include "phasar/PhasarLLVM/Pointer/CachedLLVMAliasIterator.h"
+
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
+#include "phasar/Utils/DefaultValue.h"
+#include "phasar/Utils/NlohmannLogging.h"
+
+#include "FilteredAliasesUtils.h"
+
+using namespace psr;
+
+CachedLLVMAliasIterator::CachedLLVMAliasIterator(
+    LLVMAliasIteratorRef AS) noexcept
+    : AS(AS), Owner(&MRes) {}
+
+AliasResult CachedLLVMAliasIterator::alias(const llvm::Value *V1,
+                                           const llvm::Value *V2,
+                                           const llvm::Instruction *I) {
+  auto V1AS = getAliasSet(V1, I);
+  return V1AS->contains(V2) ? AliasResult::MayAlias : AliasResult::NoAlias;
+}
+
+static BoxedPtr<CachedLLVMAliasIterator::AliasSetTy> getEmptyAliasSet() {
+  static CachedLLVMAliasIterator::AliasSetTy EmptySet{};
+  static CachedLLVMAliasIterator::AliasSetTy *EmptySetPtr = &EmptySet;
+  return &EmptySetPtr;
+}
+
+auto CachedLLVMAliasIterator::getAliasSet(const llvm::Value *V,
+                                          const llvm::Instruction *I)
+    -> AliasSetPtrTy {
+  if (!isInterestingPointer(V)) {
+    return getEmptyAliasSet();
+  }
+
+  const auto *Fun = I ? I->getFunction() : nullptr;
+
+  // XXX: This may be wrong, if the underlying alias analysis is more precise
+  // than on function-level!
+  // Checkout the comment on the CachedLLVMAliasIterator for that; should be
+  // fine for now.
+  auto &Entry = AliasSetMap[{Fun, V}];
+  if (!Entry) {
+    auto Set = Owner.acquire();
+    AS.forallAliasesOf(V, I, [&Set](v_t Alias) { Set->insert(Alias); });
+    Entry = Set;
+  }
+  return Entry;
+}
+
+auto CachedLLVMAliasIterator::getReachableAllocationSites(
+    const llvm::Value *V, bool IntraProcOnly, const llvm::Instruction *I)
+    -> AllocationSiteSetPtrTy {
+
+  // if V is not a (interesting) pointer we can return an empty set
+  if (!isInterestingPointer(V)) {
+    return &getDefaultValue<AliasSetTy>();
+  }
+
+  const auto *Fun = I ? I->getFunction() : nullptr;
+  auto &AllocSites = ReachableAllocationSitesMap[ReachableAllocationSitesKey{
+      {Fun, IntraProcOnly}, V}];
+  if (AllocSites) {
+    return AllocSites.get();
+  }
+
+  AllocSites = std::make_unique<AliasSetTy>();
+
+  const auto *VFun = getFunction(V);
+  const auto *VG = llvm::dyn_cast<llvm::GlobalObject>(V);
+
+  AS.forallAliasesOf(
+      V, I, [Set = AllocSites.get(), V, IntraProcOnly, VFun, VG](v_t Alias) {
+        if (psr::isInReachableAllocationSitesTy(V, Alias, IntraProcOnly, VFun,
+                                                VG)) {
+          Set->insert(Alias);
+        }
+      });
+
+  return AllocSites.get();
+}
+
+// Checks if PotentialValue is in the reachable allocation sites of V.
+bool CachedLLVMAliasIterator::isInReachableAllocationSites(
+    const llvm::Value *V, const llvm::Value *PotentialValue, bool IntraProcOnly,
+    const llvm::Instruction *I) {
+
+  if (PotentialValue == V) {
+    return true;
+  }
+
+  // if V is not a (interesting) pointer we can return an empty set
+  if (!isInterestingPointer(V)) {
+    return false;
+  }
+
+  bool PVIsReachableAllocationSiteType =
+      psr::isInReachableAllocationSitesTy(V, PotentialValue, IntraProcOnly);
+
+  if (PVIsReachableAllocationSiteType) {
+    const auto PTS = getAliasSet(V, I);
+    return PTS->count(PotentialValue);
+  }
+
+  return false;
+}
+
+void CachedLLVMAliasIterator::print(llvm::raw_ostream &OS) const {
+  for (const auto &[FV, PTS] : AliasSetMap) {
+    OS << "V: " << llvmIRToString(FV.second) << " in function '"
+       << FV.first->getName() << "'\n";
+    for (const auto &Ptr : *PTS) {
+      OS << "\taliases with -> " << llvmIRToString(Ptr) << '\n';
+    }
+  }
+}
+
+nlohmann::json CachedLLVMAliasIterator::getAsJson() const {
+  nlohmann::json J;
+
+  for (const auto &[FV, PTS] : AliasSetMap) {
+    auto &JFV = J.emplace_back();
+
+    JFV["Value"] = getMetaDataID(FV.second);
+    JFV["Function"] = FV.first->getName().str();
+
+    auto &JSet = JFV["Aliases"];
+
+    for (const auto &Ptr : *PTS) {
+      JSet.push_back(getMetaDataID(Ptr));
+    }
+  }
+
+  return J;
+}
+
+void CachedLLVMAliasIterator::printAsJson(llvm::raw_ostream &OS) const {
+  OS << getAsJson();
+}
+
+static_assert(
+    std::is_convertible_v<CachedLLVMAliasIterator *, LLVMAliasInfoRef>);
diff --git a/lib/PhasarLLVM/Pointer/FilteredAliasesUtils.h b/lib/PhasarLLVM/Pointer/FilteredAliasesUtils.h
new file mode 100644
index 0000000000..79a6d4574d
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/FilteredAliasesUtils.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "llvm/IR/Function.h"
+#include "llvm/IR/GlobalAlias.h"
+#include "llvm/IR/GlobalVariable.h"
+#include "llvm/IR/Instructions.h"
+#include "llvm/Support/Compiler.h"
+
+inline LLVM_LIBRARY_VISIBILITY const llvm::Function *
+getFunction(const llvm::Value *V) {
+  if (const auto *Inst = llvm::dyn_cast<llvm::Instruction>(V)) {
+    return Inst->getFunction();
+  }
+  if (const auto *Arg = llvm::dyn_cast<llvm::Argument>(V)) {
+    return Arg->getParent();
+  }
+  return nullptr;
+}
+
+[[nodiscard]] inline LLVM_LIBRARY_VISIBILITY bool
+isConstantGlobalValue(const llvm::GlobalValue *GlobV) {
+  if (const auto *Glob = llvm::dyn_cast<llvm::GlobalVariable>(GlobV)) {
+    return Glob->isConstant();
+  }
+  if (const auto *Alias = llvm::dyn_cast<llvm::GlobalAlias>(GlobV)) {
+    if (const auto *AliasGlob =
+            llvm::dyn_cast<llvm::GlobalVariable>(Alias->getAliasee())) {
+      return AliasGlob->isConstant();
+    }
+  }
+  return true;
+}
+
+inline LLVM_LIBRARY_VISIBILITY bool mustNoalias(const llvm::Value *P1,
+                                                const llvm::Value *P2) {
+  if (P1 == P2) {
+    return false;
+  }
+  assert(P1);
+  assert(P2);
+
+  // Assumptions:
+  // - Globals do not alias with allocas
+  // - Globals do not alias with each other (this may be a bit unsound, though)
+  // - Allocas do not alias each other (relax a bit for allocas of pointers)
+  // - Constant globals are not generated as data-flow facts
+
+  if (const auto *Alloca1 = llvm::dyn_cast<llvm::AllocaInst>(P1)) {
+    if (llvm::isa<llvm::GlobalValue>(P2)) {
+      return true;
+    }
+    if (const auto *Alloca2 = llvm::dyn_cast<llvm::AllocaInst>(P2)) {
+      return !Alloca1->getAllocatedType()->isPointerTy() &&
+             !Alloca2->getAllocatedType()->isPointerTy();
+    }
+  } else if (const auto *Glob1 = llvm::dyn_cast<llvm::GlobalValue>(P1)) {
+    if (llvm::isa<llvm::AllocaInst>(P2) || isConstantGlobalValue(Glob1)) {
+      return true;
+    }
+    if (const auto *Glob2 = llvm::dyn_cast<llvm::GlobalValue>(P2)) {
+      return true; // approximation
+    }
+  } else if (const auto *Glob2 = llvm::dyn_cast<llvm::GlobalValue>(P2)) {
+    return isConstantGlobalValue(Glob2);
+  }
+
+  return false;
+}
diff --git a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.cpp b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.cpp
new file mode 100644
index 0000000000..28762fa746
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.cpp
@@ -0,0 +1,60 @@
+#include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasIterator.h"
+
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+
+#include "llvm/IR/Constants.h"
+
+#include "FilteredAliasesUtils.h"
+
+using namespace psr;
+
+static void
+forallAliasesOfImpl(LLVMAliasIteratorRef Underlying, const llvm::Value *V,
+                    const llvm::Instruction *At, const llvm::Function *Fun,
+                    llvm::function_ref<void(const llvm::Value *)> WithAlias) {
+  if (!Fun) {
+    Underlying.forallAliasesOf(V, At, WithAlias);
+    return;
+  }
+
+  const auto *Base = V->stripPointerCastsAndAliases();
+
+  Underlying.forallAliasesOf(V, At, [=](const auto *Alias) {
+    // Skip inter-procedural aliases
+    const auto *AliasFun = getFunction(Alias);
+    if (AliasFun && Fun != AliasFun) {
+      return;
+    }
+
+    if (V == Alias) {
+      WithAlias(Alias);
+      return;
+    }
+
+    if (llvm::isa<llvm::ConstantExpr, llvm::ConstantData>(Alias)) {
+      // Assume: Compile-time constants are not generated as data-flow facts!
+      return;
+    }
+
+    const auto *AliasBase = Alias->stripPointerCastsAndAliases();
+
+    if (mustNoalias(Base, AliasBase)) {
+      return;
+    }
+
+    WithAlias(Alias);
+  });
+}
+
+void FilteredLLVMAliasIterator::forallAliasesOf(
+    const llvm::Value *V, const llvm::Function *Fun,
+    llvm::function_ref<void(const llvm::Value *)> WithAlias) {
+  forallAliasesOfImpl(Underlying, V, nullptr, Fun, WithAlias);
+}
+
+void FilteredLLVMAliasIterator::forallAliasesOf(
+    const llvm::Value *V, const llvm::Instruction *At,
+    llvm::function_ref<void(const llvm::Value *)> WithAlias) {
+  forallAliasesOfImpl(Underlying, V, At, At ? At->getFunction() : nullptr,
+                      WithAlias);
+}
diff --git a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
deleted file mode 100644
index f6ed829e87..0000000000
--- a/lib/PhasarLLVM/Pointer/FilteredLLVMAliasSet.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-#include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
-
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
-#include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
-#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
-#include "phasar/Pointer/AliasResult.h"
-#include "phasar/Utils/DefaultValue.h"
-#include "phasar/Utils/NlohmannLogging.h"
-
-#include "llvm/ADT/STLExtras.h"
-#include "llvm/IR/GlobalAlias.h"
-#include "llvm/IR/GlobalVariable.h"
-#include "llvm/IR/Instructions.h"
-
-#include "nlohmann/json_fwd.hpp"
-
-#include <memory>
-#include <type_traits>
-
-using namespace psr;
-
-static const llvm::Function *getFunction(const llvm::Value *V) {
-  if (const auto *Inst = llvm::dyn_cast<llvm::Instruction>(V)) {
-    return Inst->getFunction();
-  }
-  if (const auto *Arg = llvm::dyn_cast<llvm::Argument>(V)) {
-    return Arg->getParent();
-  }
-  return nullptr;
-}
-
-[[nodiscard]] static bool
-isConstantGlobalValue(const llvm::GlobalValue *GlobV) {
-  if (const auto *Glob = llvm::dyn_cast<llvm::GlobalVariable>(GlobV)) {
-    return Glob->isConstant();
-  }
-  if (const auto *Alias = llvm::dyn_cast<llvm::GlobalAlias>(GlobV)) {
-    if (const auto *AliasGlob =
-            llvm::dyn_cast<llvm::GlobalVariable>(Alias->getAliasee())) {
-      return AliasGlob->isConstant();
-    }
-  }
-  return true;
-}
-
-static bool mustNoalias(const llvm::Value *p1, const llvm::Value *p2) {
-  if (p1 == p2) {
-    return false;
-  }
-  assert(p1);
-  assert(p2);
-
-  // Assumptions:
-  // - Globals do not alias with allocas
-  // - Globals do not alias with each other (this may be a bit unsound, though)
-  // - Allocas do not alias each other (relax a bit for allocas of pointers)
-  // - Constant globals are not generated as data-flow facts
-
-  if (const auto *Alloca1 = llvm::dyn_cast<llvm::AllocaInst>(p1)) {
-    if (llvm::isa<llvm::GlobalValue>(p2)) {
-      return true;
-    }
-    if (const auto *Alloca2 = llvm::dyn_cast<llvm::AllocaInst>(p2)) {
-      return !Alloca1->getAllocatedType()->isPointerTy() &&
-             !Alloca2->getAllocatedType()->isPointerTy();
-    }
-  } else if (const auto *Glob1 = llvm::dyn_cast<llvm::GlobalValue>(p1)) {
-    if (llvm::isa<llvm::AllocaInst>(p2) || isConstantGlobalValue(Glob1)) {
-      return true;
-    }
-    if (const auto *Glob2 = llvm::dyn_cast<llvm::GlobalValue>(p2)) {
-      return true; // approximation
-    }
-  } else if (const auto *Glob2 = llvm::dyn_cast<llvm::GlobalValue>(p2)) {
-    return isConstantGlobalValue(Glob2);
-  }
-
-  return false;
-}
-
-template <typename WithAliasFn>
-static void foreachValidAliasIn(LLVMAliasSet::AliasSetPtrTy AS,
-                                const llvm::Value *V, const llvm::Function *Fun,
-                                WithAliasFn &&WithAlias) {
-  if (!Fun) {
-    llvm::for_each(*AS, WithAlias);
-    return;
-  }
-
-  const auto *Base = V->stripPointerCastsAndAliases();
-  for (const auto *Alias : *AS) {
-
-    // Skip inter-procedural aliases
-    const auto *AliasFun = getFunction(Alias);
-    if (AliasFun && Fun != AliasFun) {
-      continue;
-    }
-
-    if (V == Alias) {
-      std::invoke(WithAlias, Alias);
-      continue;
-    }
-
-    if (llvm::isa<llvm::ConstantExpr, llvm::ConstantData>(Alias)) {
-      // Assume: Compile-time constants are not generated as data-flow facts!
-      continue;
-    }
-
-    const auto *AliasBase = Alias->stripPointerCastsAndAliases();
-
-    if (mustNoalias(Base, AliasBase)) {
-      continue;
-    }
-
-    std::invoke(WithAlias, Alias);
-  }
-}
-
-FilteredLLVMAliasSet::FilteredLLVMAliasSet(LLVMAliasSet *AS) noexcept
-    : AS(AS), Owner(&AS->MRes) {}
-
-FilteredLLVMAliasSet::FilteredLLVMAliasSet(
-    MaybeUniquePtr<LLVMAliasSet, true> AS) noexcept
-    : AS(std::move(AS)), Owner(&this->AS->MRes) {}
-
-FilteredLLVMAliasSet::~FilteredLLVMAliasSet() = default;
-
-AliasAnalysisType FilteredLLVMAliasSet::getAliasAnalysisType() const noexcept {
-  return AS->getAliasAnalysisType();
-}
-
-AliasResult FilteredLLVMAliasSet::alias(const llvm::Value *V1,
-                                        const llvm::Value *V2,
-                                        const llvm::Function *Fun) {
-  auto V1AS = getAliasSet(V1, Fun);
-  return V1AS->contains(V2) ? AliasResult::MayAlias : AliasResult::NoAlias;
-}
-
-AliasResult FilteredLLVMAliasSet::alias(const llvm::Value *V1,
-                                        const llvm::Value *V2,
-                                        const llvm::Instruction *I) {
-  if (!I) {
-    return AS->alias(V1, V2);
-  }
-
-  return alias(V1, V2, I->getFunction());
-}
-
-auto FilteredLLVMAliasSet::getAliasSet(const llvm::Value *V,
-                                       const llvm::Function *Fun)
-    -> AliasSetPtrTy {
-  if (!isInterestingPointer(V)) {
-    return AS->getEmptyAliasSet();
-  }
-
-  auto &Entry = AliasSetMap[{Fun, V}];
-  if (!Entry) {
-    auto Set = Owner.acquire();
-    foreachValidAliasIn(AS->getAliasSet(V), V, Fun,
-                        [&Set](v_t Alias) { Set->insert(Alias); });
-    Entry = Set;
-  }
-  return Entry;
-}
-
-auto FilteredLLVMAliasSet::getAliasSet(const llvm::Value *V,
-                                       const llvm::Instruction *I)
-    -> AliasSetPtrTy {
-  const auto *Fun = I ? I->getFunction() : nullptr;
-  return getAliasSet(V, Fun);
-}
-
-auto FilteredLLVMAliasSet::getReachableAllocationSites(
-    const llvm::Value *V, bool IntraProcOnly, const llvm::Instruction *I)
-    -> AllocationSiteSetPtrTy {
-
-  // if V is not a (interesting) pointer we can return an empty set
-  if (!isInterestingPointer(V)) {
-    return &getDefaultValue<AliasSetTy>();
-  }
-
-  const auto *Fun = I ? I->getFunction() : nullptr;
-  auto &AllocSites = ReachableAllocationSitesMap[ReachableAllocationSitesKey{
-      {Fun, IntraProcOnly}, V}];
-  if (AllocSites) {
-    return AllocSites.get();
-  }
-
-  AllocSites = std::make_unique<AliasSetTy>();
-
-  // consider the full inter-procedural points-to/alias information
-  if (!IntraProcOnly) {
-    foreachValidAliasIn(AS->getAliasSet(V), V, Fun,
-                        [Set = AllocSites.get(), AS = AS.get(), V](v_t Alias) {
-                          if (AS->interIsReachableAllocationSiteTy(V, Alias)) {
-                            Set->insert(Alias);
-                          }
-                        });
-
-  } else {
-    // consider the function-local, i.e. intra-procedural, points-to/alias
-    // information only
-
-    // We may not be able to retrieve a function for the given value since some
-    // pointer values can exist outside functions, for instance, in case of
-    // vtables, etc.
-    const auto *VFun = getFunction(V);
-    const auto *VG = llvm::dyn_cast<llvm::GlobalObject>(V);
-    foreachValidAliasIn(
-        AS->getAliasSet(V), V, Fun,
-        [Set = AllocSites.get(), AS = AS.get(), V, VFun, VG](v_t Alias) {
-          if (AS->intraIsReachableAllocationSiteTy(V, Alias, VFun, VG)) {
-            Set->insert(Alias);
-          }
-        });
-  }
-  return AllocSites.get();
-}
-
-// Checks if PotentialValue is in the reachable allocation sites of V.
-bool FilteredLLVMAliasSet::isInReachableAllocationSites(
-    const llvm::Value *V, const llvm::Value *PotentialValue, bool IntraProcOnly,
-    const llvm::Instruction *I) {
-
-  if (PotentialValue == V) {
-    return true;
-  }
-
-  // if V is not a (interesting) pointer we can return an empty set
-  if (!isInterestingPointer(V)) {
-    return false;
-  }
-
-  bool PVIsReachableAllocationSiteType = false;
-  if (IntraProcOnly) {
-    const auto *VFun = getFunction(V);
-    const auto *VG = llvm::dyn_cast<llvm::GlobalObject>(V);
-    PVIsReachableAllocationSiteType =
-        AS->intraIsReachableAllocationSiteTy(V, PotentialValue, VFun, VG);
-  } else {
-    PVIsReachableAllocationSiteType =
-        AS->interIsReachableAllocationSiteTy(V, PotentialValue);
-  }
-
-  if (PVIsReachableAllocationSiteType) {
-    const auto PTS = getAliasSet(V, I);
-    return PTS->count(PotentialValue);
-  }
-
-  return false;
-}
-
-void FilteredLLVMAliasSet::print(llvm::raw_ostream &OS) const {
-  for (const auto &[FV, PTS] : AliasSetMap) {
-    OS << "V: " << llvmIRToString(FV.second) << " in function '"
-       << FV.first->getName() << "'\n";
-    for (const auto &Ptr : *PTS) {
-      OS << "\taliases with -> " << llvmIRToString(Ptr) << '\n';
-    }
-  }
-}
-
-nlohmann::json FilteredLLVMAliasSet::getAsJson() const {
-  nlohmann::json J;
-
-  for (const auto &[FV, PTS] : AliasSetMap) {
-    auto &JFV = J.emplace_back();
-
-    JFV["Value"] = getMetaDataID(FV.second);
-    JFV["Function"] = FV.first->getName().str();
-
-    auto &JSet = JFV["Aliases"];
-
-    for (const auto &Ptr : *PTS) {
-      JSet.push_back(getMetaDataID(Ptr));
-    }
-  }
-
-  return J;
-}
-
-void FilteredLLVMAliasSet::printAsJson(llvm::raw_ostream &OS) const {
-  OS << getAsJson();
-}
-
-static_assert(std::is_convertible_v<FilteredLLVMAliasSet *, LLVMAliasInfoRef>);
diff --git a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
index d66b161618..5b246c3d8f 100644
--- a/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
+++ b/lib/PhasarLLVM/Pointer/LLVMAliasSet.cpp
@@ -253,8 +253,9 @@ void LLVMAliasSet::mergeAliasSets(BoxedPtr<AliasSetTy> PTS1,
   Owner.release(ToDelete);
 }
 
-bool LLVMAliasSet::interIsReachableAllocationSiteTy(
-    [[maybe_unused]] const llvm::Value *V, const llvm::Value *P) const {
+[[nodiscard]] static bool
+interIsReachableAllocationSiteTy([[maybe_unused]] const llvm::Value *V,
+                                 const llvm::Value *P) {
   // consider the full inter-procedural points-to/alias information
 
   if (llvm::isa<llvm::AllocaInst>(P)) {
@@ -270,9 +271,9 @@ bool LLVMAliasSet::interIsReachableAllocationSiteTy(
   return false;
 }
 
-bool LLVMAliasSet::intraIsReachableAllocationSiteTy(
+[[nodiscard]] static bool intraIsReachableAllocationSiteTy(
     [[maybe_unused]] const llvm::Value *V, const llvm::Value *P,
-    const llvm::Function *VFun, const llvm::GlobalObject *VG) const {
+    const llvm::Function *VFun, const llvm::GlobalObject *VG) {
   // consider the function-local, i.e. intra-procedural, points-to/alias
   // information only
 
@@ -776,3 +777,21 @@ void LLVMAliasSet::drawAliasSetsDistribution(int Peak) const {
 }
 
 } // namespace psr
+
+bool psr::isInReachableAllocationSitesTy(const llvm::Value *V,
+                                         const llvm::Value *PotentialValue,
+                                         bool IntraProcOnly,
+                                         const llvm::Function *VFun,
+                                         const llvm::GlobalObject *VG) {
+  if (IntraProcOnly) {
+    if (!VFun) {
+      VFun = AliasInfoBaseUtils::retrieveFunction(V);
+    }
+    if (!VG) {
+      VG = llvm::dyn_cast<llvm::GlobalObject>(V);
+    }
+    return intraIsReachableAllocationSiteTy(V, PotentialValue, VFun, VG);
+  }
+
+  return interIsReachableAllocationSiteTy(V, PotentialValue);
+}
diff --git a/lib/PhasarLLVM/Pointer/Pointer.cppm b/lib/PhasarLLVM/Pointer/Pointer.cppm
index d7c812df74..92661ac141 100644
--- a/lib/PhasarLLVM/Pointer/Pointer.cppm
+++ b/lib/PhasarLLVM/Pointer/Pointer.cppm
@@ -6,6 +6,7 @@ module;
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSetData.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 
 #ifdef PHASAR_USE_SVF
@@ -22,10 +23,14 @@ using psr::FunctionAliasView;
 using psr::isInterestingPointer;
 using psr::LLVMAliasInfo;
 using psr::LLVMAliasInfoRef;
+using psr::LLVMAliasIteratorRef;
 using psr::LLVMAliasSet;
 using psr::LLVMAliasSetData;
+using psr::LLVMPointsToIterator;
+using psr::LLVMPointsToIteratorRef;
 
 #ifdef PHASAR_USE_SVF
+using psr::createLLVMSVFPointsToIterator;
 using psr::createSVFDDAPointsToInfo;
 using psr::createSVFVFSPointsToInfo;
 using psr::SVFBasedPointsToInfo;
diff --git a/lib/PhasarLLVM/Pointer/SVF/PhasarSVFUtils.h b/lib/PhasarLLVM/Pointer/SVF/PhasarSVFUtils.h
new file mode 100644
index 0000000000..85dfd53042
--- /dev/null
+++ b/lib/PhasarLLVM/Pointer/SVF/PhasarSVFUtils.h
@@ -0,0 +1,51 @@
+#ifndef PHASAR_PHASARLLVM_POINTER_SVFUTILS_H
+#define PHASAR_PHASARLLVM_POINTER_SVFUTILS_H
+
+#include "SVF-LLVM/LLVMModule.h"
+#include "SVFIR/SVFIR.h"
+#include "Util/GeneralType.h"
+
+namespace psr {
+[[nodiscard]] inline const llvm::Value *
+pointerNodeToLLVMOrNull(SVF::NodeID Nod, SVF::LLVMModuleSet &ModSet,
+                        SVF::SVFIR &PAG) {
+
+  if (const SVF::SVFVar *Var = PAG.getGNode(Nod)) {
+    if (const auto *Val = Var->getValue()) {
+      if (const auto *LLVMVal = ModSet.getLLVMValue(Val)) {
+        return LLVMVal;
+      }
+    }
+  }
+  return nullptr;
+}
+
+[[nodiscard]] inline const llvm::Value *
+objectNodeToLLVMOrNull(SVF::NodeID Nod, SVF::LLVMModuleSet &ModSet,
+                       SVF::SVFIR &PAG) {
+  if (const SVF::MemObj *Mem = PAG.getObject(Nod)) {
+    if (const auto *Val = Mem->getValue()) {
+      if (const auto *LLVMVal = ModSet.getLLVMValue(Val)) {
+        return LLVMVal;
+      }
+    }
+  }
+  return nullptr;
+}
+
+[[nodiscard]] inline SVF::NodeID getNodeId(const llvm::Value *Pointer,
+                                           SVF::LLVMModuleSet &ModSet,
+                                           SVF::SVFIR &PAG) {
+  auto *Nod = ModSet.getSVFValue(Pointer);
+  return PAG.getValueNode(Nod);
+}
+[[nodiscard]] inline SVF::NodeID getObjNodeId(const llvm::Value *Obj,
+                                              SVF::LLVMModuleSet &ModSet,
+                                              SVF::SVFIR &PAG) {
+  auto *Nod = ModSet.getSVFValue(Obj);
+  return PAG.getObjectNode(Nod);
+}
+
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_POINTER_SVFUTILS_H
diff --git a/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp b/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp
index 0416a8415b..a87901706c 100644
--- a/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp
+++ b/lib/PhasarLLVM/Pointer/SVF/SVFBasedAliasAnalysis.cpp
@@ -2,17 +2,34 @@
 
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/AliasAnalysisView.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
+#include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
+#include "phasar/Pointer/AliasInfoTraits.h"
 #include "phasar/Pointer/AliasResult.h"
+#include "phasar/Pointer/AliasSetOwner.h"
+#include "phasar/Utils/AnalysisProperties.h"
 #include "phasar/Utils/Fn.h"
 
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/IR/Argument.h"
+#include "llvm/IR/Value.h"
+#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/raw_ostream.h"
+
 #include "DDA/ContextDDA.h"
 #include "DDA/DDAClient.h"
 #include "InitSVF.h"
+#include "MemoryModel/PointerAnalysis.h"
+#include "PhasarSVFUtils.h"
+#include "SVF-LLVM/LLVMModule.h"
 #include "SVF-LLVM/SVFIRBuilder.h"
 #include "SVFIR/SVFIR.h"
 #include "SVFIR/SVFModule.h"
 #include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 #include "WPA/Andersen.h"
 #include "WPA/VersionedFlowSensitive.h"
 
@@ -34,9 +51,9 @@ translateSVFAliasResult(SVF::AliasResult AR) noexcept {
   }
 }
 
-static psr::AliasResult aliasImpl(SVF::PointerAnalysis *AA,
-                                  const llvm::Value *V, const llvm::Value *Rep,
-                                  const llvm::DataLayout & /*DL*/) {
+static psr::AliasResult doAliasImpl(SVF::PointerAnalysis *AA,
+                                    const llvm::Value *V,
+                                    const llvm::Value *Rep) {
   auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
   auto *Nod1 = ModSet->getSVFValue(V);
   auto *Nod2 = ModSet->getSVFValue(Rep);
@@ -48,6 +65,12 @@ static psr::AliasResult aliasImpl(SVF::PointerAnalysis *AA,
   return translateSVFAliasResult(AA->alias(Nod1, Nod2));
 }
 
+static psr::AliasResult aliasImpl(SVF::PointerAnalysis *AA,
+                                  const llvm::Value *V, const llvm::Value *Rep,
+                                  const llvm::DataLayout & /*DL*/) {
+  return doAliasImpl(AA, V, Rep);
+}
+
 // NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
 class SVFAliasAnalysisBase : public AliasAnalysisView {
 public:
@@ -80,6 +103,14 @@ class SVFVFSAnalysis : public SVFAliasAnalysisBase {
 
   ~SVFVFSAnalysis() override { SVF::VersionedFlowSensitive::releaseVFSWPA(); }
 
+  [[nodiscard]] SVF::PointerAnalysis &getPTA() const { return *VFS; }
+  [[nodiscard]] AliasAnalysisType getAliasAnalysisType() const noexcept {
+    return AliasAnalysisType::SVFVFS;
+  }
+  [[nodiscard]] AnalysisProperties getAnalysisProperties() const noexcept {
+    return AnalysisProperties::FlowSensitive;
+  }
+
 private:
   FunctionAliasView doGetAAResults(const llvm::Function * /*F*/) override {
     return {VFS, fn<aliasImpl>};
@@ -99,25 +130,230 @@ class SVFDDAAnalysis : public SVFAliasAnalysisBase {
     DDA->finalize();
   }
 
+  [[nodiscard]] SVF::PointerAnalysis &getPTA() const { return *DDA; }
+  [[nodiscard]] AliasAnalysisType getAliasAnalysisType() const noexcept {
+    return AliasAnalysisType::SVFDDA;
+  }
+  [[nodiscard]] AnalysisProperties getAnalysisProperties() const noexcept {
+    return AnalysisProperties::ContextSensitive;
+  }
+
 private:
   FunctionAliasView doGetAAResults(const llvm::Function * /*F*/) override {
     return {&*DDA, fn<aliasImpl>};
   }
 
   SVF::DDAClient Client;
-  std::optional<SVF::ContextDDA> DDA;
+  // Note: SVF is not thread-safe anyway, so this 'mutable' should not be a
+  // problem
+  mutable std::optional<SVF::ContextDDA> DDA;
 };
 
 } // namespace psr
 
-[[nodiscard]] auto psr::createSVFVFSAnalysis(LLVMProjectIRDB &IRDB)
+auto psr::createSVFVFSAnalysis(LLVMProjectIRDB &IRDB)
     -> std::unique_ptr<AliasAnalysisView> {
 
   return std::make_unique<SVFVFSAnalysis>(psr::initSVFModule(IRDB));
 }
 
-[[nodiscard]] auto psr::createSVFDDAAnalysis(LLVMProjectIRDB &IRDB)
+auto psr::createSVFDDAAnalysis(LLVMProjectIRDB &IRDB)
     -> std::unique_ptr<AliasAnalysisView> {
 
   return std::make_unique<SVFDDAAnalysis>(psr::initSVFModule(IRDB));
 }
+
+namespace psr {
+
+class SVFAliasInfoImpl;
+
+template <>
+struct AliasInfoTraits<SVFAliasInfoImpl>
+    : DefaultAATraits<const llvm::Value *, const llvm::Instruction *> {};
+
+class SVFAliasInfoImpl
+    : public SVFDDAAnalysis,
+      public AnalysisPropertiesMixin<SVFAliasInfoImpl>,
+      public DefaultAATraits<const llvm::Value *, const llvm::Instruction *> {
+public:
+  using SVFDDAAnalysis::SVFDDAAnalysis;
+
+  [[nodiscard]] bool isInterProcedural() const noexcept { return true; }
+
+  [[nodiscard]] psr::AliasResult alias(const llvm::Value *V,
+                                       const llvm::Value *Rep,
+                                       const llvm::Instruction * /*At*/) const {
+    return doAliasImpl(&getPTA(), V, Rep);
+  }
+
+  void createAliasSet(SVF::NodeID PointerNod, AliasSetTy &Into,
+                      SVF::LLVMModuleSet &ModSet) const {
+    const auto &Pts = getPTA().getPts(PointerNod);
+    for (auto PointeeNod : Pts) {
+
+      if (const auto *PointeeVal =
+              objectNodeToLLVMOrNull(PointeeNod, ModSet, *PAG)) {
+        Into.insert(PointeeVal);
+      }
+
+      const auto &RevPts = getPTA().getRevPts(PointeeNod);
+      for (auto AliasNod : RevPts) {
+        if (const auto *AliasVal =
+                pointerNodeToLLVMOrNull(AliasNod, ModSet, *PAG)) {
+          Into.insert(AliasVal);
+        }
+      }
+    }
+  }
+
+  [[nodiscard]] AliasSetPtrTy getAliasSet(const llvm::Value *Ptr,
+                                          const llvm::Instruction * /*At*/) {
+    auto &Ret = Cache[Ptr];
+    if (Ret) {
+      return Ret;
+    }
+
+    auto Set = Owner.acquire();
+    Ret = Set;
+
+    auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+    auto *Nod = ModSet->getSVFValue(Ptr);
+
+    auto PointerNod = PAG->getValueNode(Nod);
+
+    createAliasSet(PointerNod, *Set, *ModSet);
+
+    return Set;
+  }
+
+  AllocationSiteSetPtrTy
+  getReachableAllocationSites(const llvm::Value *Ptr, bool IntraProcOnly,
+                              const llvm::Instruction * /*At*/) {
+    auto Ret = std::make_unique<AliasSetTy>();
+    if (!psr::isInterestingPointer(Ptr)) {
+      return Ret;
+    }
+
+    auto &ModSet = *SVF::LLVMModuleSet::getLLVMModuleSet();
+    auto Nod = getNodeId(Ptr, ModSet, *PAG);
+    const auto &Pts = getPTA().getPts(Nod);
+
+    const auto *VFun = AliasInfoBaseUtils::retrieveFunction(Ptr);
+    const auto *VG = llvm::dyn_cast<llvm::GlobalObject>(Ptr);
+
+    for (auto PointeeNod : Pts) {
+      const auto *PointeeVal = objectNodeToLLVMOrNull(PointeeNod, ModSet, *PAG);
+      if (!PointeeVal) {
+        continue;
+      }
+
+      if (!IntraProcOnly || psr::isInReachableAllocationSitesTy(
+                                Ptr, PointeeVal, true, VFun, VG)) {
+        Ret->insert(PointeeVal);
+      }
+    }
+
+    return Ret;
+  }
+
+  bool isInReachableAllocationSites(const llvm::Value *Ptr,
+                                    const llvm::Value *AllocSite,
+                                    bool IntraProcOnly,
+                                    const llvm::Instruction * /*At*/) {
+
+    if (IntraProcOnly &&
+        !psr::isInReachableAllocationSitesTy(Ptr, AllocSite, true)) {
+      return false;
+    }
+
+    auto &ModSet = *SVF::LLVMModuleSet::getLLVMModuleSet();
+    auto Nod = getNodeId(Ptr, ModSet, *PAG);
+
+    if (IntraProcOnly && llvm::isa<llvm::Argument>(AllocSite)) {
+      auto AllocSiteNod = getNodeId(AllocSite, ModSet, *PAG);
+      return getPTA().alias(Nod, AllocSiteNod) != SVF::NoAlias;
+    }
+
+    auto AllocSiteNod = getObjNodeId(AllocSite, ModSet, *PAG);
+    const auto &Pts = getPTA().getPts(Nod);
+
+    return Pts.test(AllocSiteNod);
+  }
+
+  void print(llvm::raw_ostream &OS) const {
+    OS << "========== SVFDDAAliasSet ==========\n";
+
+    auto &ModSet = *SVF::LLVMModuleSet::getLLVMModuleSet();
+    for (const auto &[Nod, Var] : *PAG) {
+      if (!Var->hasValue()) {
+        continue;
+      }
+
+      const auto *PointerVal = ModSet.getLLVMValue(Var->getValue());
+      if (!PointerVal) {
+        continue;
+      }
+
+      AliasSetTy Buf;
+      const auto &Aliases = [&, Nod = Nod]() -> const AliasSetTy & {
+        auto It = Cache.find(PointerVal);
+        if (It != Cache.end()) {
+          return *It->second;
+        }
+
+        createAliasSet(Nod, Buf, ModSet);
+        return Buf;
+      }();
+
+      if (Aliases.empty()) {
+        continue;
+      }
+
+      OS << "V: " << llvmIRToString(PointerVal) << '\n';
+      for (const auto *Alias : Aliases) {
+        OS << "\taliases " << llvmIRToString(Alias) << '\n';
+      }
+    }
+
+    OS << "=====\n";
+  }
+
+  void printAsJson(llvm::raw_ostream &OS) const {
+    OS << "{\n";
+
+    bool First = true;
+    for (const auto &[Nod, Var] : *PAG) {
+      if (First) {
+        First = false;
+      } else {
+        OS << ",\n";
+      }
+
+      OS << "  \"" << Nod << "\": [";
+      const auto &Pts = getPTA().getPts(Nod);
+      llvm::interleaveComma(Pts, OS);
+      OS << "]";
+    }
+
+    OS << "\n}\n";
+  }
+
+  void mergeWith(SVFAliasInfoImpl & /*Other*/) {
+    llvm::report_fatal_error("[mergeWith]: not supported");
+  }
+
+  void introduceAlias(const llvm::Value * /*V1*/, const llvm::Value * /*V2*/,
+                      const llvm::Instruction * /*At*/, AliasResult /*Kind*/) {
+    llvm::report_fatal_error("[introduceAlias]: not supported");
+  }
+
+private:
+  llvm::DenseMap<const llvm::Value *, AliasSetPtrTy> Cache;
+  AliasSetOwner<AliasSetTy>::memory_resource_type MRes;
+  AliasSetOwner<AliasSetTy> Owner{&MRes};
+};
+} // namespace psr
+
+auto psr::createLLVMSVFDDAAliasInfo(LLVMProjectIRDB &IRDB) -> LLVMAliasInfo {
+  return std::make_unique<SVFAliasInfoImpl>(psr::initSVFModule(IRDB));
+}
diff --git a/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp b/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp
index 1aa5744403..2de171a186 100644
--- a/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp
+++ b/lib/PhasarLLVM/Pointer/SVF/SVFPointsToSet.cpp
@@ -1,15 +1,21 @@
 #include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
 
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
 #include "phasar/Pointer/PointsToInfoBase.h"
 
+#include "llvm/IR/Instruction.h"
+#include "llvm/Support/ErrorHandling.h"
+
 #include "DDA/ContextDDA.h"
 #include "DDA/DDAClient.h"
 #include "InitSVF.h"
 #include "MemoryModel/PointerAnalysis.h"
+#include "PhasarSVFUtils.h"
 #include "SVF-LLVM/LLVMModule.h"
 #include "SVF-LLVM/SVFIRBuilder.h"
 #include "WPA/Andersen.h"
 
+#include <memory>
 #include <utility>
 
 namespace {
@@ -49,6 +55,8 @@ class SVFPointsToSet : public psr::PointsToInfoBase<SVFPointsToSet<Derived>> {
     SVF::LLVMModuleSet::releaseLLVMModuleSet();
   }
 
+  [[nodiscard]] constexpr SVF::SVFIR &getPAG() const noexcept { return *PAG; }
+
 private:
   SVFPointsToSet(SVF::SVFModule *Mod)
       : IRBuilder(Mod), PAG(IRBuilder.build()) {}
@@ -63,17 +71,13 @@ class SVFPointsToSet : public psr::PointsToInfoBase<SVFPointsToSet<Derived>> {
   [[nodiscard]] o_t
   asAbstractObjectImpl(psr::ByConstRef<v_t> Pointer) const noexcept {
     auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
-    auto *Nod = ModSet->getSVFValue(Pointer);
-
-    return PAG->getValueNode(Nod);
+    return psr::getNodeId(Pointer, *ModSet, *PAG);
   }
 
   [[nodiscard]] std::optional<v_t> asPointerOrNullImpl(o_t Obj) const noexcept {
-    if (const auto *Val = PAG->getObject(Obj)->getValue()) {
-      auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
-      if (const auto *LLVMVal = ModSet->getLLVMValue(Val)) {
-        return LLVMVal;
-      }
+    if (const auto *LLVMVal = psr::objectNodeToLLVMOrNull(
+            Obj, *SVF::LLVMModuleSet::getLLVMModuleSet(), *PAG)) {
+      return LLVMVal;
     }
 
     return std::nullopt;
@@ -151,3 +155,86 @@ auto psr::createSVFDDAPointsToInfo(LLVMProjectIRDB &IRDB)
   return SVFBasedPointsToInfo(std::in_place_type<DDAPointsToSetImpl>,
                               psr::initSVFModule(IRDB));
 }
+
+auto psr::createSVFPointsToInfo(LLVMProjectIRDB &IRDB,
+                                SVFPointsToAnalysisType PTATy)
+    -> SVFBasedPointsToInfo {
+  switch (PTATy) {
+  case SVFPointsToAnalysisType::DDA:
+    return SVFBasedPointsToInfo(std::in_place_type<DDAPointsToSetImpl>,
+                                psr::initSVFModule(IRDB));
+  case SVFPointsToAnalysisType::VFS:
+    return SVFBasedPointsToInfo(std::in_place_type<VFSPointsToSetImpl>,
+                                psr::initSVFModule(IRDB));
+  }
+  llvm_unreachable("Should have handled all SVFPointsToAnalysisType variants "
+                   "in the switch above!");
+}
+
+namespace {
+
+template <typename SVFPointsToSetT> struct SVFLLVMPointsToIterator {
+  using n_t = const llvm::Instruction *;
+  using v_t = const llvm::Value *;
+  using o_t = const llvm::Value *;
+
+  SVFLLVMPointsToIterator(SVF::SVFModule *Mod) : PT(Mod) {}
+
+  [[nodiscard]] constexpr o_t asAbstractObject(v_t Pointer) const noexcept {
+    return Pointer;
+  }
+
+  [[nodiscard]] SVF::NodeID getNodeId(v_t Pointer) const noexcept {
+    auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+    return psr::getNodeId(Pointer, *ModSet, PT.getPAG());
+  }
+  [[nodiscard]] SVF::NodeID getObjNodeId(o_t Obj) const noexcept {
+    auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+    return psr::getObjNodeId(Obj, *ModSet, PT.getPAG());
+  }
+
+  void forallPointeesOf(o_t Pointer, n_t /*At*/,
+                        llvm::function_ref<void(o_t)> WithPointee) const {
+    SVF::PointerAnalysis &PTA = PT.getPTA();
+
+    auto Nod = getNodeId(Pointer);
+
+    const auto &Pts = PTA.getPts(Nod);
+
+    auto *ModSet = SVF::LLVMModuleSet::getLLVMModuleSet();
+    SVF::SVFIR &PAG = PT.getPAG();
+    for (auto PointeeNod : Pts) {
+      if (const auto *PointeeVal =
+              psr::objectNodeToLLVMOrNull(PointeeNod, *ModSet, PAG)) {
+        WithPointee(PointeeVal);
+      }
+    }
+  }
+
+  [[nodiscard]] bool mayPointsTo(o_t Pointer, o_t Obj, n_t /*At*/) const {
+    SVF::PointerAnalysis &PTA = PT.getPTA();
+    auto PointerNod = getNodeId(Pointer);
+    auto ObjNod = getObjNodeId(Obj);
+
+    const auto &Pts = PTA.getPts(PointerNod);
+    return Pts.test(ObjNod);
+  }
+
+  SVFPointsToSetT PT;
+};
+} // namespace
+
+auto psr::createLLVMSVFPointsToIterator(LLVMProjectIRDB &IRDB,
+                                        SVFPointsToAnalysisType PTATy)
+    -> LLVMPointsToIterator {
+  auto *Mod = psr::initSVFModule(IRDB);
+
+  switch (PTATy) {
+  case SVFPointsToAnalysisType::DDA:
+    return {std::make_unique<SVFLLVMPointsToIterator<DDAPointsToSetImpl>>(Mod)};
+  case SVFPointsToAnalysisType::VFS:
+    return {std::make_unique<SVFLLVMPointsToIterator<VFSPointsToSetImpl>>(Mod)};
+  }
+  llvm_unreachable("Should have handled all SVFPointsToAnalysisType variants "
+                   "in the switch above!");
+}
diff --git a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
index eb991a8ffa..471d6eb37c 100644
--- a/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
+++ b/lib/PhasarLLVM/Utils/LLVMShorthands.cpp
@@ -161,6 +161,9 @@ std::string psr::llvmIRToString(const llvm::Value *V) {
   if (!V) {
     return "<null>";
   }
+  if (const auto *F = llvm::dyn_cast<llvm::Function>(V)) {
+    return "fun @" + F->getName().str();
+  }
 
   std::string IRBuffer;
   llvm::raw_string_ostream RSO(IRBuffer);
diff --git a/lib/Pointer/PhasarPointer.cppm b/lib/Pointer/PhasarPointer.cppm
index 21e84a075a..bdea5ab2e1 100644
--- a/lib/Pointer/PhasarPointer.cppm
+++ b/lib/Pointer/PhasarPointer.cppm
@@ -4,9 +4,11 @@ module;
 #include "phasar/Pointer/AliasInfo.h"
 #include "phasar/Pointer/AliasInfoBase.h"
 #include "phasar/Pointer/AliasInfoTraits.h"
+#include "phasar/Pointer/AliasIterator.h"
 #include "phasar/Pointer/AliasResult.h"
 #include "phasar/Pointer/AliasSetOwner.h"
 #include "phasar/Pointer/PointsToInfo.h"
+#include "phasar/Pointer/PointsToIterator.h"
 
 export module phasar.pointer;
 
@@ -20,10 +22,13 @@ using psr::AliasInfo;
 using psr::AliasInfoBaseUtils;
 using psr::AliasInfoRef;
 using psr::AliasInfoTraits;
+using psr::AliasIteratorRef;
 using psr::AliasResult;
 using psr::AnalysisProperties;
 using psr::DefaultAATraits;
 using psr::IsAliasInfo;
+using psr::IsAliasIterator;
+using psr::IsPointsToIterator;
 using psr::toAliasResult;
 using psr::toString;
 using psr::operator<<;
@@ -34,5 +39,7 @@ using psr::is_PointsToTraits_v;
 using psr::PointsToInfo;
 using psr::PointsToInfoBase;
 using psr::PointsToInfoRef;
+using psr::PointsToIterator;
+using psr::PointsToIteratorRef;
 using psr::PointsToTraits;
 } // namespace psr
diff --git a/test/llvm_test_code/pointers/call_01.cpp b/test/llvm_test_code/pointers/call_01.cpp
index 45480454b9..6301dcb262 100644
--- a/test/llvm_test_code/pointers/call_01.cpp
+++ b/test/llvm_test_code/pointers/call_01.cpp
@@ -1,5 +1,7 @@
 
-void setInteger(int *x) { *x = 42; }
+void setInteger(int *x) { //
+  *x = 42;
+}
 
 int main() {
   int i;
diff --git a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
index 4edb035297..07870993a9 100644
--- a/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
+++ b/unittests/PhasarLLVM/DataFlow/IfdsIde/DefaultFlowFunctionTest.cpp
@@ -4,6 +4,7 @@
 #include "phasar/PhasarLLVM/DataFlow/IfdsIde/DefaultReachableAllocationSitesIDEProblem.h"
 #include "phasar/PhasarLLVM/Pointer/FilteredLLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
 #include "llvm/ADT/STLExtras.h"
@@ -25,14 +26,15 @@ namespace {
 class IDEAliasImpl : public DefaultAliasAwareIFDSProblem {
 public:
   IDEAliasImpl(LLVMProjectIRDB *IRDB)
-      : DefaultAliasAwareIFDSProblem(IRDB, &PT, {}, {}), PT(IRDB) {};
+      : DefaultAliasAwareIFDSProblem(IRDB, &PT, {}, {}), AS(IRDB) {};
 
   [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
     return {};
   };
 
 private:
-  FilteredLLVMAliasSet PT;
+  LLVMAliasSet AS;
+  FilteredLLVMAliasSet PT{&AS};
 };
 
 class IDENoAliasImpl : public DefaultNoAliasIFDSProblem {
@@ -54,14 +56,15 @@ class IDEReachableAllocationSitesImpl
 public:
   IDEReachableAllocationSitesImpl(LLVMProjectIRDB *IRDB)
       : DefaultReachableAllocationSitesIFDSProblem(IRDB, &PT, {}, {}),
-        PT(IRDB) {};
+        AS(IRDB) {};
 
   [[nodiscard]] InitialSeeds<n_t, d_t, l_t> initialSeeds() override {
     return {};
   };
 
 private:
-  FilteredLLVMAliasSet PT;
+  LLVMAliasSet AS;
+  FilteredLLVMAliasSet PT{&AS};
 };
 
 std::set<const llvm::Value *>
diff --git a/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp b/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp
index 74a242dec3..15208cccc5 100644
--- a/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp
+++ b/unittests/PhasarLLVM/Pointer/LLVMAliasSetTest.cpp
@@ -4,12 +4,16 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Passes/ValueAnnotationPass.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
+#include "phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMPointsToUtils.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 
 #include "TestConfig.h"
 #include "gtest/gtest.h"
 
+#include <type_traits>
+
 using namespace psr;
 
 TEST(LLVMAliasSet, Intra_01) {
@@ -62,8 +66,16 @@ TEST(LLVMAliasSet, Global_01) {
   }
   PTS.print(llvm::outs());
   llvm::outs() << '\n';
+
+  [[maybe_unused]] LLVMPointsToIteratorRef PTIt = &PTS;
+  [[maybe_unused]] LLVMAliasIteratorRef ASIt = &PTS;
 }
 
+static_assert(std::is_convertible_v<LLVMAliasSet *, LLVMAliasIteratorRef>);
+static_assert(std::is_convertible_v<LLVMAliasSet *, LLVMAliasInfoRef>);
+static_assert(std::is_convertible_v<LLVMAliasInfoRef &, LLVMAliasIteratorRef>);
+static_assert(std::is_convertible_v<LLVMAliasSet *, LLVMPointsToIteratorRef>);
+
 int main(int Argc, char **Argv) {
   ::testing::InitGoogleTest(&Argc, Argv);
   return RUN_ALL_TESTS();
diff --git a/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp b/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp
index 4482d6071e..5121421e1b 100644
--- a/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp
+++ b/unittests/PhasarLLVM/Pointer/SVFAliasSetTest.cpp
@@ -2,6 +2,7 @@
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"
 #include "phasar/PhasarLLVM/Pointer/SVF/SVFPointsToSet.h"
+#include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Pointer/AliasAnalysisType.h"
 #include "phasar/Pointer/AliasResult.h"
 
@@ -86,6 +87,51 @@ TEST(SVFAliasSetTest, PointsTo_02) {
   EXPECT_TRUE(PT.mayPointsTo(V, AllocObj, V->getNextNode()));
 }
 
+TEST(SVFAliasSetTest, PointsTo_03) {
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "pointers/basic_01_cpp_dbg.ll");
+
+  auto PT = createLLVMSVFPointsToIterator(IRDB, SVFPointsToAnalysisType::VFS);
+
+  const auto *V = IRDB.getInstruction(5);
+  ASSERT_TRUE(V && V->getType()->isPointerTy());
+
+  const auto *Alloc = IRDB.getInstruction(0);
+
+  auto PSet = PT.asSet(V, V->getNextNode());
+  ASSERT_EQ(1, PSet.size());
+  EXPECT_EQ(Alloc, *PSet.begin());
+
+  auto AllocObjs = PT.asSet(Alloc, Alloc->getNextNode());
+  ASSERT_EQ(1, AllocObjs.size());
+  const auto *AllocObj = *AllocObjs.begin();
+  EXPECT_TRUE(PT.mayPointsTo(V, AllocObj, V->getNextNode()));
+}
+
+TEST(SVFAliasSetTest, PointsTo_04) {
+  LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
+                       "pointers/call_01_cpp_dbg.ll");
+
+  auto PT = createLLVMSVFDDAAliasInfo(IRDB);
+
+  const auto *V = IRDB.getInstruction(3);
+  ASSERT_TRUE(V && V->getType()->isPointerTy());
+
+  decltype(PT)::AliasSetTy GroundTruth = {
+      fromMetaDataId(IRDB, "_Z10setIntegerPi.0"), // x
+      IRDB.getValueFromId(3),                     // itself
+      IRDB.getValueFromId(7),                     // i = alloca
+      IRDB.getValueFromId(13),                    // load p before call
+      IRDB.getValueFromId(15),                    // load p after call
+  };
+
+  auto PSet = PT.getAliasSet(V, V->getNextNode());
+  PT.print();
+  PT.printAsJson(llvm::outs());
+
+  EXPECT_EQ(*PSet, GroundTruth);
+}
+
 int main(int Argc, char **Argv) {
   ::testing::InitGoogleTest(&Argc, Argv);
   return RUN_ALL_TESTS();

From 8faccfd7d4200fda67f98d41219308c1d6753ad1 Mon Sep 17 00:00:00 2001
From: Fabian Schiebel <52407375+fabianbs96@users.noreply.github.com>
Date: Fri, 24 Oct 2025 17:50:56 +0200
Subject: [PATCH 24/24] Bump version number + update BreakingChanges (#796)

---
 BreakingChanges.md                                 | 14 ++++++++++++++
 CMakeLists.txt                                     |  3 ++-
 README.md                                          |  3 +--
 .../use-phasar-with-fetch-content/CMakeLists.txt   |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/BreakingChanges.md b/BreakingChanges.md
index 8c17daa8ae..af467cf67f 100644
--- a/BreakingChanges.md
+++ b/BreakingChanges.md
@@ -4,6 +4,20 @@
 
 *None*
 
+## v2510
+
+- Removed some old APIs from `PhasarConfig`
+- Removed the header `phasar/Config/Version.h`. Use the generated header `phasar/Config/phasar-config.h` instead.
+- Removed `getAsJson()` from various classes. Use `printAsJson(llvm::raw_ostream &)` instead.
+- Removed `CallGraphAnalysisType::DTA` and the `DTAResolver` (see below)
+- Removed the legacy flow functions `Identity`, `LambdaFlow`, etc. Use the static functions from `FlowFunctionTemplates` instead.
+- Removed getter-functions from `GeneralStatistics`. Use the corresponding public fields instead.
+- Removed `LLVMAliasGraph`. Use `LLVMAliasSet` instead.
+- Removed `TypeGraphs/*` as they are not used.
+- Removed the namespace-scoped function `initializeLogger()`. Use the static functions in the `Logger` class instead.
+- Removed `legacy::stripPointer(const llvm::Type *)` as it does not work anymore with opaque pointers.
+
+
 ## v2503
 
 - The `DTAResolver` and the cli option `--call-graph-analysis=dta` do not work anymore (due to opaque pointers) and will be removed for the next release. Please use the `OTF` or `RTA` resolver instead.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbf3b5d9fd..0cf3198a04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,10 @@ if (NOT PHASAR_IN_TREE)
   project (phasar
     LANGUAGES C CXX
     DESCRIPTION "A LLVM-based static analysis framework."
+    VERSION 2510
   )
 endif ()
-set(PHASAR_VERSION 2503)
+set(PHASAR_VERSION ${PROJECT_VERSION})
 
 # NOTE: When we require cmake >= 3.21, we can use PROJECT_IS_TOP_LEVEL instead
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
diff --git a/README.md b/README.md
index a6342ea32e..684f5dffa7 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,7 @@
 
 [![C++ Standard](https://img.shields.io/badge/C++_Standard-C%2B%2B17-blue.svg?style=flat&logo=c%2B%2B)](https://isocpp.org/)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blueviolet.svg)](https://raw.githubusercontent.com/secure-software-engineering/phasar/master/LICENSE.txt)
-
-Version 2503
+[![GitHub Release](https://img.shields.io/github/v/release/secure-software-engineering/phasar?label=version)](https://github.com/secure-software-engineering/phasar/releases)
 
 ## What is PhASAR?
 
diff --git a/examples/use-phasar-with-fetch-content/CMakeLists.txt b/examples/use-phasar-with-fetch-content/CMakeLists.txt
index c6e7ce876c..09b10c05f6 100644
--- a/examples/use-phasar-with-fetch-content/CMakeLists.txt
+++ b/examples/use-phasar-with-fetch-content/CMakeLists.txt
@@ -12,7 +12,7 @@ include(FetchContent)
 FetchContent_Declare(
   phasar
   GIT_REPOSITORY https://github.com/secure-software-engineering/phasar.git
-  GIT_TAG development # At best, use a tagged version, such as v2503
+  GIT_TAG development # At best, use a tagged version, such as v2510
   EXCLUDE_FROM_ALL
   OVERRIDE_FIND_PACKAGE
 )