svf-tools 1.0.976 → 1.0.978

package/package.json

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

package/svf/include/Graphs/ThreadCallGraph.h

@@ -356,12 +356,6 @@ public:
     void addDirectJoinEdge(const CallICFGNode* cs,const CallSiteSet& forksite);
     //@}
 
-    /// Add direct/indirect parallel for edges
-    //@{
-    void addDirectParForEdge(const CallICFGNode* cs);
-    void addIndirectParForEdge(const CallICFGNode* cs, const SVFFunction* callee);
-    //@}
-
 
     /// map call instruction to its CallGraphEdge map
     inline void addThreadForkEdgeSetMap(const CallICFGNode* cs, ThreadForkEdge* edge)

package/svf/include/MTA/LockAnalysis.h

@@ -58,11 +58,11 @@ public:
 
     typedef NodeBS LockSet;
     typedef TCT::InstVec InstVec;
-    typedef Set<const SVFInstruction*> InstSet;
+    typedef Set<const ICFGNode*> InstSet;
     typedef InstSet CISpan;
-    typedef Map<const SVFInstruction*, CISpan>CILockToSpan;
+    typedef Map<const ICFGNode*, CISpan>CILockToSpan;
     typedef Set<const SVFFunction*> FunSet;
-    typedef Map<const SVFInstruction*, InstSet> InstToInstSetMap;
+    typedef Map<const ICFGNode*, InstSet> InstToInstSetMap;
     typedef Map<CxtStmt, ValDomain> CxtStmtToLockFlagMap;
     typedef FIFOWorkList<CxtStmt> CxtStmtWorkList;
     typedef Set<CxtStmt> LockSpan;
@@ -71,13 +71,13 @@ public:
 
     typedef Map<CxtLock, LockSpan> CxtLockToSpan;
     typedef Map<CxtLock, NodeBS> CxtLockToLockSet;
-    typedef Map<const SVFInstruction*, NodeBS> LockSiteToLockSet;
-    typedef Map<const SVFInstruction*, LockSpan> InstToCxtStmtSet;
+    typedef Map<const ICFGNode*, NodeBS> LockSiteToLockSet;
+    typedef Map<const ICFGNode*, LockSpan> InstToCxtStmtSet;
     typedef Map<CxtStmt, CxtLockSet> CxtStmtToCxtLockSet;
     typedef FIFOWorkList<CxtLockProc> CxtLockProcVec;
     typedef Set<CxtLockProc> CxtLockProcSet;
 
