Merge branch 'development' of github.com:secure-software-engineering/phasar into development

MMory · MMory · commit f4f57a451ce2 · 2020-01-27T18:33:58.000+01:00
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowEdgeFunctionCache.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowEdgeFunctionCache.h
@@ -141,7 +141,7 @@ class FlowEdgeFunctionCache {
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(N) Call Stmt : " << problem.NtoString(callStmt));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
-                  << "(M) Dest Mthd : " << problem.MtoString(destMthd));
+                  << "(M) Dest Mthd : " << problem.FtoString(destMthd));
     auto key = std::tie(callStmt, destMthd);
     if (CallFlowFunctionCache.count(key)) {
       LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
@@ -172,7 +172,7 @@ class FlowEdgeFunctionCache {
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(N) Call Site : " << problem.NtoString(callSite));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
-                  << "(M) Callee    : " << problem.MtoString(calleeMthd));
+                  << "(M) Callee    : " << problem.FtoString(calleeMthd));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(N) Exit Stmt : " << problem.NtoString(exitStmt));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
@@ -213,7 +213,7 @@ class FlowEdgeFunctionCache {
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG) << "(M) Callee's  : ");
     for (auto callee : callees) {
       LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
-                    << "  " << problem.MtoString(callee));
+                    << "  " << problem.FtoString(callee));
     }
     auto key = std::tie(callSite, retSite, callees);
     if (CallToRetFlowFunctionCache.count(key)) {
@@ -248,7 +248,7 @@ class FlowEdgeFunctionCache {
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(N) Call Stmt : " << problem.NtoString(callStmt));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
-                  << "(M) Dest Mthd : " << problem.MtoString(destMthd));
+                  << "(M) Dest Mthd : " << problem.FtoString(destMthd));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG) << ' ');
     auto ff = problem.getSummaryFlowFunction(callStmt, destMthd);
     return ff;
@@ -297,7 +297,7 @@ class FlowEdgeFunctionCache {
                   << "(D) Src Node  : " << problem.DtoString(srcNode));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(M) Dest Mthd : "
-                  << problem.MtoString(destinationMethod));
+                  << problem.FtoString(destinationMethod));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(D) Dest Node : " << problem.DtoString(destNode));
     auto key = std::tie(callStmt, srcNode, destinationMethod, destNode);
@@ -329,7 +329,7 @@ class FlowEdgeFunctionCache {
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(N) Call Site : " << problem.NtoString(callSite));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
-                  << "(M) Callee    : " << problem.MtoString(calleeMethod));
+                  << "(M) Callee    : " << problem.FtoString(calleeMethod));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
                   << "(N) Exit Stmt : " << problem.NtoString(exitStmt));
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
@@ -375,7 +375,7 @@ class FlowEdgeFunctionCache {
     LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG) << "(M) Callee's  : ");
     for (auto callee : callees) {
       LOG_IF_ENABLE(BOOST_LOG_SEV(lg, DEBUG)
-                    << "  " << problem.MtoString(callee));
+                    << "  " << problem.FtoString(callee));
     }
     auto key = std::tie(callSite, callNode, retSite, retSiteNode);
     if (CallToRetEdgeFunctionCache.count(key)) {
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h
@@ -42,7 +42,7 @@ template <typename N, typename D, typename M, typename T, typename V,
 class IFDSTabulationProblem : public virtual FlowFunctions<N, D, M>,
                               public virtual NodePrinter<N>,
                               public virtual DataFlowFactPrinter<D>,
-                              public virtual MethodPrinter<M> {
+                              public virtual FunctionPrinter<M> {
   static_assert(std::is_base_of_v<ICFG<N, M>, I>,
                 "I must implement the ICFG interface!");
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h
@@ -128,7 +128,7 @@ class IDEInstInteractionAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void printEdgeFact(std::ostream &os, l_t l) const override;
 };
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.h
@@ -239,7 +239,7 @@ class IDELinearConstantAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void printEdgeFact(std::ostream &os, l_t l) const override;
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.h
@@ -126,7 +126,7 @@ class IDEProtoAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void printEdgeFact(std::ostream &os, l_t l) const override;
 };
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.h
@@ -129,7 +129,7 @@ class IDESolverTest
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void printEdgeFact(std::ostream &os, l_t l) const override;
 };
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETaintAnalysis.h
@@ -131,7 +131,7 @@ class IDETaintAnalysis
 
   void printNode(std::ostream &os, n_t n) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void printEdgeFact(std::ostream &os, l_t l) const override;
 };
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.h
@@ -171,7 +171,7 @@ class IDETypeStateAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void printEdgeFact(std::ostream &os, l_t l) const override;
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.h
@@ -169,7 +169,7 @@ class IFDSConstAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void emitTextReport(std::ostream &os,
                       const SolverResults<n_t, d_t, BinaryDomain> &SR) override;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSFieldSensTaintAnalysis.h
@@ -116,7 +116,7 @@ class IFDSFieldSensTaintAnalysis
     }
   }
 
-  void printMethod(std::ostream &os, const llvm::Function *m) const override {
+  void printFunction(std::ostream &os, const llvm::Function *m) const override {
     os << m->getName().str();
   }
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSLinearConstantAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSLinearConstantAnalysis.h
@@ -102,7 +102,7 @@ class IFDSLinearConstantAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.h
@@ -78,7 +78,7 @@ class IFDSProtoAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.h
@@ -78,7 +78,7 @@ class IFDSSignAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.h
@@ -78,7 +78,7 @@ class IFDSSolverTest
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.h
@@ -104,7 +104,7 @@ class IFDSTaintAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void emitTextReport(std::ostream &os,
                       const SolverResults<n_t, d_t, BinaryDomain> &SR) override;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.h
@@ -77,7 +77,7 @@ class IFDSTypeAnalysis
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 };
 } // namespace psr
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.h
@@ -96,7 +96,7 @@ class IFDSUninitializedVariables
 
   void printDataFlowFact(std::ostream &os, d_t d) const override;
 
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
 
   void emitTextReport(std::ostream &os,
                       const SolverResults<n_t, d_t, BinaryDomain> &SR) override;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSToIDETabulationProblem.h b/include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSToIDETabulationProblem.h
@@ -145,8 +145,8 @@ class IFDSToIDETabulationProblem
     Problem.printDataFlowFact(os, d);
   }
 
-  void printMethod(std::ostream &os, M m) const override {
-    Problem.printMethod(os, m);
+  void printFunction(std::ostream &os, M m) const override {
+    Problem.printFunction(os, m);
   }
 
   void printEdgeFact(std::ostream &os, BinaryDomain v) const override {
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h b/include/phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h
@@ -39,7 +39,7 @@ template <typename N, typename D, typename M, typename T, typename V,
           typename C>
 class IntraMonoProblem : public NodePrinter<N>,
                          public DataFlowFactPrinter<D>,
-                         public MethodPrinter<M> {
+                         public FunctionPrinter<M> {
   static_assert(std::is_base_of_v<CFG<N, M>, C>,
                 "C must implement the CFG interface!");
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h b/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.h
@@ -90,7 +90,7 @@ class InterMonoSolverTest
 
   void printDataFlowFact(std::ostream &os, const llvm::Value *d) const override;
 
-  void printMethod(std::ostream &os, const llvm::Function *m) const override;
+  void printFunction(std::ostream &os, const llvm::Function *m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h b/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.h
@@ -97,7 +97,7 @@ class InterMonoTaintAnalysis
 
   void printDataFlowFact(std::ostream &os, const llvm::Value *d) const override;
 
-  void printMethod(std::ostream &os, const llvm::Function *m) const override;
+  void printFunction(std::ostream &os, const llvm::Function *m) const override;
 
   const std::map<const llvm::Instruction *, std::set<const llvm::Value *>> &
   getAllLeaks() const;
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h b/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.h
@@ -84,7 +84,7 @@ class IntraMonoFullConstantPropagation
   printDataFlowFact(std::ostream &os,
                     std::pair<const llvm::Value *, unsigned> d) const override;
 
-  void printMethod(std::ostream &os, const llvm::Function *m) const override;
+  void printFunction(std::ostream &os, const llvm::Function *m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h b/include/phasar/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.h
@@ -74,7 +74,7 @@ class IntraMonoSolverTest
 
   void printDataFlowFact(std::ostream &os, const llvm::Value *d) const override;
 
-  void printMethod(std::ostream &os, const llvm::Function *m) const override;
+  void printFunction(std::ostream &os, const llvm::Function *m) const override;
 };
 
 } // namespace psr
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSAliasCollector.h b/include/phasar/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSAliasCollector.h
@@ -95,7 +95,7 @@ class WPDSAliasCollector
 
   void printNode(std::ostream &os, n_t n) const override;
   void printDataFlowFact(std::ostream &os, d_t d) const override;
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
   void printEdgeFact(std::ostream &os, l_t v) const override;
 };
 
diff --git a/include/phasar/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSSolverTest.h b/include/phasar/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSSolverTest.h
@@ -93,7 +93,7 @@ class WPDSSolverTest
 
   void printNode(std::ostream &os, n_t n) const override;
   void printDataFlowFact(std::ostream &os, d_t d) const override;
-  void printMethod(std::ostream &os, m_t m) const override;
+  void printFunction(std::ostream &os, m_t m) const override;
   void printEdgeFact(std::ostream &os, l_t v) const override;
 };
 
diff --git a/include/phasar/PhasarLLVM/Plugins/Interfaces/IfdsIde/IFDSTabulationProblemPlugin.h b/include/phasar/PhasarLLVM/Plugins/Interfaces/IfdsIde/IFDSTabulationProblemPlugin.h
@@ -80,7 +80,7 @@ class IFDSTabulationProblemPlugin
     os << llvmIRToString(d);
   }
 
-  void printMethod(std::ostream &os, const llvm::Function *m) const override {
+  void printFunction(std::ostream &os, const llvm::Function *m) const override {
     os << m->getName().str();
   }
 };
diff --git a/include/phasar/PhasarLLVM/Utils/Printer.h b/include/phasar/PhasarLLVM/Utils/Printer.h
@@ -108,19 +108,19 @@ template <typename L> struct EdgeFactPrinter {
   }
 };
 
-template <typename M> struct MethodPrinter {
-  MethodPrinter() = default;
-  MethodPrinter(const MethodPrinter &) = delete;
-  MethodPrinter &operator=(const MethodPrinter &) = delete;
-  MethodPrinter(MethodPrinter &&) = delete;
-  MethodPrinter &operator=(MethodPrinter &&) = delete;
-  virtual ~MethodPrinter() = default;
+template <typename F> struct FunctionPrinter {
+  FunctionPrinter() = default;
+  FunctionPrinter(const FunctionPrinter &) = delete;
+  FunctionPrinter &operator=(const FunctionPrinter &) = delete;
+  FunctionPrinter(FunctionPrinter &&) = delete;
+  FunctionPrinter &operator=(FunctionPrinter &&) = delete;
+  virtual ~FunctionPrinter() = default;
 
-  virtual void printMethod(std::ostream &os, M m) const = 0;
+  virtual void printFunction(std::ostream &os, F f) const = 0;
 
-  virtual std::string MtoString(M m) const {
+  virtual std::string FtoString(F f) const {
     std::stringstream ss;
-    printMethod(ss, m);
+    printFunction(ss, f);
     return ss.str();
   }
 };
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.cpp
@@ -242,7 +242,7 @@ void IDEInstInteractionAnalysis::printDataFlowFact(
   os << llvmIRToString(d);
 }
 
-void IDEInstInteractionAnalysis::printMethod(
+void IDEInstInteractionAnalysis::printFunction(
     ostream &os, IDEInstInteractionAnalysis::m_t m) const {
   os << m->getName().str();
 }
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
@@ -806,7 +806,7 @@ void IDELinearConstantAnalysis::printDataFlowFact(
   os << llvmIRToShortString(d);
 }
 
-void IDELinearConstantAnalysis::printMethod(
+void IDELinearConstantAnalysis::printFunction(
     ostream &os, IDELinearConstantAnalysis::m_t m) const {
   os << m->getName().str();
 }
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEProtoAnalysis.cpp
@@ -197,7 +197,8 @@ void IDEProtoAnalysis::printDataFlowFact(ostream &os,
   os << llvmIRToString(d);
 }
 
-void IDEProtoAnalysis::printMethod(ostream &os, IDEProtoAnalysis::m_t m) const {
+void IDEProtoAnalysis::printFunction(ostream &os,
+                                     IDEProtoAnalysis::m_t m) const {
   os << m->getName().str();
 }
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDESolverTest.cpp
@@ -190,7 +190,7 @@ void IDESolverTest::printDataFlowFact(ostream &os, IDESolverTest::d_t d) const {
   os << llvmIRToString(d);
 }
 
-void IDESolverTest::printMethod(ostream &os, IDESolverTest::m_t m) const {
+void IDESolverTest::printFunction(ostream &os, IDESolverTest::m_t m) const {
   os << m->getName().str();
 }
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETaintAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETaintAnalysis.cpp
@@ -185,7 +185,8 @@ void IDETaintAnalysis::printDataFlowFact(ostream &os,
   os << llvmIRToString(d);
 }
 
-void IDETaintAnalysis::printMethod(ostream &os, IDETaintAnalysis::m_t m) const {
+void IDETaintAnalysis::printFunction(ostream &os,
+                                     IDETaintAnalysis::m_t m) const {
   os << m->getName().str();
 }
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp
@@ -457,8 +457,8 @@ void IDETypeStateAnalysis::printDataFlowFact(std::ostream &os, d_t d) const {
   os << llvmIRToString(d);
 }
 
-void IDETypeStateAnalysis::printMethod(ostream &os,
-                                       IDETypeStateAnalysis::m_t m) const {
+void IDETypeStateAnalysis::printFunction(ostream &os,
+                                         IDETypeStateAnalysis::m_t m) const {
   os << m->getName().str();
 }
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSConstAnalysis.cpp
@@ -245,8 +245,8 @@ void IFDSConstAnalysis::printDataFlowFact(ostream &os,
   os << llvmIRToString(d);
 }
 
-void IFDSConstAnalysis::printMethod(ostream &os,
-                                    IFDSConstAnalysis::m_t m) const {
+void IFDSConstAnalysis::printFunction(ostream &os,
+                                      IFDSConstAnalysis::m_t m) const {
   os << m->getName().str();
 }
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSLinearConstantAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSLinearConstantAnalysis.cpp
@@ -132,7 +132,7 @@ void IFDSLinearConstantAnalysis::printDataFlowFact(
   os << '<' + llvmIRToString(d.first) + ", " + std::to_string(d.second) + '>';
 }
 
-void IFDSLinearConstantAnalysis::printMethod(
+void IFDSLinearConstantAnalysis::printFunction(
     ostream &os, IFDSLinearConstantAnalysis::m_t m) const {
   os << m->getName().str();
 }
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSProtoAnalysis.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSignAnalysis.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSSolverTest.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTypeAnalysis.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.cpp b/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoSolverTest.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.cpp b/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoFullConstantPropagation.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.cpp b/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/IntraMonoSolverTest.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSAliasCollector.cpp b/lib/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSAliasCollector.cpp
diff --git a/lib/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSSolverTest.cpp b/lib/PhasarLLVM/DataFlowSolver/WPDS/Problems/WPDSSolverTest.cpp

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class IFDSFieldSensTaintAnalysis`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
`119`		`- void printMethod(std::ostream &os, const llvm::Function *m) const override {`
	`119`	`+ void printFunction(std::ostream &os, const llvm::Function *m) const override {`
`120`	`120`	`os << m->getName().str();`
`121`	`121`	`}`
`122`	`122`