fix IFDS reporter bug

Author: pdschubert

external/googletest

@@ -65,32 +65,6 @@ class IDETabulationProblem
 
   /// Returns an edge function that represents the top element of the analysis.
   virtual EdgeFunctionPtrType allTopFunction() = 0;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#pragma clang diagnostic ignored "-Wsuggest-override"
-  /// Generates a text report of the results that is written to the specified
-  /// output stream.
-  virtual void emitTextReport(const SolverResults<n_t, d_t, l_t> &SR,
-                              std::ostream &OS = std::cout) {
-    OS << "No text report available!\n";
-  }
-#pragma clang diagnostic pop
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#pragma clang diagnostic ignored "-Wsuggest-override"
-  /// Generates a graphical report, e.g. in html or other markup languages, of
-  /// the results that is written to the specified output stream.
-  virtual void emitGraphicalReport(const SolverResults<n_t, d_t, l_t> &SR,
-                                   std::ostream &OS = std::cout) {
-    OS << "No graphical report available!\n";
-  }
-#pragma clang diagnostic pop
-
-private:
-  using IFDSTabulationProblem<AnalysisDomainTy, Container>::emitTextReport;
-  using IFDSTabulationProblem<AnalysisDomainTy, Container>::emitGraphicalReport;
 };
 
 } // namespace psr

external/json

@@ -87,31 +87,33 @@ class IFDSTabulationProblem
 
   /// Checks if the given data-flow fact is the special tautological lambda (or
   /// zero) fact.
-  virtual bool isZeroValue(d_t d) const = 0;
+  virtual bool isZeroValue(d_t FlowFact) const = 0;
 
   /// Returns initial seeds to be used for the analysis. This is a mapping of
   /// statements to initial analysis facts.
   virtual InitialSeeds<n_t, d_t, l_t> initialSeeds() = 0;
 
   /// Returns the special tautological lambda (or zero) fact.
-  d_t getZeroValue() const { return ZeroValue; }
+  [[nodiscard]] d_t getZeroValue() const { return ZeroValue; }
 
   /// Returns the analysis' entry points.
   [[nodiscard]] std::set<std::string> getEntryPoints() const {
     return EntryPoints;
   }
 
   /// Returns the underlying IR.
-  const ProjectIRDB *getProjectIRDB() const { return IRDB; }
+  [[nodiscard]] const ProjectIRDB *getProjectIRDB() const { return IRDB; }
 
   /// Returns the underlying type hierarchy.
-  const TypeHierarchy<t_t, f_t> *getTypeHierarchy() const { return TH; }
+  [[nodiscard]] const TypeHierarchy<t_t, f_t> *getTypeHierarchy() const {
+    return TH;
+  }
 
   /// Returns the underlying inter-procedural control-flow graph.
-  const i_t *getICFG() const { return ICF; }
+  [[nodiscard]] const i_t *getICFG() const { return ICF; }
 
   /// Returns the underlying points-to information.
-  PointsToInfo<v_t, n_t> *getPointstoInfo() const { return PT; }
+  [[nodiscard]] PointsToInfo<v_t, n_t> *getPointstoInfo() const { return PT; }
 
   /// Sets the configuration to be used by the IFDS/IDE solver.
   void setIFDSIDESolverConfig(IFDSIDESolverConfig Config) {
@@ -125,16 +127,17 @@ class IFDSTabulationProblem
 
   /// Generates a text report of the results that is written to the specified
   /// output stream.
-  virtual void emitTextReport(const SolverResults<n_t, d_t, BinaryDomain> &SR,
-                              std::ostream &OS = std::cout) {
+  virtual void
+  emitTextReport([[maybe_unused]] const SolverResults<n_t, d_t, l_t> &Results,
+                 std::ostream &OS = std::cout) {
     OS << "No text report available!\n";
   }
 
   /// Generates a graphical report, e.g. in html or other markup languages, of
   /// the results that is written to the specified output stream.
-  virtual void
-  emitGraphicalReport(const SolverResults<n_t, d_t, BinaryDomain> &SR,
-                      std::ostream &OS = std::cout) {
+  virtual void emitGraphicalReport(
+      [[maybe_unused]] const SolverResults<n_t, d_t, l_t> &Results,
+      std::ostream &OS = std::cout) {
     OS << "No graphical report available!\n";
   }
 

external/json-schema-validator

@@ -83,7 +83,7 @@ class IFDSUninitializedVariables
 
   void printFunction(std::ostream &os, f_t m) const override;
 
-  void emitTextReport(const SolverResults<n_t, d_t, BinaryDomain> &SR,
+  void emitTextReport(const SolverResults<n_t, d_t, l_t> &Results,
                       std::ostream &OS = std::cout) override;
 
   const std::map<n_t, std::set<d_t>> &getAllUndefUses() const;

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IDETabulationProblem.h

@@ -178,6 +178,16 @@ class IFDSToIDETabulationProblem
   void printEdgeFact(std::ostream &os, BinaryDomain v) const override {
     os << v;
   }
+
+  void emitTextReport(const SolverResults<n_t, d_t, l_t> &Results,
+                      std::ostream &OS = std::cout) override {
+    Problem.emitTextReport(Results, OS);
+  }
+
+  void emitGraphicalReport(const SolverResults<n_t, d_t, l_t> &Results,
+                           std::ostream &OS = std::cout) override {
+    Problem.emitGraphicalReport(Results, OS);
+  }
 };
 
 } // namespace psr

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h

@@ -443,7 +443,7 @@ void IFDSUninitializedVariables::printFunction(
 
 void IFDSUninitializedVariables::emitTextReport(
     const SolverResults<IFDSUninitializedVariables::n_t,
-                        IFDSUninitializedVariables::d_t, BinaryDomain> &SR,
+                        IFDSUninitializedVariables::d_t, l_t> &Result,
     ostream &OS) {
   OS << "====================== IFDS-Uninitialized-Analysis Report "
         "======================\n";