svf-lib 1.0.885 → 1.0.889

package/SVF-osx/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 @@ public:
     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)
     {

package/SVF-osx/include/Graphs/GraphPrinter.h

@@ -54,7 +54,7 @@ public:
      *  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 @@ public:
      * 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

package/SVF-osx/include/Graphs/ICFGEdge.h

@@ -96,7 +96,7 @@ public:
 
     /// 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;

package/SVF-osx/include/Graphs/ICFGNode.h

@@ -91,7 +91,7 @@ public:
 
     /// 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;

package/SVF-osx/include/Graphs/ICFGStat.h

@@ -145,16 +145,16 @@ public:
     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();
     }
 };
 

package/SVF-osx/include/Graphs/PTACallGraph.h

@@ -154,7 +154,7 @@ public:
 
     /// 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 @@ public:
 
     /// 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;

package/SVF-osx/include/Graphs/VFG.h

@@ -555,7 +555,7 @@ protected:
 		/// 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);
 		}

package/SVF-osx/include/Graphs/VFGEdge.h

@@ -124,7 +124,7 @@ public:
 
     /// 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;

package/SVF-osx/include/Graphs/VFGNode.h

@@ -94,7 +94,7 @@ public:
 
     /// 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;

package/SVF-osx/include/MSSA/MemSSA.h

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

package/SVF-osx/include/MTA/MTA.h

@@ -68,14 +68,6 @@ public:
 
     void dump(Module &module, MHP *mhp, LockAnalysis *lsa);
 
-    /// Get analysis usage
-    inline virtual void getAnalysisUsage(AnalysisUsage& au) const
-    {
-        /// do not intend to change the IR in this pass,
-        au.setPreservesAll();
-        au.addRequired<ScalarEvolutionWrapperPass>();
-    }
-
     // Get ScalarEvolution for Function F.
     static inline ScalarEvolution* getSE(const Function *F)
     {

package/SVF-osx/include/MemoryModel/ConditionalPT.h

@@ -31,7 +31,6 @@
 #define CONDVAR_H_
 
 #include "Util/SVFUtil.h"
-#include "llvm/Support/raw_ostream.h"
 #include "MemoryModel/PointsTo.h"
 
 namespace SVF
@@ -114,7 +113,7 @@ public:
         return rawstr.str();
     }
 
