svf-tools 1.0.1052 → 1.0.1053

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1052",
+  "version": "1.0.1053",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/lib/SVFIR/SVFVariables.cpp

@@ -289,7 +289,7 @@ const std::string ConstAggValVar::toString() const
 {
     std::string str;
     std::stringstream rawstr(str);
-    rawstr << "ConstAggValNode ID: " << getId();
+    rawstr << "ConstAggValVar ID: " << getId();
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
@@ -301,7 +301,7 @@ const std::string ConstDataValVar::toString() const
 {
     std::string str;
     std::stringstream rawstr(str);
-    rawstr << "ConstDataValNode ID: " << getId();
+    rawstr << "ConstDataValVar ID: " << getId();
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
@@ -327,7 +327,7 @@ const std::string ConstFPValVar::toString() const
 {
     std::string str;
     std::stringstream rawstr(str);
-    rawstr << "ConstFPValNode ID: " << getId();
+    rawstr << "ConstFPValVar ID: " << getId();
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
@@ -340,7 +340,7 @@ const std::string ConstIntValVar::toString() const
 {
     std::string str;
     std::stringstream rawstr(str);
-    rawstr << "ConstIntValNode ID: " << getId();
+    rawstr << "ConstIntValVar ID: " << getId();
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
@@ -366,7 +366,7 @@ const std::string GlobalObjVar::toString() const
 {
     std::string str;
     std::stringstream rawstr(str);
-    rawstr << "GlobalObjNode ID: " << getId();
+    rawstr << "GlobalObjVar ID: " << getId();
     if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";

package/svf-llvm/include/SVF-LLVM/LLVMModule.h

@@ -57,7 +57,7 @@ public:
     typedef Map<const Function*, SVFFunction*> LLVMFun2SVFFunMap;
     typedef Map<const Function*, FunObjVar*> LLVMFun2FunObjVarMap;
     typedef Map<const BasicBlock*, SVFBasicBlock*> LLVMBB2SVFBBMap;
-    typedef Map<const Instruction*, SVFInstruction*> LLVMInst2SVFInstMap;
+    typedef Map<const Instruction*, SVFLLVMValue*> LLVMInst2SVFInstMap;
     typedef Map<const Argument*, SVFLLVMValue*> LLVMArgument2SVFArgumentMap;
     typedef Map<const Constant*, SVFLLVMValue*> LLVMConst2SVFConstMap;
     typedef Map<const Value*, SVFLLVMValue*> LLVMValue2SVFOtherValueMap;
@@ -233,7 +233,7 @@ public:
         SVFBaseNode2LLVMValue[svfBB] = bb;
     }
 
-    inline void addInstructionMap(const Instruction* inst, SVFInstruction* svfInst)
+    inline void addInstructionMap(const Instruction* inst, SVFLLVMValue* svfInst)
     {
         LLVMInst2SVFInst[inst] = svfInst;
         setValueAttr(inst,svfInst);
@@ -346,7 +346,7 @@ public:
         return it->second;
     }
 
-    inline SVFInstruction* getSVFInstruction(const Instruction* inst) const
+    inline SVFLLVMValue* getSVFInstruction(const Instruction* inst) const
     {
         LLVMInst2SVFInstMap::const_iterator it = LLVMInst2SVFInst.find(inst);
         assert(it!=LLVMInst2SVFInst.end() && "SVF Instruction not found!");

package/svf-llvm/include/SVF-LLVM/SVFIRBuilder.h

@@ -454,9 +454,9 @@ protected:
     inline void addStoreEdge(NodeID src, NodeID dst)
     {
         ICFGNode* node;
-        if (const SVFInstruction* inst = SVFUtil::dyn_cast<SVFInstruction>(curVal))
+        if (const Instruction* inst = SVFUtil::dyn_cast<Instruction>(llvmModuleSet()->getLLVMValue(curVal)))
             node = llvmModuleSet()->getICFGNode(
-                       SVFUtil::cast<Instruction>(llvmModuleSet()->getLLVMValue(inst)));
+                       SVFUtil::cast<Instruction>(inst));
         else
             node = nullptr;
         if (StoreStmt* edge = pag->addStoreStmt(src, dst, node))

package/svf-llvm/include/SVF-LLVM/SVFLLVMValue.h

@@ -63,7 +63,6 @@ public:
     {
         SVFVal,
         SVFFunc,
-        SVFInst,
     };
 
 private:
@@ -375,47 +374,6 @@ public:
     }
 };
 
-class ICFGNode;
-class FunObjVar;
-
-class SVFInstruction : public SVFLLVMValue
-{
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    const SVFBasicBlock* bb;    /// The BasicBlock where this Instruction resides
-    bool terminator;    /// return true if this is a terminator instruction
-    bool ret;           /// return true if this is an return instruction of a function
-
-public:
-    /// Constructor without name, set name with setName()
-    SVFInstruction(const SVFType* ty, const SVFBasicBlock* b, bool tm,
-                   bool isRet, SVFValKind k = SVFInst);
-    SVFInstruction(void) = delete;
-
-    static inline bool classof(const SVFLLVMValue *node)
-    {
-        return node->getKind() == SVFInst;
-    }
-
-    inline const SVFBasicBlock* getParent() const
-    {
-        return bb;
-    }
-
-    inline const FunObjVar* getFunction() const
-    {
-        return bb->getParent();
-    }
-
-    inline bool isRetInst() const
-    {
-        return ret;
-    }
-};
-
-
 /// [FOR DEBUG ONLY, DON'T USE IT UNSIDE `svf`!]
 /// Converts an SVFValue to corresponding LLVM::Value, then get the string
 /// representation of it. Use it only when you are debugging. Don't use

package/svf-llvm/lib/LLVMModule.cpp

@@ -288,9 +288,7 @@ void LLVMModuleSet::createSVFFunction(const Function* func)
         addBasicBlock(svfFunc, &bb);
         for (const Instruction& inst : bb)
         {
-            SVFInstruction* svfInst = new SVFInstruction(getSVFType(inst.getType()),
-                    getSVFBasicBlock(&bb), inst.isTerminator(),
-                    SVFUtil::isa<ReturnInst>(inst));
+            SVFLLVMValue* svfInst = new SVFLLVMValue(getSVFType(inst.getType()));
 
             addInstructionMap(&inst, svfInst);
         }

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1541,7 +1541,9 @@ NodeID SVFIRBuilder::getGepValVar(const Value* val, const AccessPath& ap, const
          * 1. Instruction
          * 2. GlobalVariable
          */
-        assert((SVFUtil::isa<SVFInstruction>(curVal) || SVFUtil::isa<GlobalVariable>(llvmModuleSet()->getLLVMValue(curVal))) && "curVal not an instruction or a globalvariable?");
+        assert(
+            (SVFUtil::isa<Instruction>(llvmModuleSet()->getLLVMValue(curVal)) || SVFUtil::isa<GlobalVariable>(
+                 llvmModuleSet()->getLLVMValue(curVal))) && "curVal not an instruction or a globalvariable?");
 
         // We assume every GepValNode and its GepEdge to the baseNode are unique across the whole program
         // We preserve the current BB information to restore it after creating the gepNode
@@ -1590,17 +1592,17 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
     edge->setValue(pag->getGNode(llvmModuleSet()->getValueNode(curVal)));
     ICFGNode* icfgNode = pag->getICFG()->getGlobalICFGNode();
     LLVMModuleSet* llvmMS = llvmModuleSet();
-    if (const SVFInstruction* curInst = SVFUtil::dyn_cast<SVFInstruction>(curVal))
+    if (const Instruction* curInst = SVFUtil::dyn_cast<Instruction>(llvmMS->getLLVMValue(curVal)))
     {
         const FunObjVar* srcFun = edge->getSrcNode()->getFunction();
         const FunObjVar* dstFun = edge->getDstNode()->getFunction();
         if(srcFun!=nullptr && !SVFUtil::isa<RetPE>(edge) && !SVFUtil::isa<FunValVar>(edge->getSrcNode()) && !SVFUtil::isa<FunObjVar>(edge->getSrcNode()))
         {
-            assert(srcFun==curInst->getFunction() && "SrcNode of the PAGEdge not in the same function?");
+            assert(srcFun==llvmMS->getFunObjVar(curInst->getFunction()) && "SrcNode of the PAGEdge not in the same function?");
         }
         if(dstFun!=nullptr && !SVFUtil::isa<CallPE>(edge) && !SVFUtil::isa<RetValPN>(edge->getDstNode()))
         {
-            assert(dstFun==curInst->getFunction() && "DstNode of the PAGEdge not in the same function?");
+            assert(dstFun==llvmMS->getFunObjVar(curInst->getFunction()) && "DstNode of the PAGEdge not in the same function?");
         }
 
         /// We assume every GepValVar and its GepStmt are unique across whole program
@@ -1608,16 +1610,16 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
             assert(curBB && "instruction does not have a basic block??");
 
         /// We will have one unique function exit ICFGNode for all returns
-        if(curInst->isRetInst())
+        if(SVFUtil::isa<ReturnInst>(curInst))
         {
-            icfgNode = pag->getICFG()->getFunExitICFGNode(curInst->getFunction());
+            icfgNode = pag->getICFG()->getFunExitICFGNode(llvmMS->getFunObjVar(curInst->getFunction()));
         }
         else
         {
             if(SVFUtil::isa<RetPE>(edge))
-                icfgNode = llvmMS->getRetICFGNode(SVFUtil::cast<Instruction>(llvmMS->getLLVMValue(curInst)));
+                icfgNode = llvmMS->getRetICFGNode(SVFUtil::cast<Instruction>(curInst));
             else
-                icfgNode = llvmMS->getICFGNode(SVFUtil::cast<Instruction>(llvmMS->getLLVMValue(curInst)));
+                icfgNode = llvmMS->getICFGNode(SVFUtil::cast<Instruction>(curInst));
         }
     }
     else if (const Argument* arg = SVFUtil::dyn_cast<Argument>(llvmModuleSet()->getLLVMValue(curVal)))

package/svf-llvm/lib/SVFIRExtAPI.cpp

@@ -128,7 +128,7 @@ void SVFIRBuilder::addComplexConsForExt(Value *D, Value *S, const Value* szValue
 
 void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCallee)
 {
-    const SVFInstruction* svfInst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(cs);
+    const SVFLLVMValue* svfInst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(cs);
     const CallICFGNode *callICFGNode = llvmModuleSet()->getCallICFGNode(cs);
 
     if (isHeapAllocExtCallViaRet(callICFGNode))

package/svf-llvm/lib/SVFLLVMValue.cpp

@@ -50,11 +50,6 @@ void SVFFunction::setExitBlock(SVFBasicBlock *bb)
 }
 
 
-SVFInstruction::SVFInstruction(const SVFType* ty, const SVFBasicBlock* b,
-                               bool tm, bool isRet, SVFValKind k)
-    : SVFLLVMValue(ty, k), bb(b), terminator(tm), ret(isRet)
-{
-}
 
 __attribute__((weak))
 std::string SVFLLVMValue::toString() const