svf-tools 1.0.366 → 1.0.370

package/include/Graphs/ICFGEdge.h

@@ -112,15 +112,8 @@ class IntraCFGEdge : public ICFGEdge
 {
 
 public:
-    /// the first element is a boolean (for if/else) or numeric condition value (for switch)
-    /// the second element is the value when this condition should hold to execute this CFGEdge.
-    /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
-    /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
-
-    typedef std::pair<const Value*,NodeID> BranchCondition;
-
     /// Constructor
-    IntraCFGEdge(ICFGNode* s, ICFGNode* d): ICFGEdge(s,d,IntraCF)
+    IntraCFGEdge(ICFGNode* s, ICFGNode* d): ICFGEdge(s,d,IntraCF), conditionVar(nullptr), branchCondVal(0)
     {
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -139,19 +132,29 @@ public:
     }
     //@}
 
-    const BranchCondition& getBranchCondtion() const{
-        return brCondition;
+    const Value* getCondition() const{
+        return conditionVar;
     }
 
-    void setBranchCondtion(const Value* pNode, NodeID branchID){
-        brCondition = std::make_pair(pNode,branchID);
+    const s64_t getSuccessorCondValue() const{
+        assert(getCondition() && "this is not a conditional branch edge");
+        return branchCondVal;
+    }
+
+    void setBranchCondition(const Value* c, s64_t bVal){
+        conditionVar = c;
+        branchCondVal = bVal;
     }
 
     virtual const std::string toString() const;
 
 private:
-    BranchCondition brCondition;
-
+    /// conditionVar is a boolean (for if/else) or numeric condition variable (for switch)
+    /// branchCondVal is the value when this condition should hold to execute this CFGEdge.
+    /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
+    /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
+    const Value* conditionVar;
+    s64_t branchCondVal;
 };
 
 

package/include/MemoryModel/SVFIR.h

@@ -645,9 +645,9 @@ private:
     /// Add Store edge
     StoreStmt* addStoreStmt(NodeID src, NodeID dst, const IntraICFGNode* val);
     /// Add Call edge
-    CallPE* addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    CallPE* addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry);
     /// Add Return edge
-    RetPE* addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    RetPE* addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit);
     /// Add Gep edge
     GepStmt* addGepStmt(NodeID src, NodeID dst, const LocationSet& ls, bool constGep);
     /// Add Offset(Gep) edge
@@ -655,9 +655,9 @@ private:
     /// Add Variant(Gep) edge
     GepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Thread fork edge for parameter passing
-    TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry);
     /// Add Thread join edge for parameter passing
-    TDJoinPE* addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    TDJoinPE* addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit);
     //@}
 
     /// Set a pointer points-to black hole (e.g. int2ptr)

package/include/MemoryModel/SVFStatements.h

@@ -481,7 +481,8 @@ private:
     CallPE(const CallPE &);  ///< place holder
     void operator=(const CallPE &); ///< place holder
 
-    const CallICFGNode* inst;		///< llvm instruction for this call
+    const CallICFGNode* call;		        /// the callsite statement calling from 
+    const FunEntryICFGNode* entry;		/// the function exit statement calling to
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -502,8 +503,8 @@ public:
     //@}
 
     /// constructor
-    CallPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, GEdgeKind k = SVFStmt::Call) :
-        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), inst(i)
+    CallPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunEntryICFGNode* e, GEdgeKind k = SVFStmt::Call) :
+        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), call(i), entry(e)
     {
     }
 
@@ -511,11 +512,15 @@ public:
     //@{
     inline const CallICFGNode* getCallInst() const
     {
-        return inst;
+        return call;
     }
     inline const CallICFGNode* getCallSite() const
     {
-        return inst;
+        return call;
+    }
+    inline const FunEntryICFGNode* getFunEntryICFGNode() const
+    {
+        return entry;
     }
     //@}
 
@@ -533,7 +538,8 @@ private:
     RetPE(const RetPE &);  ///< place holder
     void operator=(const RetPE &); ///< place holder
 
-    const CallICFGNode* inst;		/// the callsite instruction return to
+    const CallICFGNode* call;		        /// the callsite statement returning to
+    const FunExitICFGNode* exit;		/// the function exit statement returned from
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -554,8 +560,8 @@ public:
     //@}
 
     /// constructor
-    RetPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, GEdgeKind k = SVFStmt::Ret) :
-        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), inst(i)
+    RetPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunExitICFGNode* e, GEdgeKind k = SVFStmt::Ret) :
+        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), call(i), exit(e)
     {
     }
 
@@ -563,11 +569,15 @@ public:
     //@{
     inline const CallICFGNode* getCallInst() const
     {
-        return inst;
+        return call;
     }
     inline const CallICFGNode* getCallSite() const
     {
-        return inst;
+        return call;
+    }
+    inline const FunExitICFGNode* getFunExitICFGNode() const
+    {
+        return exit;
     }
     //@}
 
@@ -629,15 +639,6 @@ public:
     {
         return SVFStmt::getDstNode();
     }