-    typedef Map<const SVFInstruction*, CxtStmtSet> InstToCxtStmt;
+    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmt;
 
     LockAnalysis(TCT* t) : tct(t), lockTime(0),numOfTotalQueries(0), numOfLockedQueries(0), lockQueriesTime(0)
     {
@@ -88,7 +88,7 @@ public:
     /// (2) maps a context-sensitive lock site to its corresponding lock span.
     void analyze();
     void analyzeIntraProcedualLock();
-    bool intraForwardTraverse(const SVFInstruction* lock, InstSet& unlockset, InstSet& forwardInsts);
+    bool intraForwardTraverse(const ICFGNode* lock, InstSet& unlockset, InstSet& forwardInsts);
     bool intraBackwardTraverse(const InstSet& unlockset, InstSet& backwardInsts);
 
     void collectCxtLock();
@@ -100,14 +100,14 @@ public:
     /// Intraprocedural locks
     //@{
     /// Return true if the lock is an intra-procedural lock
-    inline bool isIntraLock(const SVFInstruction* lock) const
+    inline bool isIntraLock(const ICFGNode* lock) const
     {
         assert(locksites.find(lock)!=locksites.end() && "not a lock site?");
         return ciLocktoSpan.find(lock)!=ciLocktoSpan.end();
     }
 
     /// Add intra-procedural lock
-    inline void addIntraLock(const SVFInstruction* lockSite, const InstSet& stmts)
+    inline void addIntraLock(const ICFGNode* lockSite, const InstSet& stmts)
     {
         for(InstSet::const_iterator it = stmts.begin(), eit = stmts.end(); it!=eit; ++it)
         {
@@ -117,7 +117,7 @@ public:
     }
 
     /// Add intra-procedural lock
-    inline void addCondIntraLock(const SVFInstruction* lockSite, const InstSet& stmts)
+    inline void addCondIntraLock(const ICFGNode* lockSite, const InstSet& stmts)
     {
         for(InstSet::const_iterator it = stmts.begin(), eit = stmts.end(); it!=eit; ++it)
         {
@@ -126,18 +126,18 @@ public:
     }
 
     /// Return true if a statement is inside an intra-procedural lock
-    inline bool isInsideIntraLock(const SVFInstruction* stmt) const
+    inline bool isInsideIntraLock(const ICFGNode* stmt) const
     {
         return instCILocksMap.find(stmt)!=instCILocksMap.end() || isInsideCondIntraLock(stmt);
     }
 
     /// Return true if a statement is inside a partial lock/unlock pair (conditional lock with unconditional unlock)
-    inline bool isInsideCondIntraLock(const SVFInstruction* stmt) const
+    inline bool isInsideCondIntraLock(const ICFGNode* stmt) const
     {
         return instTocondCILocksMap.find(stmt)!=instTocondCILocksMap.end();
     }
 
-    inline const InstSet& getIntraLockSet(const SVFInstruction* stmt) const
+    inline const InstSet& getIntraLockSet(const ICFGNode* stmt) const
     {
         InstToInstSetMap::const_iterator it = instCILocksMap.find(stmt);
         assert(it!=instCILocksMap.end() && "intralock not found!");
@@ -148,7 +148,7 @@ public:
     /// Context-sensitive locks
     //@{
     /// Add inter-procedural context-sensitive lock
-    inline void addCxtLock(const CallStrCxt& cxt,const SVFInstruction* inst)
+    inline void addCxtLock(const CallStrCxt& cxt,const ICFGNode* inst)
     {
         CxtLock cxtlock(cxt,inst);
         cxtLockset.insert(cxtlock);
@@ -200,12 +200,12 @@ public:
     /// Context-sensitive statement and lock spans
     //@{
     /// Get LockSet and LockSpan
-    inline bool hasCxtStmtfromInst(const SVFInstruction* inst) const
+    inline bool hasCxtStmtfromInst(const ICFGNode* inst) const
     {
         InstToCxtStmtSet::const_iterator it = instToCxtStmtSet.find(inst);
         return (it != instToCxtStmtSet.end());
     }
-    inline const CxtStmtSet& getCxtStmtfromInst(const SVFInstruction* inst) const
+    inline const CxtStmtSet& getCxtStmtfromInst(const ICFGNode* inst) const
     {
         InstToCxtStmtSet::const_iterator it = instToCxtStmtSet.find(inst);
         assert(it != instToCxtStmtSet.end());
@@ -269,7 +269,7 @@ public:
 
 
     /// Check if one instruction's context stmt is in a lock span
-    inline bool hasOneCxtInLockSpan(const SVFInstruction *I, LockSpan lspan) const
+    inline bool hasOneCxtInLockSpan(const ICFGNode *I, LockSpan lspan) const
     {
         if(!hasCxtStmtfromInst(I))
             return false;
@@ -284,7 +284,7 @@ public:
         return false;
     }
 
-    inline bool hasAllCxtInLockSpan(const SVFInstruction *I, LockSpan lspan) const
+    inline bool hasAllCxtInLockSpan(const ICFGNode *I, LockSpan lspan) const
     {
         if(!hasCxtStmtfromInst(I))
             return false;
@@ -303,15 +303,15 @@ public:
     /// Check if two Instructions are protected by common locks
     /// echo inst may have multiple cxt stmt
     /// we check whether every cxt stmt of instructions is protected by a common lock.
-    bool isProtectedByCommonLock(const SVFInstruction *i1, const SVFInstruction *i2);
-    bool isProtectedByCommonCxtLock(const SVFInstruction *i1, const SVFInstruction *i2);
+    bool isProtectedByCommonLock(const ICFGNode *i1, const ICFGNode *i2);
+    bool isProtectedByCommonCxtLock(const ICFGNode *i1, const ICFGNode *i2);
     bool isProtectedByCommonCxtLock(const CxtStmt& cxtStmt1, const CxtStmt& cxtStmt2);
-    bool isProtectedByCommonCILock(const SVFInstruction *i1, const SVFInstruction *i2);
+    bool isProtectedByCommonCILock(const ICFGNode *i1, const ICFGNode *i2);
 
-    bool isInSameSpan(const SVFInstruction *I1, const SVFInstruction *I2);
-    bool isInSameCSSpan(const SVFInstruction *i1, const SVFInstruction *i2) const;
+    bool isInSameSpan(const ICFGNode *I1, const ICFGNode *I2);
+    bool isInSameCSSpan(const ICFGNode *i1, const ICFGNode *i2) const;
     bool isInSameCSSpan(const CxtStmt& cxtStmt1, const CxtStmt& cxtStmt2) const;
-    bool isInSameCISpan(const SVFInstruction *i1, const SVFInstruction *i2) const;
+    bool isInSameCISpan(const ICFGNode *i1, const ICFGNode *i2) const;
 
     inline u32_t getNumOfCxtLocks()
     {
@@ -346,7 +346,7 @@ private:
     {
         return isAliasedLocks(cl1.getStmt(), cl2.getStmt());
     }
-    bool isAliasedLocks(const SVFInstruction* i1, const SVFInstruction* i2)
+    bool isAliasedLocks(const ICFGNode* i1, const ICFGNode* i2)
     {
         /// todo: must alias
         return tct->getPTA()->alias(getLockVal(i1), getLockVal(i2));
@@ -430,27 +430,37 @@ private:
     //@}
 
     /// Push calling context
-    void pushCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee);
+    void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee);
     /// Match context
-    bool matchCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee);
+    bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee);
 
     /// Whether it is a lock site
-    inline bool isTDFork(const SVFInstruction* call)
+    inline bool isTDFork(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->isTDFork(call);
     }
     /// Whether it is a lock site
-    inline bool isTDAcquire(const SVFInstruction* call)
+    inline bool isTDAcquire(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->isTDAcquire(call);
     }
     /// Whether it is a unlock site
-    inline bool isTDRelease(const SVFInstruction* call)
+    inline bool isTDRelease(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->isTDRelease(call);
     }
+    /// Whether it is a callsite
+    inline bool isCallSite(const ICFGNode* inst)
+    {
+        return tct->isCallSite(inst);
+    }
+    /// Whether it is calling an external function
+    inline bool isExtCall(const ICFGNode* inst)
+    {
+        return tct->isExtCall(inst);
+    }
     /// Get lock value
-    inline const SVFValue* getLockVal(const SVFInstruction* call)
+    inline const SVFValue* getLockVal(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->getLockVal(call);
     }

package/svf/include/MTA/MHP.h

@@ -48,11 +48,11 @@ class MHP
 public:
     typedef Set<const SVFFunction*> FunSet;
     typedef Set<const SVFInstruction*> InstSet;
-    typedef TCT::InstVec InstVec;
+    typedef std::vector<const SVFInstruction*> InstVec;
     typedef FIFOWorkList<CxtThreadStmt> CxtThreadStmtWorkList;
     typedef Set<CxtThreadStmt> CxtThreadStmtSet;
     typedef Map<CxtThreadStmt,NodeBS> ThreadStmtToThreadInterleav;
-    typedef Map<const SVFInstruction*,CxtThreadStmtSet> InstToThreadStmtSetMap;
+    typedef Map<const ICFGNode*,CxtThreadStmtSet> InstToThreadStmtSetMap;
     typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
 
     typedef Set<CxtStmt> LockSpan;
@@ -84,30 +84,15 @@ public:
         return tct;
     }
 
-    // Get CallICFGNode
-    inline CallICFGNode* getCBN(const SVFInstruction* inst)
-    {
-        return tct->getCallICFGNode(inst);
-    }
-
     /// Whether the function is connected from main function in thread call graph
     bool isConnectedfromMain(const SVFFunction* fun);
 
-//    /// Interface to query whether two instructions are protected by common locks
-//    virtual bool isProtectedByACommonLock(const SVFInstruction* i1, const SVFInstruction* i2);
-//    virtual bool isAllCxtInSameLockSpan(const SVFInstruction *I1, const SVFInstruction *I2);
-//    virtual bool isOneCxtInSameLockSpan(const SVFInstruction *I1, const SVFInstruction *I2);
-//
-//    bool hasOneCxtInLockSpan(const SVFInstruction *I, LockSpan lspan);
-//    bool hasAllCxtInLockSpan(const SVFInstruction *I, LockSpan lspan);
-//
-//
 //    LockSpan getSpanfromCxtLock(NodeID l);
     /// Interface to query whether two instructions may happen-in-parallel
-    virtual bool mayHappenInParallel(const SVFInstruction* i1, const SVFInstruction* i2);
-    virtual bool mayHappenInParallelCache(const SVFInstruction* i1, const SVFInstruction* i2);
-    virtual bool mayHappenInParallelInst(const SVFInstruction* i1, const SVFInstruction* i2);
-    virtual bool executedByTheSameThread(const SVFInstruction* i1, const SVFInstruction* i2);
+    virtual bool mayHappenInParallel(const ICFGNode* i1, const ICFGNode* i2);
+    virtual bool mayHappenInParallelCache(const ICFGNode* i1, const ICFGNode* i2);
+    virtual bool mayHappenInParallelInst(const ICFGNode* i1, const ICFGNode* i2);
+    virtual bool executedByTheSameThread(const ICFGNode* i1, const ICFGNode* i2);
 
     /// Get interleaving thread for statement inst
     //@{
@@ -123,13 +108,13 @@ public:
 
     /// Get/has ThreadStmt
     //@{
-    inline const CxtThreadStmtSet& getThreadStmtSet(const SVFInstruction* inst) const
+    inline const CxtThreadStmtSet& getThreadStmtSet(const ICFGNode* inst) const
     {
         InstToThreadStmtSetMap::const_iterator it = instToTSMap.find(inst);
         assert(it!=instToTSMap.end() && "no thread access the instruction?");
         return it->second;
     }
-    inline bool hasThreadStmtSet(const SVFInstruction* inst) const
+    inline bool hasThreadStmtSet(const ICFGNode* inst) const
     {
         return instToTSMap.find(inst)!=instToTSMap.end();
     }
@@ -140,9 +125,9 @@ public:
 
 private:
 
-    inline const CallGraph::FunctionSet& getCallee(const SVFInstruction* inst, CallGraph::FunctionSet& callees)
+    inline const CallGraph::FunctionSet& getCallee(const CallICFGNode* inst, CallGraph::FunctionSet& callees)
     {
-        tcg->getCallees(getCBN(inst), callees);
+        tcg->getCallees(inst, callees);
         return callees;
     }
     /// Update non-candidate functions' interleaving.
@@ -186,7 +171,7 @@ private:
             pushToCTSWorkList(tgr);
         }
     }
-    inline void rmInterleavingThread(const CxtThreadStmt& tgr, const NodeBS& tids, const SVFInstruction* joinsite)
+    inline void rmInterleavingThread(const CxtThreadStmt& tgr, const NodeBS& tids, const ICFGNode* joinsite)
     {
         NodeBS joinedTids;
         for(NodeBS::iterator it = tids.begin(), eit = tids.end(); it!=eit; ++it)
@@ -211,7 +196,7 @@ private:
     bool isRecurFullJoin(NodeID parentTid, NodeID curTid);
 
     /// Whether a join site must join a thread t
-    bool isMustJoin(const NodeID curTid, const SVFInstruction* joinsite);
+    bool isMustJoin(const NodeID curTid, const ICFGNode* joinsite);
 
     /// A thread is a multiForked thread if it is in a loop or recursion
     inline bool isMultiForkedThread(NodeID curTid)
@@ -219,12 +204,12 @@ private:
         return tct->getTCTNode(curTid)->isMultiforked();
     }
     /// Push calling context
-    inline void pushCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee)
+    inline void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee)
     {
         tct->pushCxt(cxt,call,callee);
     }
     /// Match context
