svf-lib 1.0.2437 → 1.0.2439

package/SVF-linux-aarch64/include/MTA/LockAnalysis.h

@@ -72,13 +72,11 @@ public:
     typedef Map<CxtLock, LockSpan> CxtLockToSpan;
     typedef Map<CxtLock, NodeBS> CxtLockToLockSet;
     typedef Map<const ICFGNode*, NodeBS> LockSiteToLockSet;
-    typedef Map<const ICFGNode*, LockSpan> InstToCxtStmtSet;
+    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmtSet;
     typedef Map<CxtStmt, CxtLockSet> CxtStmtToCxtLockSet;
     typedef FIFOWorkList<CxtLockProc> CxtLockProcVec;
     typedef Set<CxtLockProc> CxtLockProcSet;
 
-    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmt;
-
     LockAnalysis(TCT* t) : tct(t), lockTime(0),numOfTotalQueries(0), numOfLockedQueries(0), lockQueriesTime(0)
     {
     }
@@ -200,12 +198,12 @@ public:
     /// Context-sensitive statement and lock spans
     //@{
     /// Get LockSet and LockSpan
-    inline bool hasCxtStmtfromInst(const ICFGNode* 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 ICFGNode* inst) const
+    inline const CxtStmtSet& getCxtStmtsFromInst(const ICFGNode* inst) const
     {
         InstToCxtStmtSet::const_iterator it = instToCxtStmtSet.find(inst);
         assert(it != instToCxtStmtSet.end());
@@ -271,9 +269,9 @@ public:
     /// Check if one instruction's context stmt is in a lock span
     inline bool hasOneCxtInLockSpan(const ICFGNode *I, LockSpan lspan) const
     {
-        if(!hasCxtStmtfromInst(I))
+        if(!hasCxtStmtFromInst(I))
             return false;
-        const LockSpan ctsset = getCxtStmtfromInst(I);
+        const LockSpan ctsset = getCxtStmtsFromInst(I);
         for (LockSpan::const_iterator cts = ctsset.begin(), ects = ctsset.end(); cts != ects; cts++)
         {
             if(lspan.find(*cts) != lspan.end())
@@ -286,9 +284,9 @@ public:
 
     inline bool hasAllCxtInLockSpan(const ICFGNode *I, LockSpan lspan) const
     {
-        if(!hasCxtStmtfromInst(I))
+        if(!hasCxtStmtFromInst(I))
             return false;
-        const LockSpan ctsset = getCxtStmtfromInst(I);
+        const LockSpan ctsset = getCxtStmtsFromInst(I);
         for (LockSpan::const_iterator cts = ctsset.begin(), ects = ctsset.end(); cts != ects; cts++)
         {
             if (lspan.find(*cts) == lspan.end())
@@ -429,10 +427,15 @@ private:
     }
     //@}
 
+    /// Context helper functions
+    //@{
     /// Push calling context
     void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
     /// Match context
     bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    /// If lhs is a suffix of rhs, including equal
+    bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt& call);
+    //@}
 
     /// Whether it is a lock site
     inline bool isTDFork(const ICFGNode* call)

package/SVF-linux-aarch64/include/MTA/MHP.h

@@ -96,11 +96,11 @@ public:
     //@{
     inline const NodeBS& getInterleavingThreads(const CxtThreadStmt& cts)
     {
-        return threadStmtToTheadInterLeav[cts];
+        return threadStmtToThreadInterLeav[cts];
     }
     inline bool hasInterleavingThreads(const CxtThreadStmt& cts) const
     {
-        return threadStmtToTheadInterLeav.find(cts)!=threadStmtToTheadInterLeav.end();
+        return threadStmtToThreadInterLeav.find(cts)!=threadStmtToThreadInterLeav.end();
     }
     //@}
 
@@ -154,7 +154,7 @@ private:
     //@{
     inline void addInterleavingThread(const CxtThreadStmt& tgr, NodeID tid)
     {
-        if(threadStmtToTheadInterLeav[tgr].test_and_set(tid))
+        if(threadStmtToThreadInterLeav[tgr].test_and_set(tid))
         {
             instToTSMap[tgr.getStmt()].insert(tgr);
             pushToCTSWorkList(tgr);
@@ -162,7 +162,7 @@ private:
     }
     inline void addInterleavingThread(const CxtThreadStmt& tgr, const CxtThreadStmt& src)
     {
-        bool changed = threadStmtToTheadInterLeav[tgr] |= threadStmtToTheadInterLeav[src];
+        bool changed = threadStmtToThreadInterLeav[tgr] |= threadStmtToThreadInterLeav[src];
         if(changed)
         {
             instToTSMap[tgr.getStmt()].insert(tgr);
@@ -177,7 +177,7 @@ private:
             if(isMustJoin(tgr.getTid(),joinsite))
                 joinedTids.set(*it);
         }
-        if(threadStmtToTheadInterLeav[tgr].intersectWithComplement(joinedTids))
+        if(threadStmtToThreadInterLeav[tgr].intersectWithComplement(joinedTids))
         {
             pushToCTSWorkList(tgr);
         }
@@ -201,16 +201,28 @@ private:
     {
         return tct->getTCTNode(curTid)->isMultiforked();
     }
+
+    /// Context helper functions
+    //@{
     /// Push calling context
     inline void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
     {
+        /// handle calling context for candidate functions only
+        if(tct->isCandidateFun(call->getFun()) == false)
+            return;
         tct->pushCxt(cxt,call,callee);
     }
     /// Match context
-    inline bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    inline bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    {
+        return tct->matchAndPopCxt(cxt,call,callee);
+    }
+    /// If lhs is a suffix of rhs, including equal
+    inline bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt call)
     {
-        return tct->matchCxt(cxt,call,callee);
+        return tct->isContextSuffix(lhs,call);
     }
+    //@}
 
     /// WorkList helper functions
     //@{
@@ -253,7 +265,7 @@ private:
     TCT* tct;							///< TCT
     ForkJoinAnalysis* fja;				///< ForJoin Analysis
     CxtThreadStmtWorkList cxtStmtList;	///< CxtThreadStmt worklist
-    ThreadStmtToThreadInterleav threadStmtToTheadInterLeav; /// Map a statement to its thread interleavings
+    ThreadStmtToThreadInterleav threadStmtToThreadInterLeav; /// Map a statement to its thread interleavings
     InstToThreadStmtSetMap instToTSMap; ///< Map an instruction to its ThreadStmtSet
     FuncPairToBool nonCandidateFuncMHPRelMap;
 
@@ -290,6 +302,10 @@ public:
     typedef Map<CxtStmt, LoopBBs> CxtStmtToLoopMap;
     typedef FIFOWorkList<CxtStmt> CxtStmtWorkList;
 
+    typedef Set<CxtStmt> CxtStmtSet;
+    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmt;
+
+
     ForkJoinAnalysis(TCT* t) : tct(t)
     {
         collectSCEVInfo();
@@ -337,15 +353,6 @@ public:
         return full && !partial;
     }
 
-    /// Get exit instruction of the start routine function of tid's parent thread
-    inline const ICFGNode* getExitInstOfParentRoutineFun(NodeID tid) const
-    {
-        NodeID parentTid = tct->getParentThread(tid);
-        const CxtThread& parentct = tct->getTCTNode(parentTid)->getCxtThread();
-        const FunObjVar* parentRoutine = tct->getStartRoutineOfCxtThread(parentct);
-        return parentRoutine->getExitBB()->back();
-    }
-
     /// Get loop for join site
     inline LoopBBs& getJoinLoop(const CallICFGNode* inst)
     {
@@ -381,7 +388,7 @@ private:
     /// Whether it is a matched fork join pair
     bool isAliasedForkJoin(const CallICFGNode* forkSite, const CallICFGNode* joinSite)
     {
-        return tct->getPTA()->alias(getForkedThread(forkSite)->getId(), getJoinedThread(joinSite)->getId()) && isSameSCEV(forkSite,joinSite);
+        return tct->getPTA()->alias(getForkedThread(forkSite)->getId(), getJoinedThread(joinSite)->getId());
     }
     /// Mark thread flags for cxtStmt
     //@{
@@ -403,7 +410,11 @@ private:
         ValDomain flag_tgr = getMarkedFlag(tgr);
         cxtStmtToAliveFlagMap[tgr] = flag;
         if(flag_tgr!=getMarkedFlag(tgr))
+        {
+            instToCxtStmt[tgr.getStmt()].insert(tgr);
             pushToCTSWorkList(tgr);
+        }
+
     }
     /// Transfer function for marking context-sensitive statement
     void markCxtStmtFlag(const CxtStmt& tgr, const CxtStmt& src)
@@ -425,6 +436,7 @@ private:
         }
         if(flag_tgr!=getMarkedFlag(tgr))
         {
+            instToCxtStmt[tgr.getStmt()].insert(tgr);
             pushToCTSWorkList(tgr);
         }
     }
@@ -449,16 +461,27 @@ private:
     }
     //@}
 
+    /// Context helper functions
+    //@{
     /// Push calling context
     inline void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
     {
+        /// handle calling context for candidate functions only
+        if(tct->isCandidateFun(call->getFun()) == false)
+            return;
         tct->pushCxt(cxt,call,callee);
     }
     /// Match context
-    inline bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    inline bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    {
+        return tct->matchAndPopCxt(cxt,call,callee);
+    }
+    /// If lhs is a suffix of rhs, including equal
+    inline bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt call)
     {
-        return tct->matchCxt(cxt,call,callee);
+        return tct->isContextSuffix(lhs,call);
     }
