svf-tools 1.0.368 → 1.0.372

package/include/SVF-FE/SVFIRBuilder.h

@@ -309,7 +309,9 @@ public:
     inline PhiStmt* addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
     {
         PhiStmt *edge = pag->addPhiStmt(res,opnd,pred);
-        setCurrentBBAndValueForPAGEdge(edge);
+        /// If we already added this phi node, then skip this adding
+        if(edge)
+            setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add SelectStmt

package/include/Util/ExtAPI.h

@@ -139,7 +139,7 @@ public:
             funName = "llvm." + F->getName().split('.').second.split('.').first.str();
         }
         llvm::StringMap<extf_t>::const_iterator it= info.find(funName);
-        if(it == info.end() || !F->isDeclaration())
+        if(it == info.end())
             return EFT_OTHER;
         else
             return it->second;

package/lib/Graphs/ICFG.cpp

@@ -149,10 +149,10 @@ const std::string ICFGEdge::toString() const {
 const std::string IntraCFGEdge::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    if(brCondition.first == nullptr)
+    if(getCondition() == nullptr)
         rawstr << "IntraCFGEdge: [ICFGNode" << getDstID() << " <-- ICFGNode" << getSrcID() << "]\t";
     else
-        rawstr << "IntraCFGEdge: [ICFGNode" << getDstID() << " <-- ICFGNode" << getSrcID() << "] with condition (" << *brCondition.first << "==" << brCondition.second << ") \t";
+        rawstr << "IntraCFGEdge: [ICFGNode" << getDstID() << " <-- ICFGNode" << getSrcID() << "] (branchCondition:" << *getCondition() << ") (succCondValue: " << getSuccessorCondValue() << ") \t";
 
     return rawstr.str();
 }
@@ -352,7 +352,7 @@ ICFGEdge* ICFG::addIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode)
 /*!
  * Add conditional intraprocedural edges between two nodes
  */
-ICFGEdge* ICFG::addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, NodeID branchID){
+ICFGEdge* ICFG::addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s64_t branchCondVal){
 
     checkIntraEdgeParents(srcNode, dstNode);
     if(ICFGEdge* edge = hasIntraICFGEdge(srcNode,dstNode, ICFGEdge::IntraCF))
@@ -363,7 +363,7 @@ ICFGEdge* ICFG::addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, co
     else
     {
         IntraCFGEdge* intraEdge = new IntraCFGEdge(srcNode,dstNode);
-        intraEdge->setBranchCondtion(condition,branchID);
+        intraEdge->setBranchCondition(condition,branchCondVal);
         return (addICFGEdge(intraEdge) ? intraEdge : nullptr);
     }
 }
@@ -440,9 +440,24 @@ void ICFG::updateCallGraph(PTACallGraph* callgraph)
             RetICFGNode* retBlockNode = getRetICFGNode(cs);
             FunEntryICFGNode* calleeEntryNode = getFunEntryBlock(callee);
             FunExitICFGNode* calleeExitNode = getFunExitBlock(callee);
-            addCallEdge(callBlockNode, calleeEntryNode, cs);
-            addRetEdge(calleeExitNode, retBlockNode, cs);
-
+            if(ICFGEdge* callEdge = addCallEdge(callBlockNode, calleeEntryNode, cs)){
+                for (const SVFStmt *stmt : callBlockNode->getSVFStmts())
+                {
+                    if(const CallPE *callPE = SVFUtil::dyn_cast<CallPE>(stmt)){
+                        if(callPE->getFunEntryICFGNode() == calleeEntryNode)
+                            SVFUtil::cast<CallCFGEdge>(callEdge)->addCallPE(callPE);
+                    }
+                }
+            }
+            if(ICFGEdge* retEdge = addRetEdge(calleeExitNode, retBlockNode, cs)){
+                for (const SVFStmt *stmt : retBlockNode->getSVFStmts())
+                {
+                    if(const RetPE *retPE = SVFUtil::dyn_cast<RetPE>(stmt)){
+                        if(retPE->getFunExitICFGNode() == calleeExitNode)
+                            SVFUtil::cast<RetCFGEdge>(retEdge)->addRetPE(retPE);
+                    }
+                }
+            }
             /// if this is an external function (no function body), connect calleeEntryNode to calleeExitNode
             if (isExtCall(callee))
                 addIntraEdge(calleeEntryNode, calleeExitNode); 

package/lib/MemoryModel/SVFIR.cpp

@@ -98,7 +98,8 @@ PhiStmt* SVFIR::addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
     }
     else{
         it->second->addOpVar(opNode,pred);
-        return it->second;
+        /// return null if we already added this PhiStmt
+        return nullptr;
     }
 }
 

package/lib/MemoryModel/SVFStatements.cpp

