secure-software-engineering · fabianbs96 · Mar 4, 2025 · May 15, 2024 · May 29, 2024 · Jun 3, 2024
@@ -2,6 +2,8 @@
 
 ## development HEAD
 
+- 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.
+- The default type-hierarchy implementation has been changed from `LLVMTypeHierarchy` to `DIBasedTypeHierarchy`. This also requires all affected analyses to be performed on LLVM IR that contains debug information.
 - Removed the phasar-library `phasar_controller`. It is now part of the tool `phasar-cli`.
 - The API of the `TypeHierarchy` interface (and thus the `LLVMTypeHierarchy` and `DIBasedTypeHierarchy` as well) has changed:
   - No handling of the super-type relation (only sub-types)

@@ -312,7 +312,7 @@ option(USE_LLVM_FAT_LIB  "Link against libLLVM.so instead of the individual LLVM
 
 # LLVM
 if (NOT PHASAR_LLVM_VERSION)
-  set(PHASAR_LLVM_VERSION 14)
+  set(PHASAR_LLVM_VERSION 15)
 endif()
 include(add_llvm)
 add_llvm()

@@ -6,10 +6,10 @@ source ./utils/safeCommandsSet.sh
 
 readonly PHASAR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 PHASAR_INSTALL_DIR="/usr/local/phasar"
-LLVM_INSTALL_DIR="/usr/local/llvm-14"
+LLVM_INSTALL_DIR="/usr/local/llvm-15"
 
 NUM_THREADS=$(nproc)
-LLVM_RELEASE=llvmorg-14.0.6
+LLVM_RELEASE=llvmorg-15.0.7
 DO_UNIT_TEST=true
 DO_INSTALL=false
 BUILD_TYPE=Release

@@ -163,17 +163,6 @@ function(generate_ll_file)
   set(GEN_C_FLAGS -fno-discard-value-names -emit-llvm -S -w)
   set(GEN_CMD_COMMENT "[LL]")
 
-  string(REGEX MATCH "clang\\+*-?[0-9]*$" compiler "${CMAKE_CXX_COMPILER}")
-  if (compiler)
-    if(PHASAR_LLVM_VERSION GREATER_EQUAL 15)
-      list(APPEND GEN_CXX_FLAGS -Xclang -no-opaque-pointers)
-    endif()
-
-    if(PHASAR_LLVM_VERSION GREATER_EQUAL 15)
-      list(APPEND GEN_C_FLAGS -Xclang -no-opaque-pointers)
-    endif()
-  endif()
-
   if(GEN_LL_MEM2REG)
     list(APPEND GEN_CXX_FLAGS -Xclang -disable-O0-optnone)
     list(APPEND GEN_C_FLAGS -Xclang -disable-O0-optnone)
@@ -219,7 +208,7 @@ function(generate_ll_file)
       add_custom_command(
       OUTPUT ${test_code_ll_file}
       COMMAND ${GEN_CMD} ${test_code_file_path} -o ${test_code_ll_file}
-      COMMAND ${CMAKE_CXX_COMPILER_LAUNCHER} ${opt} -mem2reg -S -opaque-pointers=0 ${test_code_ll_file} -o ${test_code_ll_file}
+      COMMAND ${CMAKE_CXX_COMPILER_LAUNCHER} ${opt} -mem2reg -S ${test_code_ll_file} -o ${test_code_ll_file}
       COMMENT ${GEN_CMD_COMMENT}
       DEPENDS ${GEN_LL_FILE}
       VERBATIM

@@ -121,7 +121,7 @@ class IDESolver
             llvm::StringRef(NToString(Cells[I].getRowKey())).trim().str();
 
         std::string NodeStr =
-            ICF->getFunctionName(ICF->getFunctionOf(Curr)) + "::" + NStr;
+            ICF->getFunctionName(ICF->getFunctionOf(Curr)).str() + "::" + NStr;
         J[DataFlowID][NodeStr];
         std::string FactStr =
             llvm::StringRef(DToString(Cells[I].getColumnKey())).trim().str();

@@ -17,14 +17,14 @@
 namespace psr {
 class LLVMProjectIRDB;
 enum class CallGraphAnalysisType;
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 class LLVMVFTableProvider;
 class Resolver;
 
 [[nodiscard]] LLVMBasedCallGraph
 buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, CallGraphAnalysisType CGType,
                         llvm::ArrayRef<const llvm::Function *> EntryPoints,
-                        LLVMTypeHierarchy &TH, LLVMVFTableProvider &VTP,
+                        DIBasedTypeHierarchy &TH, LLVMVFTableProvider &VTP,
                         LLVMAliasInfoRef PT = nullptr,
                         Soundness S = Soundness::Soundy);
 
@@ -36,7 +36,7 @@ buildLLVMBasedCallGraph(const LLVMProjectIRDB &IRDB, Resolver &CGResolver,
 [[nodiscard]] LLVMBasedCallGraph
 buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, CallGraphAnalysisType CGType,
                         llvm::ArrayRef<std::string> EntryPoints,
-                        LLVMTypeHierarchy &TH, LLVMVFTableProvider &VTP,
+                        DIBasedTypeHierarchy &TH, LLVMVFTableProvider &VTP,
                         LLVMAliasInfoRef PT = nullptr,
                         Soundness S = Soundness::Soundy);
 

@@ -36,10 +36,8 @@
 #include "llvm/IR/Value.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <memory>
-
 namespace psr {
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 class LLVMProjectIRDB;
 class Resolver;
 
@@ -73,7 +71,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   /// IRDB. True by default
   explicit LLVMBasedICFG(LLVMProjectIRDB *IRDB, CallGraphAnalysisType CGType,
                          llvm::ArrayRef<std::string> EntryPoints = {},
-                         LLVMTypeHierarchy *TH = nullptr,
+                         DIBasedTypeHierarchy *TH = nullptr,
                          LLVMAliasInfoRef PT = nullptr,
                          Soundness S = Soundness::Soundy,
                          bool IncludeGlobals = true);
@@ -93,7 +91,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   explicit LLVMBasedICFG(const LLVMProjectIRDB *IRDB,
                          const CallGraphData &SerializedCG);
 
-  // Deleter of LLVMTypeHierarchy may be unknown here...
+  // Deleter of DIBasedTypeHierarchy may be unknown here...
   ~LLVMBasedICFG();
 
   LLVMBasedICFG(const LLVMBasedICFG &) = delete;

@@ -16,7 +16,7 @@
 
 namespace llvm {
 class Module;
-class StructType;
+class DIType;
 class GlobalVariable;
 } // namespace llvm
 
@@ -28,12 +28,12 @@ class LLVMVFTableProvider {
   explicit LLVMVFTableProvider(const llvm::Module &Mod);
   explicit LLVMVFTableProvider(const LLVMProjectIRDB &IRDB);
 
-  [[nodiscard]] bool hasVFTable(const llvm::StructType *Type) const;
+  [[nodiscard]] bool hasVFTable(const llvm::DIType *Type) const;
   [[nodiscard]] const LLVMVFTable *
-  getVFTableOrNull(const llvm::StructType *Type) const;
+  getVFTableOrNull(const llvm::DIType *Type) const;
 
 private:
-  std::unordered_map<const llvm::StructType *, LLVMVFTable> TypeVFTMap;
+  std::unordered_map<const llvm::DIType *, LLVMVFTable> TypeVFTMap;
 };
 } // namespace psr
 

@@ -25,11 +25,11 @@ class CallBase;
 } // namespace llvm
 
 namespace psr {
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 class CHAResolver : public Resolver {
 public:
   CHAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
-              const LLVMTypeHierarchy *TH);
+              const DIBasedTypeHierarchy *TH);
 
   // Deleting an incomplete type (LLVMTypeHierarchy) is UB, so instantiate the
   // dtor in CHAResolver.cpp
@@ -45,7 +45,7 @@ class CHAResolver : public Resolver {
   }
 
 protected:
-  MaybeUniquePtr<const LLVMTypeHierarchy, true> TH;
+  MaybeUniquePtr<const DIBasedTypeHierarchy, true> TH;
 };
 } // namespace psr
 