-    inline bool matchCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee)
+    inline bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee)
     {
         return tct->matchCxt(cxt,call,callee);
     }
@@ -242,24 +227,24 @@ private:
     }
 
     /// Whether it is a fork site
-    inline bool isTDFork(const SVFInstruction* call)
+    inline bool isTDFork(const ICFGNode* call)
     {
         return tcg->getThreadAPI()->isTDFork(call);
     }
     /// Whether it is a join site
-    inline bool isTDJoin(const SVFInstruction* call)
+    inline bool isTDJoin(const ICFGNode* call)
     {
         return tcg->getThreadAPI()->isTDJoin(call);
     }
 
     /// Return thread id(s) which are directly or indirectly joined at this join site
-    NodeBS getDirAndIndJoinedTid(const CallStrCxt& cxt, const SVFInstruction* call);
+    NodeBS getDirAndIndJoinedTid(const CallStrCxt& cxt, const ICFGNode* call);
 
     /// Whether a context-sensitive join satisfies symmetric loop pattern
-    bool hasJoinInSymmetricLoop(const CallStrCxt& cxt, const SVFInstruction* call) const;
+    bool hasJoinInSymmetricLoop(const CallStrCxt& cxt, const ICFGNode* call) const;
 
     /// Whether a context-sensitive join satisfies symmetric loop pattern