@@ -90,9 +90,9 @@ const std::string CopyStmt::toString() const{
 const std::string PhiStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "PhiStmt: [Var" << getResID() << " <-- (Var";
-    for(const SVFVar* op : getOpndVars())
-        rawstr << op->getId() << ",";
+    rawstr << "PhiStmt: [Var" << getResID() << " <-- (";
+    for(u32_t i = 0; i < getOpVarNum(); i++)
+        rawstr << "[Var" << getOpVar(i)->getId() << ", ICFGNode" << getOpICFGNode(i)->getId() <<  "],";
     rawstr << ")]\t";
     if (Options::ShowSVFIRValue) {
         rawstr << "\n";
@@ -152,12 +152,12 @@ const std::string BranchStmt::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     if(isConditional())
-        rawstr << "BranchStmt: [Condition Var" <<  getCondition()->getId() << "]\t";
+        rawstr << "BranchStmt: [Condition Var" <<  getCondition()->getId() << "]\n";
     else
-        rawstr << "BranchStmt: [" <<  " Unconditional branch" << "]\t";
+        rawstr << "BranchStmt: [" <<  " Unconditional branch" << "]\n";
 
     for(u32_t i = 0; i < getNumSuccessors(); i++)
-        rawstr << "Successor " << i << " ICFGNode" << getSuccessor(i)->getId() << "\n";
+        rawstr << "Successor " << i << " ICFGNode" << getSuccessor(i)->getId() << "   ";
 
     if (Options::ShowSVFIRValue) {
         rawstr << "\n";

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -632,7 +632,7 @@ bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
                     return false;
             }
         }
-        assert(hasIntersection && "cannot find field of specified offset");
+        //assert(hasIntersection && "cannot find field of specified offset");
         return true;
     }
     else

package/lib/SVF-FE/ICFGBuilder.cpp

@@ -97,7 +97,7 @@ void ICFGBuilder::processFunBody(WorkList& worklist)
             }
             InstVec nextInsts;
             getNextInsts(inst, nextInsts);
-            NodeID branchID = 0;
+            u32_t branchID = 0;
             for (InstVec::const_iterator nit = nextInsts.begin(), enit =
                         nextInsts.end(); nit != enit; ++nit)
             {
@@ -112,14 +112,19 @@ void ICFGBuilder::processFunBody(WorkList& worklist)
                 
                 if (const BranchInst* br = SVFUtil::dyn_cast<BranchInst>(inst))
                 {
+                    assert(branchID <= 2 && "if/else has more than two branches?");
                     if(br->isConditional())
-                        icfg->addConditionalIntraEdge(srcNode, dstNode, br->getCondition(), branchID);
+                        icfg->addConditionalIntraEdge(srcNode, dstNode, br->getCondition(), 1 - branchID);
                     else 
                         icfg->addIntraEdge(srcNode, dstNode);
                 }
                 else if (const SwitchInst* si = SVFUtil::dyn_cast<SwitchInst>(inst))
                 {
-                    icfg->addConditionalIntraEdge(srcNode, dstNode, si->getCondition(),branchID);
+                    /// branch condition value
+                    const ConstantInt* condVal = const_cast<SwitchInst*>(si)->findCaseDest(const_cast<BasicBlock*>(succ->getParent()));
+                    /// default case is set to -1;
+                    s64_t val = condVal ? condVal->getSExtValue() : -1;
+                    icfg->addConditionalIntraEdge(srcNode, dstNode, si->getCondition(),val);
                 }
                 else
                     icfg->addIntraEdge(srcNode, dstNode);

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -74,7 +74,7 @@ SVFIR* SVFIRBuilder::build(SVFModule* svfModule)
     {
         const SVFFunction& fun = **fit;
         /// collect return node of function fun
-        if(!SVFUtil::isExtCall(&fun))
+        if(!fun.isDeclaration())
         {
             /// Return SVFIR node will not be created for function which can not
             /// reach the return instruction due to call to abort(), exit(),
@@ -629,7 +629,7 @@ 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 Instruction* predInst = &inst.getIncomingBlock(i)->back();
         const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(predInst);
         NodeID src = getValueNode(val);
         addPhiStmt(dst,src,icfgNode);
@@ -893,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)->back();
+        const Instruction* succInst = &inst.getSuccessor(i)->front();
         const ICFGNode* icfgNode = pag->getICFG()->getICFGNode(succInst);
         successors.push_back(std::make_pair(icfgNode, 1-i));
     }
@@ -1687,6 +1687,18 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
 
     pag->addToSVFStmtList(icfgNode,edge);
     icfgNode->addSVFStmt(edge);
+    if(const CallPE* callPE = SVFUtil::dyn_cast<CallPE>(edge)){
+        CallICFGNode* callNode = const_cast<CallICFGNode*>(callPE->getCallSite());
+        FunEntryICFGNode* entryNode = const_cast<FunEntryICFGNode*>(callPE->getFunEntryICFGNode());
+        if(ICFGEdge* edge = pag->getICFG()->hasInterICFGEdge(callNode,entryNode, ICFGEdge::CallCF))
+            SVFUtil::cast<CallCFGEdge>(edge)->addCallPE(callPE);
+    }
+    else if(const RetPE* retPE = SVFUtil::dyn_cast<RetPE>(edge)){
+        RetICFGNode* retNode = const_cast<RetICFGNode*>(retPE->getCallSite()->getRetICFGNode());
+        FunExitICFGNode* exitNode = const_cast<FunExitICFGNode*>(retPE->getFunExitICFGNode());
+        if(ICFGEdge* edge = pag->getICFG()->hasInterICFGEdge(exitNode, retNode, ICFGEdge::RetCF))
+            SVFUtil::cast<RetCFGEdge>(edge)->addRetPE(retPE);
+    }
 }
 
 

package/lib/Util/ExtAPI.cpp

@@ -461,7 +461,6 @@ static const ei_pair ei_pairs[]=
     {"SSLv23_client_method", ExtAPI::EFT_ALLOC},
     {"SyGetmem", ExtAPI::EFT_ALLOC},
     {"TLSv1_client_method", ExtAPI::EFT_ALLOC},
-    {"Void_ExtendCore", ExtAPI::EFT_ALLOC},
     {"XAddExtension", ExtAPI::EFT_ALLOC},
     {"XAllocClassHint", ExtAPI::EFT_ALLOC},
     {"XAllocSizeHints", ExtAPI::EFT_ALLOC},

package/package.json

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