+    //@}
 
     /// Whether it is a fork site
     inline bool isTDFork(const ICFGNode* call)
@@ -524,6 +547,18 @@ private:
     }
     //@}
 
+    /// Get CxtStmtSet for an instruction
+    inline const CxtStmtSet& getCxtStmtsFromInst(const ICFGNode* inst) const
+    {
+        InstToCxtStmt::const_iterator it = instToCxtStmt.find(inst);
+        assert(it!=instToCxtStmt.end() && "no CxtStmt for the instruction?");
+        return it->second;
+    }
+    inline bool hasCxtStmtsFromInst(const ICFGNode* inst) const
+    {
+        return instToCxtStmt.find(inst)!=instToCxtStmt.end();
+    }
+
     /// Add inloop join
     inline void addSymmetricLoopJoin(const CxtStmt& cs, LoopBBs& lp)
     {
@@ -539,6 +574,7 @@ private:
     ThreadPairSet HPPair;		///< threads happen-in-parallel
     ThreadPairSet fullJoin;		///< t1 fully joins t2 along all program path
     ThreadPairSet partialJoin;		///< t1 partially joins t2 along some program path(s)
+    InstToCxtStmt instToCxtStmt;    ///<Map a statement to all its context-sensitive statements
 };
 
 } // End namespace SVF

