svf-tools 1.0.362 → 1.0.366

package/lib/Graphs/ConsG.cpp

@@ -74,6 +74,15 @@ void ConstraintGraph::buildCG()
             addCopyCGEdge(opVar->getId(),edge->getResID());
     }
 
+    SVFStmt::SVFStmtSetTy& selects = getPAGEdgeSet(SVFStmt::Select);
+    for (SVFStmt::SVFStmtSetTy::iterator iter = selects.begin(), eiter =
+                selects.end(); iter != eiter; ++iter)
+    {
+        const SelectStmt* edge = SVFUtil::cast<SelectStmt>(*iter);
+        for(const auto opVar : edge->getOpndVars())
+            addCopyCGEdge(opVar->getId(),edge->getResID());
+    }
+
     SVFStmt::SVFStmtSetTy& calls = getPAGEdgeSet(SVFStmt::Call);
     for (SVFStmt::SVFStmtSetTy::iterator iter = calls.begin(), eiter =
                 calls.end(); iter != eiter; ++iter)

package/lib/Graphs/ICFG.cpp

@@ -436,25 +436,20 @@ void ICFG::updateCallGraph(PTACallGraph* callgraph)
         for (PTACallGraph::FunctionSet::const_iterator func_iter = functions.begin(); func_iter != functions.end(); func_iter++)
         {
             const SVFFunction*  callee = *func_iter;
-            CallICFGNode* callICFGNode = getCallICFGNode(cs);
+            CallICFGNode* callBlockNode = getCallICFGNode(cs);
             RetICFGNode* retBlockNode = getRetICFGNode(cs);
-            /// if this is an external function (no function body or specified in ExAPI.cpp)
+            FunEntryICFGNode* calleeEntryNode = getFunEntryBlock(callee);
+            FunExitICFGNode* calleeExitNode = getFunExitBlock(callee);
+            addCallEdge(callBlockNode, calleeEntryNode, cs);
+            addRetEdge(calleeExitNode, retBlockNode, cs);
+
+            /// if this is an external function (no function body), connect calleeEntryNode to calleeExitNode
             if (isExtCall(callee))
-            {
-                addIntraEdge(callICFGNode, retBlockNode); 
-            }
-            /// otherwise connect interprocedural edges 
-            else
-            {
-                FunEntryICFGNode* calleeEntryNode = getFunEntryICFGNode(callee);
-                FunExitICFGNode* calleeExitNode = getFunExitICFGNode(callee);
-                addCallEdge(callICFGNode, calleeEntryNode, cs);
-                addRetEdge(calleeExitNode, retBlockNode, cs);
-
-                /// Remove callBlockNode to retBlockNode intraICFGEdge since we found at least one inter procedural edge
-                if(ICFGEdge* edge = hasIntraICFGEdge(callICFGNode,retBlockNode, ICFGEdge::IntraCF))
-                    removeICFGEdge(edge);
-            }
+                addIntraEdge(calleeEntryNode, calleeExitNode); 
+
+            /// Remove callBlockNode to retBlockNode intraICFGEdge since we found at least one inter procedural edge
+            if(ICFGEdge* edge = hasIntraICFGEdge(callBlockNode,retBlockNode, ICFGEdge::IntraCF))
+                removeICFGEdge(edge);
         }
     }
     // dump ICFG

package/lib/Graphs/VFG.cpp

@@ -489,6 +489,15 @@ void VFG::addVFGNodes()
         if(isInterestedPAGNode(edge->getRes()))
             addIntraPHIVFGNode(edge);
     }
