update branch

Author: pdschubert

Config.cmake.in

@@ -9,7 +9,7 @@ foreach(component ${phasar_FIND_COMPONENTS})
 endforeach()
 
 function(phasar_config executable)
-  find_package(LLVM 10 REQUIRED CONFIG)
+  find_package(LLVM 12 REQUIRED CONFIG)
   include_directories(${LLVM_INCLUDE_DIRS})
   link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
   find_library(LLVM_LIBRARY NAMES LLVM HINTS ${LLVM_LIBRARY_DIRS})

external/googletest

@@ -62,7 +62,8 @@ class AnalysisController {
   std::string ProjectID;
   std::string OutDirectory;
   boost::filesystem::path ResultDirectory;
-  [[maybe_unused]] Soundness S;
+  [[maybe_unused]] Soundness SoundnessLevel;
+  [[maybe_unused]] bool AutoGlobalSupport;
 
   ///
   /// \brief The maximum length of the CallStrings used in the InterMonoSolver
@@ -117,7 +118,8 @@ class AnalysisController {
                      std::vector<DataFlowAnalysisKind> DataFlowAnalyses,
                      std::vector<std::string> AnalysisConfigs,
                      PointerAnalysisType PTATy, CallGraphAnalysisType CGTy,
-                     Soundness S, const std::set<std::string> &EntryPoints,
+                     Soundness SoundnessLevel, bool AutoGlobalSupport,
+                     const std::set<std::string> &EntryPoints,
                      AnalysisStrategy Strategy,
                      AnalysisControllerEmitterOptions EmitterOptions,
                      const std::string &ProjectID = "default-phasar-project",

external/json

@@ -138,7 +138,7 @@ class ProjectIRDB {
   [[nodiscard]] const llvm::Module *
   getModuleDefiningFunction(const std::string &FunctionName) const;
 
-  [[nodiscard]] std::set<const llvm::Instruction *>
+  [[nodiscard]] inline const std::set<const llvm::Instruction *> &
   getAllocaInstructions() const {
     return AllocaInstructions;
   };
@@ -159,26 +159,28 @@ class ProjectIRDB {
   [[nodiscard]] std::set<const llvm::StructType *>
   getAllocatedStructTypes() const;
 
-  [[nodiscard]] std::set<const llvm::Instruction *>
+  [[nodiscard]] inline std::set<const llvm::Instruction *>
   getRetOrResInstructions() const {
     return RetOrResInstructions;
   };
 
-  [[nodiscard]] std::size_t getNumberOfModules() const {
+  [[nodiscard]] inline std::size_t getNumberOfModules() const {
     return Modules.size();
   };
 
-  [[nodiscard]] std::size_t getNumInstructions() const {
+  [[nodiscard]] inline std::size_t getNumInstructions() const {
     return IDInstructionMapping.size();
   }
 
-  [[nodiscard]] llvm::Instruction *getInstruction(std::size_t id);
+  [[nodiscard]] std::size_t getNumGlobals() const;
+
+  [[nodiscard]] llvm::Instruction *getInstruction(std::size_t Id);
 
   [[nodiscard]] static std::size_t getInstructionID(const llvm::Instruction *I);
 
   void print() const;
 
-  void emitPreprocessedIR(std::ostream &os = std::cout,
+  void emitPreprocessedIR(std::ostream &OS = std::cout,
                           bool ShortenIR = false) const;
 
   /**

external/json-schema-validator

@@ -18,6 +18,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include "llvm/IR/LLVMContext.h"
+
 #include "phasar/PhasarLLVM/ControlFlow/ICFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardCFG.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
@@ -42,17 +44,28 @@ class LLVMBasedBackwardsICFG
     : public ICFG<const llvm::Instruction *, const llvm::Function *>,
       public virtual LLVMBasedBackwardCFG {
 private:
-  LLVMBasedICFG ForwardICFG;
+  LLVMBasedICFG &ForwardICFG;
+  static inline const std::unique_ptr<llvm::LLVMContext> LLVMBackwardRetCTX =
+      std::make_unique<llvm::LLVMContext>();
+
+  class LLVMBackwardRet {
+  private:
+    const llvm::ReturnInst *Instance;
+
+  public:
+    LLVMBackwardRet()
+        : Instance(llvm::ReturnInst::Create(*LLVMBackwardRetCTX)){};
+    [[nodiscard]] const llvm::ReturnInst *getInstance() const {
+      return Instance;
+    }
+  };
+  std::unordered_map<const llvm::Function *, LLVMBackwardRet> BackwardRets;
+  llvm::DenseMap<const llvm::Instruction *, const llvm::Function *>
+      BackwardRetToFunction;
 
 public:
   LLVMBasedBackwardsICFG(LLVMBasedICFG &ICFG);
 
-  LLVMBasedBackwardsICFG(ProjectIRDB &IRDB, CallGraphAnalysisType CGType,
-                         const std::set<std::string> &EntryPoints = {},
-                         LLVMTypeHierarchy *TH = nullptr,
-                         LLVMPointsToInfo *PT = nullptr,
-                         Soundness S = Soundness::Soundy);
-
   ~LLVMBasedBackwardsICFG() override = default;
 
   std::set<const llvm::Function *> getAllFunctions() const override;
@@ -77,6 +90,20 @@ class LLVMBasedBackwardsICFG
 
   std::set<const llvm::Instruction *> allNonCallStartNodes() const override;
 
+  [[nodiscard]] const llvm::Function *
+  getFunctionOf(const llvm::Instruction *Stmt) const override;
+
+  [[nodiscard]] std::vector<const llvm::Instruction *>
+  getPredsOf(const llvm::Instruction *Stmt) const override;
+
+  [[nodiscard]] std::vector<const llvm::Instruction *>
+  getSuccsOf(const llvm::Instruction *Stmt) const override;
+
+  [[nodiscard]] std::set<const llvm::Instruction *>
+  getExitPointsOf(const llvm::Function *Fun) const override;
+
+  [[nodiscard]] bool isExitInst(const llvm::Instruction *Stmt) const override;
+
   void mergeWith(const LLVMBasedBackwardsICFG &other);
 
   using LLVMBasedBackwardCFG::print; // tell the compiler we wish to have both
@@ -95,6 +122,9 @@ class LLVMBasedBackwardsICFG
 
   std::vector<const llvm::Function *> getDependencyOrderedFunctions();
 
+private:
+  void createBackwardRets();
+
 protected:
   void collectGlobalCtors() override;
 

include/phasar/Controller/AnalysisController.h

@@ -74,11 +74,11 @@ class LLVMBasedCFG
 
   [[nodiscard]] bool
   isFallThroughSuccessor(const llvm::Instruction *Inst,
-                         const llvm::Instruction *succ) const override;
+                         const llvm::Instruction *Succ) const override;
 
   [[nodiscard]] bool
   isBranchTarget(const llvm::Instruction *Inst,
-                 const llvm::Instruction *succ) const override;
+                 const llvm::Instruction *Succ) const override;
 
   [[nodiscard]] bool
   isHeapAllocatingFunction(const llvm::Function *Fun) const override;

include/phasar/DB/ProjectIRDB.h

@@ -30,8 +30,10 @@
 #include "boost/container/flat_set.hpp"
 #include "boost/graph/adjacency_list.hpp"
 
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/Constants.h"
+#include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Module.h"
 
@@ -71,35 +73,23 @@ class LLVMBasedICFG
   LLVMTypeHierarchy *TH;
   LLVMPointsToInfo *PT;
   std::unique_ptr<Resolver> Res;
-  std::unordered_set<const llvm::Function *> VisitedFunctions;
-  llvm::SmallPtrSet<llvm::Function *, 2> UserEntryPoints;
+  llvm::DenseSet<const llvm::Function *> VisitedFunctions;
+  std::unordered_set<llvm::Function *> UserEntryPoints;
 
   GlobalCtorTy GlobalCtors;
   GlobalDtorTy GlobalDtors;
 
-  // llvm::SmallDenseMap<F, typename GlobalCtorTy::const_iterator, 2>
-  // GlobalCtorFn; llvm::SmallDenseMap<F, typename GlobalDtorTy::const_iterator,
-  // 2> GlobalDtorFn;
-
   llvm::Function *GlobalCleanupFn = nullptr;
 
   llvm::SmallDenseMap<const llvm::Module *, llvm::Function *>
       GlobalRegisteredDtorsCaller;
-  /// Keeps track of the call-sites already resolved
-  // std::vector<const llvm::Instruction *> CallStack;
-
-  // Keeps track of the type graph already constructed
-  // TypeGraph_t typegraph;
-
-  // Any types that could be initialized outside of the module
-  // std::set<const llvm::StructType*> unsound_types;
 
   // The worklist for direct callee resolution.
   std::vector<const llvm::Function *> FunctionWL;
 
   // Map indirect calls to the number of possible targets found for it. Fixpoint
   // is not reached when more targets are found.
-  std::unordered_map<const llvm::Instruction *, unsigned> IndirectCalls;
+  llvm::DenseMap<const llvm::Instruction *, unsigned> IndirectCalls;
   // The VertexProperties for our call-graph.
   struct VertexProperties {
     const llvm::Function *F = nullptr;
@@ -192,7 +182,7 @@ class LLVMBasedICFG
   LLVMBasedICFG(ProjectIRDB &IRDB, CallGraphAnalysisType CGType,
                 const std::set<std::string> &EntryPoints = {},
                 LLVMTypeHierarchy *TH = nullptr, LLVMPointsToInfo *PT = nullptr,
-                Soundness S = Soundness::Soundy, bool IncludeGlobals = false);
+                Soundness S = Soundness::Soundy, bool IncludeGlobals = true);
 
   LLVMBasedICFG(const LLVMBasedICFG &);
 

include/phasar/PhasarLLVM/ControlFlow/LLVMBasedBackwardICFG.h

@@ -33,8 +33,7 @@ class CHAResolver : public Resolver {
 
   ~CHAResolver() override = default;
 
-  std::set<const llvm::Function *>
-  resolveVirtualCall(const llvm::CallBase *CallSite) override;
+  FunctionSetTy resolveVirtualCall(const llvm::CallBase *CallSite) override;
 };
 } // namespace psr