svf-lib 1.0.883 → 1.0.887

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.883",
+  "version": "1.0.887",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {