svf-tools 1.0.980 → 1.0.982

package/svf/lib/MSSA/MemRegion.cpp

@@ -147,24 +147,26 @@ void MRGenerator::generateMRs()
     updateAliasMRs();
 }
 
-bool MRGenerator::hasSVFStmtList(const SVFInstruction* inst)
+bool MRGenerator::hasSVFStmtList(const ICFGNode* node)
 {
     SVFIR* pag = pta->getPAG();
     if (ptrOnlyMSSA)
-        return pag->hasPTASVFStmtList(pag->getICFG()->getICFGNode(inst));
+        return pag->hasPTASVFStmtList(node);
     else
-        return pag->hasSVFStmtList(pag->getICFG()->getICFGNode(inst));
+        return pag->hasSVFStmtList(node);
 }
 
-SVFIR::SVFStmtList& MRGenerator::getPAGEdgesFromInst(const SVFInstruction* inst)
+
+SVFIR::SVFStmtList& MRGenerator::getPAGEdgesFromInst(const ICFGNode* node)
 {
     SVFIR* pag = pta->getPAG();
     if (ptrOnlyMSSA)
-        return pag->getPTASVFStmtList(pag->getICFG()->getICFGNode(inst));
+        return pag->getPTASVFStmtList(node);
     else
-        return pag->getSVFStmtList(pag->getICFG()->getICFGNode(inst));
+        return pag->getSVFStmtList(node);
 }
 
+
 /*!
  * Generate memory regions for loads/stores
  */
