Redesign ICFG

.clang-tidy

@@ -15,6 +15,7 @@ Checks: '-*,
            -readability-function-cognitive-complexity,
            -readability-convert-member-functions-to-static,
            -readability-isolate-declaration,
+           -readability-identifier-length,
          cppcoreguidelines-*,
            -cppcoreguidelines-avoid-non-const-global-variables,
            -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
@@ -28,7 +29,6 @@ Checks: '-*,
            -bugprone-easily-swappable-parameters,
          modernize-*,
            -modernize-use-trailing-return-type,
-           -modernize-pass-by-value,
          performance-*,
          clang-analyzer-*,
         '

config/DOTGraphConfig.json

@@ -1,49 +1,48 @@
 {
-	"CFNode": {
-		"style": "filled",
-		"shape": "record"
-	},
-	"CFIntraEdge": {
-	},
-	"CFInterEdge": {
-		"weight": "1"
-	},
-	"FactNode": {
-		"style": "rounded"
-	},
-	"FactIDEdge": {
-		"style": "dotted",
-		"arrowhead": "normal",
-		"fontsize": "11",
-		"arrowsize": "0.7"
-	},
-	"FactCrossEdge": {
+  "CFNode": {
+    "style": "filled",
+    "shape": "record"
+  },
+  "CFIntraEdge": {},
+  "CFInterEdge": {
+    "weight": "1"
+  },
+  "FactNode": {
+    "style": "rounded"
+  },
+  "FactIDEdge": {
     "style": "dotted",
-		"arrowhead": "normal",
-		"fontsize": "11",
-		"arrowsize": "0.7"
-	},
-	"FactInterEdge": {
+    "arrowhead": "normal",
+    "fontsize": "11",
+    "arrowsize": "0.7"
+  },
+  "FactCrossEdge": {
+    "style": "dotted",
+    "arrowhead": "normal",
+    "fontsize": "11",
+    "arrowsize": "0.7"
+  },
+  "FactInterEdge": {
     "weight": "0.1",
-		"style": "dashed",
-		"arrowhead": "normal",
-		"fontsize": "11",
-		"arrowsize": "0.7"
-	},
-	"LambdaNode": {
-		"style": "rounded"
-	},
-	"LambdaIDEdge": {
-		"style": "dotted",
-		"arrowhead": "normal",
-		"fontsize": "11",
-		"arrowsize": "0.7"
-	},
-	"LambdaInterEdge": {
+    "style": "dashed",
+    "arrowhead": "normal",
+    "fontsize": "11",
+    "arrowsize": "0.7"
+  },
+  "LambdaNode": {
+    "style": "rounded"
+  },
+  "LambdaIDEdge": {
+    "style": "dotted",
+    "arrowhead": "normal",
+    "fontsize": "11",
+    "arrowsize": "0.7"
+  },
+  "LambdaInterEdge": {
     "weight": "0.1",
-		"style": "dashed",
-		"arrowhead": "normal",
-		"fontsize": "11",
-		"arrowsize": "0.7"
-	}
+    "style": "dashed",
+    "arrowhead": "normal",
+    "fontsize": "11",
+    "arrowsize": "0.7"
+  }
 }

config/phasar-source-sink-function.json

@@ -1,20 +1,28 @@
 {
-	"Source Functions": {
-		"source()": {
-			"Args": [],
-			"Return": true
-		},
-		"read": {
-			"Args": [0, 1, 3],
-			"Return": false
-		}
-	},
-	"Sink Functions": {
-		"sink(int)": {
-			"Args": [0]
-		},
-		"write": {
-			"Args": [1]
-		}
-	}
+  "Source Functions": {
+    "source()": {
+      "Args": [],
+      "Return": true
+    },
+    "read": {
+      "Args": [
+        0,
+        1,
+        3
+      ],
+      "Return": false
+    }
+  },
+  "Sink Functions": {
+    "sink(int)": {
+      "Args": [
+        0
+      ]
+    },
+    "write": {
+      "Args": [
+        1
+      ]
+    }
+  }
 }

include/phasar/Controller/AnalysisController.h