-    friend raw_ostream& operator<< (raw_ostream &o, const CondVar<Cond> &cvar)
+    friend OutStream& operator<< (OutStream &o, const CondVar<Cond> &cvar)
     {
         o << cvar.toString();
         return o;
@@ -708,7 +707,7 @@ public:
 
     // Print all points-to targets
     //@{
-    inline void dump(raw_ostream & O) const
+    inline void dump(OutStream & O) const
     {
         CondPtsConstIter it = cptsBegin();
         CondPtsConstIter eit = cptsEnd();

package/SVF-osx/include/MemoryModel/MutablePointsToDS.h

@@ -4,6 +4,8 @@
 #ifndef MUTABLE_POINTSTO_H_
 #define MUTABLE_POINTSTO_H_
 
+#include<fstream>
+
 #include "MemoryModel/AbstractPointsToDS.h"
 #include "Util/SVFBasicTypes.h"
 #include "Util/SVFUtil.h"
@@ -124,7 +126,7 @@ public:
     ///@}
 
 protected:
-    virtual inline void dumpPts(const PtsMap & ptsSet,raw_ostream & O = SVFUtil::outs()) const
+    virtual inline void dumpPts(const PtsMap & ptsSet,OutStream & O = SVFUtil::outs()) const
     {
         for (PtsMapConstIter nodeIt = ptsSet.begin(); nodeIt != ptsSet.end(); nodeIt++)
         {
@@ -581,10 +583,9 @@ public:
         mutPTData.dumpPTData();
         /// dump points-to of address-taken variables
         std::error_code ErrInfo;
-        ToolOutputFile F("svfg_pts.data", ErrInfo, llvm::sys::fs::OF_None);
-        if (!ErrInfo)
+        std::fstream f("svfg_pts.data", std::ios_base::out);
+        if (f.good())
         {
-            raw_fd_ostream & osm = F.os();
             NodeBS locs;
             for(DFPtsMapconstIter it = dfInPtsMap.begin(), eit = dfInPtsMap.end(); it!=eit; ++it)
                 locs.set(it->first);
@@ -597,31 +598,29 @@ public:
                 LocID loc = *it;
                 if (this->hasDFInSet(loc))
                 {
-                    osm << "Loc:" << loc << " IN:{";
-                    this->dumpPts(this->getDFInPtsMap(loc), osm);
-                    osm << "}\n";
+                    f << "Loc:" << loc << " IN:{";
+                    this->dumpPts(this->getDFInPtsMap(loc), f);
+                    f << "}\n";
                 }
 
                 if (this->hasDFOutSet(loc))
                 {
-                    osm << "Loc:" << loc << " OUT:{";
-                    this->dumpPts(this->getDFOutPtsMap(loc), osm);
-                    osm << "}\n";
+                    f << "Loc:" << loc << " OUT:{";
+                    this->dumpPts(this->getDFOutPtsMap(loc), f);
+                    f << "}\n";
                 }
             }
-            F.os().close();
-            if (!F.os().has_error())
+            f.close();
+            if (f.good())
             {
                 SVFUtil::outs() << "\n";
-                F.keep();
                 return;
             }
         }
         SVFUtil::outs() << "  error opening file for writing!\n";
-        F.os().clear_error();
     }
 
-    virtual inline void dumpPts(const PtsMap & ptsSet,raw_ostream & O = SVFUtil::outs()) const
+    virtual inline void dumpPts(const PtsMap & ptsSet,OutStream & O = SVFUtil::outs()) const
     {
         for (PtsMapConstIter nodeIt = ptsSet.begin(); nodeIt != ptsSet.end(); nodeIt++)
         {

package/SVF-osx/include/MemoryModel/PersistentPointsToCache.h

@@ -296,31 +296,31 @@ public:
     void printStats(const std::string subtitle) const
     {
         static const unsigned fieldWidth = 25;
-        std::cout.flags(std::ios::left);
+        SVFUtil::outs().flags(std::ios::left);
 
-        std::cout << "****Persistent Points-To Cache Statistics: " << subtitle << "****\n";
+        SVFUtil::outs() << "****Persistent Points-To Cache Statistics: " << subtitle << "****\n";
 
-        std::cout << std::setw(fieldWidth) << "UniquePointsToSets"      << idToPts.size()          << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "UniquePointsToSets"      << idToPts.size()          << "\n";
 
-        std::cout << std::setw(fieldWidth) << "TotalUnions"             << totalUnions             << "\n";
-        std::cout << std::setw(fieldWidth) << "PropertyUnions"          << propertyUnions          << "\n";
-        std::cout << std::setw(fieldWidth) << "UniqueUnions"            << uniqueUnions            << "\n";
-        std::cout << std::setw(fieldWidth) << "LookupUnions"            << lookupUnions            << "\n";
-        std::cout << std::setw(fieldWidth) << "PreemptiveUnions"        << preemptiveUnions        << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "TotalUnions"             << totalUnions             << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "PropertyUnions"          << propertyUnions          << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "UniqueUnions"            << uniqueUnions            << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "LookupUnions"            << lookupUnions            << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "PreemptiveUnions"        << preemptiveUnions        << "\n";
 
-        std::cout << std::setw(fieldWidth) << "TotalComplements"        << totalComplements        << "\n";
-        std::cout << std::setw(fieldWidth) << "PropertyComplements"     << propertyComplements     << "\n";
-        std::cout << std::setw(fieldWidth) << "UniqueComplements"       << uniqueComplements       << "\n";
-        std::cout << std::setw(fieldWidth) << "LookupComplements"       << lookupComplements       << "\n";
-        std::cout << std::setw(fieldWidth) << "PreemptiveComplements"   << preemptiveComplements   << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "TotalComplements"        << totalComplements        << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "PropertyComplements"     << propertyComplements     << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "UniqueComplements"       << uniqueComplements       << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "LookupComplements"       << lookupComplements       << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "PreemptiveComplements"   << preemptiveComplements   << "\n";
 
-        std::cout << std::setw(fieldWidth) << "TotalIntersections"      << totalIntersections      << "\n";
-        std::cout << std::setw(fieldWidth) << "PropertyIntersections"   << propertyIntersections   << "\n";
-        std::cout << std::setw(fieldWidth) << "UniqueIntersections"     << uniqueIntersections     << "\n";
-        std::cout << std::setw(fieldWidth) << "LookupIntersections"     << lookupIntersections     << "\n";
-        std::cout << std::setw(fieldWidth) << "PreemptiveIntersections" << preemptiveIntersections << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "TotalIntersections"      << totalIntersections      << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "PropertyIntersections"   << propertyIntersections   << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "UniqueIntersections"     << uniqueIntersections     << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "LookupIntersections"     << lookupIntersections     << "\n";
+        SVFUtil::outs() << std::setw(fieldWidth) << "PreemptiveIntersections" << preemptiveIntersections << "\n";
 
-        std::cout.flush();
+        SVFUtil::outs().flush();
     }
 
     /// Returns all points-to sets stored by this cache as keys to a map.

package/SVF-osx/include/MemoryModel/PointerAnalysis.h

@@ -400,7 +400,7 @@ public:
     //@}
 
     /// Resolve indirect call edges
-    virtual void resolveIndCalls(const CallICFGNode* cs, const PointsTo& target, CallEdgeMap& newEdges,LLVMCallGraph* callgraph = nullptr);
+    virtual void resolveIndCalls(const CallICFGNode* cs, const PointsTo& target, CallEdgeMap& newEdges);
     /// Match arguments for callsite at caller and callee
     bool matchArgs(const CallICFGNode* cs, const SVFFunction* callee);
 

package/SVF-osx/include/MemoryModel/PointerAnalysisImpl.h

@@ -536,15 +536,15 @@ public:
         CPtSet cpts2;
         expandFIObjs(pts2,cpts2);
         if (containBlackHoleNode(cpts1) || containBlackHoleNode(cpts2))
-            return llvm::AliasResult::MayAlias;
+            return AliasResult::MayAlias;
         else if(this->getAnalysisTy()==PathS_DDA && contains(cpts1,cpts2) && contains(cpts2,cpts1))
         {
-            return llvm::AliasResult::MustAlias;
+            return AliasResult::MustAlias;
         }
         else if(overlap(cpts1,cpts2))
-            return llvm::AliasResult::MayAlias;
+            return AliasResult::MayAlias;
         else
-            return llvm::AliasResult::NoAlias;
+            return AliasResult::NoAlias;
     }
     /// Test blk node for cpts
     inline bool containBlackHoleNode(const CPtSet& cpts)
@@ -583,7 +583,7 @@ public:
                 }
                 else if (!SVFUtil::isa<DummyValVar>(node))
                 {
-                    SVFUtil::outs() << "##<" << node->getValue()->getName() << "> ";
+                    SVFUtil::outs() << "##<" << node->getValue()->getName().str() << "> ";
                     //SVFUtil::outs() << "Source Loc: " << SVFUtil::getSourceLoc(node->getValue());
                 }
 

package/SVF-osx/include/MemoryModel/SVFStatements.h

@@ -167,7 +167,7 @@ public:
     //@}
     /// Overloading operator << for dumping SVFVar value
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const SVFStmt &edge)
+    friend OutStream& operator<< (OutStream &o, const SVFStmt &edge)
     {
         o << edge.toString();
         return o;

package/SVF-osx/include/MemoryModel/SVFVariables.h

@@ -250,7 +250,7 @@ public:
     //@}
     /// Overloading operator << for dumping SVFVar value
     //@{
-    friend raw_ostream& operator<< (raw_ostream &o, const SVFVar &node)
+    friend OutStream& operator<< (OutStream &o, const SVFVar &node)
     {
         o << node.toString();
         return o;

package/SVF-osx/include/MemoryModel/SymbolTableInfo.h

@@ -173,12 +173,6 @@ public:
         return dl;
     }
 
-    /// Helper method to get the size of the type from target data layout
-    //@{
-    u32_t getTypeSizeInBytes(const Type* type);
-    u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
-    //@}
-
     /// special value
     // @{
     static bool isNullPtrSym(const Value *val);

package/SVF-osx/include/SABER/SaberCheckerAPI.h

@@ -77,7 +77,7 @@ private:
     {
         if(F)
         {
-            TDAPIMap::const_iterator it= tdAPIMap.find(F->getName().str());
+            TDAPIMap::const_iterator it= tdAPIMap.find(F->getName());
             if(it != tdAPIMap.end())
                 return it->second;
         }

package/SVF-osx/include/SVF-FE/BasicTypes.h

@@ -0,0 +1,19 @@
+#ifndef SVF_FE_BASIC_TYPES_H
+#define SVF_FE_BASIC_TYPES_H
+
+#include <llvm/IR/Instructions.h>
+#include <llvm/IR/Metadata.h>
+
+#include <llvm/Support/SourceMgr.h>
+
+typedef llvm::SMDiagnostic SMDiagnostic;
+
+typedef llvm::ExtractValueInst  ExtractValueInst;
+typedef llvm::ExtractElementInst ExtractElementInst;
+typedef llvm::MetadataAsValue MetadataAsValue;
+typedef llvm::BlockAddress BlockAddress;
+
+typedef llvm::ConstantAggregate ConstantAggregate;
+typedef llvm::ConstantAggregateZero ConstantAggregateZero;
+
+#endif  // SVF_FE_BASIC_TYPES_H

package/SVF-osx/include/SVF-FE/BreakConstantExpr.h

@@ -42,11 +42,6 @@ public:
         return "Remove Constant GEP Expressions";
     }
     virtual bool runOnModule (Module & M);
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const
-    {
-        // This pass does not modify the control-flow graph of the function
-        AU.setPreservesCFG();
-    }
 };
 
 
@@ -92,12 +87,6 @@ public:
         assert(!fn.isDeclaration() && "external function does not have DF");
         return &getAnalysis<UnifyFunctionExitNodes>(const_cast<Function&>(fn));
     }
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const
-    {
-        // This pass does not modify the control-flow graph of the function
-        AU.addRequired<UnifyFunctionExitNodes>();
-        AU.addPreserved<BreakConstantGEPs>();
-    }
 };
 
 } // End namespace SVF