@@ -185,11 +187,9 @@ void MRGenerator::collectModRefForLoadStore()
                 iter != eiter; ++iter)
         {
             const SVFBasicBlock* bb = *iter;
-            for (SVFBasicBlock::const_iterator bit = bb->begin(), ebit = bb->end();
-                    bit != ebit; ++bit)
+            for (const auto& inst: bb->getICFGNodeList())
             {
-                const SVFInstruction* svfInst = *bit;
-                SVFStmtList& pagEdgeList = getPAGEdgesFromInst(svfInst);
+                SVFStmtList& pagEdgeList = getPAGEdgesFromInst(inst);
                 for (SVFStmtList::iterator bit = pagEdgeList.begin(), ebit =
                             pagEdgeList.end(); bit != ebit; ++bit)
                 {
@@ -603,7 +603,7 @@ bool MRGenerator::handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallICFGN
     /// if a callee is a heap allocator function, then its mod set of this callsite is the heap object.
     if(isHeapAllocExtCall(cs->getCallSite()))
     {
-        SVFStmtList& pagEdgeList = getPAGEdgesFromInst(cs->getCallSite());
+        SVFStmtList& pagEdgeList = getPAGEdgesFromInst(cs);
         for (SVFStmtList::const_iterator bit = pagEdgeList.begin(),
                 ebit = pagEdgeList.end(); bit != ebit; ++bit)
         {
@@ -669,7 +669,7 @@ NodeBS MRGenerator::getModInfoForCall(const CallICFGNode* cs)
 {
     if (isExtCall(cs->getCallSite()) && !isHeapAllocExtCall(cs->getCallSite()))
     {
-        SVFStmtList& pagEdgeList = getPAGEdgesFromInst(cs->getCallSite());
+        SVFStmtList& pagEdgeList = getPAGEdgesFromInst(cs);
         NodeBS mods;
         for (SVFStmtList::const_iterator bit = pagEdgeList.begin(), ebit =
                     pagEdgeList.end(); bit != ebit; ++bit)
@@ -693,7 +693,7 @@ NodeBS MRGenerator::getRefInfoForCall(const CallICFGNode* cs)
 {
     if (isExtCall(cs->getCallSite()) && !isHeapAllocExtCall(cs->getCallSite()))
     {
-        SVFStmtList& pagEdgeList = getPAGEdgesFromInst(cs->getCallSite());
+        SVFStmtList& pagEdgeList = getPAGEdgesFromInst(cs);
         NodeBS refs;
         for (SVFStmtList::const_iterator bit = pagEdgeList.begin(), ebit =
                     pagEdgeList.end(); bit != ebit; ++bit)

package/svf/lib/MSSA/MemSSA.cpp

@@ -114,7 +114,6 @@ void MemSSA::buildMemSSA(const SVFFunction& fun)
 void MemSSA::createMUCHI(const SVFFunction& fun)
 {
 
-    SVFIR* pag = pta->getPAG();
 
     DBOUT(DMSSA,
           outs() << "\t creating mu chi for function " << fun.getName()
@@ -142,9 +141,8 @@ void MemSSA::createMUCHI(const SVFFunction& fun)
     {
         const SVFBasicBlock* bb = *iter;
         varKills.clear();
-        for (SVFBasicBlock::const_iterator it = bb->begin(), eit = bb->end(); it != eit; ++it)
+        for (const auto& inst: bb->getICFGNodeList())
         {
-            const SVFInstruction* inst = *it;
             if(mrGen->hasSVFStmtList(inst))
             {
                 SVFStmtList& pagEdgeList = mrGen->getPAGEdgesFromInst(inst);
@@ -160,7 +158,7 @@ void MemSSA::createMUCHI(const SVFFunction& fun)
             }
             if (isNonInstricCallSite(inst))
             {
-                const CallICFGNode* cs = pag->getICFG()->getCallICFGNode(inst);
+                const CallICFGNode* cs = cast<CallICFGNode>(inst);
                 if(mrGen->hasRefMRSet(cs))
                     AddCallSiteMU(cs,mrGen->getCallSiteRefMRSet(cs));
 
@@ -263,7 +261,6 @@ void MemSSA::SSARename(const SVFFunction& fun)
 void MemSSA::SSARenameBB(const SVFBasicBlock& bb)
 {
 
-    SVFIR* pag = pta->getPAG();
     // record which mem region needs to pop stack
     MRVector memRegs;
 
@@ -281,13 +278,11 @@ void MemSSA::SSARenameBB(const SVFBasicBlock& bb)
     // 		rewrite r' with top mrver of stack(r)
     // 		rewrite r with new name
 
-    for (SVFBasicBlock::const_iterator it = bb.begin(), eit = bb.end();
-            it != eit; ++it)
+    for (const auto& pNode: bb.getICFGNodeList())
     {
-        const SVFInstruction* inst = *it;
-        if(mrGen->hasSVFStmtList(inst))
+        if(mrGen->hasSVFStmtList(pNode))
         {
-            SVFStmtList& pagEdgeList = mrGen->getPAGEdgesFromInst(inst);
+            SVFStmtList& pagEdgeList = mrGen->getPAGEdgesFromInst(pNode);
             for(SVFStmtList::const_iterator bit = pagEdgeList.begin(), ebit= pagEdgeList.end();
                     bit!=ebit; ++bit)
             {
@@ -300,16 +295,16 @@ void MemSSA::SSARenameBB(const SVFBasicBlock& bb)
 
             }
         }
-        if (isNonInstricCallSite(inst))
+        if (isNonInstricCallSite(pNode))
         {
-            const CallICFGNode* cs = pag->getICFG()->getCallICFGNode(inst);
+            const CallICFGNode* cs = cast<CallICFGNode>(pNode);
             if(mrGen->hasRefMRSet(cs))
                 RenameMuSet(getMUSet(cs));
 
             if(mrGen->hasModMRSet(cs))
                 RenameChiSet(getCHISet(cs),memRegs);
         }
-        else if(inst->isRetInst())
+        else if(isRetInstNode(pNode))
         {
             const SVFFunction* fun = bb.getParent();
             RenameMuSet(getReturnMuSet(fun));
@@ -579,7 +574,6 @@ u32_t MemSSA::getBBPhiNum() const
  */
 void MemSSA::dumpMSSA(OutStream& Out)
 {
-    SVFIR* pag = pta->getPAG();
 
     for (SVFModule::iterator fit = pta->getModule()->begin(), efit = pta->getModule()->end();
             fit != efit; ++fit)
@@ -611,14 +605,12 @@ void MemSSA::dumpMSSA(OutStream& Out)
             }
 
             bool last_is_chi = false;
-            for (SVFBasicBlock::const_iterator it = bb->begin(), eit = bb->end();
-                    it != eit; ++it)
+            for (const auto& inst: bb->getICFGNodeList())
             {
-                const SVFInstruction* inst = *it;
                 bool isAppCall = isNonInstricCallSite(inst) && !isExtCall(inst);
                 if (isAppCall || isHeapAllocExtCall(inst))
                 {
-                    const CallICFGNode* cs = pag->getICFG()->getCallICFGNode(inst);
+                    const CallICFGNode* cs = cast<CallICFGNode>(inst);
                     if(hasMU(cs))
                     {
                         if (!last_is_chi)

package/svf/lib/MTA/LockAnalysis.cpp

@@ -74,9 +74,8 @@ void LockAnalysis::collectLockUnlocksites()
     {
         for (const SVFBasicBlock* bb : F->getBasicBlockList())
         {
-            for (const SVFInstruction* inst : bb->getInstructionList())
+            for (const ICFGNode* icfgNode : bb->getICFGNodeList())
             {
-                const ICFGNode* icfgNode = tct->getICFGNode(inst);
                 if (tcg->getThreadAPI()->isTDRelease(icfgNode))
                 {
                     unlocksites.insert(icfgNode);
@@ -180,8 +179,8 @@ bool LockAnalysis::intraForwardTraverse(const ICFGNode* lockSite, InstSet& unloc
     {
         const ICFGNode *I = worklist.back();
         worklist.pop_back();
-        const SVFInstruction* exitInst = svfFun->getExitBB()->back();
-        if(tct->getICFGNode(exitInst) == I)
+        const ICFGNode* exitInst = svfFun->getExitBB()->back();
+        if(exitInst == I)
             return false;
 
         // Skip the visited Instructions.
@@ -220,7 +219,7 @@ bool LockAnalysis::intraBackwardTraverse(const InstSet& unlockSet, InstSet& back
     for(InstSet::const_iterator it = unlockSet.begin(), eit = unlockSet.end(); it!=eit; ++it)
     {
         const ICFGNode* unlockSite = *it;
-        const SVFInstruction* entryInst = unlockSite->getFun()->getEntryBlock()->back();
+        const ICFGNode* entryInst = unlockSite->getFun()->getEntryBlock()->back();
         worklist.push_back(*it);
 
         while (!worklist.empty())
@@ -228,7 +227,7 @@ bool LockAnalysis::intraBackwardTraverse(const InstSet& unlockSet, InstSet& back
             const ICFGNode *I = worklist.back();
             worklist.pop_back();
 
-            if(tct->getICFGNode(entryInst) == I)
+            if(entryInst == I)
                 return false;
 
             // Skip the visited Instructions.
@@ -287,7 +286,7 @@ void LockAnalysis::collectCxtLock()
                 DBOUT(DMTA,
                       outs() << "\nCollecting CxtLocks: handling direct call:" << **cit << "\t" << cgEdge->getSrcNode()->getFunction()->getName()
                       << "-->" << cgEdge->getDstNode()->getFunction()->getName() << "\n");
-                handleCallRelation(clp, cgEdge, getSVFCallSite((*cit)->getCallSite()));
+                handleCallRelation(clp, cgEdge, *cit);
             }
             for (CallGraphEdge::CallInstSet::const_iterator ind = cgEdge->indirectCallsBegin(), eind = cgEdge->indirectCallsEnd();
                     ind != eind; ++ind)
@@ -296,7 +295,7 @@ void LockAnalysis::collectCxtLock()
                       outs() << "\nCollecting CxtLocks: handling indirect call:" << **ind << "\t"
                       << cgEdge->getSrcNode()->getFunction()->getName() << "-->" << cgEdge->getDstNode()->getFunction()->getName()
                       << "\n");
-                handleCallRelation(clp, cgEdge, getSVFCallSite((*ind)->getCallSite()));
+                handleCallRelation(clp, cgEdge, *ind);
             }
         }
     }
@@ -306,11 +305,11 @@ void LockAnalysis::collectCxtLock()
 /*!
  * Handling call relations when collecting context-sensitive locks
  */
-void LockAnalysis::handleCallRelation(CxtLockProc& clp, const CallGraphEdge* cgEdge, CallSite cs)
+void LockAnalysis::handleCallRelation(CxtLockProc& clp, const CallGraphEdge* cgEdge, const CallICFGNode* cs)
 {
 
     CallStrCxt cxt(clp.getContext());
-    const ICFGNode* curNode = tct->getICFGNode(cs.getInstruction());
+    const ICFGNode* curNode = cs;
     if (isTDAcquire(curNode))
     {
         addCxtLock(cxt,curNode);
@@ -337,8 +336,8 @@ void LockAnalysis::analyzeLockSpanCxtStmt()
         if (!isLockCandidateFun(*it))
             continue;
         CallStrCxt cxt;
-        const SVFInstruction* frontInst = (*it)->getEntryBlock()->front();
-        CxtStmt cxtstmt(cxt, tct->getICFGNode(frontInst));
+        const ICFGNode* frontInst = (*it)->getEntryBlock()->front();
+        CxtStmt cxtstmt(cxt, frontInst);
         pushToCTSWorkList(cxtstmt);
     }
 
@@ -375,7 +374,7 @@ void LockAnalysis::analyzeLockSpanCxtStmt()
         {
             handleCall(cts);
         }
-        else if (isa<IntraICFGNode>(curInst) && cast<IntraICFGNode>(curInst)->getInst()->isRetInst())
+        else if (isRetInstNode(curInst))
         {
             handleRet(cts);
         }
@@ -417,8 +416,8 @@ void LockAnalysis::handleFork(const CxtStmt& cts)
             const SVFFunction* svfcallee = (*cgIt)->getDstNode()->getFunction();
             CallStrCxt newCxt = curCxt;
             pushCxt(newCxt,call,svfcallee);
-            const SVFInstruction* svfInst = svfcallee->getEntryBlock()->front();
-            CxtStmt newCts(newCxt, tct->getICFGNode(svfInst));
+            const ICFGNode* svfInst = svfcallee->getEntryBlock()->front();
+            CxtStmt newCts(newCxt, svfInst);
             markCxtStmtFlag(newCts, cts);
         }
     }
@@ -441,8 +440,8 @@ void LockAnalysis::handleCall(const CxtStmt& cts)
                 continue;
             CallStrCxt newCxt = curCxt;
             pushCxt(newCxt, call, svfcallee);
-            const SVFInstruction* svfInst = svfcallee->getEntryBlock()->front();
-            CxtStmt newCts(newCxt, tct->getICFGNode(svfInst));
+            const ICFGNode* svfInst = svfcallee->getEntryBlock()->front();
+            CxtStmt newCts(newCxt, svfInst);
             markCxtStmtFlag(newCts, cts);
         }
     }

package/svf/lib/MTA/MHP.cpp

@@ -79,8 +79,8 @@ void MHP::analyzeInterleaving()
         const CxtThread& ct = tpair.second->getCxtThread();
         NodeID rootTid = tpair.first;
         const SVFFunction* routine = tct->getStartRoutineOfCxtThread(ct);
-        const SVFInstruction* svfInst = routine->getEntryBlock()->front();
-        CxtThreadStmt rootcts(rootTid, ct.getContext(), tct->getICFGNode(svfInst));
+        const ICFGNode* svfInst = routine->getEntryBlock()->front();
+        CxtThreadStmt rootcts(rootTid, ct.getContext(), svfInst);
 
         addInterleavingThread(rootcts, rootTid);
         updateAncestorThreads(rootTid);
@@ -119,7 +119,7 @@ void MHP::analyzeInterleaving()
                     if (!tct->isCandidateFun(getCallee(SVFUtil::cast<CallICFGNode>(curInst), callees)))
                         handleIntra(cts);
                 }
-                else if (isa<IntraICFGNode>(curInst) && cast<IntraICFGNode>(curInst)->getInst()->isRetInst())
+                else if (isRetInstNode(curInst))
                 {
                     handleRet(cts);
                 }
@@ -148,8 +148,7 @@ void MHP::updateNonCandidateFunInterleaving()
     {
         if (!tct->isCandidateFun(fun) && !isExtCall(fun))
         {
-            const SVFInstruction* entryinst = fun->getEntryBlock()->front();
-            const ICFGNode* entryNode = tct->getICFGNode(entryinst);
+            const ICFGNode* entryNode = fun->getEntryBlock()->front();
 
             if (!hasThreadStmtSet(entryNode))
                 continue;
@@ -162,11 +161,10 @@ void MHP::updateNonCandidateFunInterleaving()
 
                 for (const SVFBasicBlock* svfbb : fun->getBasicBlockList())
                 {
-                    for (const SVFInstruction* svfInst : svfbb->getInstructionList())
+                    for (const ICFGNode* curNode : svfbb->getICFGNodeList())
                     {
-                        if (svfInst == entryinst)
+                        if (curNode == entryNode)
                             continue;
-                        const ICFGNode* curNode = tct->getICFGNode(svfInst);
                         CxtThreadStmt newCts(cts.getTid(), curCxt, curNode);
                         threadStmtToTheadInterLeav[newCts] |= threadStmtToTheadInterLeav[cts];
                         instToTSMap[curNode].insert(newCts);
@@ -184,7 +182,7 @@ void MHP::handleNonCandidateFun(const CxtThreadStmt& cts)
 {
     const ICFGNode* curInst = cts.getStmt();
     const SVFFunction* curfun = curInst->getFun();
-    assert((curInst == tct->getICFGNode(curfun->getEntryBlock()->front())) && "curInst is not the entry of non candidate function.");
+    assert((curInst == curfun->getEntryBlock()->front()) && "curInst is not the entry of non candidate function.");
     const CallStrCxt& curCxt = cts.getContext();
     CallGraphNode* node = tcg->getCallGraphNode(curfun);
     for (CallGraphNode::const_iterator nit = node->OutEdgeBegin(), neit = node->OutEdgeEnd(); nit != neit; nit++)
@@ -192,8 +190,8 @@ void MHP::handleNonCandidateFun(const CxtThreadStmt& cts)
         const SVFFunction* callee = (*nit)->getDstNode()->getFunction();
         if (!isExtCall(callee))
         {
-            const SVFInstruction* calleeInst = callee->getEntryBlock()->front();
-            CxtThreadStmt newCts(cts.getTid(), curCxt, tct->getICFGNode(calleeInst));
+            const ICFGNode* calleeInst = callee->getEntryBlock()->front();
+            CxtThreadStmt newCts(cts.getTid(), curCxt, calleeInst);
             addInterleavingThread(newCts, cts);
         }
     }
@@ -220,9 +218,9 @@ void MHP::handleFork(const CxtThreadStmt& cts, NodeID rootTid)
             const SVFFunction* svfroutine = (*cgIt)->getDstNode()->getFunction();
             CallStrCxt newCxt = curCxt;
             pushCxt(newCxt, cbn, svfroutine);
-            const SVFInstruction* stmt = svfroutine->getEntryBlock()->front();
+            const ICFGNode* stmt = svfroutine->getEntryBlock()->front();
             CxtThread ct(newCxt, call);
-            CxtThreadStmt newcts(tct->getTCTNode(ct)->getId(), ct.getContext(), tct->getICFGNode(stmt));
+            CxtThreadStmt newcts(tct->getTCTNode(ct)->getId(), ct.getContext(), stmt);
             addInterleavingThread(newcts, cts);
         }
     }
@@ -251,8 +249,8 @@ void MHP::handleJoin(const CxtThreadStmt& cts, NodeID rootTid)
             {
                 const SVFBasicBlock* eb = exitbbs.back();
                 exitbbs.pop_back();
-                const SVFInstruction* svfEntryInst = eb->front();
-                CxtThreadStmt newCts(cts.getTid(), curCxt, tct->getICFGNode(svfEntryInst));
+                const ICFGNode* svfEntryInst = eb->front();
+                CxtThreadStmt newCts(cts.getTid(), curCxt, svfEntryInst);
                 addInterleavingThread(newCts, cts);
                 if (hasJoinInSymmetricLoop(curCxt, call))
                     rmInterleavingThread(newCts, joinedTids, call);
@@ -276,8 +274,8 @@ void MHP::handleJoin(const CxtThreadStmt& cts, NodeID rootTid)
             {
                 const SVFBasicBlock* eb = exitbbs.back();
                 exitbbs.pop_back();
-                const SVFInstruction* svfEntryInst = eb->front();
-                CxtThreadStmt newCts(cts.getTid(), cts.getContext(), tct->getICFGNode(svfEntryInst));
+                const ICFGNode* svfEntryInst = eb->front();
+                CxtThreadStmt newCts(cts.getTid(), cts.getContext(), svfEntryInst);
                 addInterleavingThread(newCts, cts);
             }
         }
@@ -307,8 +305,8 @@ void MHP::handleCall(const CxtThreadStmt& cts, NodeID rootTid)
             CallStrCxt newCxt = curCxt;
             const CallICFGNode* callicfgnode = SVFUtil::cast<CallICFGNode>(call);
             pushCxt(newCxt, callicfgnode, svfcallee);
-            const SVFInstruction* svfEntryInst = svfcallee->getEntryBlock()->front();
-            CxtThreadStmt newCts(cts.getTid(), newCxt, tct->getICFGNode(svfEntryInst));
+            const ICFGNode* svfEntryInst = svfcallee->getEntryBlock()->front();
+            CxtThreadStmt newCts(cts.getTid(), newCxt, svfEntryInst);
             addInterleavingThread(newCts, cts);
         }
     }
@@ -430,8 +428,8 @@ void MHP::updateSiblingThreads(NodeID curTid)
 
             const CxtThread& ct = tct->getTCTNode(stid)->getCxtThread();
             const SVFFunction* routine = tct->getStartRoutineOfCxtThread(ct);
-            const SVFInstruction* stmt = routine->getEntryBlock()->front();
-            CxtThreadStmt cts(stid, ct.getContext(), tct->getICFGNode(stmt));
+            const ICFGNode* stmt = routine->getEntryBlock()->front();
+            CxtThreadStmt cts(stid, ct.getContext(), stmt);
             addInterleavingThread(cts, curTid);
         }
 
@@ -760,7 +758,7 @@ void ForkJoinAnalysis::analyzeForkJoinPair()
 
                     handleCall(cts, rootTid);
                 }
-                else if (isa<IntraICFGNode>(curInst) && cast<IntraICFGNode>(curInst)->getInst()->isRetInst())
+                else if (isRetInstNode(curInst))
                 {
                     handleRet(cts);
                 }
@@ -832,8 +830,8 @@ void ForkJoinAnalysis::handleJoin(const CxtStmt& cts, NodeID rootTid)
                 {
                     const SVFBasicBlock* eb = exitbbs.back();
                     exitbbs.pop_back();
-                    const SVFInstruction* svfEntryInst = eb->front();
-                    CxtStmt newCts(curCxt, tct->getICFGNode(svfEntryInst));
+                    const ICFGNode* svfEntryInst = eb->front();
+                    CxtStmt newCts(curCxt, svfEntryInst);
                     addDirectlyJoinTID(cts, rootTid);
                     if (isSameSCEV(forkSite, joinSite))
                     {
@@ -863,8 +861,8 @@ void ForkJoinAnalysis::handleJoin(const CxtStmt& cts, NodeID rootTid)
                 {
                     const SVFBasicBlock* eb = exitbbs.back();
                     exitbbs.pop_back();
-                    const SVFInstruction* svfEntryInst = eb->front();
-                    CxtStmt newCts(curCxt, tct->getICFGNode(svfEntryInst));
+                    const ICFGNode* svfEntryInst = eb->front();
+                    CxtStmt newCts(curCxt, svfEntryInst);
                     markCxtStmtFlag(newCts, cts);
                 }
             }
@@ -891,8 +889,8 @@ void ForkJoinAnalysis::handleCall(const CxtStmt& cts, NodeID rootTid)
                 continue;
             CallStrCxt newCxt = curCxt;
             pushCxt(newCxt, cbn, svfcallee);
-            const SVFInstruction* svfEntryInst = svfcallee->getEntryBlock()->front();
-            CxtStmt newCts(newCxt, tct->getICFGNode(svfEntryInst));
+            const ICFGNode* svfEntryInst = svfcallee->getEntryBlock()->front();
+            CxtStmt newCts(newCxt, svfEntryInst);
             markCxtStmtFlag(newCts, cts);
         }
     }
@@ -914,7 +912,7 @@ void ForkJoinAnalysis::handleRet(const CxtStmt& cts)
                 cit != ecit; ++cit)
         {
             CallStrCxt newCxt = curCxt;
-            const ICFGNode* curNode = tct->getICFGNode((*cit)->getCallSite());
+            const ICFGNode* curNode = (*cit);
             if (matchCxt(newCxt, SVFUtil::cast<CallICFGNode>(curNode), curFunNode->getFunction()))
             {
                 for(const ICFGEdge* outEdge : curNode->getOutEdges())
@@ -932,7 +930,7 @@ void ForkJoinAnalysis::handleRet(const CxtStmt& cts)
                 cit != ecit; ++cit)
         {
             CallStrCxt newCxt = curCxt;
-            const ICFGNode* curNode = tct->getICFGNode((*cit)->getCallSite());
+            const ICFGNode* curNode = (*cit);
 
             if (matchCxt(newCxt, SVFUtil::cast<CallICFGNode>(curNode), curFunNode->getFunction()))
             {

package/svf/lib/MTA/MTA.cpp

@@ -135,16 +135,15 @@ void MTA::detect(SVFModule* module)
     SVFIR* pag = SVFIR::getPAG();
     PointerAnalysis* pta = AndersenWaveDiff::createAndersenWaveDiff(pag);
 
-    Set<const SVFInstruction*> needcheckinst;
     // Add symbols for all of the functions and the instructions in them.
     for (const SVFFunction* F : module->getFunctionSet())
     {
         // collect and create symbols inside the function body
         for (const SVFBasicBlock* svfbb : F->getBasicBlockList())
         {
-            for (const SVFInstruction* svfInst : svfbb->getInstructionList())
+            for (const ICFGNode* icfgNode : svfbb->getICFGNodeList())
             {
-                for(const SVFStmt* stmt : pag->getSVFStmtList(pag->getICFG()->getICFGNode(svfInst)))
+                for(const SVFStmt* stmt : pag->getSVFStmtList(icfgNode))
                 {
                     if (const LoadStmt* l = SVFUtil::dyn_cast<LoadStmt>(stmt))
                     {

package/svf/lib/MTA/MTAStat.cpp

@@ -126,10 +126,9 @@ void MTAStat::performMHPPairStat(MHP* mhp, LockAnalysis* lsa)
             for (SVFFunction::const_iterator bit =  fun->begin(), ebit = fun->end(); bit != ebit; ++bit)
             {
                 const SVFBasicBlock* bb = *bit;
-                for (SVFBasicBlock::const_iterator ii = bb->begin(), eii = bb->end(); ii != eii; ++ii)
+                for (const auto& icfgNode : bb->getICFGNodeList())
                 {
-                    const SVFInstruction* inst = *ii;
-                    for(const SVFStmt* stmt : pag->getSVFStmtList(pag->getICFG()->getICFGNode(inst)))
+                    for(const SVFStmt* stmt : pag->getSVFStmtList(icfgNode))
                     {
                         if(SVFUtil::isa<LoadStmt>(stmt))
                         {
@@ -141,7 +140,6 @@ void MTAStat::performMHPPairStat(MHP* mhp, LockAnalysis* lsa)
                             instSet2.insert(stmt->getICFGNode());
                         }
                     }
-
                 }
             }
         }

package/svf/lib/MTA/TCT.cpp

@@ -240,13 +240,13 @@ void TCT::collectMultiForkedThreads()
 /*!
  * Handle call relations
  */
-void TCT::handleCallRelation(CxtThreadProc& ctp, const CallGraphEdge* cgEdge, CallSite cs)
+void TCT::handleCallRelation(CxtThreadProc& ctp, const CallGraphEdge* cgEdge, const CallICFGNode* cs)
 {
     const SVFFunction* callee = cgEdge->getDstNode()->getFunction();
 
     CallStrCxt cxt(ctp.getContext());
     CallStrCxt oldCxt = cxt;
-    const CallICFGNode* callNode = SVFUtil::cast<CallICFGNode>(getICFGNode(cs.getInstruction()));
+    const CallICFGNode* callNode = cs;
     pushCxt(cxt,callNode,callee);
 
     if(cgEdge->getEdgeKind() == CallGraphEdge::CallRetEdge)
@@ -416,13 +416,13 @@ void TCT::build()
                     ecit = cgEdge->directCallsEnd(); cit!=ecit; ++cit)
             {
                 DBOUT(DMTA,outs() << "\nTCT handling direct call:" << **cit << "\t" << cgEdge->getSrcNode()->getFunction()->getName() << "-->" << cgEdge->getDstNode()->getFunction()->getName() << "\n");
-                handleCallRelation(ctp,cgEdge,getSVFCallSite((*cit)->getCallSite()));
+                handleCallRelation(ctp,cgEdge,*cit);
             }
             for(CallGraphEdge::CallInstSet::const_iterator ind = cgEdge->indirectCallsBegin(),
                     eind = cgEdge->indirectCallsEnd(); ind!=eind; ++ind)
             {
                 DBOUT(DMTA,outs() << "\nTCT handling indirect call:" << **ind << "\t" << cgEdge->getSrcNode()->getFunction()->getName() << "-->" << cgEdge->getDstNode()->getFunction()->getName() << "\n");
-                handleCallRelation(ctp,cgEdge,getSVFCallSite((*ind)->getCallSite()));
+                handleCallRelation(ctp,cgEdge,*ind);
             }
         }
     }

package/svf/lib/MemoryModel/PointerAnalysis.cpp

@@ -509,11 +509,9 @@ void PointerAnalysis::validateSuccessTests(std::string fun)
 
         for(const CallICFGNode* callNode : pag->getCallSiteSet())
         {
-            const SVFInstruction* svfInst = callNode->getCallSite();
-            if (SVFUtil::getCallee(svfInst) == checkFun)
+            if (SVFUtil::getCallee(callNode) == checkFun)
             {
-
-                CallSite cs(svfInst);
+                CallSite cs = SVFUtil::getSVFCallSite(callNode);
                 assert(cs.getNumArgOperands() == 2
                        && "arguments should be two pointers!!");
                 const SVFValue* V1 = cs.getArgOperand(0);
@@ -551,12 +549,12 @@ void PointerAnalysis::validateSuccessTests(std::string fun)
 
                 if (checkSuccessful)
                     outs() << sucMsg("\t SUCCESS :") << fun << " check <id:" << id1 << ", id:" << id2 << "> at ("
-                           << svfInst->getSourceLoc() << ")\n";
+                           << callNode->getSourceLoc() << ")\n";
                 else
                 {
                     SVFUtil::errs() << errMsg("\t FAILURE :") << fun
                                     << " check <id:" << id1 << ", id:" << id2
-                                    << "> at (" << svfInst->getSourceLoc() << ")\n";
+                                    << "> at (" << callNode->getSourceLoc() << ")\n";
                     assert(false && "test case failed!");
                 }
             }
@@ -577,10 +575,9 @@ void PointerAnalysis::validateExpectedFailureTests(std::string fun)
 
         for(const CallICFGNode* callNode : pag->getCallSiteSet())
         {
-            const SVFInstruction* svfInst = callNode->getCallSite();
-            if (SVFUtil::getCallee(svfInst) == checkFun)
+            if (SVFUtil::getCallee(callNode) == checkFun)
             {
-                CallSite call = getSVFCallSite(svfInst);
+                CallSite call = getSVFCallSite(callNode);
                 assert(call.arg_size() == 2
                        && "arguments should be two pointers!!");
                 const SVFValue* V1 = call.getArgOperand(0);

package/svf/lib/SABER/DoubleFreeChecker.cpp

@@ -42,7 +42,7 @@ void DoubleFreeChecker::reportBug(ProgSlice* slice)
         GenericBug::EventStack eventStack;
         slice->evalFinalCond2Event(eventStack);
         eventStack.push_back(
-            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())->getCallSite()));
+            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())));
         report.addSaberBug(GenericBug::DOUBLEFREE, eventStack);
     }
     if(Options::ValidateTests())

package/svf/lib/SABER/FileChecker.cpp

@@ -39,10 +39,7 @@ void FileChecker::reportBug(ProgSlice* slice)
     if(isAllPathReachable() == false && isSomePathReachable() == false)
     {
         // full leakage
-        GenericBug::EventStack eventStack =
-        {
-            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())->getCallSite())
-        };
+        GenericBug::EventStack eventStack = { SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())) };
         report.addSaberBug(GenericBug::FILENEVERCLOSE, eventStack);
     }
     else if (isAllPathReachable() == false && isSomePathReachable() == true)
@@ -50,7 +47,7 @@ void FileChecker::reportBug(ProgSlice* slice)
         GenericBug::EventStack eventStack;
         slice->evalFinalCond2Event(eventStack);
         eventStack.push_back(
-            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())->getCallSite()));
+            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())));
         report.addSaberBug(GenericBug::FILEPARTIALCLOSE, eventStack);
     }
 }

package/svf/lib/SABER/LeakChecker.cpp

@@ -154,7 +154,7 @@ void LeakChecker::reportBug(ProgSlice* slice)
         // full leakage
         GenericBug::EventStack eventStack =
         {
-            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())->getCallSite())
+            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource()))
         };
         report.addSaberBug(GenericBug::NEVERFREE, eventStack);
     }
@@ -164,7 +164,7 @@ void LeakChecker::reportBug(ProgSlice* slice)
         GenericBug::EventStack eventStack;
         slice->evalFinalCond2Event(eventStack);
         eventStack.push_back(
-            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())->getCallSite()));
+            SVFBugEvent(SVFBugEvent::SourceInst, getSrcCSID(slice->getSource())));
         report.addSaberBug(GenericBug::PARTIALLEAK, eventStack);
     }
 

package/svf/lib/SABER/ProgSlice.cpp

@@ -198,7 +198,7 @@ void ProgSlice::evalFinalCond2Event(GenericBug::EventStack &eventStack) const
     NodeBS elems = pathAllocator->exactCondElem(finalCond);
     for(NodeBS::iterator it = elems.begin(), eit = elems.end(); it!=eit; ++it)
     {
-        const SVFInstruction* tinst = pathAllocator->getCondInst(*it);
+        const ICFGNode* tinst = pathAllocator->getCondInst(*it);
         if(pathAllocator->isNegCond(*it))
             eventStack.push_back(SVFBugEvent(
                                      SVFBugEvent::Branch|((((u32_t)false) << 4) & BRANCHFLAGMASK), tinst));
@@ -226,7 +226,7 @@ std::string ProgSlice::evalFinalCond() const
 
     for(NodeBS::iterator it = elems.begin(), eit = elems.end(); it!=eit; ++it)
     {
-        const SVFInstruction* tinst = pathAllocator->getCondInst(*it);
+        const ICFGNode* tinst = pathAllocator->getCondInst(*it);
         if(pathAllocator->isNegCond(*it))
             locations.insert(tinst->getSourceLoc()+"|False");
         else