svf-tools 1.0.1037 → 1.0.1039

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1037",
+  "version": "1.0.1039",
   "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/Graphs/SCC.h

@@ -123,14 +123,30 @@ public:
 
 
     // Return a handle to the stack of nodes in topological
-    // order.  This will be used to seed the initial solution
+    // order. This will be used to seed the initial solution
     // and improve efficiency.
     inline GNodeStack &topoNodeStack()
     {
         return _T;
     }
 
-    const inline  GNODESCCInfoMap &GNodeSCCInfo() const
+    /// Return a handle to the stack of nodes in reverse topological
+    /// order. This will be used to seed the initial solution
+    /// and improve efficiency.
+    inline GNodeStack revTopoNodeStack()
+    {
+        GNodeStack revTopoOrder;
+        GNodeStack topoOrder = topoNodeStack();
+        while(!topoOrder.empty())
+        {
+            NodeID nodeID = topoOrder.top();
+            topoOrder.pop();
+            revTopoOrder.push(nodeID);
+        }
+        return revTopoOrder;
+    }
+
+    const inline GNODESCCInfoMap &GNodeSCCInfo() const
     {
         return _NodeSCCAuxInfo;
     }

package/svf/include/SVFIR/SVFIR.h

@@ -553,10 +553,10 @@ private:
         return addValNode(node);
     }
 
-    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type, bool isUncalled = false)
+    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type)
     {
         ArgValVar* node =
-            new ArgValVar(i, argNo, icfgNode, callGraphNode, type, isUncalled);
+            new ArgValVar(i, argNo, icfgNode, callGraphNode, type);
         return addValNode(node);
     }
 

package/svf/include/SVFIR/SVFValue.h

@@ -292,6 +292,8 @@ public:
     //@}
 };
 
+class ArgValVar;
+
 class SVFFunction : public SVFValue
 {
     friend class LLVMModuleSet;
@@ -316,7 +318,7 @@ private:
     const SVFFunctionType* funcType; /// FunctionType, which is different from the type (PointerType) of this SVFFunction
     SVFLoopAndDomInfo* loopAndDom;  /// the loop and dominate information
     const SVFFunction* realDefFun;  /// the definition of a function across multiple modules
-    std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
+    std::vector<const ArgValVar*> 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
     BasicBlockGraph* bbGraph; /// the basic block graph of this function
@@ -327,7 +329,7 @@ protected:
         callGraphNode = cgn;
     }
 
-    inline void addArgument(SVFArgument* arg)
+    inline void addArgument(const ArgValVar* arg)
     {
         allArgs.push_back(arg);
     }
@@ -417,7 +419,7 @@ public:
     }
 
     u32_t arg_size() const;
-    const SVFArgument* getArg(u32_t idx) const;
+    const ArgValVar* getArg(u32_t idx) const;
     bool isVarArg() const;
 
     inline bool hasBasicBlock() const

package/svf/include/SVFIR/SVFVariables.h

@@ -368,7 +368,6 @@ class ArgValVar: public ValVar
 private:
     const CallGraphNode* cgNode;
     u32_t argNo;
-    bool uncalled;
 
 protected:
     /// Constructor to create function argument (for SVFIRReader/deserialization)
@@ -401,7 +400,7 @@ public:
 
     /// Constructor
     ArgValVar(NodeID i, u32_t argNo, const ICFGNode* icn, const CallGraphNode* callGraphNode,
-              const SVFType* svfType, bool isUncalled = false);
+              const SVFType* svfType);
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
@@ -422,7 +421,7 @@ public:
 
     inline bool isArgOfUncalledFunction() const
     {
-        return uncalled;
+        return getFunction()->isUncalledFunction();
     }
 
     virtual bool isPointer() const;

package/svf/include/WPA/WPAFSSolver.h

@@ -69,31 +69,23 @@ protected:
         /// SCC detection
         this->getSCCDetector()->find();
 
