implemented review suggestions

include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h

@@ -23,7 +23,6 @@
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMBasedContainerConfig.h"
 #include "phasar/Utils/Soundness.h"
 

include/phasar/PhasarLLVM/ControlFlow/LLVMVFTableProvider.h

@@ -12,8 +12,6 @@
 
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h"
 
-#include "llvm/IR/DebugInfoMetadata.h"
-
 #include <unordered_map>
 
 namespace llvm {

include/phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h

@@ -18,7 +18,6 @@
 #define PHASAR_PHASARLLVM_CONTROLFLOW_RESOLVER_CHARESOLVER_H_
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/Utils/MaybeUniquePtr.h"
 
 namespace llvm {

include/phasar/PhasarLLVM/ControlFlow/Resolver/RTAResolver.h

@@ -19,18 +19,18 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
 
-#include "llvm/IR/DebugInfoMetadata.h"
-
 #include <vector>
 
 namespace llvm {
 class CallBase;
 class StructType;
 class Function;
 class StructType;
+class DICompositeType;
 } // namespace llvm
 
 namespace psr {
+class DIBasedTypeHierarchy;
 class RTAResolver : public CHAResolver {
 public:
   RTAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,

include/phasar/PhasarLLVM/ControlFlow/Resolver/Resolver.h

@@ -18,9 +18,9 @@
 #define PHASAR_PHASARLLVM_CONTROLFLOW_RESOLVER_RESOLVER_H_
 
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
-#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 
 #include "llvm/ADT/DenseSet.h"
+#include "llvm/IR/DerivedTypes.h"
 
 #include <memory>
 #include <optional>
@@ -45,9 +45,6 @@ getVFTIndex(const llvm::CallBase *CallSite);
 [[nodiscard]] const llvm::DIType *
 getReceiverType(const llvm::CallBase *CallSite);
 
-[[nodiscard]] const llvm::StructType *
-getReceiverStructType(const llvm::CallBase *CallSite);
-
 [[nodiscard]] std::string getReceiverTypeName(const llvm::CallBase *CallSite);
 
 [[nodiscard]] bool isConsistentCall(const llvm::CallBase *CallSite,

include/phasar/PhasarLLVM/Domain/LLVMAnalysisDomain.h

@@ -12,13 +12,12 @@
 
 #include "phasar/Domain/AnalysisDomain.h"
 
-#include "llvm/IR/DebugInfoMetadata.h"
-
 namespace llvm {
 class Value;
 class Instruction;
 class StructType;
 class Function;
+class DIType;
 } // namespace llvm
 
 namespace psr {

include/phasar/PhasarLLVM/TypeHierarchy/LLVMVFTable.h

@@ -22,6 +22,7 @@ class ConstantStruct;
 } // namespace llvm
 
 namespace psr {
+class DIBasedTypeHierarchy;
 
 /**
  * 	@brief Represents a virtual method table.
@@ -30,6 +31,7 @@ namespace psr {
  * 	virtual method table matters.
  */
 class LLVMVFTable : public VFTable<const llvm::Function *> {
+
 private:
   friend class DIBasedTypeHierarchy;
   std::vector<const llvm::Function *> VFT;

lib/PhasarLLVM/ControlFlow/LLVMVFTableProvider.cpp

@@ -30,8 +30,9 @@ static std::vector<const llvm::Function *> getVirtualFunctions(
     const llvm::DIType *Type) {
   auto ClearName = getTypeName(Type);
 
-  if (llvm::StringRef(ClearName).startswith("typeinfo name for ")) {
-    ClearName = ClearName.substr(18, ClearName.size() - 1);
+  static constexpr llvm::StringLiteral TIPrefix = "typeinfo name for ";
+  if (llvm::StringRef(ClearName).startswith(TIPrefix)) {
+    ClearName = ClearName.substr(TIPrefix.size());
   }
 
   auto It = ClearNameTVMap.find(ClearName);
@@ -64,16 +65,11 @@ LLVMVFTableProvider::LLVMVFTableProvider(const llvm::Module &Mod) {
   llvm::DebugInfoFinder DIF;
   DIF.processModule(Mod);
   for (const auto *Ty : DIF.types()) {
-    if (const auto *DerivedTy = llvm::dyn_cast<llvm::DIDerivedType>(Ty)) {
-      if (const auto *BaseTy = DerivedTy->getBaseType()) {
-        if (const auto *CompTy =
-                llvm::dyn_cast<llvm::DICompositeType>(BaseTy)) {
-          if (CompTy->getTag() == llvm::dwarf::DW_TAG_class_type ||
-              CompTy->getTag() == llvm::dwarf::DW_TAG_structure_type) {
-            TypeVFTMap.try_emplace(CompTy,
-                                   getVirtualFunctions(ClearNameTVMap, CompTy));
-          }
-        }
+    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));
       }
     }
   }

lib/PhasarLLVM/ControlFlow/Resolver/CHAResolver.cpp

@@ -16,6 +16,7 @@
 
 #include "phasar/PhasarLLVM/ControlFlow/Resolver/CHAResolver.h"
 
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 #include "phasar/Utils/Logger.h"

lib/PhasarLLVM/ControlFlow/Resolver/RTAResolver.cpp

@@ -18,11 +18,11 @@
 
 #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/IR/DebugInfo.h"
 #include "llvm/IR/DebugInfoMetadata.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/Function.h"
@@ -99,16 +99,10 @@ void RTAResolver::resolveAllocatedCompositeTypes() {
 
   llvm::DebugInfoFinder DIF;
   DIF.processModule(*IRDB->getModule());
-  llvm::DenseSet<const llvm::DICompositeType *> AllocatedCompositeTypes;
 
   for (const auto *Ty : DIF.types()) {
     if (const auto *CompTy = llvm::dyn_cast<llvm::DICompositeType>(Ty)) {
-      AllocatedCompositeTypes.insert(CompTy);
+      AllocatedCompositeTypes.push_back(CompTy);
     }
   }
-
-  this->AllocatedCompositeTypes.reserve(AllocatedCompositeTypes.size());
-  this->AllocatedCompositeTypes.insert(this->AllocatedCompositeTypes.end(),
-                                       AllocatedCompositeTypes.begin(),
-                                       AllocatedCompositeTypes.end());
 }

lib/PhasarLLVM/ControlFlow/Resolver/Resolver.cpp

@@ -83,57 +83,6 @@ const llvm::DIType *psr::getReceiverType(const llvm::CallBase *CallSite) {
       }
     }
   }
-  /*
-    if (Receiver->getType()->isOpaquePointerTy()) {
-      if (const auto *Load = llvm::dyn_cast<llvm::LoadInst>(Receiver)) {
-        if (const auto *DerivedTy = llvm::dyn_cast<llvm::DIDerivedType>(
-                getDILocalVariable(Load->getPointerOperand())->getType())) {
-          return DerivedTy->getBaseType();
-        }
-      }
-    }
-
-    if (!Receiver->getType()->isOpaquePointerTy()) {
-      if (const auto *ReceiverTy = llvm::dyn_cast<llvm::StructType>(
-              Receiver->getType()->getNonOpaquePointerElementType())) {
-        if (const auto *ValueTy = llvm::dyn_cast<llvm::Type>(ReceiverTy)) {
-          if (const auto *DerivedTy = llvm::dyn_cast<llvm::DIDerivedType>(
-                  getDILocalVariable(TypeToDIType[ValueTy]))) {
-            return DerivedTy->getBaseType();
-          }
-        }
-      }
-    }
-*/
-  return nullptr;
-}
-
-const llvm::StructType *
-psr::getReceiverStructType(const llvm::CallBase *CallSite) {
-  if (CallSite->arg_empty() ||
-      (CallSite->hasStructRetAttr() && CallSite->arg_size() < 2)) {
-    return nullptr;
-  }
-
-  const auto *Receiver =
-      CallSite->getArgOperand(unsigned(CallSite->hasStructRetAttr()));
-
-  if (!Receiver->getType()->isPointerTy()) {
-    return nullptr;
-  }
-
-  if (Receiver->getType()->isOpaquePointerTy()) {
-    llvm::errs() << "WARNING: The IR under analysis uses opaque pointers, "
-                    "which are not supported by phasar yet!\n";
-    return nullptr;
-  }
-
-  if (!Receiver->getType()->isOpaquePointerTy()) {
-    if (const auto *ReceiverTy = llvm::dyn_cast<llvm::StructType>(
-            Receiver->getType()->getNonOpaquePointerElementType())) {
-      return ReceiverTy;
-    }
-  }
 
   return nullptr;
 }

lib/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.cpp

@@ -208,7 +208,7 @@ auto DIBasedTypeHierarchy::subTypesOf(ClassType Ty) const noexcept
 }
 
 bool DIBasedTypeHierarchy::isVTable(llvm::StringRef VarName) {
-  if (VarName.startswith("_ZTV")) {
+  if (VarName.startswith(VTablePrefix)) {
     return true;
   }
   // In LLVM 16 demangle() takes a StringRef

tools/example-tool/myphasartool.cpp

@@ -7,6 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
+#include "phasar/PhasarLLVM/TypeHierarchy/DIBasedTypeHierarchy.h"
+
 #include "phasar.h"
 
 #include <filesystem>

unittests/PhasarLLVM/ControlFlow/LLVMBasedICFGExportTest.cpp

@@ -151,12 +151,6 @@ class LLVMBasedICFGExportTest : public ::testing::Test {
                             const nlohmann::json &GroundTruth) {
     ASSERT_TRUE(ExportedICFG.is_array());
 
-    // llvm::outs() << "JSONs: GroundTruth\n";
-    // llvm::outs() << GroundTruth.dump() << "\n";
-    // llvm::outs() << "\n\n------------------------------------------\n\n";
-    // llvm::outs() << "JSONs: ExportedICFG\n";
-    // llvm::outs() << ExportedICFG.dump() << "\n";
-
     EXPECT_EQ(GroundTruth.size(), ExportedICFG.size());
     bool HasError = false;
     for (const auto &GTJson : GroundTruth) {
@@ -178,7 +172,7 @@ class LLVMBasedICFGExportTest : public ::testing::Test {
     }
 
     if (HasError) {
-      // llvm::errs() << "Errorneous json: " << ExportedICFG.dump(4) << '\n';
+      llvm::errs() << "Errorneous json: " << ExportedICFG.dump(4) << '\n';
     }
   }
 

unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_DTATest.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/TypeHierarchy/DIBasedTypeHierarchy.h"
 #include "phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h"
 #include "phasar/PhasarLLVM/Utils/LLVMShorthands.h"
 
@@ -12,7 +13,7 @@
 using namespace std;
 using namespace psr;
 TEST(LLVMBasedICFG_DTATest, VirtualCallSite_5) {
-#if 0
+  GTEST_SKIP();
   LLVMProjectIRDB IRDB(unittest::PathToLLTestFiles +
                        "call_graphs/virtual_call_5_cpp.ll");
   DIBasedTypeHierarchy TH(IRDB);
@@ -38,7 +39,6 @@ TEST(LLVMBasedICFG_DTATest, VirtualCallSite_5) {
     ASSERT_TRUE(llvm::is_contained(ICFG.getCallersOf(VFuncA), I));
     ASSERT_TRUE(llvm::is_contained(ICFG.getCallersOf(VFuncB), I));
   }
-#endif
 }
 
 TEST(LLVMBasedICFG_DTATest, VirtualCallSite_6) {

unittests/PhasarLLVM/ControlFlow/LLVMBasedICFG_OTFTest.cpp

@@ -5,6 +5,7 @@
 #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"
 

unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEGeneralizedLCATest.cpp

@@ -129,11 +129,11 @@ TEST_F(IDEGeneralizedLCATest, StringTestCpp) {
   std::vector<groundTruth_t> GroundTruth;
   const auto *LastMainInstruction =
       getLastInstructionOf(HA->getProjectIRDB().getFunction("main"));
-  GroundTruth.push_back({{EdgeValue("Hello, World")},
-                         3,
-                         std::stoi(getMetaDataID(LastMainInstruction))});
+  GroundTruth.push_back(
+      {{EdgeValue("Hello, World")},
+       3,
+       (unsigned int)std::stoi(getMetaDataID(LastMainInstruction))});
   compareResults(GroundTruth);
-  LCASolver->dumpResults();
 }
 
 TEST_F(IDEGeneralizedLCATest, FloatDivisionTest) {

unittests/PhasarLLVM/DataFlow/IfdsIde/Problems/IDEInstInteractionAnalysisTest.cpp

@@ -367,7 +367,6 @@ TEST_F(IDEInstInteractionAnalysisTest, StructEquality_01) {
 
 TEST_F(IDEInstInteractionAnalysisTest, StructEquality_02) {
   initializeIR("struct_02_cpp.ll");
-  IRDB->dump();
   const auto *Main = IRDB->getFunction("main");
   const auto *Inst = getNthInstruction(Main, 2);
   auto FlowFact = IDEIIAFlowFact::create(Inst);