svf-tools 1.0.1029 → 1.0.1030

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1029",
+  "version": "1.0.1030",
   "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/include/SVFIR/SVFVariables.h

@@ -529,8 +529,7 @@ public:
 };
 
 /*
- * Field-insensitive Gep Obj variable, this is dynamic generated for field sensitive analysis
- * Each field-insensitive gep obj node represents all fields of a MemObj (base)
+ * Base memory object variable (address-taken variables in LLVM-based languages)
  */
 class BaseObjVar : public ObjVar
 {
@@ -540,7 +539,7 @@ class BaseObjVar : public ObjVar
 private:
     ObjTypeInfo* typeInfo;
 
-    const SVFBaseNode* gNode;
+    const ICFGNode* icfgNode; /// ICFGNode related to the creation of this object
 
 protected:
     /// Constructor to create empty ObjVar (for SVFIRReader/deserialization)
@@ -571,7 +570,7 @@ public:
     }
     //@}
 
-    /// Constructorx
+    /// Constructor
     BaseObjVar(const SVFValue* val, NodeID i, ObjTypeInfo* ti, PNODEK ty = BaseObjNode)
         :  ObjVar(val, i, ty), typeInfo(ti)
     {
@@ -582,10 +581,10 @@ public:
         return this;
     }
 
-    /// Get the reference value to this object
-    inline const SVFBaseNode* getGNode() const
+    /// Get the ICFGNode related to the creation of this object
+    inline const ICFGNode* getICFGNode() const
     {
-        return gNode;
+        return icfgNode;
     }
 
     /// Return name of a LLVM value

package/svf/lib/AE/Svfexe/AEDetector.cpp