+    // initialize select statement
+    SVFStmt::SVFStmtSetTy& selects = getPAGEdgeSet(SVFStmt::Select);
+    for (SVFStmt::SVFStmtSetTy::iterator iter = selects.begin(), eiter =
+                selects.end(); iter != eiter; ++iter)
+    {
+        const MultiOpndStmt* edge = SVFUtil::cast<MultiOpndStmt>(*iter);
+        if(isInterestedPAGNode(edge->getRes()))
+            addIntraPHIVFGNode(edge);
+    }
     // initialize llvm binary nodes (binary operators)
     SVFStmt::SVFStmtSetTy& binaryops = getPAGEdgeSet(SVFStmt::BinaryOp);
     for (SVFStmt::SVFStmtSetTy::iterator iter = binaryops.begin(), eiter =

package/lib/MemoryModel/PAGBuilderFromFile.cpp

@@ -183,7 +183,9 @@ void PAGBuilderFromFile::addEdge(NodeID srcID, NodeID dstID,
     else if (edge == "unary-op")
         pag->addUnaryOPStmt(srcID, dstID, dstID);
     else if (edge == "phi")
-        pag->addPhiStmt(srcID, dstID);
+        assert(false && "fix phi here!");
+    else if (edge == "select")
+        assert(false && "fix select here!");
     else if (edge == "branch"){
         assert(false && "fix successors here!");
         //pag->addBranchStmt(srcID, dstID, nullptr);

package/lib/MemoryModel/PointerAnalysis.cpp

@@ -204,9 +204,6 @@ void PointerAnalysis::finalize()
     dumpStat();
 
     SVFIR* pag = SVFIR::getPAG();
-    // dump SVFIR
-    if (Options::PAGDotGraph)
-        pag->dump("pag_final");
 
     /// Dump results
     if (Options::PTSPrint)

package/lib/MemoryModel/SVFIR.cpp

@@ -84,24 +84,45 @@ CopyStmt* SVFIR::addCopyStmt(NodeID src, NodeID dst)
 /*!
  * Add Phi statement 
  */
-PhiStmt* SVFIR::addPhiStmt(NodeID res, NodeID opnd)
+PhiStmt* SVFIR::addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
 {
     SVFVar* opNode = getGNode(opnd);
     SVFVar* resNode = getGNode(res);
     PHINodeMap::iterator it = phiNodeMap.find(resNode);
     if(it == phiNodeMap.end()){
-        PhiStmt* phi = new PhiStmt(resNode, {opNode});
+        PhiStmt* phi = new PhiStmt(resNode, {opNode}, {pred});
         addToStmt2TypeMap(phi);
         addEdge(opNode, resNode, phi);
         phiNodeMap[resNode] = phi;
         return phi;
     }
     else{
-        it->second->addOpVar(opNode);
+        it->second->addOpVar(opNode,pred);
         return it->second;
     }
 }
 
+/*!
+ * Add Phi statement 
+ */
+SelectStmt* SVFIR::addSelectStmt(NodeID res, NodeID op1, NodeID op2, NodeID cond)
+{
+    SVFVar* op1Node = getGNode(op1);
+    SVFVar* op2Node = getGNode(op2);
+    SVFVar* dstNode = getGNode(res);
+    SVFVar* condNode = getGNode(cond);
+    if(SVFStmt* edge = hasLabeledEdge(op1Node, dstNode, SVFStmt::Select, op2Node))
+        return SVFUtil::cast<SelectStmt>(edge);
+    else
+    {
+        std::vector<SVFVar*> opnds = {op1Node, op2Node};
+        SelectStmt* select = new SelectStmt(dstNode, opnds, condNode);
+        addToStmt2TypeMap(select);
+        addEdge(op1Node, dstNode, select);
+        return select;
+    }
+}
+
 /*!
  * Add Compare edge
  */

package/lib/MemoryModel/SVFStatements.cpp

@@ -101,6 +101,20 @@ const std::string PhiStmt::toString() const{
     return rawstr.str();
 }
 
+const std::string SelectStmt::toString() const{
+    std::string str;
+    raw_string_ostream rawstr(str);
+    rawstr << "SelectStmt: (Condition Var" <<  getCondition()->getId() << ") [Var" << getResID() << " <-- (Var";
+    for(const SVFVar* op : getOpndVars())
+        rawstr << op->getId() << ",";
+    rawstr << ")]\t";
+    if (Options::ShowSVFIRValue) {
+        rawstr << "\n";
+        rawstr << value2String(getValue());
+    }
+    return rawstr.str();
+}
+
 const std::string CmpStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -369,11 +369,11 @@ void SVFIRBuilder::processCE(const Value *val)
             const Value* cval = getCurrentValue();
             const BasicBlock* cbb = getCurrentBB();
             setCurrentLocation(selectce, nullptr);
+            NodeID cond = pag->getValueNode(selectce->getOperand(0));
             NodeID nsrc1 = pag->getValueNode(src1);
             NodeID nsrc2 = pag->getValueNode(src2);
             NodeID nres = pag->getValueNode(selectce);
-            addPhiStmt(nres,nsrc1);
-            addPhiStmt(nres,nsrc2);
+            addSelectStmt(nres,nsrc1, nsrc2, cond);
             setCurrentLocation(cval, cbb);
         }
         // if we meet a int2ptr, then it points-to black hole
@@ -629,9 +629,10 @@ void SVFIRBuilder::visitPHINode(PHINode &inst)
         const Value* val = inst.getIncomingValue(i);
         const Instruction* incomingInst = SVFUtil::dyn_cast<Instruction>(val);
         assert((incomingInst==nullptr) || (incomingInst->getFunction() == inst.getFunction()));
-
+        const Instruction* predInst = &inst.getIncomingBlock(i)->front();
+        const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(predInst);
         NodeID src = getValueNode(val);
-        addPhiStmt(dst,src);
+        addPhiStmt(dst,src,icfgNode);
     }
 }
 
@@ -772,10 +773,9 @@ void SVFIRBuilder::visitSelectInst(SelectInst &inst)
     NodeID dst = getValueNode(&inst);
     NodeID src1 = getValueNode(inst.getTrueValue());
     NodeID src2 = getValueNode(inst.getFalseValue());