package/SVF-osx/include/SVF-FE/DataFlowUtil.h

@@ -169,12 +169,6 @@ public:
     {
     }
 
-    virtual void getAnalysisUsage(AnalysisUsage &AU) const
-    {
-        AU.setPreservesAll();
-        // AU.addRequired<DominanceFrontier>();
-    }
-
 //	virtual bool runOnFunction(Function &m) {
 //		Frontiers.clear();
 //		DF = &getAnalysis<DominanceFrontier>();

package/SVF-osx/include/SVF-FE/LLVMUtil.h

@@ -30,7 +30,9 @@
 #ifndef INCLUDE_SVF_FE_LLVMUTIL_H_
 #define INCLUDE_SVF_FE_LLVMUTIL_H_
 
+#include "SVF-FE/BasicTypes.h"
 #include "Util/SVFUtil.h"
+#include "SVF-FE/BasicTypes.h"
 #include "Util/BasicTypes.h"
 #include "Util/ExtAPI.h"
 #include "Util/ThreadAPI.h"
@@ -416,12 +418,12 @@ inline bool ArgInDeadFunction (const Value * val)
 /// Return true if this is a program entry function (e.g. main)
 inline bool isProgEntryFunction (const SVFFunction * fun)
 {
-    return fun && fun->getName().str() == "main";
+    return fun && fun->getName() == "main";
 }
 
 inline bool isProgEntryFunction (const Function * fun)
 {
-    return fun && fun->getName().str() == "main";
+    return fun && fun->getName() == "main";
 }
 
 /// Get program entry function from module.