-    const LoopBBs& getJoinInSymmetricLoop(const CallStrCxt& cxt, const SVFInstruction* call) const;
+    const LoopBBs& getJoinInSymmetricLoop(const CallStrCxt& cxt, const ICFGNode* call) const;
 
     /// Whether thread t1 happens before t2 based on ForkJoin Analysis
     bool isHBPair(NodeID tid1, NodeID tid2);
@@ -353,21 +338,21 @@ public:
     }
 
     /// Get exit instruction of the start routine function of tid's parent thread
-    inline const SVFInstruction* getExitInstOfParentRoutineFun(NodeID tid) const
+    inline const ICFGNode* getExitInstOfParentRoutineFun(NodeID tid) const
     {
         NodeID parentTid = tct->getParentThread(tid);
         const CxtThread& parentct = tct->getTCTNode(parentTid)->getCxtThread();
         const SVFFunction* parentRoutine = tct->getStartRoutineOfCxtThread(parentct);
         const SVFInstruction* inst = parentRoutine->getExitBB()->back();
-        return inst;
+        return tct->getICFGNode(inst);
     }
 
     /// Get loop for join site
-    inline LoopBBs& getJoinLoop(const SVFInstruction* inst)
+    inline LoopBBs& getJoinLoop(const ICFGNode* inst)
     {
         return tct->getJoinLoop(inst);
     }
