svf-tools 1.0.336 → 1.0.340

package/include/Graphs/ICFG.h

@@ -46,6 +46,8 @@ typedef GenericGraph<ICFGNode,ICFGEdge> GenericICFGTy;
 class ICFG : public GenericICFGTy
 {
 
+friend class ICFGBuilder;
+
 public:
 
     typedef Map<NodeID, ICFGNode *> ICFGNodeIDToNodeMapTy;
@@ -109,7 +111,7 @@ public:
     /// update ICFG for indirect calls
     void updateCallGraph(PTACallGraph* callgraph);
 
-public:
+protected:
     /// Remove a SVFG edge
     inline void removeICFGEdge(ICFGEdge* edge)
     {
@@ -157,6 +159,7 @@ public:
         addGNode(node->getId(),node);
     }
 
+public:
     /// Get a basic block ICFGNode
     /// TODO:: need to fix the assertions
     //@{
@@ -172,11 +175,10 @@ public:
 
     FunExitBlockNode* getFunExitBlockNode(const SVFFunction*  fun);
 
-    GlobalBlockNode* getGlobalBlockNode() const
+    inline GlobalBlockNode* getGlobalBlockNode() const
     {
         return globalBlockNode;
     }
-    
     //@}
 
 private:

package/include/MemoryModel/PointerAnalysis.h

@@ -293,9 +293,6 @@ protected:
     virtual void validateExpectedFailureTests(std::string fun);
     //@}
 
-    /// Whether to dump the graph for debugging purpose
-    bool dumpGraph();
-
     /// Reset all object node as field-sensitive.
     void resetObjFieldSensitive();
 

package/include/MemoryModel/SVFStatements.h

@@ -753,6 +753,11 @@ public:
     void addOpVar(SVFVar* op){
         opVars.push_back(op);
     }
+
+    /// Return true if this is a phi at the function exit 
+    /// to receive one or multiple return values of this function
+    bool isFunctionRetPhi() const;
+
     virtual const std::string toString() const override;
 };
 

package/include/MemoryModel/SVFVariables.h

@@ -285,12 +285,16 @@ public:
     {
         return node->getNodeKind() == SVFVar::ValNode ||
                node->getNodeKind() == SVFVar::GepValNode ||
+               node->getNodeKind() == SVFVar::RetNode ||
+               node->getNodeKind() == SVFVar::VarargNode ||
                node->getNodeKind() == SVFVar::DummyValNode;
     }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::ValNode ||
                node->getNodeKind() == SVFVar::GepValNode ||
+               node->getNodeKind() == SVFVar::RetNode ||
+               node->getNodeKind() == SVFVar::VarargNode ||
                node->getNodeKind() == SVFVar::DummyValNode;
     }
     //@}
@@ -578,7 +582,7 @@ public:
 /*
  * Unique Return node of a procedure
  */