@@ -462,9 +464,9 @@ bool isPtrInDeadFunction (const Value * value);
 //@{
 inline bool isProgExitFunction (const SVFFunction * fun)
 {
-    return fun && (fun->getName().str() == "exit" ||
-                   fun->getName().str() == "__assert_rtn" ||
-                   fun->getName().str() == "__assert_fail" );
+    return fun && (fun->getName() == "exit" ||
+                   fun->getName() == "__assert_rtn" ||
+                   fun->getName() == "__assert_fail" );
 }
 
 inline bool isProgExitCall(const CallSite cs)
@@ -636,6 +638,14 @@ bool isIRFile(const std::string &filename);
 void processArguments(int argc, char **argv, int &arg_num, char **arg_value,
                       std::vector<std::string> &moduleNameVec);
 
+/// Helper method to get the size of the type from target data layout
+//@{
+u32_t getTypeSizeInBytes(const Type* type);
+u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
+//@}
+
+const std::string type2String(const Type* type);
+
 } // End namespace SVFUtil
 
 } // End namespace SVF

package/SVF-osx/include/SVF-FE/SVFIRBuilder.h

@@ -32,6 +32,7 @@
 
 #include "MemoryModel/SVFIR.h"
 #include "Util/ExtAPI.h"
+#include "SVF-FE/BasicTypes.h"
 #include "SVF-FE/ICFGBuilder.h"
 
 namespace SVF