-    inline bool hasJoinLoop(const SVFInstruction* inst)
+    inline bool hasJoinLoop(const ICFGNode* inst)
     {
         return tct->hasJoinLoop(inst);
     }
@@ -389,21 +374,16 @@ private:
     void handleIntra(const CxtStmt& cts);
 
     /// Return true if the fork and join have the same SCEV
-    bool isSameSCEV(const SVFInstruction* forkSite, const SVFInstruction* joinSite);
+    bool isSameSCEV(const ICFGNode* forkSite, const ICFGNode* joinSite);
 
     /// Same loop trip count
-    bool sameLoopTripCount(const SVFInstruction* forkSite, const SVFInstruction* joinSite);
+    bool sameLoopTripCount(const ICFGNode* forkSite, const ICFGNode* joinSite);
 
     /// Whether it is a matched fork join pair
-    bool isAliasedForkJoin(const SVFInstruction* forkSite, const SVFInstruction* joinSite)
+    bool isAliasedForkJoin(const ICFGNode* forkSite, const ICFGNode* joinSite)
     {
         return tct->getPTA()->alias(getForkedThread(forkSite), getJoinedThread(joinSite)) && isSameSCEV(forkSite,joinSite);
     }
-    // Get CallICFGNode
-    inline CallICFGNode* getCBN(const SVFInstruction* inst)
-    {
-        return tct->getCallICFGNode(inst);
-    }
     /// Mark thread flags for cxtStmt
     //@{
     /// Get the flag for a cxtStmt
@@ -471,39 +451,39 @@ private:
     //@}
 
     /// Push calling context
-    inline void pushCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee)
+    inline void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee)
     {
         tct->pushCxt(cxt,call,callee);
     }
     /// Match context
-    inline bool matchCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee)
+    inline bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee)
     {
         return tct->matchCxt(cxt,call,callee);
     }
 
     /// Whether it is a fork site
-    inline bool isTDFork(const SVFInstruction* call)
+    inline bool isTDFork(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->isTDFork(call);
     }
     /// Whether it is a join site
-    inline bool isTDJoin(const SVFInstruction* call)
+    inline bool isTDJoin(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->isTDJoin(call);
     }
     /// Get forked thread
