Taint Config Serialization

include/phasar/PhasarLLVM/TaintConfig/LLVMTaintConfig.h

@@ -19,6 +19,7 @@
 namespace psr {
 class LLVMTaintConfig;
 class LLVMProjectIRDB;
+class TaintConfigData;
 
 template <> struct TaintConfigTraits<LLVMTaintConfig> {
   using n_t = const llvm::Instruction *;
@@ -31,7 +32,7 @@ class LLVMTaintConfig : public TaintConfigBase<LLVMTaintConfig> {
 
 public:
   explicit LLVMTaintConfig(const psr::LLVMProjectIRDB &Code,
-                           const nlohmann::json &Config);
+                           const psr::TaintConfigData &Config);
   explicit LLVMTaintConfig(const psr::LLVMProjectIRDB &AnnotatedCode);
   explicit LLVMTaintConfig(
       TaintDescriptionCallBackTy SourceCB, TaintDescriptionCallBackTy SinkCB,
@@ -93,7 +94,7 @@ class LLVMTaintConfig : public TaintConfigBase<LLVMTaintConfig> {
   // --- utilities
 
   void addAllFunctions(const LLVMProjectIRDB &IRDB,
-                       const nlohmann::json &Config);
+                       const TaintConfigData &Config);
 
   // --- data members
 

include/phasar/PhasarLLVM/TaintConfig/TaintConfigBase.h

@@ -10,15 +10,14 @@
 #ifndef PHASAR_PHASARLLVM_TAINTCONFIG_TAINTCONFIGBASE_H
 #define PHASAR_PHASARLLVM_TAINTCONFIG_TAINTCONFIGBASE_H
 
+#include "phasar/PhasarLLVM/TaintConfig/TaintConfigData.h"
 #include "phasar/Utils/Nullable.h"
 
 #include "llvm/ADT/FunctionExtras.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "nlohmann/json.hpp"
-
 #include <map>
 #include <set>
 #include <type_traits>
@@ -159,8 +158,8 @@ template <typename Derived> class TaintConfigBase {
 //===----------------------------------------------------------------------===//
 // Miscellaneous helper functions
 
-nlohmann::json parseTaintConfig(const llvm::Twine &Path);
-std::optional<nlohmann::json> parseTaintConfigOrNull(const llvm::Twine &Path);
+TaintConfigData parseTaintConfig(const llvm::Twine &Path);
+std::optional<TaintConfigData> parseTaintConfigOrNull(const llvm::Twine &Path);
 
 } // namespace psr
 

include/phasar/PhasarLLVM/TaintConfig/TaintConfigData.h

@@ -0,0 +1,47 @@
+/******************************************************************************
+ * Copyright (c) 2023 Fabian Schiebel.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Maximilian Leo Huber and others
+ *****************************************************************************/
+
+#ifndef PHASAR_PHASARLLVM_TAINTCONFIG_TAINTCONFIGDATA_H
+#define PHASAR_PHASARLLVM_TAINTCONFIG_TAINTCONFIGDATA_H
+
+#include <string>
+#include <vector>
+
+namespace psr {
+struct TaintConfigData;
+class LLVMProjectIRDB;
+
+struct FunctionData {
+  FunctionData() = default;
+
+  std::string Name;
+  std::string ReturnType;
+  std::vector<int> SourceValues;
+  std::vector<int> SinkValues;
+  std::vector<int> SanitizerValues;
+  bool HasAllSinkParam = false;
+};
+
+struct VariableData {
+  VariableData() = default;
+
+  size_t Line{};
+  std::string Name;
+  std::string Scope;
+  std::string Cat;
+};
+
+struct TaintConfigData {
+  std::vector<FunctionData> Functions;
+  std::vector<VariableData> Variables;
+};
+
+} // namespace psr
+
+#endif // PHASAR_PHASARLLVM_TAINTCONFIG_TAINTCONFIGDATA_H

lib/Controller/AnalysisController.cpp

@@ -15,8 +15,8 @@
 #include "phasar/PhasarLLVM/DB/LLVMProjectIRDB.h"
 #include "phasar/PhasarLLVM/HelperAnalyses.h"
 #include "phasar/PhasarLLVM/Passes/GeneralStatisticsAnalysis.h"
+#include "phasar/PhasarLLVM/TaintConfig/TaintConfigData.h"
 #include "phasar/PhasarLLVM/Utils/DataFlowAnalysisType.h"
-#include "phasar/Utils/NlohmannLogging.h"
 #include "phasar/Utils/Utilities.h"
 
 #include "llvm/ADT/STLExtras.h"
@@ -185,10 +185,6 @@ void AnalysisController::emitRequestedHelperAnalysisResults() {
     WithResultFileOrStdout("/psr-cg.txt",
                            [this](auto &OS) { HA.getICFG().print(OS); });
   }
-  if (EmitterOptions & AnalysisControllerEmitterOptions::EmitCGAsJson) {
-    WithResultFileOrStdout(
-        "/psr-cg.json", [this](auto &OS) { OS << HA.getICFG().getAsJson(); });
-  }
 
   if (EmitterOptions &
       (AnalysisControllerEmitterOptions::EmitStatisticsAsJson |
@@ -198,11 +194,6 @@ void AnalysisController::emitRequestedHelperAnalysisResults() {
     GeneralStatisticsAnalysis GSA;
     const auto &Stats = GSA.runOnModule(*IRDB.getModule());
 
-    if (EmitterOptions &
-        AnalysisControllerEmitterOptions::EmitStatisticsAsText) {
-      llvm::outs() << Stats << '\n';
-    }
-
     if (EmitterOptions &
         AnalysisControllerEmitterOptions::EmitStatisticsAsJson) {
       WithResultFileOrStdout("/psr-IrStatistics.json",
@@ -214,10 +205,8 @@ void AnalysisController::emitRequestedHelperAnalysisResults() {
 LLVMTaintConfig AnalysisController::makeTaintConfig() {
   std::string AnalysisConfigPath =
       !AnalysisConfigs.empty() ? AnalysisConfigs[0] : "";
-  return !AnalysisConfigPath.empty()
-             ? LLVMTaintConfig(HA.getProjectIRDB(),
-                               parseTaintConfig(AnalysisConfigPath))
-             : LLVMTaintConfig(HA.getProjectIRDB());
+
+  return LLVMTaintConfig(HA.getProjectIRDB());
 }
 
 } // namespace psr

lib/PhasarLLVM/TaintConfig/CMakeLists.txt

@@ -5,8 +5,6 @@ set(PHASAR_LINK_LIBS
   phasar_db
   phasar_llvm_db
   phasar_llvm_utils
-  phasar_controlflow
-  phasar_llvm_controlflow
 )
 
 set(LLVM_LINK_COMPONENTS