@@ -43,9 +43,9 @@ enum class AnalysisControllerEmitterOptions : uint32_t {
   EmitTHAsText = (1 << 5),
   EmitTHAsDot = (1 << 6),
   EmitTHAsJson = (1 << 7),
-  EmitCGAsText = (1 << 8),
+  // EmitCGAsText = (1 << 8),
   EmitCGAsDot = (1 << 9),
-  EmitCGAsJson = (1 << 10),
+  // EmitCGAsJson = (1 << 10),
   EmitPTAAsText = (1 << 11),
   EmitPTAAsDot = (1 << 12),
   EmitPTAAsJson = (1 << 13),
@@ -60,7 +60,7 @@ class AnalysisController {
   LLVMBasedICFG ICF;
   std::vector<DataFlowAnalysisType> DataFlowAnalyses;
   std::vector<std::string> AnalysisConfigs;
-  std::set<std::string> EntryPoints;
+  std::vector<std::string> EntryPoints;
   [[maybe_unused]] AnalysisStrategy Strategy;
   AnalysisControllerEmitterOptions EmitterOptions =
       AnalysisControllerEmitterOptions::None;
@@ -193,7 +193,7 @@ class AnalysisController {
                      std::vector<std::string> AnalysisConfigs,
                      PointerAnalysisType PTATy, CallGraphAnalysisType CGTy,
                      Soundness SoundnessLevel, bool AutoGlobalSupport,
-                     const std::set<std::string> &EntryPoints,
+                     std::vector<std::string> EntryPoints,
                      AnalysisStrategy Strategy,
                      AnalysisControllerEmitterOptions EmitterOptions,
                      IFDSIDESolverConfig SolverConfig,

include/phasar/DB/ProjectIRDB.h

@@ -61,7 +61,8 @@ class ProjectIRDB {
   std::map<std::string, std::unique_ptr<llvm::Module>> Modules;
   // Maps an id to its corresponding instruction
   std::map<std::size_t, llvm::Instruction *> IDInstructionMapping;
-  size_t NumberCallsites;
+  size_t NumGlobals = 0;
+  size_t NumberCallsites = 0;
   nlohmann::json StatsJson;
 
   void buildIDModuleMapping(llvm::Module *M);
@@ -97,6 +98,7 @@ class ProjectIRDB {
   ~ProjectIRDB();
 
   void insertModule(llvm::Module *M);
+  void insertFunction(llvm::Function *F);
 
   // add WPA support by providing a fat completely linked module
   void linkForWPA();
@@ -180,6 +182,8 @@ class ProjectIRDB {
 
   [[nodiscard]] std::size_t getNumGlobals() const;
 
+  [[nodiscard]] std::size_t getNumFunctions() const;
+
   [[nodiscard]] llvm::Instruction *getInstruction(std::size_t Id) const;
 
   [[nodiscard]] static std::size_t getInstructionID(const llvm::Instruction *I);

include/phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.h

@@ -19,6 +19,7 @@
 
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
 
@@ -54,7 +55,7 @@ class WholeProgramAnalysis {
 
 public:
   WholeProgramAnalysis(IFDSIDESolverConfig SolverConfig, ProjectIRDB &IRDB,
-                       std::set<std::string> EntryPoints = {},
+                       llvm::ArrayRef<std::string> EntryPoints = {},
                        PointerAnalysisTy *PointerInfo = nullptr,
                        CallGraphAnalysisTy *CallGraph = nullptr,
                        TypeHierarchyTy *TypeHierarchy = nullptr)
@@ -67,11 +68,12 @@ class WholeProgramAnalysis {
                         : std::unique_ptr<PointerAnalysisTy>(PointerInfo)),
         CallGraph(CallGraph == nullptr
                       ? std::make_unique<CallGraphAnalysisTy>(
-                            IRDB, CallGraphAnalysisType::OTF, EntryPoints,
+                            &IRDB, CallGraphAnalysisType::OTF, EntryPoints,
                             this->TypeHierarchy.get(), this->PointerInfo.get())
                       : std::unique_ptr<CallGraphAnalysisTy>(CallGraph)),
-        EntryPoints(EntryPoints),
-        ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo, EntryPoints),
+        EntryPoints(EntryPoints.begin(), EntryPoints.end()),
+        ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo,
+                    this->EntryPoints),
         DataFlowSolver(ProblemDesc) {
     if constexpr (has_setIFDSIDESolverConfig_v<ProblemDescription>) {
       ProblemDesc.setIFDSIDESolverConfig(SolverConfig);
@@ -83,7 +85,7 @@ class WholeProgramAnalysis {
                 typename T::ConfigurationTy, HasNoConfigurationType>>>
   WholeProgramAnalysis(IFDSIDESolverConfig SolverConfig, ProjectIRDB &IRDB,
                        ConfigurationTy *Config,
-                       std::set<std::string> EntryPoints = {},
+                       llvm::ArrayRef<std::string> EntryPoints = {},
                        PointerAnalysisTy *PointerInfo = nullptr,
                        CallGraphAnalysisTy *CallGraph = nullptr,
                        TypeHierarchyTy *TypeHierarchy = nullptr)
@@ -96,12 +98,12 @@ class WholeProgramAnalysis {
                         : std::unique_ptr<PointerAnalysisTy>(PointerInfo)),
         CallGraph(CallGraph == nullptr
                       ? std::make_unique<CallGraphAnalysisTy>(
-                            IRDB, CallGraphAnalysisType::OTF, EntryPoints,
+                            &IRDB, CallGraphAnalysisType::OTF, EntryPoints,
                             this->TypeHierarchy.get(), this->PointerInfo.get())
                       : std::unique_ptr<CallGraphAnalysisTy>(CallGraph)),
-        EntryPoints(EntryPoints), Config(Config),
+        EntryPoints(EntryPoints.begin(), EntryPoints.end()), Config(Config),
         ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo, *Config,
-                    EntryPoints),
+                    this->EntryPoints),
         DataFlowSolver(ProblemDesc) {
     if constexpr (has_setIFDSIDESolverConfig_v<ProblemDescription>) {
       ProblemDesc.setIFDSIDESolverConfig(SolverConfig);
@@ -113,7 +115,7 @@ class WholeProgramAnalysis {
                 typename T::ConfigurationTy, HasNoConfigurationType>>>
   WholeProgramAnalysis(IFDSIDESolverConfig SolverConfig, ProjectIRDB &IRDB,
                        std::string ConfigPath,
-                       std::set<std::string> EntryPoints = {},
+                       llvm::ArrayRef<std::string> EntryPoints = {},
                        PointerAnalysisTy *PointerInfo = nullptr,
                        CallGraphAnalysisTy *CallGraph = nullptr,
                        TypeHierarchyTy *TypeHierarchy = nullptr)
@@ -126,13 +128,14 @@ class WholeProgramAnalysis {
                         : std::unique_ptr<PointerAnalysisTy>(PointerInfo)),
         CallGraph(CallGraph == nullptr
                       ? std::make_unique<CallGraphAnalysisTy>(
-                            IRDB, CallGraphAnalysisType::OTF, EntryPoints,
+                            &IRDB, CallGraphAnalysisType::OTF, EntryPoints,
                             this->TypeHierarchy.get(), this->PointerInfo.get())
                       : std::unique_ptr<CallGraphAnalysisTy>(CallGraph)),
-        EntryPoints(EntryPoints), Config(new ConfigurationTy(ConfigPath)),
-        OwnsConfig(true), ConfigPath(ConfigPath),
+        EntryPoints(EntryPoints.begin(), EntryPoints.end()),
+        Config(new ConfigurationTy(ConfigPath)), OwnsConfig(true),
+        ConfigPath(ConfigPath),
         ProblemDesc(&IRDB, TypeHierarchy, CallGraph, PointerInfo, *Config,
-                    EntryPoints),
+                    this->EntryPoints),
         DataFlowSolver(ProblemDesc) {
     if constexpr (has_setIFDSIDESolverConfig_v<ProblemDescription>) {
       ProblemDesc.setIFDSIDESolverConfig(SolverConfig);