-    inline const SVFValue* getForkedThread(const SVFInstruction* call)
+    inline const SVFValue* getForkedThread(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->getForkedThread(call);
     }
     /// Get joined thread
-    inline const SVFValue* getJoinedThread(const SVFInstruction* call)
+    inline const SVFValue* getJoinedThread(const ICFGNode* call)
     {
         return getTCG()->getThreadAPI()->getJoinedThread(call);
     }
-    inline const CallGraph::FunctionSet& getCallee(const SVFInstruction* inst, CallGraph::FunctionSet& callees)
+    inline const CallGraph::FunctionSet& getCallee(const ICFGNode* inst, CallGraph::FunctionSet& callees)
     {
-        getTCG()->getCallees(getCBN(inst), callees);
+        getTCG()->getCallees(SVFUtil::cast<CallICFGNode>(inst), callees);
         return callees;
     }
     /// ThreadCallGraph

package/svf/include/MTA/MTAStat.h

@@ -51,7 +51,7 @@ public:
     typedef Set<const Instruction*> InstSet;
 
     /// Constructor
-    MTAStat():PTAStat(nullptr),TCTTime(0),MHPTime(0),FSMPTATime(0),AnnotationTime(0)
+    MTAStat():PTAStat(nullptr),TCTTime(0),MHPTime(0),AnnotationTime(0)
     {
     }
     /// Statistics for thread call graph
@@ -65,7 +65,6 @@ public:
 
     double TCTTime;
     double MHPTime;
-    double FSMPTATime;
     double AnnotationTime;
 };
 

package/svf/include/MTA/TCT.h

@@ -140,13 +140,13 @@ public:
     typedef TCTEdge::ThreadCreateEdgeSet ThreadCreateEdgeSet;
     typedef ThreadCreateEdgeSet::iterator TCTNodeIter;
     typedef Set<const SVFFunction*> FunSet;
-    typedef std::vector<const SVFInstruction*> InstVec;
-    typedef Set<const SVFInstruction*> InstSet;
+    typedef std::vector<const ICFGNode*> InstVec;
+    typedef Set<const ICFGNode*> InstSet;
     typedef Set<const CallGraphNode*> PTACGNodeSet;
     typedef Map<CxtThread,TCTNode*> CxtThreadToNodeMap;
     typedef Map<CxtThread,CallStrCxt> CxtThreadToForkCxt;
     typedef Map<CxtThread,const SVFFunction*> CxtThreadToFun;
-    typedef Map<const SVFInstruction*, LoopBBs> InstToLoopMap;
+    typedef Map<const ICFGNode*, LoopBBs> InstToLoopMap;
     typedef FIFOWorkList<CxtThreadProc> CxtThreadProcVec;
     typedef Set<CxtThreadProc> CxtThreadProcSet;
     typedef SCCDetection<CallGraph*> ThreadCallGraphSCC;
@@ -172,6 +172,11 @@ public:
     {
         return pta->getICFG()->getCallICFGNode(inst);
     }
+    const ICFGNode* getICFGNode(const SVFInstruction* inst)
+    {
+        return pta->getICFG()->getICFGNode(inst);
+    }
+
     /// Get SVFFModule
     SVFModule* getSVFModule() const
     {
@@ -246,6 +251,19 @@ public:
     }
     //@}
 
+    /// Whether it is calling an external function
+    inline bool isExtCall(const ICFGNode* inst)
+    {
+        if(const CallICFGNode* call = SVFUtil::dyn_cast<CallICFGNode>(inst))
+            return SVFUtil::isExtCall(call->getCallSite());
+        return false;
+    }
+    /// Whether it is a callsite
+    inline bool isCallSite(const ICFGNode* inst)
+    {
+        return SVFUtil::isa<CallICFGNode>(inst);
+    }
+
     /// Find/Get TCT node
     //@{
     inline bool hasTCTNode(const CxtThread& ct) const
@@ -355,7 +373,7 @@ public:
     }
 
     /// Get loop for join site
-    inline LoopBBs& getJoinLoop(const SVFInstruction* join)
+    inline LoopBBs& getJoinLoop(const ICFGNode* join)
     {
         assert(tcg->getThreadAPI()->isTDJoin(join) && "not a join site");
         InstToLoopMap::iterator it = joinSiteToLoopMap.find(join);
@@ -363,7 +381,7 @@ public:
         return it->second;
     }
 