+        assert(nodeStack.empty() && "node stack is not empty, some nodes are not popped properly.");
+
         /// Both rep and sub nodes need to be processed later.
         /// Collect sub nodes from SCCDetector.
-        NodeStack revTopoStack;
-        NodeStack& topoStack = this->getSCCDetector()->topoNodeStack();
-        while (!topoStack.empty())
+        NodeStack revTopoStack = this->getSCCDetector()->revTopoNodeStack();
+        while (!revTopoStack.empty())
         {
-            NodeID nodeId = topoStack.top();
-            topoStack.pop();
+            NodeID nodeId = revTopoStack.top();
+            revTopoStack.pop();
             const NodeBS& subNodes = this->getSCCDetector()->subNodes(nodeId);
             for (NodeBS::iterator it = subNodes.begin(), eit = subNodes.end(); it != eit; ++it)
             {
-                revTopoStack.push(*it);
+                /// restore the topological order.
+                nodeStack.push(*it);
             }
         }
 
-        assert(nodeStack.empty() && "node stack is not empty, some nodes are not popped properly.");
-
-        /// restore the topological order.
-        while (!revTopoStack.empty())
-        {
-            NodeID nodeId = revTopoStack.top();
-            revTopoStack.pop();
-            nodeStack.push(nodeId);
-        }
-
         return nodeStack;
     }
 };

package/svf/lib/MSSA/MemRegion.cpp

@@ -461,12 +461,11 @@ bool MRGenerator::addModSideEffectOfCallSite(const CallICFGNode* cs, const NodeB
  */
 void MRGenerator::getCallGraphSCCRevTopoOrder(WorkList& worklist)
 {
-
-    NodeStack& topoOrder = callGraphSCC->topoNodeStack();
-    while(!topoOrder.empty())
+    NodeStack revTopoNodeStack = callGraphSCC->revTopoNodeStack();
+    while(!revTopoNodeStack.empty())
     {
-        NodeID callgraphNodeID = topoOrder.top();
-        topoOrder.pop();
+        NodeID callgraphNodeID = revTopoNodeStack.top();
+        revTopoNodeStack.pop();
         worklist.push(callgraphNodeID);
     }
 }

package/svf/lib/SVFIR/SVFValue.cpp

@@ -160,8 +160,6 @@ SVFFunction::SVFFunction(const SVFType* ty, const SVFFunctionType* ft,
 
 SVFFunction::~SVFFunction()
 {
-    for(const SVFArgument* arg : allArgs)
-        delete arg;
     delete loopAndDom;
     delete bbGraph;
 }
@@ -171,7 +169,7 @@ u32_t SVFFunction::arg_size() const
     return allArgs.size();
 }
 
-const SVFArgument* SVFFunction::getArg(u32_t idx) const
+const ArgValVar* SVFFunction::getArg(u32_t idx) const
 {
     assert (idx < allArgs.size() && "getArg() out of range!");
     return allArgs[idx];

package/svf/lib/SVFIR/SVFVariables.cpp

@@ -102,9 +102,9 @@ const std::string ObjVar::toString() const
 }
 
 ArgValVar::ArgValVar(NodeID i, u32_t argNo, const ICFGNode* icn,
-                     const SVF::CallGraphNode* callGraphNode, const SVFType* svfType, bool isUncalled)
+                     const SVF::CallGraphNode* callGraphNode, const SVFType* svfType)
     : ValVar(i, svfType, icn, ArgValNode),
-      cgNode(callGraphNode), argNo(argNo), uncalled(isUncalled)
+      cgNode(callGraphNode), argNo(argNo)
 {
 
 }

package/svf/lib/WPA/Andersen.cpp