@@ -70,8 +70,7 @@ void BufOverflowDetector::detect(AbstractState& as, const ICFGNode* node)
                     }
                     else
                     {
-                        const ICFGNode* addrNode = SVFUtil::cast<ICFGNode>(
-                                                       svfir->getBaseObject(objId)->getGNode());
+                        const ICFGNode* addrNode = svfir->getBaseObject(objId)->getICFGNode();
                         for (const SVFStmt* stmt2 : addrNode->getSVFStmts())
                         {
                             if (const AddrStmt* addrStmt = SVFUtil::dyn_cast<AddrStmt>(stmt2))
@@ -472,8 +471,7 @@ bool BufOverflowDetector::canSafelyAccessMemory(AbstractState& as, const SVF::SV
         else
         {
             // if the object is not a constant size object, get the size from the addrStmt
-            const ICFGNode* addrNode = SVFUtil::cast<ICFGNode>(
-                                           svfir->getBaseObject(objId)->getGNode());
+            const ICFGNode* addrNode = svfir->getBaseObject(objId)->getICFGNode();
             for (const SVFStmt* stmt2 : addrNode->getSVFStmts())
             {
                 if (const AddrStmt* addrStmt = SVFUtil::dyn_cast<AddrStmt>(stmt2))

package/svf/lib/AE/Svfexe/AbsExtAPI.cpp

@@ -284,7 +284,7 @@ void AbsExtAPI::initExtFunMap()
             }
             else
             {
-                const ICFGNode* addrNode = SVFUtil::cast<ICFGNode>(svfir->getBaseObject(objId)->getGNode());
+                const ICFGNode* addrNode = svfir->getBaseObject(objId)->getICFGNode();
                 for (const SVFStmt* stmt2: addrNode->getSVFStmts())
                 {
                     if (const AddrStmt* addrStmt = SVFUtil::dyn_cast<AddrStmt>(stmt2))
@@ -478,7 +478,7 @@ IntervalValue AbsExtAPI::getStrlen(AbstractState& as, const SVF::SVFVar *strValu
         }
         else
         {
-            const ICFGNode* icfgNode = SVFUtil::cast<ICFGNode>( svfir->getBaseObject(objId)->getGNode());
+            const ICFGNode* icfgNode = svfir->getBaseObject(objId)->getICFGNode();
             for (const SVFStmt* stmt2: icfgNode->getSVFStmts())
             {
                 if (const AddrStmt* addrStmt = SVFUtil::dyn_cast<AddrStmt>(stmt2))

package/svf/lib/DDA/ContextDDA.cpp

@@ -356,19 +356,15 @@ bool ContextDDA::isHeapCondMemObj(const CxtVar& var, const StoreSVFGNode*)
             }
             return true;
         }
-        else if(const SVFBaseNode* gNode = obj->getGNode())
+        else if(const ICFGNode* node = obj->getICFGNode())
         {
-            if (const auto& node =
-                        SVFUtil::dyn_cast<ICFGNode>(gNode))
-            {
-                const SVFFunction* svfFun = node->getFun();
-                if(_ander->isInRecursion(svfFun))
-                    return true;
-                if(var.get_cond().isConcreteCxt() == false)
-                    return true;
-                if(_pag->getICFG()->isInLoop(node))
-                    return true;
-            }
+            const SVFFunction* svfFun = node->getFun();
+            if(_ander->isInRecursion(svfFun))
+                return true;
+            if(var.get_cond().isConcreteCxt() == false)
+                return true;
+            if(_pag->getICFG()->isInLoop(node))
+                return true;
         }
     }
     return false;

package/svf/lib/Graphs/ThreadCallGraph.cpp

@@ -86,7 +86,7 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
                     const BaseObjVar* obj = pag->getBaseObject(objPN->getId());
                     if(obj->isFunction())
                     {
-                        const SVFFunction* svfCallee = SVFUtil::cast<CallGraphNode>(obj->getGNode())->getFunction();
+                        const SVFFunction* svfCallee = SVFUtil::cast<FunObjVar>(obj)->getFunction();
                         this->addIndirectForkEdge(*it, svfCallee);
                     }
                 }

package/svf/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -541,7 +541,7 @@ void BVDataPTAImpl::onTheFlyThreadCallGraphSolve(const CallSiteToFunPtrMap& call
                         const BaseObjVar* obj = pag->getBaseObject(objPN->getId());
                         if(obj->isFunction())
                         {
-                            const SVFFunction *svfForkedFun = SVFUtil::cast<CallGraphNode>(obj->getGNode())->getFunction();
+                            const SVFFunction *svfForkedFun = SVFUtil::cast<FunObjVar>(obj)->getFunction();
                             if(tdCallGraph->addIndirectForkEdge(*it, svfForkedFun))
                                 newForkEdges[*it].insert(svfForkedFun);
                         }

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

@@ -190,17 +190,17 @@ public:
     inline void addInstructionMap(const Instruction* inst, CallICFGNode* svfInst)
     {
         CSToCallNodeMap[inst] = svfInst;
-        addToLLVMVal2SVFVarMap(inst, svfInst);
+        addToSVFVar2LLVMValueMap(inst, svfInst);
     }
     inline void addInstructionMap(const Instruction* inst, RetICFGNode* svfInst)
     {
         CSToRetNodeMap[inst] = svfInst;
-        addToLLVMVal2SVFVarMap(inst, svfInst);
+        addToSVFVar2LLVMValueMap(inst, svfInst);
     }
     inline void addInstructionMap(const Instruction* inst, IntraICFGNode* svfInst)
     {
         InstToBlockNodeMap[inst] = svfInst;
-        addToLLVMVal2SVFVarMap(inst, svfInst);
+        addToSVFVar2LLVMValueMap(inst, svfInst);
     }
 
     inline void addArgumentMap(const Argument* arg, SVFArgument* svfArg)
@@ -426,7 +426,7 @@ private:
     void initSVFBasicBlock(const Function* func);
     void initDomTree(SVFFunction* func, const Function* f);
     void setValueAttr(const Value* val, SVFValue* value);
-    void addToLLVMVal2SVFVarMap(const Value* val, SVFBaseNode* svfBaseNode);
+    void addToSVFVar2LLVMValueMap(const Value* val, SVFBaseNode* svfBaseNode);
     void buildFunToFunMap();
     void buildGlobalDefToRepMap();
     /// Invoke llvm passes to modify module

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

@@ -273,7 +273,7 @@ protected:
         LLVMContext& cxt = llvmModuleSet()->getContext();
         ConstantPointerNull* constNull = ConstantPointerNull::get(PointerType::getUnqual(cxt));
         NodeID nullPtr = pag->addConstantNullPtrValNode(llvmModuleSet()->getSVFValue(constNull),pag->getNullPtr(), nullptr);
-        llvmModuleSet()->addToLLVMVal2SVFVarMap(
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(
             constNull, pag->getGNode(pag->getNullPtr()));
         setCurrentLocation(constNull, nullptr);
         addBlackHoleAddrEdge(pag->getBlkPtr());

package/svf-llvm/lib/LLVMModule.cpp

@@ -1222,7 +1222,7 @@ void LLVMModuleSet::dumpModulesToFile(const std::string& suffix)
 void LLVMModuleSet::addFunctionMap(const Function* func, CallGraphNode* svfFunc)
 {
     LLVMFunc2CallGraphNode[func] = svfFunc;
-    addToLLVMVal2SVFVarMap(func, svfFunc);
+    addToSVFVar2LLVMValueMap(func, svfFunc);
 }
 
 void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)
@@ -1253,7 +1253,7 @@ void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)
     svfvalue->setSourceLoc(LLVMUtil::getSourceLoc(val));
 }
 
-void LLVMModuleSet::addToLLVMVal2SVFVarMap(const Value* val,
+void LLVMModuleSet::addToSVFVar2LLVMValueMap(const Value* val,
         SVFBaseNode* svfBaseNode)
 {
     SVFBaseNode2LLVMValue[svfBaseNode] = val;

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -232,44 +232,33 @@ void SVFIRBuilder::initialiseNodes()
                 iter->second, argval->getArgNo(), icfgNode,
                 llvmModuleSet()->getCallGraphNode(argval->getParent()),
                 LLVMUtil::isArgOfUncalledFunction(argval));
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                argval, pag->getGNode(iter->second));
         }
         else if (auto fpValue = SVFUtil::dyn_cast<ConstantFP>(llvmValue))
         {
             pag->addConstantFPValNode(iter->first, iter->second, LLVMUtil::getDoubleValue(fpValue), icfgNode);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                fpValue, pag->getGNode(iter->second));
         }
         else if (auto intValue = SVFUtil::dyn_cast<ConstantInt>(llvmValue))
         {
             pag->addConstantIntValNode(iter->first, iter->second, LLVMUtil::getIntegerValue(intValue), icfgNode);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                intValue, pag->getGNode(iter->second));
         }