-    /// Return the position of this op
-    const u32_t getOpPos(const SVFVar* op) const{
-        for(u32_t i = 0; i < getOpVarNum(); i++){
-            if(getOpVar(i)==op)
-                return i;
-        }
-        assert(false && "this operand not found!");
-        abort();
-    }
 
     NodeID getOpVarID(u32_t pos) const;
     NodeID getResID() const;
@@ -708,8 +709,8 @@ public:
     }
 
     /// Return the corresponding ICFGNode of this operand
-    inline const ICFGNode* getOpICFGNode(const SVFVar* op) const{
-        return opICFGNodes.at(getOpPos(op));
+    inline const ICFGNode* getOpICFGNode(u32_t op_idx) const{
+        return opICFGNodes.at(op_idx);
     }
 
     /// Return true if this is a phi at the function exit 
@@ -1022,8 +1023,8 @@ public:
     //@}
 
     /// constructor
-    TDForkPE(SVFVar* s, SVFVar* d, const CallICFGNode* i) :
-        CallPE(s,d,i,SVFStmt::ThreadFork)
+    TDForkPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunEntryICFGNode* entry) :
+        CallPE(s,d,i,entry,SVFStmt::ThreadFork)
     {
     }
 
@@ -1060,8 +1061,8 @@ public:
     //@}
 
     /// Constructor
-    TDJoinPE(SVFVar* s, SVFVar* d, const CallICFGNode* i) :
-        RetPE(s,d,i,SVFStmt::ThreadJoin)
+    TDJoinPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunExitICFGNode* e) :
+        RetPE(s,d,i,e, SVFStmt::ThreadJoin)
     {
     }
 

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
@@ -366,16 +368,16 @@ public:
         return edge;
     }
     /// Add Call edge
-    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        CallPE *edge = pag->addCallPE(src, dst, cs);
+        CallPE *edge = pag->addCallPE(src, dst, cs, entry);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Return edge
-    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        RetPE *edge = pag->addRetPE(src, dst, cs);
+        RetPE *edge = pag->addRetPE(src, dst, cs, exit);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -401,16 +403,16 @@ public:
         return edge;
     }
     /// Add Thread fork edge for parameter passing
-    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        TDForkPE *edge = pag->addThreadForkPE(src, dst, cs);
+        TDForkPE *edge = pag->addThreadForkPE(src, dst, cs, entry);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Thread join edge for parameter passing
-    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs);
+        TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs, exit);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

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);
     }
 }

package/lib/MemoryModel/PAGBuilderFromFile.cpp

@@ -173,9 +173,9 @@ void PAGBuilderFromFile::addEdge(NodeID srcID, NodeID dstID,
     else if (edge == "variant-gep")
         pag->addVariantGepStmt(srcID, dstID, LocationSet(offsetOrCSId));
     else if (edge == "call")
-        pag->addEdge(srcNode, dstNode, new CallPE(srcNode, dstNode, nullptr));
+        pag->addEdge(srcNode, dstNode, new CallPE(srcNode, dstNode, nullptr, nullptr));
     else if (edge == "ret")
-        pag->addEdge(srcNode, dstNode, new RetPE(srcNode, dstNode, nullptr));
+        pag->addEdge(srcNode, dstNode, new RetPE(srcNode, dstNode, nullptr,nullptr));
     else if (edge == "cmp")
         pag->addCmpStmt(srcID, dstID, dstID, dstID);
     else if (edge == "binary-op")

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;
     }
 }
 
@@ -240,7 +241,7 @@ StoreStmt* SVFIR::addStoreStmt(NodeID src, NodeID dst, const IntraICFGNode* curV
 /*!
  * Add Call edge
  */
-CallPE* SVFIR::addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs)
+CallPE* SVFIR::addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
@@ -248,7 +249,7 @@ CallPE* SVFIR::addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs)
         return SVFUtil::cast<CallPE>(edge);
     else
     {
-        CallPE* callPE = new CallPE(srcNode, dstNode, cs);
+        CallPE* callPE = new CallPE(srcNode, dstNode, cs,entry);
         addToStmt2TypeMap(callPE);
         addEdge(srcNode,dstNode, callPE);
         return callPE;
@@ -258,7 +259,7 @@ CallPE* SVFIR::addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs)
 /*!
  * Add Return edge
  */
-RetPE* SVFIR::addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs)
+RetPE* SVFIR::addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
@@ -266,7 +267,7 @@ RetPE* SVFIR::addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs)
         return SVFUtil::cast<RetPE>(edge);
     else
     {
-        RetPE* retPE = new RetPE(srcNode, dstNode, cs);
+        RetPE* retPE = new RetPE(srcNode, dstNode, cs, exit);
         addToStmt2TypeMap(retPE);
         addEdge(srcNode,dstNode, retPE);
         return retPE;
@@ -287,7 +288,7 @@ SVFStmt* SVFIR::addBlackHoleAddrStmt(NodeID node)
 /*!
  * Add Thread fork edge for parameter passing from a spawner to its spawnees
  */
-TDForkPE* SVFIR::addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs)
+TDForkPE* SVFIR::addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
@@ -295,7 +296,7 @@ TDForkPE* SVFIR::addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs)
         return SVFUtil::cast<TDForkPE>(edge);
     else
     {
-        TDForkPE* forkPE = new TDForkPE(srcNode, dstNode, cs);
+        TDForkPE* forkPE = new TDForkPE(srcNode, dstNode, cs, entry);
         addToStmt2TypeMap(forkPE);
         addEdge(srcNode,dstNode, forkPE);
         return forkPE;
@@ -305,7 +306,7 @@ TDForkPE* SVFIR::addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs)
 /*!
  * Add Thread fork edge for parameter passing from a spawnee back to its spawners
  */
-TDJoinPE* SVFIR::addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs)
+TDJoinPE* SVFIR::addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
 {
     SVFVar* srcNode = getGNode(src);
     SVFVar* dstNode = getGNode(dst);
@@ -313,7 +314,7 @@ TDJoinPE* SVFIR::addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs)
         return SVFUtil::cast<TDJoinPE>(edge);
     else
     {
-        TDJoinPE* joinPE = new TDJoinPE(srcNode, dstNode, cs);
+        TDJoinPE* joinPE = new TDJoinPE(srcNode, dstNode, cs, exit);
         addToStmt2TypeMap(joinPE);
         addEdge(srcNode,dstNode, joinPE);
         return joinPE;

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/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));
     }
@@ -961,8 +961,9 @@ void SVFIRBuilder::handleDirectCall(CallSite cs, const SVFFunction *F)
     if (!cs.getType()->isVoidTy())
     {
         NodeID srcret = getReturnNode(F);
-        CallICFGNode* icfgNode = pag->getICFG()->getCallICFGNode(cs.getInstruction());
-        addRetEdge(srcret, dstrec,icfgNode);
+        CallICFGNode* callICFGNode = pag->getICFG()->getCallICFGNode(cs.getInstruction());
+        FunExitICFGNode* exitICFGNode = pag->getICFG()->getFunExitICFGNode(F);
+        addRetEdge(srcret, dstrec,callICFGNode, exitICFGNode);
     }
     //Iterators for the actual and formal parameters
     CallSite::arg_iterator itA = cs.arg_begin(), ieA = cs.arg_end();
@@ -984,7 +985,8 @@ void SVFIRBuilder::handleDirectCall(CallSite cs, const SVFFunction *F)
         NodeID dstFA = getValueNode(FA);
         NodeID srcAA = getValueNode(AA);
         CallICFGNode* icfgNode = pag->getICFG()->getCallICFGNode(cs.getInstruction());
-        addCallEdge(srcAA, dstFA, icfgNode);
+        FunEntryICFGNode* entry = pag->getICFG()->getFunEntryICFGNode(F);
+        addCallEdge(srcAA, dstFA, icfgNode, entry);
     }
     //Any remaining actual args must be varargs.
     if (F->getLLVMFun()->isVarArg())
@@ -996,7 +998,8 @@ void SVFIRBuilder::handleDirectCall(CallSite cs, const SVFFunction *F)
             Value *AA = *itA;
             NodeID vnAA = getValueNode(AA);
             CallICFGNode* icfgNode = pag->getICFG()->getCallICFGNode(cs.getInstruction());
-            addCallEdge(vnAA,vaF, icfgNode);
+            FunEntryICFGNode* entry = pag->getICFG()->getFunEntryICFGNode(F);
+            addCallEdge(vnAA,vaF, icfgNode,entry);
         }
     }
     if(itA != ieA)
@@ -1479,7 +1482,8 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                     if(SVFUtil::isa<PointerType>(actualParm->getType()) && SVFUtil::isa<PointerType>(formalParm->getType()) )
                     {
                         CallICFGNode* icfgNode = pag->getICFG()->getCallICFGNode(inst);
-                        addThreadForkEdge(pag->getValueNode(actualParm), pag->getValueNode(formalParm),icfgNode);
+                        FunEntryICFGNode* entry = pag->getICFG()->getFunEntryICFGNode(LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(forkedFun));
+                        addThreadForkEdge(pag->getValueNode(actualParm), pag->getValueNode(formalParm),icfgNode, entry);
                     }
                 }
             }
@@ -1508,7 +1512,8 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 if(SVFUtil::isa<PointerType>(actualParm->getType()) && SVFUtil::isa<PointerType>(formalParm->getType()) )
                 {
                     CallICFGNode* icfgNode = pag->getICFG()->getCallICFGNode(inst);
-                    addThreadForkEdge(pag->getValueNode(actualParm), pag->getValueNode(formalParm),icfgNode);
+                    FunEntryICFGNode* entry = pag->getICFG()->getFunEntryICFGNode(LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(taskFunc));
+                    addThreadForkEdge(pag->getValueNode(actualParm), pag->getValueNode(formalParm),icfgNode, entry);
                 }
             }
             else

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.366",
+  "version": "1.0.370",
   "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": {