-class RetPN: public SVFVar
+class RetPN: public ValVar
 {
 
 public:
@@ -592,6 +596,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::RetNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::RetNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::RetNode;
@@ -600,7 +608,7 @@ public:
 
     /// Constructor
     RetPN(const SVFFunction* val, NodeID i) :
-        SVFVar(val->getLLVMFun(), i, RetNode)
+        ValVar(val->getLLVMFun(), i, RetNode)
     {
     }
 
@@ -617,7 +625,7 @@ public:
 /*
  * Unique vararg node of a procedure
  */
-class VarArgPN: public SVFVar
+class VarArgPN: public ValVar
 {
 
 public:
@@ -631,6 +639,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::VarargNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::VarargNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::VarargNode;
@@ -639,7 +651,7 @@ public:
 
     /// Constructor
     VarArgPN(const SVFFunction* val, NodeID i) :
-        SVFVar(val->getLLVMFun(), i, VarargNode)
+        ValVar(val->getLLVMFun(), i, VarargNode)
     {
     }
 
@@ -672,6 +684,10 @@ public:
     {
         return node->getNodeKind() == SVFVar::DummyValNode;
     }
+    static inline bool classof(const ValVar *node)
+    {
+        return node->getNodeKind() == SVFVar::DummyValNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::DummyValNode;
@@ -712,6 +728,11 @@ public:
         return node->getNodeKind() == SVFVar::DummyObjNode
                || node->getNodeKind() == SVFVar::CloneDummyObjNode;
     }
+    static inline bool classof(const ObjVar *node)
+    {
+        return node->getNodeKind() == SVFVar::DummyObjNode
+               || node->getNodeKind() == SVFVar::CloneDummyObjNode;
+    }
     static inline bool classof(const GenericPAGNodeTy *node)
     {
         return node->getNodeKind() == SVFVar::DummyObjNode

package/include/MemoryModel/SymbolTableInfo.h

@@ -53,10 +53,10 @@ public:
     /// Symbol types
     enum SYMTYPE
     {
+        NullPtr,
+        BlkPtr,
         BlackHole,
         ConstantObj,
-        BlkPtr,
-        NullPtr,
         ValSymbol,
         ObjSymbol,
         RetSymbol,

package/lib/Graphs/ICFG.cpp

@@ -472,7 +472,7 @@ struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>
         if (IntraBlockNode* bNode = SVFUtil::dyn_cast<IntraBlockNode>(node))
         {
             rawstr << "IntraBlockNode ID: " << bNode->getId() << " \t";
-            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getPTASVFStmtList(bNode);
+            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getSVFStmtList(bNode);
             if (edges.empty()) {
                 rawstr << value2String(bNode->getInst()) << " \t";
             } else {
@@ -502,7 +502,7 @@ struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>
         }
         else if (GlobalBlockNode* glob  = SVFUtil::dyn_cast<GlobalBlockNode>(node) )
         {
-            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getPTASVFStmtList(glob);
+            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getSVFStmtList(glob);
             for (SVFIR::SVFStmtList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
             {
                 const PAGEdge* edge = *it;

package/lib/MSSA/MemSSA.cpp

@@ -67,7 +67,7 @@ MemSSA::MemSSA(BVDataPTAImpl* p, bool ptrOnlyMSSA) : df(nullptr),dt(nullptr)
     double mrStart = stat->getClk(true);
     mrGen->generateMRs();
     double mrEnd = stat->getClk(true);
-    timeOfGeneratingMemRegions += (mrEnd - mrStart)/TIMEINTERVAL;
+    timeOfGeneratingMemRegions = (mrEnd - mrStart)/TIMEINTERVAL;
 }
 
 SVFIR* MemSSA::getPAG()

package/lib/MemoryModel/PointerAnalysis.cpp

@@ -129,18 +129,6 @@ void PointerAnalysis::initialize()
 
     svfMod = pag->getModule();
 
-    // dump SVFIR
-    if (dumpGraph())
-        pag->dump("pag_initial");
-
-    // dump ICFG
-    if (Options::DumpICFG)
-    	pag->getICFG()->dump("icfg_initial");
-
-    // print to command line of the SVFIR graph
-    if (Options::PAGPrint)
-        pag->print();
-
     /// initialise pta call graph for every pointer analysis instance
     if(Options::EnableThreadCallGraph)
     {
@@ -192,14 +180,6 @@ void PointerAnalysis::resetObjFieldSensitive()
     }
 }
 
-/*!
- * Flag in order to dump graph
- */
-bool PointerAnalysis::dumpGraph()
-{
-    return Options::PAGDotGraph;
-}
-
 /*
  * Dump statistics
  */
@@ -225,7 +205,7 @@ void PointerAnalysis::finalize()
 
     SVFIR* pag = SVFIR::getPAG();
     // dump SVFIR
-    if (dumpGraph())
+    if (Options::PAGDotGraph)
         pag->dump("pag_final");
 
     // dump ICFG

package/lib/MemoryModel/SVFStatements.cpp

@@ -90,7 +90,10 @@ const std::string CopyStmt::toString() const{
 const std::string PhiStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "PhiStmt: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
+    rawstr << "PhiStmt: [" << getResID() << "<--(";
+    for(const SVFVar* op : getOpndVars())
+        rawstr << op->getId() << ",";
+    rawstr << ")]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -263,6 +266,12 @@ NodeID UnaryOPStmt::getResID() const{
     return getRes()->getId();
 }
 
+/// Return true if this is a phi at the function exit 
+/// to receive one or multiple return values of this function
+bool PhiStmt::isFunctionRetPhi() const{
+    return SVFUtil::isa<RetPN>(getRes());
+}
+
 
 /// The branch is unconditional if cond is a null value
 bool BranchStmt::isUnconditional() const {

package/lib/SVF-FE/ICFGBuilder.cpp

@@ -185,7 +185,9 @@ void ICFGBuilder::addICFGInterEdges(const Instruction* cs, const SVFFunction* ca
         icfg->addRetEdge(calleeExitNode, retBlockNode, cs);
     }
 }
-
+/*
+* Add the global initialization statements immediately after the function entry of main
+*/
 void ICFGBuilder::connectGlobalToProgEntry(SVFModule* svfModule)
 {
     const SVFFunction* mainFunc = SVFUtil::getProgEntryFunction(svfModule);
@@ -196,7 +198,19 @@ void ICFGBuilder::connectGlobalToProgEntry(SVFModule* svfModule)
 
     FunEntryBlockNode* entryNode = icfg->getFunEntryBlockNode(mainFunc);
     GlobalBlockNode* globalNode = icfg->getGlobalBlockNode();
-    IntraCFGEdge* intraEdge = new IntraCFGEdge(globalNode, entryNode);
+
+    std::vector<ICFGEdge*> toBeRemovedEdges;
+    for(ICFGEdge* edge : entryNode->getOutEdges())
+        toBeRemovedEdges.push_back(edge);
+    
+    for(ICFGEdge* edge : toBeRemovedEdges){
+        assert(SVFUtil::isa<IntraCFGEdge>(edge) && "the outgoing edge of FunEntryBlockNode is not an intraCFGEdge?");
+        icfg->removeICFGEdge(edge);
+        IntraCFGEdge* intraEdge = new IntraCFGEdge(globalNode, edge->getDstNode());
+        icfg->addICFGEdge(intraEdge); 
+    }
+
+    IntraCFGEdge* intraEdge = new IntraCFGEdge(entryNode, globalNode);
     icfg->addICFGEdge(intraEdge);
 }
 

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -34,6 +34,7 @@
 #include "SVF-FE/CPPUtil.h"
 #include "Util/BasicTypes.h"
 #include "MemoryModel/PAGBuilderFromFile.h"
+#include "Util/Options.h"
 
 using namespace std;
 using namespace SVF;
@@ -119,6 +120,18 @@ SVFIR* SVFIRBuilder::build(SVFModule* svfModule)
 
     pag->setNodeNumAfterPAGBuild(pag->getTotalNodeNum());
 
+    // dump SVFIR
+    if (Options::PAGDotGraph)
+        pag->dump("svfir_initial");
+
+    // print to command line of the SVFIR graph
+    if (Options::PAGPrint)
+        pag->print();
+
+    // dump ICFG
+    if (Options::DumpICFG)
+    	pag->getICFG()->dump("icfg_initial");
+
     return pag;
 }
 

package/lib/SVF-FE/SymbolTableBuilder.cpp

@@ -52,20 +52,20 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
 
     StInfo::setMaxFieldLimit(Options::MaxFieldLimit);
 
-    // Object #0 is black hole the object that may point to any object
+    // Pointer #0 always represents the null pointer.
+    assert(symInfo->totalSymNum++ == SymbolTableInfo::NullPtr && "Something changed!");
+
+    // Pointer #1 always represents the pointer points-to black hole.
+    assert(symInfo->totalSymNum++ == SymbolTableInfo::BlkPtr && "Something changed!");
+
+    // Object #2 is black hole the object that may point to any object
     assert(symInfo->totalSymNum++ == SymbolTableInfo::BlackHole && "Something changed!");
     symInfo->createBlkObj(SymbolTableInfo::BlackHole);
 
-    // Object #1 always represents the constant
+    // Object #3 always represents the unique constant of a program (merging all constants if Options::ModelConsts is disabled)
     assert(symInfo->totalSymNum++ == SymbolTableInfo::ConstantObj && "Something changed!");
     symInfo->createConstantObj(SymbolTableInfo::ConstantObj);
 
-    // Pointer #2 always represents the pointer points-to black hole.
-    assert(symInfo->totalSymNum++ == SymbolTableInfo::BlkPtr && "Something changed!");
-
-    // Pointer #3 always represents the null pointer.
-    assert(symInfo->totalSymNum++ == SymbolTableInfo::NullPtr && "Something changed!");
-
     // Add symbols for all the globals .
     for (SVFModule::global_iterator I = svfModule->global_begin(), E =
                 svfModule->global_end(); I != E; ++I)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.336",
+  "version": "1.0.340",
   "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": {