@@ -709,25 +709,16 @@ inline void Andersen::collapseFields()
  */
 void Andersen::mergeSccCycle()
 {
-    NodeStack revTopoOrder;
-    NodeStack & topoOrder = getSCCDetector()->topoNodeStack();
-    while (!topoOrder.empty())
+    NodeStack revTopoOrder = getSCCDetector()->revTopoNodeStack();
+    while (!revTopoOrder.empty())
     {
-        NodeID repNodeId = topoOrder.top();
-        topoOrder.pop();
-        revTopoOrder.push(repNodeId);
+        NodeID repNodeId = revTopoOrder.top();
+        revTopoOrder.pop();
+
         const NodeBS& subNodes = getSCCDetector()->subNodes(repNodeId);
         // merge sub nodes to rep node
         mergeSccNodes(repNodeId, subNodes);
     }
-
-    // restore the topological order for later solving.
-    while (!revTopoOrder.empty())
-    {
-        NodeID nodeId = revTopoOrder.top();
-        revTopoOrder.pop();
-        topoOrder.push(nodeId);
-    }
 }
 
 

package/svf-llvm/lib/LLVMModule.cpp

@@ -90,6 +90,12 @@ LLVMModuleSet::~LLVMModuleSet()
         delete item.second;
         item.second = nullptr;
     }
+
+    for (auto& item: LLVMArgument2SVFArgument)
+    {
+        delete item.second;
+        item.second = nullptr;
+    }
     delete typeInference;
     typeInference = nullptr;
 }
@@ -294,7 +300,6 @@ void LLVMModuleSet::createSVFFunction(const Function* func)
         if (!arg.hasName())
             svfarg->setName(std::to_string(arg.getArgNo()));
 
-        svfFunc->addArgument(svfarg);
         addArgumentMap(&arg, svfarg);
     }
 

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -228,8 +228,9 @@ void SVFIRBuilder::initialiseNodes()
         {
             pag->addArgValNode(
                 iter->second, argval->getArgNo(), icfgNode,
-                llvmModuleSet()->getCallGraphNode(argval->getParent()),iter->first->getType(),
-                LLVMUtil::isArgOfUncalledFunction(argval));
+                llvmModuleSet()->getCallGraphNode(argval->getParent()),iter->first->getType());
+            if (!argval->hasName())
+                pag->getGNode(iter->second)->setName("arg_" + std::to_string(argval->getArgNo()));
         }
         else if (auto fpValue = SVFUtil::dyn_cast<ConstantFP>(llvmValue))
         {
@@ -403,6 +404,18 @@ void SVFIRBuilder::initialiseNodes()
     assert(pag->getTotalNodeNum() >= pag->getTotalSymNum()
            && "not all node have been initialized!!!");
 
+    /// add argvalvar for svffunctions
+    for (auto& fun: svfModule->getFunctionSet())
+    {
+        const Function* llvmFun = SVFUtil::cast<Function>(llvmModuleSet()->getLLVMValue(fun));
+        for (const Argument& arg : llvmFun->args())
+        {
+            const_cast<SVFFunction *>(fun)->addArgument(
+                SVFUtil::cast<ArgValVar>(
+                    pag->getGNode(llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFArgument(&arg)))));
+        }
+    }
+
 }
 
 /*

package/svf-llvm/lib/SVFIRExtAPI.cpp

@@ -272,12 +272,12 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
             assert((forkedFun->arg_size() <= 2) && "Size of formal parameter of start routine should be one");
             if (forkedFun->arg_size() <= 2 && forkedFun->arg_size() >= 1)
             {
-                const SVFArgument* formalParm = forkedFun->getArg(0);
+                const ArgValVar* formalParm = forkedFun->getArg(0);
                 /// Connect actual parameter to formal parameter of the start routine
                 if (actualParm->isPointer() && formalParm->getType()->isPointerTy())
                 {
                     FunEntryICFGNode *entry = pag->getICFG()->getFunEntryICFGNode(forkedFun);
-                    addThreadForkEdge(actualParm->getId(), llvmModuleSet()->getValueNode(formalParm), callICFGNode, entry);
+                    addThreadForkEdge(actualParm->getId(), formalParm->getId(), callICFGNode, entry);
                 }
             }
         }