package/SVF-linux-aarch64/include/MTA/MTA.h

@@ -66,7 +66,7 @@ public:
     /// We start the pass here
     virtual bool runOnModule(SVFIR* module);
     /// Compute MHP
-    virtual MHP* computeMHP();
+    virtual MHP* computeMHP(TCT* tct);
     /// Compute locksets
     virtual LockAnalysis* computeLocksets(TCT* tct);
     /// Perform detection

package/SVF-linux-aarch64/include/MTA/TCT.h

@@ -97,7 +97,7 @@ public:
         SVFUtil::outs() << "---\ntid: " << this->getId() << "  inloop:" << ctx.isInloop() << "  incycle:" << ctx.isIncycle() << " multiforked:"<< isMultiforked();
     }
 
-    /// Get CxtThread
+    /// Get thread creation context, <fork site, call string context>
     inline const CxtThread& getCxtThread() const
     {
         return ctx;
@@ -142,7 +142,7 @@ public:
 
 
 private:
-    const CxtThread ctx;
+    const CxtThread ctx;  /// Thread creation context, <fork site, call string context>
     bool multiforked;
 };
 
@@ -162,7 +162,8 @@ public:
     typedef Set<const ICFGNode*> InstSet;
     typedef Set<const CallGraphNode*> PTACGNodeSet;
     typedef Map<CxtThread,TCTNode*> CxtThreadToNodeMap;
-    typedef Map<CxtThread,CallStrCxt> CxtThreadToForkCxt;
+    typedef Set<std::pair<NodeID, CallStrCxt>> CallStrCxtSet;
+    typedef Map<CxtThread,CallStrCxtSet> CxtThreadToForkCxtSet;
     typedef Map<CxtThread,const FunObjVar*> CxtThreadToFun;
     typedef Map<const ICFGNode*, LoopBBs> InstToLoopMap;
     typedef FIFOWorkList<CxtThreadProc> CxtThreadProcVec;
@@ -172,7 +173,8 @@ public:
     /// Constructor
     TCT(PointerAnalysis* p) :pta(p),TCTNodeNum(0),TCTEdgeNum(0),MaxCxtSize(0)
     {
-        tcg = SVFUtil::cast<ThreadCallGraph>(pta->getCallGraph());
+        tcg = SVFUtil::dyn_cast<ThreadCallGraph>(pta->getCallGraph());
+        assert(tcg != nullptr && "TCT::TCT: call graph is not a ThreadCallGraph!");
         tcg->updateCallGraph(pta);
         //tcg->updateJoinEdge(pta);
         tcgSCC = pta->getCallGraphSCC();
@@ -182,9 +184,7 @@ public:
 
     /// Destructor
     virtual ~TCT()
-    {
-        destroy();
-    }
+    {  }
 
     /// Get TCG
     inline ThreadCallGraph* getThreadCallGraph() const
@@ -310,24 +310,29 @@ public:
         const TCTNode* node = getTCTNode(tid);
         return node->getInEdges().size()==1;
     }
-    /// Get parent thread
-    inline NodeID getParentThread(NodeID tid) const
+    /// Get parent threads
+    inline NodeBS getParentThreads(NodeID tid) const
     {
+        NodeBS parentTds;
         const TCTNode* node = getTCTNode(tid);
-        assert(node->getInEdges().size()<=1 && "should have at most one parent thread");
-        assert(node->getInEdges().size()==1 && "does not have a parent thread");
-        const TCTEdge* edge = *(node->getInEdges().begin());
-        return edge->getSrcID();
+        assert(node->getInEdges().size()>=1 && "does not have a parent thread");
+
+        for (const TCTEdge* edge : node->getInEdges())
+        {
+            parentTds.set(edge->getSrcID());
+        }
+        return parentTds;
     }
     /// Get all ancestor threads
