Integrate free-functions NToString and DToString into ExplicitESG

secure-software-engineering · Aug 25, 2023 · 5cdca10 · 5cdca10
1 parent df3511d
commit 5cdca10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/include/phasar/DataFlow/IfdsIde/Solver/PathAwareIDESolver.h b/include/phasar/DataFlow/IfdsIde/Solver/PathAwareIDESolver.h
@@ -31,7 +31,7 @@ class PathAwareIDESolver : public IDESolver<AnalysisDomainTy, Container> {
 
   explicit PathAwareIDESolver(
       IDETabulationProblem<domain_t, container_type> &Problem, const i_t *ICF)
-      : base_t(Problem, ICF), ESG(Problem.getZeroValue(), Problem, Problem) {
+      : base_t(Problem, ICF), ESG(Problem.getZeroValue()) {
 
     if (Problem.getIFDSIDESolverConfig().autoAddZero()) {
       PHASAR_LOG_LEVEL(

diff --git a/include/phasar/DataFlow/PathSensitivity/ExplodedSuperGraph.h b/include/phasar/DataFlow/PathSensitivity/ExplodedSuperGraph.h
@@ -158,12 +158,9 @@ template <typename AnalysisDomainTy> class ExplodedSuperGraph {
     const ExplodedSuperGraph *Owner{};
   };
 
-  explicit ExplodedSuperGraph(
-      d_t ZeroValue, const psr::NodePrinter<AnalysisDomainTy> &NPrinter,
-      const psr::DataFlowFactPrinter<AnalysisDomainTy>
-          &DPrinter) noexcept(std::is_nothrow_move_constructible_v<d_t>)
-      : ZeroValue(std::move(ZeroValue)), NPrinter(NPrinter),
-        DPrinter(DPrinter) {}
+  explicit ExplodedSuperGraph(d_t ZeroValue) noexcept(
+      std::is_nothrow_move_constructible_v<d_t>)
+      : ZeroValue(std::move(ZeroValue)) {}
 
   explicit ExplodedSuperGraph(const ExplodedSuperGraph &) = default;
   ExplodedSuperGraph &operator=(const ExplodedSuperGraph &) = delete;
@@ -239,11 +236,11 @@ template <typename AnalysisDomainTy> class ExplodedSuperGraph {
     for (size_t I = 0, End = NodeDataOwner.size(); I != End; ++I) {
       auto Nod = NodeRef(I, this);
       OS << I << "[label=\"";
-      OS.write_escaped(DPrinter.DtoString(Nod.value())) << "\"];\n";
+      OS.write_escaped(DToString(Nod.value())) << "\"];\n";
 
       OS << I << "->" << intptr_t(Nod.predecessor().id())
          << R"([style="bold" label=")";
-      OS.write_escaped(NPrinter.NtoString(Nod.source())) << "\"];\n";
+      OS.write_escaped(NToString(Nod.source())) << "\"];\n";
       for (auto NB : Nod.neighbors()) {
         OS << I << "->" << NB.id() << "[color=\"red\"];\n";
       }
@@ -257,8 +254,8 @@ template <typename AnalysisDomainTy> class ExplodedSuperGraph {
 
   void printESGNodes(llvm::raw_ostream &OS) const {
     for (const auto &[Node, _] : FlowFactVertexMap) {
-      OS << "( " << NPrinter.NtoString(Node.first) << "; "
-         << DPrinter.DtoString(Node.second) << " )\n";
+      OS << "( " << NToString(Node.first) << "; " << DToString(Node.second)
+         << " )\n";
     }
   }
 
@@ -355,12 +352,11 @@ template <typename AnalysisDomainTy> class ExplodedSuperGraph {
           abort();
         }
         if (Nod == SuccVtxIt->second) {
-          PHASAR_LOG_LEVEL_CAT(INFO, "PathSensitivityManager",
-                               "> saveEdge -- skip meaningless loop: ("
-                                   << NPrinter.NtoString(Curr) << ", "
-                                   << DPrinter.DtoString(CurrNode) << ") --> ("
-                                   << NPrinter.NtoString(Succ) << ", "
-                                   << DPrinter.DtoString(SuccNode) << ")");
+          PHASAR_LOG_LEVEL_CAT(
+              INFO, "PathSensitivityManager",
+              "> saveEdge -- skip meaningless loop: ("
+                  << NToString(Curr) << ", " << DToString(CurrNode) << ") --> ("
+                  << NToString(Succ) << ", " << DToString(SuccNode) << ")");
           return;
         }
         Nod = NodeAdjOwner[Nod].PredecessorIdx;
@@ -396,10 +392,6 @@ template <typename AnalysisDomainTy> class ExplodedSuperGraph {
 
   // ZeroValue
   d_t ZeroValue;
-  // References to Node and DataFlowFactPrinters required for visualizing the
-  // results
-  const psr::NodePrinter<AnalysisDomainTy> &NPrinter;
-  const psr::DataFlowFactPrinter<AnalysisDomainTy> &DPrinter;
 };
 
 } // namespace psr