Get rid of the dependency phasar_phasarllvm_utils -> phasar_db, such that phasar_db can safely refer to phasar_phasarllvm_utils

Author: fabianbs96

include/phasar/DB/ProjectIRDB.h

@@ -229,6 +229,11 @@ class ProjectIRDB {
   persistedStringToValue(const std::string &StringRep) const;
 };
 
+/**
+ * Revserses the getMetaDataID function
+ */
+const llvm::Value *fromMetaDataId(const ProjectIRDB &IRDB, llvm::StringRef Id);
+
 } // namespace psr
 
 #endif

include/phasar/PhasarLLVM/Utils/BasicBlockOrdering.h

@@ -16,8 +16,6 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FunctionExtras.h"
 
-#include "phasar/DB/ProjectIRDB.h"
-
 namespace llvm {
 class Function;
 class BasicBlock;

include/phasar/PhasarLLVM/Utils/LLVMShorthands.h

@@ -25,7 +25,6 @@
 #include "llvm/IR/ModuleSlotTracker.h"
 #include "llvm/IR/Value.h"
 
-#include "phasar/DB/ProjectIRDB.h"
 #include "phasar/Utils/Utilities.h"
 
 namespace psr {
@@ -95,11 +94,6 @@ globalValuesUsedinFunction(const llvm::Function *F);
  */
 std::string getMetaDataID(const llvm::Value *V);
 
-/**
- * Revserses the getMetaDataID function
- */
-const llvm::Value *fromMetaDataId(const ProjectIRDB &IRDB, llvm::StringRef Id);
-
 /**
  * @brief Does less-than comparison based on the annotated ID.
  *

lib/DB/ProjectIRDB.cpp

@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <charconv>
 #include <filesystem>
 #include <ostream>
 #include <string>
@@ -551,3 +552,44 @@ bool ProjectIRDB::debugInfoAvailable() const {
 }
 
 } // namespace psr
+
+const llvm::Value *psr::fromMetaDataId(const ProjectIRDB &IRDB,
+                                       llvm::StringRef Id) {
+  if (Id.empty() || Id[0] == '-') {
+    return nullptr;
+  }
+
+  auto ParseInt = [](llvm::StringRef Str) -> std::optional<unsigned> {
+    unsigned Num;
+    auto [Ptr, EC] = std::from_chars(Str.data(), Str.data() + Str.size(), Num);
+
+    if (EC == std::errc{}) {
+      return Num;
+    }
+
+    PHASAR_LOG_LEVEL(WARNING, "Invalid metadata id '"
+                                  << Str.str() << "': "
+                                  << std::make_error_code(EC).message());
+    return std::nullopt;
+  };
+
+  if (auto Dot = Id.find('.'); Dot != llvm::StringRef::npos) {
+    auto FName = Id.slice(0, Dot);
+
+    auto ArgNr = ParseInt(Id.drop_front(Dot + 1));
+
+    if (!ArgNr) {
+      return nullptr;
+    }
+
+    const auto *F = IRDB.getFunction(FName);
+    if (F) {
+      return getNthFunctionArgument(F, *ArgNr);
+    }
+
+    return nullptr;
+  }
+
+  auto IdNr = ParseInt(Id);
+  return IdNr ? IRDB.getInstruction(*IdNr) : nullptr;
+}

lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.cpp

@@ -7,12 +7,13 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#include "llvm/Support/raw_os_ostream.h"
-
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/ExtendedTaintAnalysis/EdgeDomain.h"
 #include "phasar/PhasarLLVM/Utils/BasicBlockOrdering.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
+#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/Support/raw_os_ostream.h"
+
 namespace psr::XTaint {
 
 llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, const EdgeDomain &ED) {

lib/PhasarLLVM/Utils/CMakeLists.txt

@@ -3,7 +3,6 @@ file(GLOB_RECURSE UTILS_SRC *.h *.cpp)
 set(PHASAR_LINK_LIBS
   phasar_config
   phasar_utils
-  phasar_db
 )
 
 set(LLVM_LINK_COMPONENTS

lib/PhasarLLVM/Utils/LLVMShorthands.cpp

@@ -250,46 +250,6 @@ std::string getMetaDataID(const llvm::Value *V) {
   return "-1";
 }
 
-const llvm::Value *fromMetaDataId(const ProjectIRDB &IRDB, llvm::StringRef Id) {
-  if (Id.empty() || Id[0] == '-') {
-    return nullptr;
-  }
-
-  auto ParseInt = [](llvm::StringRef Str) -> std::optional<unsigned> {
-    unsigned Num;
-    auto [Ptr, EC] = std::from_chars(Str.data(), Str.data() + Str.size(), Num);
-
-    if (EC == std::errc{}) {
-      return Num;
-    }
-
-    PHASAR_LOG_LEVEL(WARNING, "Invalid metadata id '"
-                                  << Str.str() << "': "
-                                  << std::make_error_code(EC).message());
-    return std::nullopt;
-  };
-
-  if (auto Dot = Id.find('.'); Dot != llvm::StringRef::npos) {
-    auto FName = Id.slice(0, Dot);
-
-    auto ArgNr = ParseInt(Id.drop_front(Dot + 1));
-
-    if (!ArgNr) {
-      return nullptr;
-    }
-
-    const auto *F = IRDB.getFunction(FName);
-    if (F) {
-      return getNthFunctionArgument(F, *ArgNr);
-    }
-
-    return nullptr;
-  }
-
-  auto IdNr = ParseInt(Id);
-  return IdNr ? IRDB.getInstruction(*IdNr) : nullptr;
-}
-
 bool LLVMValueIDLess::operator()(const llvm::Value *Lhs,
                                  const llvm::Value *Rhs) const {
   std::string LhsId = getMetaDataID(Lhs);