-    const NodeBS getAncestorThread(NodeID tid) const
+    const NodeBS getAncestorThreads(NodeID tid) const
     {
         NodeBS tds;
         if(hasParentThread(tid) == false)
             return tds;
 
         FIFOWorkList<NodeID> worklist;
-        worklist.push(getParentThread(tid));
+        for(NodeID parentTid : getParentThreads(tid))
+            worklist.push(parentTid);
 
         while(!worklist.empty())
         {
@@ -335,7 +340,8 @@ public:
             if(tds.test_and_set(t))
             {
                 if(hasParentThread(t))
-                    worklist.push(getParentThread(t));
+                    for(NodeID parentTid : getParentThreads(t))
+                        worklist.push(parentTid);
             }
         }
         return tds;
@@ -346,24 +352,26 @@ public:
         NodeBS tds;
         if(hasParentThread(tid) == false)
             return tds;
-
-        const TCTNode* node = getTCTNode(getParentThread(tid));
-        for(ThreadCreateEdgeSet::const_iterator it = getChildrenBegin(node), eit = getChildrenEnd(node); it!=eit; ++it)
+        for (NodeID parentTid : getParentThreads(tid))
         {
-            NodeID child = (*it)->getDstNode()->getId();
-            if(child!=tid)
-                tds.set(child);
+            const TCTNode* parentNode = getTCTNode(parentTid);
+            for(ThreadCreateEdgeSet::const_iterator it = getChildrenBegin(parentNode),
+                    eit = getChildrenEnd(parentNode); it!=eit; ++it)
+            {
+                NodeID child = (*it)->getDstNode()->getId();
+                if(child!=tid)
+                    tds.set(child);
+            }
         }
-
         return tds;
     }
     //@}
 
-    /// get the context of a thread at its spawning site (fork site)
-    const CallStrCxt& getCxtOfCxtThread(const CxtThread& ct) const
+    /// get the contexts of a thread at its spawning sites (fork sites)
+    const CallStrCxtSet& getCxtOfCxtThread(const CxtThread& ct) const
     {
-        CxtThreadToForkCxt::const_iterator it = ctToForkCxtMap.find(ct);
-        assert(it!=ctToForkCxtMap.end() && "Cxt Thread not found!!");
+        CxtThreadToForkCxtSet::const_iterator it = ctToForkCxtsMap.find(ct);
+        assert(it!=ctToForkCxtsMap.end() && "Cxt Thread not found!!");
         return it->second;
     }
 
@@ -407,17 +415,16 @@ public:
     /// Get loop for fork/join site
     const LoopBBs& getLoop(const SVFBasicBlock* bb);
 
+    /// Context helper functions
+    //@{
     /// Push calling context
     void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
     /// Match context
-    bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    /// If lhs is a suffix of rhs, including equal
+    bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt& call);
+    //@}
 
-    inline void pushCxt(CallStrCxt& cxt, CallSiteID csId)
-    {
-        cxt.push_back(csId);
-        if (cxt.size() > MaxCxtSize)
-            MaxCxtSize = cxt.size();
-    }
     /// Whether a join site is in recursion
     inline bool isJoinSiteInRecursion(const CallICFGNode* join) const
     {
@@ -504,7 +511,7 @@ private:
 
     /// Get or create a tct node based on CxtThread
     //@{
-    inline TCTNode* getOrCreateTCTNode(const CallStrCxt& cxt, const ICFGNode* fork,const CallStrCxt& oldCxt, const FunObjVar* routine)
+    inline TCTNode* getOrCreateTCTNode(const CallStrCxt& cxt, const ICFGNode* fork, const CxtThreadProc& forkSiteCtp, const FunObjVar* routine)
     {
         CxtThread ct(cxt,fork);
         CxtThreadToNodeMap::const_iterator it = ctpToNodeMap.find(ct);
@@ -513,7 +520,7 @@ private:
             return it->second;
         }
 
-        addCxtOfCxtThread(oldCxt,ct);
+        addCxtOfCxtThread(forkSiteCtp.getTid(), forkSiteCtp.getContext(), ct);
         addStartRoutineOfCxtThread(routine,ct);
 
         setMultiForkedAttrs(ct);
@@ -540,10 +547,11 @@ private:
     }
 
     /// Add context for a thread at its spawning site (fork site)
-    void addCxtOfCxtThread(const CallStrCxt& cxt, const CxtThread& ct)
+    void addCxtOfCxtThread(NodeID pTid, const CallStrCxt& cxt, const CxtThread& ct)
     {
-        ctToForkCxtMap[ct] = cxt;
+        ctToForkCxtsMap[ct].insert(std::make_pair(pTid, cxt));
     }
+
     /// Add start routine function of a cxt thread
     void addStartRoutineOfCxtThread(const FunObjVar* fun, const CxtThread& ct)
     {
@@ -571,13 +579,6 @@ private:
         return visitedCTPs.find(ctp)!=visitedCTPs.end();
     }
     //@}
-    /// Clean up memory
-    inline void destroy()
-    {
-        if(tcgSCC)
-            delete tcgSCC;
-        tcgSCC=nullptr;
-    }
 
     FunSet entryFuncSet; /// Procedures that are neither called by other functions nor extern functions
     FunSet candidateFuncSet; /// Procedures we care about during call graph traversing when creating TCT
@@ -585,7 +586,7 @@ private:
     CxtThreadProcVec ctpList;	/// CxtThreadProc List
     CxtThreadProcSet visitedCTPs; /// Record all visited ctps
     CxtThreadToNodeMap ctpToNodeMap; /// Map a ctp to its graph node
-    CxtThreadToForkCxt ctToForkCxtMap; /// Map a CxtThread to the context at its spawning site (fork site).
+    CxtThreadToForkCxtSet ctToForkCxtsMap; /// 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
     Set<const ICFGNode*>  inRecurJoinSites;	///< Fork or Join sites in recursions

package/SVF-linux-x86_64/include/MTA/LockAnalysis.h