package/SVF-osx/include/Util/BasicTypes.h

@@ -46,7 +46,6 @@
 #include <llvm/Analysis/CallGraph.h>	// call graph
 #include <llvm/IR/GlobalVariable.h>	// for GlobalVariable
 
-#include <llvm/Support/SourceMgr.h> // for SMDiagnostic
 #include <llvm/Bitcode/BitcodeWriter.h>		// for WriteBitcodeToFile
 #include <llvm/Bitcode/BitcodeReader.h>     /// for isBitcode
 #include <llvm/IRReader/IRReader.h>	// IR reader for bit file
@@ -70,7 +69,6 @@ class BddCond;
 
 
 /// LLVM Basic classes
-typedef llvm::SMDiagnostic SMDiagnostic;
 typedef llvm::LLVMContext LLVMContext;
 typedef llvm::Type Type;
 typedef llvm::Function Function;
@@ -82,7 +80,6 @@ typedef llvm::GlobalObject GlobalObject;
 typedef llvm::GlobalValue GlobalValue;
 typedef llvm::GlobalVariable GlobalVariable;
 typedef llvm::Module Module;
-typedef llvm::CallGraph LLVMCallGraph;
 typedef llvm::User User;
 typedef llvm::Use Use;
 typedef llvm::Loop Loop;
@@ -93,10 +90,8 @@ typedef llvm::LoopInfo LoopInfo;
     typedef llvm::UnifyFunctionExitNodes UnifyFunctionExitNodes;
 #endif
 typedef llvm::ModulePass ModulePass;
-typedef llvm::AnalysisUsage AnalysisUsage;
 
 /// LLVM outputs
-typedef llvm::raw_ostream raw_ostream;
 typedef llvm::raw_string_ostream raw_string_ostream;
 typedef llvm::raw_fd_ostream raw_fd_ostream;
 typedef llvm::StringRef StringRef;
@@ -108,8 +103,6 @@ typedef llvm::ArrayType ArrayType;
 typedef llvm::PointerType PointerType;
 typedef llvm::FunctionType FunctionType;
 typedef llvm::VectorType VectorType;
-typedef llvm::MetadataAsValue MetadataAsValue;
-typedef llvm::BlockAddress BlockAddress;
 
 /// LLVM data layout
 typedef llvm::DataLayout DataLayout;