@@ -19,6 +19,7 @@
 
 #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"
 
@@ -33,12 +34,13 @@ class BitCastInst;
 
 namespace psr {
 
-class DTAResolver : public CHAResolver {
+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 LLVMTypeHierarchy *TH);
+              const DIBasedTypeHierarchy *TH);
 
   ~DTAResolver() override = default;
 
@@ -48,8 +50,8 @@ class DTAResolver : public CHAResolver {
 
   [[nodiscard]] std::string str() const override;
 
-  [[nodiscard]] bool
-  mutatesHelperAnalysisInformation() const noexcept override {
+  [[nodiscard]] bool mutatesHelperAnalysisInformation()
+      const noexcept override {
     return false;
   }
 
@@ -60,13 +62,14 @@ class DTAResolver : public CHAResolver {
    * 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);
+  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);
 };

@@ -34,7 +34,7 @@ class Value;
 
 namespace psr {
 
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 
 class OTFResolver : public Resolver {
 public:

@@ -23,14 +23,15 @@
 
 namespace llvm {
 class CallBase;
-class StructType;
+class DICompositeType;
 } // namespace llvm
 
 namespace psr {
+class DIBasedTypeHierarchy;
 class RTAResolver : public CHAResolver {
 public:
   RTAResolver(const LLVMProjectIRDB *IRDB, const LLVMVFTableProvider *VTP,
-              const LLVMTypeHierarchy *TH);
+              const DIBasedTypeHierarchy *TH);
 
   ~RTAResolver() override = default;
 
@@ -44,9 +45,9 @@ class RTAResolver : public CHAResolver {
   }
 
 private:
-  void resolveAllocatedStructTypes();
+  void resolveAllocatedCompositeTypes();
 
-  std::vector<const llvm::StructType *> AllocatedStructTypes;
+  std::vector<const llvm::DICompositeType *> AllocatedCompositeTypes;
 };
 } // namespace psr
 

@@ -20,6 +20,7 @@
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasInfo.h"
 
 #include "llvm/ADT/DenseSet.h"
+#include "llvm/IR/DerivedTypes.h"
 
 #include <memory>
 #include <optional>
@@ -29,30 +30,30 @@ namespace llvm {
 class Instruction;
 class CallBase;
 class Function;
-class StructType;
+class DIType;
 } // namespace llvm
 
 namespace psr {
 class LLVMProjectIRDB;
 class LLVMVFTableProvider;
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 enum class CallGraphAnalysisType;
 
 /// Assuming that `CallSite` is a virtual call through a vtable, retrieves the
 /// index in the vtable of the virtual function called.
 [[nodiscard]] std::optional<unsigned>
 getVFTIndex(const llvm::CallBase *CallSite);
 
-/// Assuming that `CallSite` is a vall to a non-static member function,
+/// 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
-[[nodiscard]] const llvm::StructType *
+[[nodiscard]] const llvm::DIType *
 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::StructType *T, unsigned Idx,
+getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
                           const llvm::CallBase *CallSite,
                           const psr::LLVMVFTableProvider &VTP);
 
@@ -73,7 +74,7 @@ class Resolver {
   const LLVMVFTableProvider *VTP;
 
   const llvm::Function *
-  getNonPureVirtualVFTEntry(const llvm::StructType *T, unsigned Idx,
+  getNonPureVirtualVFTEntry(const llvm::DIType *T, unsigned Idx,
                             const llvm::CallBase *CallSite) {
     if (!VTP) {
       return nullptr;
@@ -115,7 +116,7 @@ class Resolver {
   static std::unique_ptr<Resolver> create(CallGraphAnalysisType Ty,
                                           const LLVMProjectIRDB *IRDB,
                                           const LLVMVFTableProvider *VTP,
-                                          const LLVMTypeHierarchy *TH,
+                                          const DIBasedTypeHierarchy *TH,
                                           LLVMAliasInfoRef PT = nullptr);
 };
 } // namespace psr

@@ -32,7 +32,7 @@ class StructType;
 namespace psr {
 
 class LLVMBasedICFG;
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 
 class InterMonoFullConstantPropagation
     : public IntraMonoFullConstantPropagation,
@@ -48,7 +48,7 @@ class InterMonoFullConstantPropagation
   using mono_container_t = IntraMonoFullConstantPropagation::mono_container_t;
 
   InterMonoFullConstantPropagation(const LLVMProjectIRDB *IRDB,
-                                   const LLVMTypeHierarchy *TH,
+                                   const DIBasedTypeHierarchy *TH,
                                    const LLVMBasedICFG *ICF,
                                    LLVMAliasInfoRef PT,
                                    std::vector<std::string> EntryPoints = {});

@@ -36,7 +36,7 @@ class StructType;
 
 namespace psr {
 
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 
 struct InterMonoSolverTestDomain : LLVMAnalysisDomainDefault {
   using mono_container_t = BitVectorSet<LLVMAnalysisDomainDefault::d_t>;
@@ -52,8 +52,9 @@ class InterMonoSolverTest : public InterMonoProblem<InterMonoSolverTestDomain> {
   using i_t = InterMonoSolverTestDomain::i_t;
   using mono_container_t = InterMonoSolverTestDomain::mono_container_t;
 
-  InterMonoSolverTest(const LLVMProjectIRDB *IRDB, const LLVMTypeHierarchy *TH,
-                      const LLVMBasedICFG *ICF, LLVMAliasInfoRef PT,
+  InterMonoSolverTest(const LLVMProjectIRDB *IRDB,
+                      const DIBasedTypeHierarchy *TH, const LLVMBasedICFG *ICF,
+                      LLVMAliasInfoRef PT,
                       std::vector<std::string> EntryPoints = {});
 
   ~InterMonoSolverTest() override = default;

@@ -37,7 +37,7 @@ class StructType;
 
 namespace psr {
 
-class LLVMTypeHierarchy;
+class DIBasedTypeHierarchy;
 
 struct InterMonoTaintAnalysisDomain : LLVMAnalysisDomainDefault {
   using mono_container_t = BitVectorSet<LLVMAnalysisDomainDefault::d_t>;
@@ -56,8 +56,9 @@ class InterMonoTaintAnalysis
   using ConfigurationTy = LLVMTaintConfig;
 
   InterMonoTaintAnalysis(const LLVMProjectIRDB *IRDB,
-                         const LLVMTypeHierarchy *TH, const LLVMBasedICFG *ICF,
-                         LLVMAliasInfoRef PT, const LLVMTaintConfig &Config,
+                         const DIBasedTypeHierarchy *TH,
+                         const LLVMBasedICFG *ICF, LLVMAliasInfoRef PT,
+                         const LLVMTaintConfig &Config,
                          std::vector<std::string> EntryPoints = {});
 
   ~InterMonoTaintAnalysis() override = default;