@@ -72,13 +72,11 @@ public:
     typedef Map<CxtLock, LockSpan> CxtLockToSpan;
     typedef Map<CxtLock, NodeBS> CxtLockToLockSet;
     typedef Map<const ICFGNode*, NodeBS> LockSiteToLockSet;
-    typedef Map<const ICFGNode*, LockSpan> InstToCxtStmtSet;
+    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmtSet;
     typedef Map<CxtStmt, CxtLockSet> CxtStmtToCxtLockSet;
     typedef FIFOWorkList<CxtLockProc> CxtLockProcVec;
     typedef Set<CxtLockProc> CxtLockProcSet;
 
-    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmt;
-
     LockAnalysis(TCT* t) : tct(t), lockTime(0),numOfTotalQueries(0), numOfLockedQueries(0), lockQueriesTime(0)
     {
     }
@@ -200,12 +198,12 @@ public:
     /// Context-sensitive statement and lock spans
     //@{
     /// Get LockSet and LockSpan
-    inline bool hasCxtStmtfromInst(const ICFGNode* 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 ICFGNode* inst) const
+    inline const CxtStmtSet& getCxtStmtsFromInst(const ICFGNode* inst) const
     {
         InstToCxtStmtSet::const_iterator it = instToCxtStmtSet.find(inst);
         assert(it != instToCxtStmtSet.end());
@@ -271,9 +269,9 @@ public:
     /// Check if one instruction's context stmt is in a lock span
     inline bool hasOneCxtInLockSpan(const ICFGNode *I, LockSpan lspan) const
     {
-        if(!hasCxtStmtfromInst(I))
+        if(!hasCxtStmtFromInst(I))
             return false;
-        const LockSpan ctsset = getCxtStmtfromInst(I);
+        const LockSpan ctsset = getCxtStmtsFromInst(I);
         for (LockSpan::const_iterator cts = ctsset.begin(), ects = ctsset.end(); cts != ects; cts++)
         {
             if(lspan.find(*cts) != lspan.end())
@@ -286,9 +284,9 @@ public:
 
     inline bool hasAllCxtInLockSpan(const ICFGNode *I, LockSpan lspan) const
     {
-        if(!hasCxtStmtfromInst(I))
+        if(!hasCxtStmtFromInst(I))
             return false;
-        const LockSpan ctsset = getCxtStmtfromInst(I);
+        const LockSpan ctsset = getCxtStmtsFromInst(I);
         for (LockSpan::const_iterator cts = ctsset.begin(), ects = ctsset.end(); cts != ects; cts++)
         {
             if (lspan.find(*cts) == lspan.end())
@@ -429,10 +427,15 @@ private:
     }
     //@}
 
+    /// Context helper functions
+    //@{
     /// Push calling context
     void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
     /// Match context
     bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    /// If lhs is a suffix of rhs, including equal
+    bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt& call);
+    //@}
 
     /// Whether it is a lock site
     inline bool isTDFork(const ICFGNode* call)

package/SVF-linux-x86_64/include/MTA/MHP.h

@@ -96,11 +96,11 @@ public:
     //@{
     inline const NodeBS& getInterleavingThreads(const CxtThreadStmt& cts)
     {
-        return threadStmtToTheadInterLeav[cts];
+        return threadStmtToThreadInterLeav[cts];
     }
     inline bool hasInterleavingThreads(const CxtThreadStmt& cts) const
     {
-        return threadStmtToTheadInterLeav.find(cts)!=threadStmtToTheadInterLeav.end();
+        return threadStmtToThreadInterLeav.find(cts)!=threadStmtToThreadInterLeav.end();
     }
     //@}
 
@@ -154,7 +154,7 @@ private:
     //@{
     inline void addInterleavingThread(const CxtThreadStmt& tgr, NodeID tid)
     {
-        if(threadStmtToTheadInterLeav[tgr].test_and_set(tid))
+        if(threadStmtToThreadInterLeav[tgr].test_and_set(tid))
         {
             instToTSMap[tgr.getStmt()].insert(tgr);
             pushToCTSWorkList(tgr);
@@ -162,7 +162,7 @@ private:
     }
     inline void addInterleavingThread(const CxtThreadStmt& tgr, const CxtThreadStmt& src)
     {
-        bool changed = threadStmtToTheadInterLeav[tgr] |= threadStmtToTheadInterLeav[src];
+        bool changed = threadStmtToThreadInterLeav[tgr] |= threadStmtToThreadInterLeav[src];
         if(changed)
         {
             instToTSMap[tgr.getStmt()].insert(tgr);
@@ -177,7 +177,7 @@ private:
             if(isMustJoin(tgr.getTid(),joinsite))
                 joinedTids.set(*it);
         }
-        if(threadStmtToTheadInterLeav[tgr].intersectWithComplement(joinedTids))
+        if(threadStmtToThreadInterLeav[tgr].intersectWithComplement(joinedTids))
         {
             pushToCTSWorkList(tgr);
         }
@@ -201,16 +201,28 @@ private:
     {
         return tct->getTCTNode(curTid)->isMultiforked();
     }
+
+    /// Context helper functions
+    //@{
     /// Push calling context
     inline void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
     {
+        /// handle calling context for candidate functions only
+        if(tct->isCandidateFun(call->getFun()) == false)
+            return;
         tct->pushCxt(cxt,call,callee);
     }
     /// Match context
-    inline bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    inline bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    {
+        return tct->matchAndPopCxt(cxt,call,callee);
+    }
+    /// If lhs is a suffix of rhs, including equal
+    inline bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt call)
     {
-        return tct->matchCxt(cxt,call,callee);
+        return tct->isContextSuffix(lhs,call);
     }
+    //@}
 
     /// WorkList helper functions
     //@{
@@ -253,7 +265,7 @@ private:
     TCT* tct;							///< TCT
     ForkJoinAnalysis* fja;				///< ForJoin Analysis
     CxtThreadStmtWorkList cxtStmtList;	///< CxtThreadStmt worklist
-    ThreadStmtToThreadInterleav threadStmtToTheadInterLeav; /// Map a statement to its thread interleavings
+    ThreadStmtToThreadInterleav threadStmtToThreadInterLeav; /// Map a statement to its thread interleavings
     InstToThreadStmtSetMap instToTSMap; ///< Map an instruction to its ThreadStmtSet
     FuncPairToBool nonCandidateFuncMHPRelMap;
 
@@ -290,6 +302,10 @@ public:
     typedef Map<CxtStmt, LoopBBs> CxtStmtToLoopMap;
     typedef FIFOWorkList<CxtStmt> CxtStmtWorkList;
 
+    typedef Set<CxtStmt> CxtStmtSet;
+    typedef Map<const ICFGNode*, CxtStmtSet> InstToCxtStmt;
+
+
     ForkJoinAnalysis(TCT* t) : tct(t)
     {
         collectSCEVInfo();
@@ -337,15 +353,6 @@ public:
         return full && !partial;
     }
 
-    /// Get exit instruction of the start routine function of tid's parent thread
-    inline const ICFGNode* getExitInstOfParentRoutineFun(NodeID tid) const
-    {
-        NodeID parentTid = tct->getParentThread(tid);
-        const CxtThread& parentct = tct->getTCTNode(parentTid)->getCxtThread();
-        const FunObjVar* parentRoutine = tct->getStartRoutineOfCxtThread(parentct);
-        return parentRoutine->getExitBB()->back();
-    }
-
     /// Get loop for join site
     inline LoopBBs& getJoinLoop(const CallICFGNode* inst)
     {
@@ -381,7 +388,7 @@ private:
     /// Whether it is a matched fork join pair
     bool isAliasedForkJoin(const CallICFGNode* forkSite, const CallICFGNode* joinSite)
     {
-        return tct->getPTA()->alias(getForkedThread(forkSite)->getId(), getJoinedThread(joinSite)->getId()) && isSameSCEV(forkSite,joinSite);
+        return tct->getPTA()->alias(getForkedThread(forkSite)->getId(), getJoinedThread(joinSite)->getId());
     }
     /// Mark thread flags for cxtStmt
     //@{
@@ -403,7 +410,11 @@ private:
         ValDomain flag_tgr = getMarkedFlag(tgr);
         cxtStmtToAliveFlagMap[tgr] = flag;
         if(flag_tgr!=getMarkedFlag(tgr))
+        {
+            instToCxtStmt[tgr.getStmt()].insert(tgr);
             pushToCTSWorkList(tgr);
+        }
+
     }
     /// Transfer function for marking context-sensitive statement
     void markCxtStmtFlag(const CxtStmt& tgr, const CxtStmt& src)
@@ -425,6 +436,7 @@ private:
         }
         if(flag_tgr!=getMarkedFlag(tgr))
         {
+            instToCxtStmt[tgr.getStmt()].insert(tgr);
             pushToCTSWorkList(tgr);
         }
     }
@@ -449,16 +461,27 @@ private:
     }
     //@}
 
+    /// Context helper functions
+    //@{
     /// Push calling context
     inline void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
     {
+        /// handle calling context for candidate functions only
+        if(tct->isCandidateFun(call->getFun()) == false)
+            return;
         tct->pushCxt(cxt,call,callee);
     }
     /// Match context
-    inline bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    inline bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee)
+    {
+        return tct->matchAndPopCxt(cxt,call,callee);
+    }
+    /// If lhs is a suffix of rhs, including equal
+    inline bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt call)
     {
-        return tct->matchCxt(cxt,call,callee);
+        return tct->isContextSuffix(lhs,call);
     }