@@ -122,8 +115,6 @@ typedef llvm::MemoryLocation MemoryLocation;
 typedef llvm::Argument Argument;
 typedef llvm::Constant Constant;
 typedef llvm::ConstantData ConstantData;
-typedef llvm::ConstantAggregate ConstantAggregate;
-typedef llvm::ConstantAggregateZero ConstantAggregateZero;
 typedef llvm::ConstantDataSequential ConstantDataSequential;
 typedef llvm::ConstantInt ConstantInt;
 typedef llvm::ConstantFP ConstantFP;
@@ -132,9 +123,6 @@ typedef llvm::ConstantExpr ConstantExpr;
 typedef llvm::ConstantPointerNull ConstantPointerNull;
 typedef llvm::ConstantArray ConstantArray;
 typedef llvm::GlobalAlias GlobalAlias;
-typedef llvm::AliasResult AliasResult;
-typedef llvm::ModRefInfo ModRefInfo;
-typedef llvm::AnalysisID AnalysisID;
 typedef llvm::ConstantDataArray ConstantDataArray;
 
 /// LLVM metadata
@@ -160,13 +148,11 @@ typedef llvm::IntToPtrInst IntToPtrInst;
 typedef llvm::CmpInst CmpInst;
 typedef llvm::BranchInst BranchInst;
 typedef llvm::SwitchInst SwitchInst;
-typedef llvm::ExtractValueInst  ExtractValueInst;
 typedef llvm::InsertValueInst InsertValueInst;
 typedef llvm::BinaryOperator BinaryOperator;
 typedef llvm::UnaryOperator UnaryOperator;
 typedef llvm::PtrToIntInst PtrToIntInst;
 typedef llvm::VAArgInst VAArgInst;
-typedef llvm::ExtractElementInst ExtractElementInst;
 typedef llvm::InsertElementInst InsertElementInst;
 typedef llvm::ShuffleVectorInst ShuffleVectorInst;
 typedef llvm::LandingPadInst LandingPadInst;
@@ -332,7 +318,7 @@ public:
 };
 
 template <typename F, typename S>
-raw_ostream& operator<< (raw_ostream &o, const std::pair<F, S> &var)
+OutStream& operator<< (OutStream &o, const std::pair<F, S> &var)
 {
     o << "<" << var.first << ", " << var.second << ">";
     return o;

package/SVF-osx/include/Util/Conditions.h

@@ -162,7 +162,7 @@ public:
     void ddClearFlag(BranchCond * f) const;
     void BddSupportStep( BranchCond * f,  NodeBS &support) const;
     void extractSubConds( BranchCond * f,  NodeBS &support) const;
-    void dump(BranchCond* lhs, raw_ostream & O);
+    void dump(BranchCond* lhs, OutStream & O);
     std::string dumpStr(BranchCond* lhs) const;
 
 private:

package/SVF-osx/include/Util/CxtStmt.h

@@ -108,7 +108,7 @@ public:
     /// Dump CxtStmt
     inline void dump() const
     {
-        SVFUtil::outs() << "[ Current Stmt: " << SVFUtil::getSourceLoc(inst) << " " << *inst << "\t Contexts: " << cxtToStr() << "  ]\n";
+        SVFUtil::outs() << "[ Current Stmt: " << SVFUtil::getSourceLoc(inst) << " " << SVFUtil::value2String(inst) << "\t Contexts: " << cxtToStr() << "  ]\n";
     }
 
 protected:
@@ -174,7 +174,7 @@ public:
     /// Dump CxtThreadStmt
     inline void dump() const
     {
-        SVFUtil::outs() << "[ Current Thread id: " << tid << "  Stmt: " << SVFUtil::getSourceLoc(inst) << " " << *inst << "\t Contexts: " << cxtToStr() << "  ]\n";
+        SVFUtil::outs() << "[ Current Thread id: " << tid << "  Stmt: " << SVFUtil::getSourceLoc(inst) << " " << SVFUtil::value2String(inst) << "\t Contexts: " << cxtToStr() << "  ]\n";
     }
 
 private:
@@ -281,11 +281,15 @@ public:
         std::string cycle = incycle?", incycle":"";
 
         if(forksite)
-            SVFUtil::outs() << "[ Thread: $" << SVFUtil::getSourceLoc(forksite) << "$ " << *forksite  << "\t Contexts: " << cxtToStr()
+        {
+            SVFUtil::outs() << "[ Thread: $" << SVFUtil::getSourceLoc(forksite) << "$ " << SVFUtil::value2String(forksite)  << "\t Contexts: " << cxtToStr()
                             << loop << cycle <<"  ]\n";
+        }
         else
+        {
             SVFUtil::outs() << "[ Thread: " << "main   "  << "\t Contexts: " << cxtToStr()
                             << loop << cycle <<"  ]\n";
+        }
     }
 protected:
     CallStrCxt cxt;