-    inline bool hasJoinLoop(const SVFInstruction* join) const
+    inline bool hasJoinLoop(const ICFGNode* join) const
     {
         assert(tcg->getThreadAPI()->isTDJoin(join) && "not a join site");
         InstToLoopMap::const_iterator it = joinSiteToLoopMap.find(join);
@@ -372,24 +390,24 @@ public:
 
     bool hasLoop(const SVFBasicBlock* bb) const
     {
-        const SVFFunction* fun = bb->getParent();
+        const SVFFunction* fun = bb->getFunction();
         return fun->hasLoopInfo(bb);
     }
-    bool hasLoop(const SVFInstruction* inst) const
+    bool hasLoop(const ICFGNode* inst) const
     {
-        return hasLoop(inst->getParent());
+        return hasLoop(inst->getBB());
     }
     /// Return true if a join instruction must be executed inside a loop
-    bool isJoinMustExecutedInLoop(const LoopBBs& lp,const SVFInstruction* join);
+    bool isJoinMustExecutedInLoop(const LoopBBs& lp,const ICFGNode* join);
     /// Get loop for an instruction
-    const LoopBBs& getLoop(const SVFInstruction* inst);
+    const LoopBBs& getLoop(const ICFGNode* inst);
     /// Get loop for fork/join site
     const LoopBBs& getLoop(const SVFBasicBlock* bb);
 
     /// Push calling context
-    void pushCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee);
+    void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee);
     /// Match context
-    bool matchCxt(CallStrCxt& cxt, const SVFInstruction* call, const SVFFunction* callee);
+    bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const SVFFunction* callee);
 
     inline void pushCxt(CallStrCxt& cxt, CallSiteID csId)
     {
@@ -398,7 +416,7 @@ public:
             MaxCxtSize = cxt.size();
     }
     /// Whether a join site is in recursion
-    inline bool isJoinSiteInRecursion(const SVFInstruction* join) const
+    inline bool isJoinSiteInRecursion(const ICFGNode* join) const
     {
         assert(tcg->getThreadAPI()->isTDJoin(join) && "not a join site");
         return inRecurJoinSites.find(join)!=inRecurJoinSites.end();
@@ -473,9 +491,9 @@ private:
     /// Multi-forked threads
     //@{
     /// Whether an instruction is in a loop
-    bool isInLoopInstruction(const SVFInstruction* inst);
+    bool isInLoopInstruction(const ICFGNode* inst);
     /// Whether an instruction is in a recursion
-    bool isInRecursion(const SVFInstruction* inst) const;
+    bool isInRecursion(const ICFGNode* inst) const;
     //@}
 
     /// Handle call relations
@@ -483,7 +501,7 @@ private:
 
     /// Get or create a tct node based on CxtThread
     //@{
-    inline TCTNode* getOrCreateTCTNode(const CallStrCxt& cxt, const SVFInstruction* fork,const CallStrCxt& oldCxt, const SVFFunction* routine)
+    inline TCTNode* getOrCreateTCTNode(const CallStrCxt& cxt, const ICFGNode* fork,const CallStrCxt& oldCxt, const SVFFunction* routine)
     {
         CxtThread ct(cxt,fork);
         CxtThreadToNodeMap::const_iterator it = ctpToNodeMap.find(ct);
@@ -506,7 +524,7 @@ private:
         /// non-main thread
         if(ct.getThread() != nullptr)
         {
-            const SVFInstruction* svfInst = ct.getThread();
+            const ICFGNode* svfInst = ct.getThread();
             ct.setInloop(isInLoopInstruction(svfInst));
             ct.setIncycle(isInRecursion(svfInst));
         }
@@ -567,7 +585,7 @@ private:
     CxtThreadToForkCxt ctToForkCxtMap; /// Map a CxtThread to the context at its spawning site (fork site).
     CxtThreadToFun ctToRoutineFunMap; /// Map a CxtThread to its start routine function.
     InstToLoopMap joinSiteToLoopMap; ///< map an inloop join to its loop class
-    InstSet inRecurJoinSites;	///< Fork or Join sites in recursions
+    Set<const ICFGNode*>  inRecurJoinSites;	///< Fork or Join sites in recursions
 };
 
 } // End namespace SVF