+    //@}
 
     /// Whether it is a fork site
     inline bool isTDFork(const ICFGNode* call)
@@ -524,6 +547,18 @@ private:
     }
     //@}
 
+    /// Get CxtStmtSet for an instruction
+    inline const CxtStmtSet& getCxtStmtsFromInst(const ICFGNode* inst) const
+    {
+        InstToCxtStmt::const_iterator it = instToCxtStmt.find(inst);
+        assert(it!=instToCxtStmt.end() && "no CxtStmt for the instruction?");
+        return it->second;
+    }
+    inline bool hasCxtStmtsFromInst(const ICFGNode* inst) const
+    {
+        return instToCxtStmt.find(inst)!=instToCxtStmt.end();
+    }
+
     /// Add inloop join
     inline void addSymmetricLoopJoin(const CxtStmt& cs, LoopBBs& lp)
     {
@@ -539,6 +574,7 @@ private:
     ThreadPairSet HPPair;		///< threads happen-in-parallel
     ThreadPairSet fullJoin;		///< t1 fully joins t2 along all program path
     ThreadPairSet partialJoin;		///< t1 partially joins t2 along some program path(s)
+    InstToCxtStmt instToCxtStmt;    ///<Map a statement to all its context-sensitive statements
 };
 
 } // End namespace SVF