-        else if (auto nullValue = SVFUtil::dyn_cast<ConstantPointerNull>(llvmValue))
+        else if (SVFUtil::isa<ConstantPointerNull>(llvmValue))
         {
             pag->addConstantNullPtrValNode(iter->first, iter->second, icfgNode);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                nullValue, pag->getGNode(iter->second));
         }
-        else if (auto globalValue = SVFUtil::dyn_cast<GlobalValue>(llvmValue))
+        else if (SVFUtil::isa<GlobalValue>(llvmValue))
         {
             pag->addGlobalValueValNode(iter->first, iter->second, icfgNode);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                globalValue, pag->getGNode(iter->second));
         }
-        else if (auto dataValue = SVFUtil::dyn_cast<ConstantData>(llvmValue))
+        else if (SVFUtil::isa<ConstantData>(llvmValue))
         {
             pag->addConstantDataValNode(iter->first, iter->second, icfgNode);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                dataValue, pag->getGNode(iter->second));
         }
         else
         {
             // Add value node to PAG
             pag->addValNode(iter->first, iter->second, icfgNode);
         }
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue, pag->getGNode(iter->second));
     }
 
     // Iterate over all object symbols in the symbol table
@@ -287,6 +276,13 @@ void SVFIRBuilder::initialiseNodes()
         // Get the LLVM value corresponding to the symbol
         const Value* llvmValue = llvmModuleSet()->getLLVMValue(iter->first);
 
+        const ICFGNode* icfgNode = nullptr;
+        if (const Instruction* inst = SVFUtil::dyn_cast<Instruction>(llvmValue))
+        {
+            if(llvmModuleSet()->hasICFGNode(inst))
+                icfgNode = llvmModuleSet()->getICFGNode(inst);
+        }
+
         // Check if the value is a function and add a function object node
         if (const Function* func = SVFUtil::dyn_cast<Function>(llvmValue))
         {
@@ -300,8 +296,6 @@ void SVFIRBuilder::initialiseNodes()
             const SVFFunction* f =
                 SVFUtil::cast<SVFInstruction>(iter->first)->getFunction();
             pag->addHeapObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id),  f);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                llvmValue, pag->getGNode(iter->second));
         }
         // Check if the value is an alloca instruction and add a stack object node
         else if (LLVMUtil::isStackObj(llvmValue))
