Remove some LLVM dependencies.

Author: mbarbar

include/DDA/DDAPass.h

@@ -21,7 +21,7 @@ namespace SVF
  * Demand-Driven Pointer Analysis.
  * This class performs various pointer analysis on the given module.
  */
-class DDAPass: public ModulePass
+class DDAPass
 {
 
 public:
@@ -31,21 +31,9 @@ class DDAPass: public ModulePass
     typedef OrderedSet<const SVFGEdge*> SVFGEdgeSet;
     typedef std::vector<PointerAnalysis*> PTAVector;
 
-    DDAPass() : ModulePass(ID), _pta(nullptr), _client(nullptr) {}
+    DDAPass() : _pta(nullptr), _client(nullptr) {}
     ~DDAPass();
 
-    virtual inline void getAnalysisUsage(AnalysisUsage &au) const
-    {
-        // declare your dependencies here.
-        /// do not intend to change the IR in this pass,
-        au.setPreservesAll();
-    }
-
-    virtual inline void* getAdjustedAnalysisPointer(AnalysisID)
-    {
-        return this;
-    }
-
     /// Interface expose to users of our pointer analysis, given Location infos
     virtual inline AliasResult alias(const MemoryLocation &LocA, const MemoryLocation &LocB)
     {

include/Graphs/GraphPrinter.h

@@ -54,7 +54,7 @@ class GraphPrinter
      *  Write the graph into dot file for debugging purpose
      */
     template<class GraphType>
-    static void WriteGraphToFile(llvm::raw_ostream &O,
+    static void WriteGraphToFile(SVF::OutStream &O,
                                  const std::string &GraphName, const GraphType &GT, bool simple = false)
     {
         // Filename of the output dot file
@@ -83,7 +83,7 @@ class GraphPrinter
      * Print the graph to command line
      */
     template<class GraphType>
-    static void PrintGraph(llvm::raw_ostream &O, const std::string &GraphName,
+    static void PrintGraph(SVF::OutStream &O, const std::string &GraphName,
                            const GraphType &GT)
     {
         ///Define the GTraits and node iterator for printing

include/Graphs/ICFGEdge.h

@@ -96,7 +96,7 @@ class ICFGEdge : public GenericICFGEdgeTy
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const ICFGEdge &edge)
+    friend OutStream& operator<< (OutStream &o, const ICFGEdge &edge)
     {
         o << edge.toString();
         return o;

include/Graphs/ICFGNode.h

@@ -91,7 +91,7 @@ class ICFGNode : public GenericICFGNodeTy
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend raw_ostream &operator<<(raw_ostream &o, const ICFGNode &node)
+    friend OutStream &operator<<(OutStream &o, const ICFGNode &node)
     {
         o << node.toString();
         return o;

include/Graphs/ICFGStat.h

@@ -145,16 +145,16 @@ class ICFGStat : public PTAStat
     void printStat(string statname)
     {
 
-        std::cout << "\n************ " << statname << " ***************\n";
-        std::cout.flags(std::ios::left);
+        SVFUtil::outs() << "\n************ " << statname << " ***************\n";
+        SVFUtil::outs().flags(std::ios::left);
         unsigned field_width = 20;
         for(NUMStatMap::iterator it = PTNumStatMap.begin(), eit = PTNumStatMap.end(); it!=eit; ++it)
         {
             // format out put with width 20 space
-            std::cout << std::setw(field_width) << it->first << it->second << "\n";
+            SVFUtil::outs() << std::setw(field_width) << it->first << it->second << "\n";
         }
         PTNumStatMap.clear();
-        std::cout.flush();
+        SVFUtil::outs().flush();
     }
 };
 

include/Graphs/PTACallGraph.h

@@ -154,7 +154,7 @@ class PTACallGraphEdge : public GenericCallGraphEdgeTy
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const PTACallGraphEdge &edge)
+    friend OutStream& operator<< (OutStream &o, const PTACallGraphEdge &edge)
     {
         o << edge.toString();
         return o;
@@ -201,7 +201,7 @@ class PTACallGraphNode : public GenericCallGraphNodeTy
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const PTACallGraphNode &node)
+    friend OutStream& operator<< (OutStream &o, const PTACallGraphNode &node)
     {
         o << node.toString();
         return o;

include/Graphs/VFG.h

@@ -555,7 +555,7 @@ class VFG : public GenericVFGTy
 		/// we will set this phi node's def later
 		/// Ideally, every function uniqueFunRet should be a PhiNode (SVFIRBuilder.cpp), unless it does not have ret instruction
 		if (!pag->isPhiNode(uniqueFunRet)){
-			std::string warn = fun->getName().str();
+			std::string warn = fun->getName();
 			SVFUtil::writeWrnMsg(warn + " does not have any ret instruction!");
 			setDef(uniqueFunRet, sNode);
 		}

include/Graphs/VFGEdge.h

@@ -124,7 +124,7 @@ class VFGEdge : public GenericVFGEdgeTy
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const VFGEdge &edge)
+    friend OutStream& operator<< (OutStream &o, const VFGEdge &edge)
     {
         o << edge.toString();
         return o;

include/Graphs/VFGNode.h

@@ -94,7 +94,7 @@ class VFGNode : public GenericVFGNodeTy
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const VFGNode &node)
+    friend OutStream& operator<< (OutStream &o, const VFGNode &node)
     {
         o << node.toString();
         return o;

include/MSSA/MemSSA.h

@@ -451,7 +451,7 @@ class MemSSA
     //@}
 
     /// Print Memory SSA
-    void dumpMSSA(raw_ostream & Out = SVFUtil::outs());
+    void dumpMSSA(OutStream & Out = SVFUtil::outs());
 };
 
 } // End namespace SVF