package/SVF-linux-x86_64/include/MTA/MTA.h

@@ -66,7 +66,7 @@ public:
     /// We start the pass here
     virtual bool runOnModule(SVFIR* module);
     /// Compute MHP
-    virtual MHP* computeMHP();
+    virtual MHP* computeMHP(TCT* tct);
     /// Compute locksets
     virtual LockAnalysis* computeLocksets(TCT* tct);
     /// Perform detection

package/SVF-linux-x86_64/include/MTA/TCT.h

@@ -97,7 +97,7 @@ public:
         SVFUtil::outs() << "---\ntid: " << this->getId() << "  inloop:" << ctx.isInloop() << "  incycle:" << ctx.isIncycle() << " multiforked:"<< isMultiforked();
     }
 
-    /// Get CxtThread
+    /// Get thread creation context, <fork site, call string context>
     inline const CxtThread& getCxtThread() const
     {
         return ctx;
@@ -142,7 +142,7 @@ public:
 
 
 private:
-    const CxtThread ctx;
+    const CxtThread ctx;  /// Thread creation context, <fork site, call string context>
     bool multiforked;
 };
 
@@ -162,7 +162,8 @@ public:
     typedef Set<const ICFGNode*> InstSet;
     typedef Set<const CallGraphNode*> PTACGNodeSet;
     typedef Map<CxtThread,TCTNode*> CxtThreadToNodeMap;
-    typedef Map<CxtThread,CallStrCxt> CxtThreadToForkCxt;
+    typedef Set<std::pair<NodeID, CallStrCxt>> CallStrCxtSet;
+    typedef Map<CxtThread,CallStrCxtSet> CxtThreadToForkCxtSet;
     typedef Map<CxtThread,const FunObjVar*> CxtThreadToFun;
     typedef Map<const ICFGNode*, LoopBBs> InstToLoopMap;
     typedef FIFOWorkList<CxtThreadProc> CxtThreadProcVec;
@@ -172,7 +173,8 @@ public:
     /// Constructor
     TCT(PointerAnalysis* p) :pta(p),TCTNodeNum(0),TCTEdgeNum(0),MaxCxtSize(0)
     {
-        tcg = SVFUtil::cast<ThreadCallGraph>(pta->getCallGraph());
+        tcg = SVFUtil::dyn_cast<ThreadCallGraph>(pta->getCallGraph());
+        assert(tcg != nullptr && "TCT::TCT: call graph is not a ThreadCallGraph!");
         tcg->updateCallGraph(pta);
         //tcg->updateJoinEdge(pta);
         tcgSCC = pta->getCallGraphSCC();
@@ -182,9 +184,7 @@ public:
 
     /// Destructor
     virtual ~TCT()
-    {
-        destroy();
-    }
+    {  }
 
     /// Get TCG
     inline ThreadCallGraph* getThreadCallGraph() const
@@ -310,24 +310,29 @@ public:
         const TCTNode* node = getTCTNode(tid);
         return node->getInEdges().size()==1;
     }
-    /// Get parent thread
-    inline NodeID getParentThread(NodeID tid) const
+    /// Get parent threads
+    inline NodeBS getParentThreads(NodeID tid) const
     {
+        NodeBS parentTds;
         const TCTNode* node = getTCTNode(tid);
-        assert(node->getInEdges().size()<=1 && "should have at most one parent thread");
-        assert(node->getInEdges().size()==1 && "does not have a parent thread");
-        const TCTEdge* edge = *(node->getInEdges().begin());
-        return edge->getSrcID();
+        assert(node->getInEdges().size()>=1 && "does not have a parent thread");
+
+        for (const TCTEdge* edge : node->getInEdges())
+        {
+            parentTds.set(edge->getSrcID());
+        }
+        return parentTds;
     }
     /// Get all ancestor threads