-
+    NodeID cond = getValueNode(inst.getCondition());
     /// Two operands have same incoming basic block, both are the current BB
-    addPhiStmt(dst,src1);
-    addPhiStmt(dst,src2);
+    addSelectStmt(dst,src1,src2, cond);
 }
 
 /*
@@ -841,8 +841,9 @@ void SVFIRBuilder::visitReturnInst(ReturnInst &inst)
 
         NodeID rnF = getReturnNode(F);
         NodeID vnS = getValueNode(src);
+        const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(&inst);
         //vnS may be null if src is a null ptr
-        addPhiStmt(rnF,vnS);
+        addPhiStmt(rnF,vnS,icfgNode);
     }
 }
 
@@ -892,7 +893,7 @@ void SVFIRBuilder::visitBranchInst(BranchInst &inst){
     BranchStmt::SuccAndCondPairVec successors;
     for (u32_t i = 0; i < inst.getNumSuccessors(); ++i)
     {
-        const Instruction* succInst = &inst.getSuccessor(i)->front();
+        const Instruction* succInst = &inst.getSuccessor(i)->back();
         const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(succInst);
         successors.push_back(std::make_pair(icfgNode, 1-i));
     }
@@ -1635,12 +1636,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(const ReturnInst* retInst = SVFUtil::dyn_cast<ReturnInst>(curVal)){
+        if(const ReturnInst* retInst = SVFUtil::dyn_cast<ReturnInst>(curInst)){
             const SVFFunction *fun = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(retInst->getParent()->getParent());
             icfgNode = pag->getICFG()->getFunExitICFGNode(fun);
         }
-        else
-            icfgNode = pag->getICFG()->getICFGNode(curInst);
+        else{
+            if(SVFUtil::isa<RetPE>(edge))
+                icfgNode = pag->getICFG()->getRetICFGNode(curInst);
+            else
+                icfgNode = pag->getICFG()->getICFGNode(curInst);
+        }
     }
     else if (const Argument* arg = SVFUtil::dyn_cast<Argument>(curVal))
     {
@@ -1656,12 +1661,20 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
     		icfgNode = pag->getICFG()->getICFGNode(&curBB->front());
     }
     else if (SVFUtil::isa<GlobalVariable>(curVal) ||
-             SVFUtil::isa<Function>(curVal) ||
              SVFUtil::isa<Constant>(curVal) ||
 			 SVFUtil::isa<MetadataAsValue>(curVal))
     {
         pag->addGlobalPAGEdge(edge);
     }
+    else if(const Function* fun = SVFUtil::dyn_cast<Function>(curVal)){
+        const SVFFunction* f = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(fun);
+        if((&fun->getEntryBlock() == curBB) && isExtCall(f)){
+            /// all external function connected to a indirect call, we will put SVFStmts in the FunctionEntryICFGNode
+            icfgNode = pag->getICFG()->getFunEntryICFGNode(f);
+        }
+        else
+            pag->addGlobalPAGEdge(edge);
+    }
     else
     {
         assert(false && "what else value can we have?");
@@ -1693,3 +1706,32 @@ u32_t SVFIRBuilder::getFields(std::vector<LocationSet>& fields, const Type* T, u
 
     return sz;
 }
+
+
+void SVFIRBuilder::updateCallGraph(PTACallGraph* callgraph){
+    PTACallGraph::CallEdgeMap::const_iterator iter = callgraph->getIndCallMap().begin();
+    PTACallGraph::CallEdgeMap::const_iterator eiter = callgraph->getIndCallMap().end();
+    for (; iter != eiter; iter++)
+    {
+        const CallICFGNode* callBlock = iter->first;
+        CallSite cs = getLLVMCallSite(callBlock->getCallSite());
+        assert(callBlock->isIndirectCall() && "this is not an indirect call?");
+        const PTACallGraph::FunctionSet & functions = iter->second;
+        for (PTACallGraph::FunctionSet::const_iterator func_iter = functions.begin(); func_iter != functions.end(); func_iter++)
+        {
+            const SVFFunction*  callee = *func_iter;
+            if (isExtCall(callee)){
+                setCurrentLocation(callee->getLLVMFun(), &callee->getLLVMFun()->getEntryBlock());
+                handleExtCall(cs, callee);
+            }
+            else{
+                setCurrentLocation(callBlock->getCallSite(), callBlock->getCallSite()->getParent());
+                handleDirectCall(cs, callee);
+            }
+        }
+    }
+
+    // dump SVFIR
+    if (Options::PAGDotGraph)
+        pag->dump("svfir_final");
+}

package/lib/SVF-FE/SymbolTableBuilder.cpp

@@ -130,6 +130,7 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
             {
                 collectSym(sel->getTrueValue());
                 collectSym(sel->getFalseValue());
+                collectSym(sel->getCondition());
             }
             else if (const BinaryOperator *binary = SVFUtil::dyn_cast<BinaryOperator>(inst))
             {

package/package.json

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