@@ -310,43 +304,31 @@ void SVFIRBuilder::initialiseNodes()
             const SVFFunction* f =
                 SVFUtil::cast<SVFInstruction>(iter->first)->getFunction();
             pag->addStackObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id), f);
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                llvmValue, pag->getGNode(iter->second));
         }
         else if (auto fpValue = SVFUtil::dyn_cast<ConstantFP>(llvmValue))
         {
             NodeID id = symTable->getObjSym(iter->first);
             pag->addConstantFPObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id),  LLVMUtil::getDoubleValue(fpValue));
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                fpValue, pag->getGNode(iter->second));
         }
         else if (auto intValue = SVFUtil::dyn_cast<ConstantInt>(llvmValue))
         {
             NodeID id = symTable->getObjSym(iter->first);
             pag->addConstantIntObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id), LLVMUtil::getIntegerValue(intValue));
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                intValue, pag->getGNode(iter->second));
         }
-        else if (auto nullValue = SVFUtil::dyn_cast<ConstantPointerNull>(llvmValue))
+        else if (SVFUtil::isa<ConstantPointerNull>(llvmValue))
         {
             NodeID id = symTable->getObjSym(iter->first);
             pag->addConstantNullPtrObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                nullValue, pag->getGNode(iter->second));
         }
-        else if (auto globalValue = SVFUtil::dyn_cast<GlobalValue>(llvmValue))
+        else if (SVFUtil::isa<GlobalValue>(llvmValue))
         {
             NodeID id = symTable->getObjSym(iter->first);
             pag->addGlobalValueObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                globalValue, pag->getGNode(iter->second));
         }
-        else if (auto dataValue = SVFUtil::dyn_cast<ConstantData>(llvmValue))
+        else if (SVFUtil::isa<ConstantData>(llvmValue))
         {
             NodeID id = symTable->getObjSym(iter->first);
             pag->addConstantDataObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
-            llvmModuleSet()->addToLLVMVal2SVFVarMap(
-                dataValue, pag->getGNode(iter->second));
         }
         // Add a generic object node for other types of values
         else
@@ -354,25 +336,12 @@ void SVFIRBuilder::initialiseNodes()
             NodeID id = symTable->getObjSym(iter->first);
             pag->addObjNode(iter->first, iter->second, symTable->getObjTypeInfo(id));
         }
-    }
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmValue, pag->getGNode(iter->second));
 
-    for (auto& it : SymbolTableInfo::SymbolInfo()->idToObjTypeInfoMap())
-    {
-        NodeID id = it.first;
-        if (BaseObjVar* obj = SVFUtil::dyn_cast<BaseObjVar>(pag->getGNode(id)))
+        if (BaseObjVar* baseObjVar =
+                    SVFUtil::dyn_cast<BaseObjVar>(pag->getGNode(iter->second)))
         {
-            if (!obj->hasValue())
-                continue;
-
-            if (const Instruction* inst = SVFUtil::dyn_cast<Instruction>(llvmModuleSet()->getLLVMValue(obj->getValue())))
-            {
-                if(llvmModuleSet()->hasICFGNode(inst))
-                    obj->gNode = llvmModuleSet()->getICFGNode(inst);
-            }
-            else if (const Function* func = SVFUtil::dyn_cast<Function>(llvmModuleSet()->getLLVMValue(obj->getValue())))
-            {
-                obj->gNode = llvmModuleSet()->getCallGraphNode(func);
-            }
+            baseObjVar->icfgNode = icfgNode;
         }
     }
 
@@ -384,6 +353,7 @@ void SVFIRBuilder::initialiseNodes()
         pag->addRetNode(iter->second,
                         llvmModuleSet()->getCallGraphNode(SVFUtil::cast<Function>(
                                     llvmModuleSet()->getLLVMValue(iter->first))));
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmModuleSet()->getLLVMValue(iter->first), pag->getGNode(iter->second));
     }
 
     for (SymbolTableInfo::FunToIDMapTy::iterator iter =
@@ -394,6 +364,7 @@ void SVFIRBuilder::initialiseNodes()
         pag->addVarargNode(iter->second,
                            llvmModuleSet()->getCallGraphNode(SVFUtil::cast<Function>(
                                        llvmModuleSet()->getLLVMValue(iter->first))));
+        llvmModuleSet()->addToSVFVar2LLVMValueMap(llvmModuleSet()->getLLVMValue(iter->first), pag->getGNode(iter->second));
     }
 
     /// add address edges for constant nodes.