-    const NodeBS getAncestorThread(NodeID tid) const
+    const NodeBS getAncestorThreads(NodeID tid) const
     {
         NodeBS tds;
         if(hasParentThread(tid) == false)
             return tds;
 
         FIFOWorkList<NodeID> worklist;
-        worklist.push(getParentThread(tid));
+        for(NodeID parentTid : getParentThreads(tid))
+            worklist.push(parentTid);
 
         while(!worklist.empty())
         {
@@ -335,7 +340,8 @@ public:
             if(tds.test_and_set(t))
             {
                 if(hasParentThread(t))
-                    worklist.push(getParentThread(t));
+                    for(NodeID parentTid : getParentThreads(t))
+                        worklist.push(parentTid);
             }
         }
         return tds;
@@ -346,24 +352,26 @@ public:
         NodeBS tds;
         if(hasParentThread(tid) == false)
             return tds;
-
-        const TCTNode* node = getTCTNode(getParentThread(tid));
-        for(ThreadCreateEdgeSet::const_iterator it = getChildrenBegin(node), eit = getChildrenEnd(node); it!=eit; ++it)
+        for (NodeID parentTid : getParentThreads(tid))
         {
-            NodeID child = (*it)->getDstNode()->getId();
-            if(child!=tid)
-                tds.set(child);
+            const TCTNode* parentNode = getTCTNode(parentTid);
+            for(ThreadCreateEdgeSet::const_iterator it = getChildrenBegin(parentNode),
+                    eit = getChildrenEnd(parentNode); it!=eit; ++it)
+            {
+                NodeID child = (*it)->getDstNode()->getId();
+                if(child!=tid)
+                    tds.set(child);
+            }
         }
-
         return tds;
     }
     //@}
 
-    /// get the context of a thread at its spawning site (fork site)
-    const CallStrCxt& getCxtOfCxtThread(const CxtThread& ct) const
+    /// get the contexts of a thread at its spawning sites (fork sites)
+    const CallStrCxtSet& getCxtOfCxtThread(const CxtThread& ct) const
     {
-        CxtThreadToForkCxt::const_iterator it = ctToForkCxtMap.find(ct);
-        assert(it!=ctToForkCxtMap.end() && "Cxt Thread not found!!");
+        CxtThreadToForkCxtSet::const_iterator it = ctToForkCxtsMap.find(ct);
+        assert(it!=ctToForkCxtsMap.end() && "Cxt Thread not found!!");
         return it->second;
     }
 
@@ -407,17 +415,16 @@ public:
     /// Get loop for fork/join site
     const LoopBBs& getLoop(const SVFBasicBlock* bb);
 
+    /// Context helper functions
+    //@{
     /// Push calling context
     void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
     /// Match context
-    bool matchCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    /// If lhs is a suffix of rhs, including equal
+    bool isContextSuffix(const CallStrCxt& lhs, const CallStrCxt& call);
+    //@}
 
-    inline void pushCxt(CallStrCxt& cxt, CallSiteID csId)
-    {
-        cxt.push_back(csId);
-        if (cxt.size() > MaxCxtSize)
-            MaxCxtSize = cxt.size();
-    }
     /// Whether a join site is in recursion
     inline bool isJoinSiteInRecursion(const CallICFGNode* join) const
     {
@@ -504,7 +511,7 @@ private:
 
     /// Get or create a tct node based on CxtThread
     //@{
-    inline TCTNode* getOrCreateTCTNode(const CallStrCxt& cxt, const ICFGNode* fork,const CallStrCxt& oldCxt, const FunObjVar* routine)
+    inline TCTNode* getOrCreateTCTNode(const CallStrCxt& cxt, const ICFGNode* fork, const CxtThreadProc& forkSiteCtp, const FunObjVar* routine)
     {
         CxtThread ct(cxt,fork);
         CxtThreadToNodeMap::const_iterator it = ctpToNodeMap.find(ct);
@@ -513,7 +520,7 @@ private:
             return it->second;
         }
 
-        addCxtOfCxtThread(oldCxt,ct);
+        addCxtOfCxtThread(forkSiteCtp.getTid(), forkSiteCtp.getContext(), ct);
         addStartRoutineOfCxtThread(routine,ct);
 
         setMultiForkedAttrs(ct);
@@ -540,10 +547,11 @@ private:
     }
 
     /// Add context for a thread at its spawning site (fork site)
-    void addCxtOfCxtThread(const CallStrCxt& cxt, const CxtThread& ct)
+    void addCxtOfCxtThread(NodeID pTid, const CallStrCxt& cxt, const CxtThread& ct)
     {
-        ctToForkCxtMap[ct] = cxt;
+        ctToForkCxtsMap[ct].insert(std::make_pair(pTid, cxt));
     }
+
     /// Add start routine function of a cxt thread
     void addStartRoutineOfCxtThread(const FunObjVar* fun, const CxtThread& ct)
     {
@@ -571,13 +579,6 @@ private:
         return visitedCTPs.find(ctp)!=visitedCTPs.end();
     }
     //@}
-    /// Clean up memory
-    inline void destroy()
-    {
-        if(tcgSCC)
-            delete tcgSCC;
-        tcgSCC=nullptr;
-    }
 
     FunSet entryFuncSet; /// Procedures that are neither called by other functions nor extern functions
     FunSet candidateFuncSet; /// Procedures we care about during call graph traversing when creating TCT
@@ -585,7 +586,7 @@ private:
     CxtThreadProcVec ctpList;	/// CxtThreadProc List
     CxtThreadProcSet visitedCTPs; /// Record all visited ctps
     CxtThreadToNodeMap ctpToNodeMap; /// Map a ctp to its graph node
-    CxtThreadToForkCxt ctToForkCxtMap; /// Map a CxtThread to the context at its spawning site (fork site).
+    CxtThreadToForkCxtSet ctToForkCxtsMap; /// 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
     Set<const ICFGNode*>  inRecurJoinSites;	///< Fork or Join sites in recursions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.2437",
+  "version": "1.0.2439",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {