svf-tools 1.0.1014 → 1.0.1015

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1014",
+  "version": "1.0.1015",
   "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/AE/Svfexe/AbstractInterpretation.h

@@ -251,8 +251,8 @@ private:
     AEStat* stat;
 
     std::vector<const CallICFGNode*> callSiteStack;
-    Map<const SVFFunction*, ICFGWTO*> funcToWTO;
-    Set<const SVFFunction*> recursiveFuns;
+    Map<const CallGraphNode*, ICFGWTO*> funcToWTO;
+    Set<const CallGraphNode*> recursiveFuns;
 
 
     AbstractState& getAbsStateFromTrace(const ICFGNode* node)

package/svf/include/Graphs/CallGraph.h

@@ -202,6 +202,8 @@ public:
 
     void addCallGraphNode(const SVFFunction* fun);
 
+    const CallGraphNode* getCallGraphNode(const std::string& name);
+
     /// Destructor
     virtual ~CallGraph()
     {

package/svf/include/SVFIR/SVFValue.h

@@ -40,7 +40,7 @@ namespace SVF
 /// LLVM Aliases and constants
 typedef SVF::GraphPrinter GraphPrinter;
 
-
+class CallGraphNode;
 class SVFInstruction;
 class SVFBasicBlock;
 class SVFArgument;
@@ -320,8 +320,14 @@ private:
     std::vector<const SVFBasicBlock*> allBBs;   /// all BasicBlocks of this function
     std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
     SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
+    const CallGraphNode *callGraphNode;          /// call graph node for this function
 
 protected:
+    inline void setCallGraphNode(CallGraphNode *cgn)
+    {
+        callGraphNode = cgn;
+    }
+
     ///@{ attributes to be set only through Module builders e.g., LLVMModule
     inline void addBasicBlock(const SVFBasicBlock* bb)
     {
@@ -354,6 +360,11 @@ public:
     SVFFunction(void) = delete;
     virtual ~SVFFunction();
 
+    inline const CallGraphNode* getCallGraphNode() const
+    {
+        return callGraphNode;
+    }
+
     static inline bool classof(const SVFValue *node)
     {
         return node->getKind() == SVFFunc;

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

@@ -84,24 +84,19 @@ void AbstractInterpretation::initWTO()
     // Detect if the call graph has cycles by finding its strongly connected components (SCC)
     Andersen::CallGraphSCC* callGraphScc = ander->getCallGraphSCC();
     callGraphScc->find();
-    auto callGraph = ander->getCallGraph();
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
 
     // Iterate through the call graph
-    for (auto it = callGraph->begin(); it != callGraph->end(); it++)
+    for (auto it = svfirCallGraph->begin(); it != svfirCallGraph->end(); it++)
     {
         // Check if the current function is part of a cycle
         if (callGraphScc->isInCycle(it->second->getId()))
-            recursiveFuns.insert(it->second->getFunction()); // Mark the function as recursive
-    }
-
-    // Initialize WTO for each function in the module
-    for (const SVFFunction* fun : svfir->getModule()->getFunctionSet())
-    {
-        if(fun->isDeclaration())
+            recursiveFuns.insert(it->second); // Mark the function as recursive
+        if (it->second->getFunction()->isDeclaration())
             continue;
-        auto* wto = new ICFGWTO(icfg, icfg->getFunEntryICFGNode(fun));
+        auto* wto = new ICFGWTO(icfg, icfg->getFunEntryICFGNode(it->second->getFunction()));
         wto->init();
-        funcToWTO[fun] = wto;
+        funcToWTO[it->second] = wto;
     }
 }
 /// Program entry
@@ -112,9 +107,9 @@ void AbstractInterpretation::analyse()
     handleGlobalNode();
     getAbsStateFromTrace(
         icfg->getGlobalICFGNode())[PAG::getPAG()->getBlkPtr()] = IntervalValue::top();
-    if (const SVFFunction* fun = svfir->getModule()->getSVFFunction("main"))
+    if (const CallGraphNode* cgn = svfir->getCallGraph()->getCallGraphNode("main"))
     {
-        ICFGWTO* wto = funcToWTO[fun];
+        ICFGWTO* wto = funcToWTO[cgn];
         handleWTOComponents(wto->getWTOComponents());
     }
 }
@@ -586,7 +581,11 @@ void AbstractInterpretation::extCallPass(const SVF::CallICFGNode *callNode)
 
 bool AbstractInterpretation::isRecursiveCall(const SVF::CallICFGNode *callNode)
 {
-    return recursiveFuns.find(callNode->getCalledFunction()) != recursiveFuns.end();
+    const SVFFunction *callfun = callNode->getCalledFunction();
+    if (!callfun)
+        return false;
+    else
+        return recursiveFuns.find(callfun->getCallGraphNode()) != recursiveFuns.end();
 }
 
 void AbstractInterpretation::recursiveCallPass(const SVF::CallICFGNode *callNode)
@@ -610,7 +609,11 @@ void AbstractInterpretation::recursiveCallPass(const SVF::CallICFGNode *callNode
 
 bool AbstractInterpretation::isDirectCall(const SVF::CallICFGNode *callNode)
 {
-    return funcToWTO.find(callNode->getCalledFunction()) != funcToWTO.end();
+    const SVFFunction *callfun =callNode->getCalledFunction();
+    if (!callfun)
+        return false;
+    else
+        return funcToWTO.find(callfun->getCallGraphNode()) != funcToWTO.end();
 }
 void AbstractInterpretation::directCallFunPass(const SVF::CallICFGNode *callNode)
 {
@@ -619,7 +622,8 @@ void AbstractInterpretation::directCallFunPass(const SVF::CallICFGNode *callNode
 
     abstractTrace[callNode] = as;
 
-    ICFGWTO* wto = funcToWTO[callNode->getCalledFunction()];
+    const SVFFunction *callfun =callNode->getCalledFunction();
+    ICFGWTO* wto = funcToWTO[callfun->getCallGraphNode()];
     handleWTOComponents(wto->getWTOComponents());
 
     callSiteStack.pop_back();
@@ -649,7 +653,7 @@ void AbstractInterpretation::indirectCallFunPass(const SVF::CallICFGNode *callNo
     SVFVar *func_var = svfir->getGNode(AbstractState::getInternalID(addr));
     if(const FunObjVar*funObjVar = SVFUtil::dyn_cast<FunObjVar>(func_var))
     {
-        const SVFFunction* callfun = funObjVar->getCallGraphNode()->getFunction();
+        const CallGraphNode* callfun = funObjVar->getCallGraphNode();
         callSiteStack.push_back(callNode);
         abstractTrace[callNode] = as;
 

package/svf/lib/Graphs/CallGraph.cpp

@@ -143,6 +143,16 @@ void CallGraph::view()
     SVF::ViewGraph(this, "Call Graph");
 }
 
+const CallGraphNode* CallGraph::getCallGraphNode(const std::string& name)
+{
+    for (const auto& item : *this)
+    {
+        if (item.second->getName() == name)
+            return item.second;
+    }
+    return nullptr;
+}
+
 namespace SVF
 {
 

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

@@ -172,7 +172,7 @@ public:
         LLVMFunc2SVFFunc[func] = svfFunc;
         setValueAttr(func,svfFunc);
     }
-    void addFunctionMap(const Function* func, CallGraphNode* svfFunc);
+    void addFunctionMap(const Function* func, CallGraphNode* cgNode);
 
     inline void addBasicBlockMap(const BasicBlock* bb, SVFBasicBlock* svfBB)
     {

package/svf-llvm/lib/LLVMModule.cpp

@@ -169,11 +169,18 @@ void LLVMModuleSet::build()
 
     createSVFDataStructure();
     initSVFFunction();
+
+
     ICFGBuilder icfgbuilder;
     icfg = icfgbuilder.build();
 
     CallGraphBuilder callGraphBuilder;
     callgraph = callGraphBuilder.buildSVFIRCallGraph(svfModule);
+    for (const auto& func : svfModule->getFunctionSet())
+    {
+        SVFFunction* svffunc = const_cast<SVFFunction*>(func);
+        svffunc->setCallGraphNode(callgraph->getCallGraphNode(func));
+    }
 
     for (const auto& it : *callgraph)
     {
@@ -1217,10 +1224,10 @@ void LLVMModuleSet::dumpModulesToFile(const std::string& suffix)
     }
 }
 
-void LLVMModuleSet::addFunctionMap(const SVF::Function* func, SVF::CallGraphNode* svfFunc)
+void LLVMModuleSet::addFunctionMap(const SVF::Function* func, SVF::CallGraphNode* cgNode)
 {
-    LLVMFunc2CallGraphNode[func] = svfFunc;
-    setValueAttr(func,svfFunc);
+    LLVMFunc2CallGraphNode[func] = cgNode;
+    setValueAttr(func, cgNode);
 }
 
 void LLVMModuleSet::setValueAttr(const Value* val, SVFValue* svfvalue)