package/SVF-osx/include/Util/DPItem.h

@@ -32,7 +32,6 @@
 
 #include "Util/Conditions.h"
 #include "MemoryModel/ConditionalPT.h"
-#include "llvm/Support/raw_ostream.h"
 #include <algorithm>    // std::sort
 
 namespace SVF

package/SVF-osx/include/Util/ExtAPI.h

@@ -53,6 +53,7 @@ public:
         EFT_ALLOC,        //returns a ptr to a newly allocated object
         EFT_REALLOC,      //like L_A0 if arg0 is a non-null ptr, else ALLOC
         EFT_FREE,      	//free memory arg0 and all pointers passing into free function
+        EFT_FREE_MULTILEVEL,  //any argument with 2-level pointer passing too a free wrapper function e.g., XFree(void**) which frees memory for void* and void**
         EFT_NOSTRUCT_ALLOC, //like ALLOC but only allocates non-struct data
         EFT_STAT,         //retval points to an unknown static var X
         EFT_STAT2,        //ret -> X -> Y (X, Y - external static vars)
@@ -133,10 +134,12 @@ public:
     extf_t get_type(const SVFFunction* F) const
     {
         assert(F);
-        std::string funName = F->getName().str();
+        std::string funName = F->getName();
         if(F->isIntrinsic())
         {
-            funName = "llvm." + F->getName().split('.').second.split('.').first.str();
+            unsigned start = funName.find('.');
+            unsigned end = funName.substr(start + 1).find('.');
+            funName = "llvm." + funName.substr(start + 1, end);
         }
         llvm::StringMap<extf_t>::const_iterator it= info.find(funName);
         if(it == info.end())

package/SVF-osx/include/Util/IRAnnotator.h

@@ -138,8 +138,8 @@ private:
         }
         else
         {
-            std::cout << "Value is NOT a Instruction, Argument, Function, GlobalVariable, BasicBlock, Constant or InlineAsm" << std::endl;
-            SVFUtil::outs() << *value << "\n";
+            SVFUtil::outs() << "Value is NOT a Instruction, Argument, Function, GlobalVariable, BasicBlock, Constant or InlineAsm" << std::endl;
+            SVFUtil::outs() << SVFUtil::value2String(value) << "\n";
         }
     }
 

package/SVF-osx/include/Util/SVFBasicTypes.h

@@ -32,10 +32,10 @@
 #define INCLUDE_UTIL_SVFBASICTYPES_H_
 
 #include <llvm/ADT/SparseBitVector.h>	// for points-to
-#include <llvm/Support/raw_ostream.h>	// for output
 #include <llvm/Support/CommandLine.h>	// for command line options
 #include <llvm/ADT/StringMap.h>	// for StringMap
 
+#include <iostream>
 #include <vector>
 #include <list>
 #include <set>
@@ -72,6 +72,8 @@ template <class T> struct Hash {
     }
 };
 
+typedef std::ostream OutStream;
+
 typedef unsigned u32_t;
 typedef signed s32_t;
 typedef unsigned long long u64_t;
@@ -179,6 +181,22 @@ template <> struct Hash<NodePair>
 /// Size of native integer that we'll use for bit vectors, in bits.
 #define NATIVE_INT_SIZE (sizeof(unsigned long long) * CHAR_BIT)
 
+enum ModRefInfo
+{
+    ModRef,
+    Ref,
+    Mod,
+    NoModRef,
+};
+
+enum AliasResult
+{
+    MustAlias,
+    MayAlias,
+    PartialAlias,
+    NoAlias,
+};
+
 class SVFValue
 {
 
@@ -228,7 +246,7 @@ public:
     }
     //@}
 
-    const llvm::StringRef getName() const
+    const std::string getName() const
     {
         return value;
     }
@@ -240,7 +258,7 @@ public:
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend llvm::raw_ostream& operator<< (llvm::raw_ostream &o, const SVFValue &node)
+    friend OutStream& operator<< (OutStream &o, const SVFValue &node)
     {
         o << node.getName();
         return o;

package/SVF-osx/include/Util/SVFUtil.h

@@ -46,20 +46,20 @@ namespace SVFUtil
 {
 
 /// Overwrite llvm::outs()
-inline raw_ostream &outs()
+inline std::ostream &outs()
 {
-    return llvm::outs();
+    return std::cout;
 }
 
 /// Overwrite llvm::errs()
-inline raw_ostream &errs()
+inline std::ostream  &errs()
 {
-    return llvm::errs();
+    return std::cerr;
 }
 
 /// Dump sparse bitvector set
-void dumpSet(NodeBS To, raw_ostream & O = SVFUtil::outs());
-void dumpSet(PointsTo To, raw_ostream & O = SVFUtil::outs());
+void dumpSet(NodeBS To, OutStream & O = SVFUtil::outs());
+void dumpSet(PointsTo To, OutStream & O = SVFUtil::outs());
 
 /// Dump points-to set
 void dumpPointsToSet(unsigned node, NodeBS To) ;
@@ -89,7 +89,7 @@ std::string  bugMsg3(std::string msg);
 std::string  pasMsg(std::string msg);
 
 /// Print memory usage in KB.
-void reportMemoryUsageKB(const std::string& infor, raw_ostream & O = SVFUtil::outs());
+void reportMemoryUsageKB(const std::string& infor, OutStream & O = SVFUtil::outs());
 
 /// Get memory usage from system file. Return TRUE if succeed.
 bool getMemoryUsageKB(u32_t* vmrss_kb, u32_t* vmsize_kb);

package/SVF-osx/include/Util/ThreadAPI.h

@@ -90,7 +90,7 @@ private:
     {
         if(F)
         {
-            TDAPIMap::const_iterator it= tdAPIMap.find(F->getName().str());
+            TDAPIMap::const_iterator it= tdAPIMap.find(F->getName());
             if(it != tdAPIMap.end())
                 return it->second;
         }

package/SVF-osx/include/WPA/WPAPass.h

@@ -51,7 +51,7 @@ class SVFG;
  */
 // excised ", public llvm::AliasAnalysis" as that has a very light interface
 // and I want to see what breaks.
-class WPAPass : public ModulePass
+class WPAPass
 {
     typedef std::vector<PointerAnalysis*> PTAVector;
 
@@ -67,7 +67,7 @@ public:
     };
 
     /// Constructor needs TargetLibraryInfo to be passed to the AliasAnalysis
-    WPAPass() : ModulePass(ID)
+    WPAPass()
     {
 
     }
@@ -75,20 +75,6 @@ public:
     /// Destructor
     virtual ~WPAPass();
 
-    /// LLVM analysis usage
-    virtual inline void getAnalysisUsage(AnalysisUsage &au) const
-    {
-        // declare your dependencies here.
-        /// do not intend to change the IR in this pass,
-        au.setPreservesAll();
-    }
-
-    /// Get adjusted analysis for alias analysis
-    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)
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.885",
+  "version": "1.0.889",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {