svf-lib 1.0.2675 → 1.0.2677

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

@@ -58,8 +58,6 @@ public:
     void performThreadCallGraphStat(ThreadCallGraph* tcg);
     /// Statistics for thread creation tree
     void performTCTStat(TCT* tct);
-    /// Statistics for MHP statement pairs
-    void performMHPPairStat(MHP* mhp, LockAnalysis* lsa);
     /// Statistics for annotation
     //void performAnnotationStat(MTAAnnotator* anno);
 

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

@@ -44,7 +44,6 @@ namespace SVF
 
 class TCTNode;
 
-
 /*
  * Thread creation edge represents a spawning relation between two context sensitive threads
  */
@@ -143,7 +142,7 @@ public:
     //@}
 
 
-private:
+protected:
     const CxtThread ctx;  /// Thread creation context, <fork site, call string context>
     bool multiforked;
 };
@@ -159,7 +158,18 @@ public:
     typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
     typedef TCTEdge::ThreadCreateEdgeSet ThreadCreateEdgeSet;
     typedef ThreadCreateEdgeSet::iterator TCTNodeIter;
-    typedef Set<const FunObjVar*> FunSet;
+    /// Order functions by id (thread ids are assigned in iteration order over
+    /// the entry-function set). Null-safe: null functions order first.
+    struct FunObjVarIdCmp
+    {
+        bool operator()(const FunObjVar* lhs, const FunObjVar* rhs) const
+        {
+            if (lhs == nullptr || rhs == nullptr)
+                return lhs == nullptr && rhs != nullptr;
+            return lhs->getId() < rhs->getId();
+        }
+    };
+    typedef OrderedSet<const FunObjVar*, FunObjVarIdCmp> FunSet;
     typedef std::vector<const ICFGNode*> InstVec;
     typedef Set<const ICFGNode*> InstSet;
     typedef Set<const CallGraphNode*> PTACGNodeSet;
@@ -171,22 +181,13 @@ public:
     typedef FIFOWorkList<CxtThreadProc> CxtThreadProcVec;
     typedef Set<CxtThreadProc> CxtThreadProcSet;
     typedef SCCDetection<CallGraph*> ThreadCallGraphSCC;
+    typedef Set<const ICFGNode*> DummyForkSiteSet;
 
     /// Constructor
-    TCT(PointerAnalysis* p) :pta(p),TCTNodeNum(0),TCTEdgeNum(0),MaxCxtSize(0)
-    {
-        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();
-        tcgSCC->find();
-        build();
-    }
+    TCT(PointerAnalysis* p);
 
     /// Destructor
-    virtual ~TCT()
-    {  }
+    virtual ~TCT();
 
     /// Get TCG
     inline ThreadCallGraph* getThreadCallGraph() const
@@ -420,7 +421,7 @@ public:
     /// Context helper functions
     //@{
     /// Push calling context
-    void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
+    virtual void pushCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
     /// Match context
     bool matchAndPopCxt(CallStrCxt& cxt, const CallICFGNode* call, const FunObjVar* callee);
     /// If lhs is a suffix of rhs, including equal
@@ -442,7 +443,7 @@ public:
     /// Print TCT information
     void print() const;
 
-private:
+protected:
     ThreadCallGraph* tcg;
     PointerAnalysis* pta;
     u32_t TCTNodeNum;
@@ -475,16 +476,36 @@ private:
     }
 
     /// Build TCT
-    void build();
+    virtual void build();
+
+    /// Free the built graph and clear all bookkeeping so build() can run again from
+    /// a clean state (SlicedTCT rebuilds the tree over a sliced view).
+    void reset()
+    {
+        destroy();
+        IDToNodeMap.clear();
+        ctpToNodeMap.clear();
+        ctToForkCxtsMap.clear();
+        ctToRoutineFunMap.clear();
+        candidateFuncSet.clear();
+        entryFuncSet.clear();
+        joinSiteToLoopMap.clear();
+        inRecurJoinSites.clear();
+        ctpList.clear();
+        visitedCTPs.clear();
+        TCTNodeNum = 0;
+        TCTEdgeNum = 0;
+        MaxCxtSize = 0;
+    }
 
     /// Mark relevant procedures that are backward reachable from any fork/join site
     //@{
-    void markRelProcs();
-    void markRelProcs(const FunObjVar* fun);
+    virtual void markRelProcs();
+    virtual void markRelProcs(const FunObjVar* fun);
     //@}
 
     /// Get entry functions that are neither called by other functions nor extern functions
-    void collectEntryFunInCallGraph();
+    virtual void collectEntryFunInCallGraph();
 
     /// Collect multi-forked threads whose 1, cxt is in loop or recursion;
     /// 2, parent thread is a multi-forked thread.
@@ -493,7 +514,7 @@ private:
     /// Handle join site in loop
     //@{
     /// collect loop info for join sites
-    void collectLoopInfoForJoin();
+    virtual void collectLoopInfoForJoin();
     /// Whether a given bb is a loop head of a inloop join site
     bool isLoopHeaderOfJoinLoop(const SVFBasicBlock* bb);
     /// Whether a given bb is an exit of a inloop join site
@@ -509,7 +530,7 @@ private:
     //@}
 
     /// Handle call relations
-    void handleCallRelation(CxtThreadProc& ctp, const CallGraphEdge* cgEdge, const CallICFGNode* call);
+    virtual void handleCallRelation(CxtThreadProc& ctp, const CallGraphEdge* cgEdge, const CallICFGNode* call);
 
     /// Get or create a tct node based on CxtThread
     //@{
@@ -519,6 +540,10 @@ private:
         CxtThreadToNodeMap::const_iterator it = ctpToNodeMap.find(ct);
         if(it!=ctpToNodeMap.end())
         {
+            // A second spawn context merged onto this truncated CxtThread: the
+            // node stands for multiple dynamic instances, so mark it multiforked.
+            if (addCxtOfCxtThread(forkSiteCtp.getTid(), forkSiteCtp.getContext(), ct))
+                it->second->setMultiforked(true);
             return it->second;
         }
 
@@ -533,14 +558,19 @@ private:
     /// Set multi-forked thread attributes
     void setMultiForkedAttrs(CxtThread& ct)
     {
-        /// non-main thread
-        if(ct.getThread() != nullptr)
+        /// non-main thread spawned at a real fork site. The main thread uses a
+        /// synthetic dummy fork site (see createDummyForkSite); it has no real
+        /// function/call-graph node, is never in a loop or recursion, and must be
+        /// treated like the null (main) case -- otherwise isInLoopInstruction would
+        /// look up a call-graph node that does not exist.
+        if(ct.getThread() != nullptr &&
+                dummyForkSites.find(ct.getThread()) == dummyForkSites.end())
         {
             const ICFGNode* svfInst = ct.getThread();
             ct.setInloop(isInLoopInstruction(svfInst));
             ct.setIncycle(isInRecursion(svfInst));
         }
-        /// main thread
+        /// main thread (null or dummy fork site)
         else
         {
             ct.setInloop(false);
@@ -548,10 +578,11 @@ private:
         }
     }
 
-    /// Add context for a thread at its spawning site (fork site)
-    void addCxtOfCxtThread(NodeID pTid, const CallStrCxt& cxt, const CxtThread& ct)
+    /// Add context for a thread at its spawning site (fork site).
+    /// Returns true if this (parent tid, context) pair was not recorded before.
+    bool addCxtOfCxtThread(NodeID pTid, const CallStrCxt& cxt, const CxtThread& ct)
     {
-        ctToForkCxtsMap[ct].insert(std::make_pair(pTid, cxt));
+        return ctToForkCxtsMap[ct].insert(std::make_pair(pTid, cxt)).second;
     }
 
     /// Add start routine function of a cxt thread
@@ -560,6 +591,14 @@ private:
         ctToRoutineFunMap[ct] = fun;
     }
 
+    /// Create and get a new dummy fork site for starter routines
+    ICFGNode* createDummyForkSite()
+    {
+        ICFGNode* dummyForkSite = new ICFGNode(dummyForkICFGNodeID--, SVFValue::GlobalBlock);
+        dummyForkSites.insert(dummyForkSite);
+        return dummyForkSite;
+    }
+
     /// WorkList helper functions
     //@{
     inline bool pushToCTPWorkList(const CxtThreadProc& ctp)
@@ -592,6 +631,8 @@ private:
     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
+    DummyForkSiteSet dummyForkSites;  ///< set of dummy fork sites for starter routines
+    NodeID dummyForkICFGNodeID = UINT32_MAX;  ///< unique ID generator for dummy
 };
 
 } // End namespace SVF

package/SVF-linux-aarch64/include/Util/CommandLine.h

@@ -353,6 +353,11 @@ public:
         value = v;
     }
 
+    bool isSet(void) const
+    {
+        return isExplicitlySet;
+    }
+
     T operator()(void) const
     {
         return value;

package/SVF-linux-aarch64/include/Util/CxtStmt.h

@@ -454,47 +454,57 @@ private:
 };
 
 } // End namespace SVF
-// Specialise has for class defined in this header file
+// Specialise hash for the classes defined in this header file.
+// Each hash must combine every field that operator== compares; hashing only a
+// subset (e.g. the tid alone) collapses all keys sharing that field into one
+// bucket. IDs are hashed instead of raw pointers so the bucket layout does not
+// depend on allocation addresses.
 template <> struct std::hash<SVF::CxtThread>
 {
-    size_t operator()(const SVF::CxtThread& cs) const
+    size_t operator()(const SVF::CxtThread& ct) const
     {
-        std::hash<SVF::CallStrCxt> h;
-        return h(cs.getContext());
+        std::hash<SVF::CallStrCxt> ch;
+        SVF::Hash<std::pair<SVF::NodeID, size_t>> pairH;
+        const SVF::NodeID forksite =
+            ct.getThread() != nullptr ? ct.getThread()->getId() : 0;
+        return pairH({forksite, ch(ct.getContext())});
     }
 };
 template <> struct std::hash<SVF::CxtThreadProc>
 {
     size_t operator()(const SVF::CxtThreadProc& ctp) const
     {
-        std::hash<SVF::NodeID> h;
-        return h(ctp.getTid());
+        std::hash<SVF::CallStrCxt> ch;
+        SVF::Hash<std::pair<SVF::NodeID, size_t>> pairH;
+        return pairH({ctp.getTid(),
+                      pairH({ctp.getProc()->getId(), ch(ctp.getContext())})});
     }
 };
-template <> struct std::hash<SVF::CxtThreadStmt>
+template <> struct std::hash<SVF::CxtStmt>
 {
-    size_t operator()(const SVF::CxtThreadStmt& cts) const
+    size_t operator()(const SVF::CxtStmt& cs) const
     {
-        std::hash<SVF::NodeID> h;
-        return h(cts.getTid());
+        std::hash<SVF::CallStrCxt> ch;
+        SVF::Hash<std::pair<SVF::NodeID, size_t>> pairH;
+        return pairH({cs.getStmt()->getId(), ch(cs.getContext())});
     }
 };
-template <> struct std::hash<SVF::CxtStmt>
+template <> struct std::hash<SVF::CxtThreadStmt>
 {
-    size_t operator()(const SVF::CxtStmt& cs) const
+    size_t operator()(const SVF::CxtThreadStmt& cts) const
     {
-        std::hash<SVF::ICFGNode*> h;
-        SVF::ICFGNode* inst = const_cast<SVF::ICFGNode*> (cs.getStmt());
-        return h(inst);
+        std::hash<SVF::CxtStmt> csH;
+        SVF::Hash<std::pair<SVF::NodeID, size_t>> pairH;
+        return pairH({cts.getTid(), csH(cts)});
     }
 };
 template <> struct std::hash<SVF::CxtProc>
 {
-    size_t operator()(const SVF::CxtProc& cs) const
+    size_t operator()(const SVF::CxtProc& cp) const
     {
-        std::hash<SVF::FunObjVar*> h;
-        SVF::FunObjVar* fun = const_cast<SVF::FunObjVar*> (cs.getProc());
-        return h(fun);
+        std::hash<SVF::CallStrCxt> ch;
+        SVF::Hash<std::pair<SVF::NodeID, size_t>> pairH;
+        return pairH({cp.getProc()->getId(), ch(cp.getContext())});
     }
 };
 #endif /* INCLUDE_UTIL_CXTSTMT_H_ */

package/SVF-linux-aarch64/include/Util/Options.h

@@ -78,7 +78,7 @@ public:
 
     // DDAPass.cpp
     static const Option<u32_t> MaxPathLen;
-    static const Option<u32_t> MaxContextLen;
+    static Option<u32_t> MaxContextLen;
     static const Option<u32_t> MaxStepInWrapper;
     static const Option<std::string> UserInputQuery;
     static const Option<bool> InsenRecur;
@@ -155,9 +155,6 @@ public:
     static const Option<bool> PrintInterLev;
     static const Option<bool> DoLockAnalysis;
 
-    //MTAStat.cpp
-    static const Option<bool> AllPairMHP;
-
     // TCT.cpp
     static const Option<bool> TCTDotGraph;
 
@@ -255,8 +252,17 @@ public:
     static const Option<bool> FileCheck;
     /// double free checker, Default: false
     static const Option<bool> DFreeCheck;
-    /// data race checker, Default: false
-    static const Option<bool> RaceCheck;
+    /// MTA: flow-sensitive (FSAM) main analysis; false = Andersen flow-insensitive base, Default: true
+    static const Option<bool> MTFlowSensitive;
+    /// MTA: dump the pointer-analysis and thread call graphs (ptacg/tcg.dot), Default: false
+    static const Option<bool> DumpMTAGraphs;
+
+    /// MTA slicing: slice before the FSAM main analysis (false = whole-program baseline), Default: true
+    static const Option<bool> EnableSlicing;
+    /// MTA slicing: one unified slice for ILA + FSPTA (single-pass baseline), Default: false
+    static const Option<bool> SlicingSingle;
+    /// MTA slicing: dump intermediate dot graphs (ICFG/TCG/SVFG/...), Default: false
+    static const Option<bool> SlicedDumpDot;
     /// if the access index of gepstmt is unknown, skip it, Default: false
     static const Option<bool> GepUnknownIdx;
     static const Option<bool> RunUncallFuncs;

package/SVF-linux-aarch64/include/Util/ThreadAPI.h

@@ -41,6 +41,7 @@ class SVFVar;
 class ValVar;
 class ObjVar;
 class FunObjVar;
+class PointerAnalysis;
 
 /*
  * ThreadAPI class contains interfaces for pthread programs
@@ -152,6 +153,17 @@ public:
     const SVFVar* getRetParmAtJoinedSite(const CallICFGNode *inst) const;
     //@}
 
+    /// If fork join the same thread
+    struct ForkJoinAliasCache
+    {
+        Map<const SVFVar*, NodeBS> joinedThreadObjects;
+    };
+
+    bool isAliasedForkJoin(PointerAnalysis* pta, const SVFVar* forkArg,
+                           const SVFVar* joinArg) const;
+    bool isAliasedForkJoin(PointerAnalysis* pta, const SVFVar* forkArg,
+                           const SVFVar* joinArg, ForkJoinAliasCache& cache) const;
+
 
     /// Return true if this call exits/terminate a thread
     //@{

package/SVF-linux-aarch64/lib/cmake/SVF/SVFTargets.cmake

@@ -81,7 +81,7 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.23.0")
       FILE_SET "HEADERS"
       TYPE "HEADERS"
       BASE_DIRS "${_IMPORT_PREFIX}/include"
-      FILES "${_IMPORT_PREFIX}/include/AE/Core/AbstractState.h" "${_IMPORT_PREFIX}/include/AE/Core/AbstractValue.h" "${_IMPORT_PREFIX}/include/AE/Core/AddressValue.h" "${_IMPORT_PREFIX}/include/AE/Core/ICFGWTO.h" "${_IMPORT_PREFIX}/include/AE/Core/IntervalValue.h" "${_IMPORT_PREFIX}/include/AE/Core/NumericValue.h" "${_IMPORT_PREFIX}/include/AE/Core/RelExeState.h" "${_IMPORT_PREFIX}/include/AE/Core/RelationSolver.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEDetector.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEStat.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEWTO.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbsExtAPI.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbstractInterpretation.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/SparseAbstractInterpretation.h" "${_IMPORT_PREFIX}/include/CFL/CFGNormalizer.h" "${_IMPORT_PREFIX}/include/CFL/CFGrammar.h" "${_IMPORT_PREFIX}/include/CFL/CFLAlias.h" "${_IMPORT_PREFIX}/include/CFL/CFLBase.h" "${_IMPORT_PREFIX}/include/CFL/CFLGramGraphChecker.h" "${_IMPORT_PREFIX}/include/CFL/CFLGraphBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSVFGBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSolver.h" "${_IMPORT_PREFIX}/include/CFL/CFLStat.h" "${_IMPORT_PREFIX}/include/CFL/CFLVF.h" "${_IMPORT_PREFIX}/include/CFL/GrammarBuilder.h" "${_IMPORT_PREFIX}/include/DDA/ContextDDA.h" "${_IMPORT_PREFIX}/include/DDA/DDAClient.h" "${_IMPORT_PREFIX}/include/DDA/DDAPass.h" "${_IMPORT_PREFIX}/include/DDA/DDAStat.h" "${_IMPORT_PREFIX}/include/DDA/DDAVFSolver.h" "${_IMPORT_PREFIX}/include/DDA/FlowDDA.h" "${_IMPORT_PREFIX}/include/FastCluster/fastcluster.h" "${_IMPORT_PREFIX}/include/Graphs/BasicBlockG.h" "${_IMPORT_PREFIX}/include/Graphs/CDG.h" "${_IMPORT_PREFIX}/include/Graphs/CFLGraph.h" "${_IMPORT_PREFIX}/include/Graphs/CHG.h" "${_IMPORT_PREFIX}/include/Graphs/CallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/ConsG.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGNode.h" "${_IMPORT_PREFIX}/include/Graphs/DOTGraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GenericGraph.h" "${_IMPORT_PREFIX}/include/Graphs/GraphPrinter.h" "${_IMPORT_PREFIX}/include/Graphs/GraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GraphWriter.h" "${_IMPORT_PREFIX}/include/Graphs/ICFG.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/IRGraph.h" "${_IMPORT_PREFIX}/include/Graphs/SCC.h" "${_IMPORT_PREFIX}/include/Graphs/SVFG.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGOPT.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/ThreadCallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/VFG.h" "${_IMPORT_PREFIX}/include/Graphs/VFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/VFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/WTO.h" "${_IMPORT_PREFIX}/include/MSSA/MSSAMuChi.h" "${_IMPORT_PREFIX}/include/MSSA/MemPartition.h" "${_IMPORT_PREFIX}/include/MSSA/MemRegion.h" "${_IMPORT_PREFIX}/include/MSSA/MemSSA.h" "${_IMPORT_PREFIX}/include/MSSA/SVFGBuilder.h" "${_IMPORT_PREFIX}/include/MTA/LockAnalysis.h" "${_IMPORT_PREFIX}/include/MTA/MHP.h" "${_IMPORT_PREFIX}/include/MTA/MTA.h" "${_IMPORT_PREFIX}/include/MTA/MTAStat.h" "${_IMPORT_PREFIX}/include/MTA/TCT.h" "${_IMPORT_PREFIX}/include/MemoryModel/AbstractPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/AccessPath.h" "${_IMPORT_PREFIX}/include/MemoryModel/ConditionalPT.h" "${_IMPORT_PREFIX}/include/MemoryModel/MutablePointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PTATY.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToCache.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysis.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysisImpl.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointsTo.h" "${_IMPORT_PREFIX}/include/MemoryModel/SVFLoop.h" "${_IMPORT_PREFIX}/include/SABER/DoubleFreeChecker.h" "${_IMPORT_PREFIX}/include/SABER/FileChecker.h" "${_IMPORT_PREFIX}/include/SABER/LeakChecker.h" "${_IMPORT_PREFIX}/include/SABER/ProgSlice.h" "${_IMPORT_PREFIX}/include/SABER/SaberCheckerAPI.h" "${_IMPORT_PREFIX}/include/SABER/SaberCondAllocator.h" "${_IMPORT_PREFIX}/include/SABER/SaberSVFGBuilder.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkDDA.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkSolver.h" "${_IMPORT_PREFIX}/include/SVFIR/ObjTypeInfo.h" "${_IMPORT_PREFIX}/include/SVFIR/PAGBuilderFromFile.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFIR.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFStatements.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFType.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFValue.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFVariables.h" "${_IMPORT_PREFIX}/include/Util/BitVector.h" "${_IMPORT_PREFIX}/include/Util/CDGBuilder.h" "${_IMPORT_PREFIX}/include/Util/CallGraphBuilder.h" "${_IMPORT_PREFIX}/include/Util/Casting.h" "${_IMPORT_PREFIX}/include/Util/CommandLine.h" "${_IMPORT_PREFIX}/include/Util/CoreBitVector.h" "${_IMPORT_PREFIX}/include/Util/CxtStmt.h" "${_IMPORT_PREFIX}/include/Util/DPItem.h" "${_IMPORT_PREFIX}/include/Util/ExtAPI.h" "${_IMPORT_PREFIX}/include/Util/GeneralType.h" "${_IMPORT_PREFIX}/include/Util/GraphReachSolver.h" "${_IMPORT_PREFIX}/include/Util/Hash.h" "${_IMPORT_PREFIX}/include/Util/NodeIDAllocator.h" "${_IMPORT_PREFIX}/include/Util/Options.h" "${_IMPORT_PREFIX}/include/Util/PTAStat.h" "${_IMPORT_PREFIX}/include/Util/SVFBugReport.h" "${_IMPORT_PREFIX}/include/Util/SVFLoopAndDomInfo.h" "${_IMPORT_PREFIX}/include/Util/SVFStat.h" "${_IMPORT_PREFIX}/include/Util/SVFUtil.h" "${_IMPORT_PREFIX}/include/Util/SparseBitVector.h" "${_IMPORT_PREFIX}/include/Util/ThreadAPI.h" "${_IMPORT_PREFIX}/include/Util/WorkList.h" "${_IMPORT_PREFIX}/include/Util/Z3Expr.h" "${_IMPORT_PREFIX}/include/Util/cJSON.h" "${_IMPORT_PREFIX}/include/Util/iterator.h" "${_IMPORT_PREFIX}/include/Util/iterator_range.h" "${_IMPORT_PREFIX}/include/WPA/Andersen.h" "${_IMPORT_PREFIX}/include/WPA/AndersenPWC.h" "${_IMPORT_PREFIX}/include/WPA/CSC.h" "${_IMPORT_PREFIX}/include/WPA/FlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/Steensgaard.h" "${_IMPORT_PREFIX}/include/WPA/TypeAnalysis.h" "${_IMPORT_PREFIX}/include/WPA/VersionedFlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/WPAFSSolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAPass.h" "${_IMPORT_PREFIX}/include/WPA/WPASolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAStat.h"
+      FILES "${_IMPORT_PREFIX}/include/AE/Core/AbstractState.h" "${_IMPORT_PREFIX}/include/AE/Core/AbstractValue.h" "${_IMPORT_PREFIX}/include/AE/Core/AddressValue.h" "${_IMPORT_PREFIX}/include/AE/Core/ICFGWTO.h" "${_IMPORT_PREFIX}/include/AE/Core/IntervalValue.h" "${_IMPORT_PREFIX}/include/AE/Core/NumericValue.h" "${_IMPORT_PREFIX}/include/AE/Core/RelExeState.h" "${_IMPORT_PREFIX}/include/AE/Core/RelationSolver.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEDetector.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEStat.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AEWTO.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbsExtAPI.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/AbstractInterpretation.h" "${_IMPORT_PREFIX}/include/AE/Svfexe/SparseAbstractInterpretation.h" "${_IMPORT_PREFIX}/include/CFL/CFGNormalizer.h" "${_IMPORT_PREFIX}/include/CFL/CFGrammar.h" "${_IMPORT_PREFIX}/include/CFL/CFLAlias.h" "${_IMPORT_PREFIX}/include/CFL/CFLBase.h" "${_IMPORT_PREFIX}/include/CFL/CFLGramGraphChecker.h" "${_IMPORT_PREFIX}/include/CFL/CFLGraphBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSVFGBuilder.h" "${_IMPORT_PREFIX}/include/CFL/CFLSolver.h" "${_IMPORT_PREFIX}/include/CFL/CFLStat.h" "${_IMPORT_PREFIX}/include/CFL/CFLVF.h" "${_IMPORT_PREFIX}/include/CFL/GrammarBuilder.h" "${_IMPORT_PREFIX}/include/DDA/ContextDDA.h" "${_IMPORT_PREFIX}/include/DDA/DDAClient.h" "${_IMPORT_PREFIX}/include/DDA/DDAPass.h" "${_IMPORT_PREFIX}/include/DDA/DDAStat.h" "${_IMPORT_PREFIX}/include/DDA/DDAVFSolver.h" "${_IMPORT_PREFIX}/include/DDA/FlowDDA.h" "${_IMPORT_PREFIX}/include/FastCluster/fastcluster.h" "${_IMPORT_PREFIX}/include/Graphs/BasicBlockG.h" "${_IMPORT_PREFIX}/include/Graphs/CDG.h" "${_IMPORT_PREFIX}/include/Graphs/CFLGraph.h" "${_IMPORT_PREFIX}/include/Graphs/CHG.h" "${_IMPORT_PREFIX}/include/Graphs/CallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/ConsG.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ConsGNode.h" "${_IMPORT_PREFIX}/include/Graphs/DOTGraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GenericGraph.h" "${_IMPORT_PREFIX}/include/Graphs/GraphPrinter.h" "${_IMPORT_PREFIX}/include/Graphs/GraphTraits.h" "${_IMPORT_PREFIX}/include/Graphs/GraphWriter.h" "${_IMPORT_PREFIX}/include/Graphs/ICFG.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/ICFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/IRGraph.h" "${_IMPORT_PREFIX}/include/Graphs/SCC.h" "${_IMPORT_PREFIX}/include/Graphs/SVFG.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGOPT.h" "${_IMPORT_PREFIX}/include/Graphs/SVFGStat.h" "${_IMPORT_PREFIX}/include/Graphs/SlicedGraphs.h" "${_IMPORT_PREFIX}/include/Graphs/ThreadCallGraph.h" "${_IMPORT_PREFIX}/include/Graphs/VFG.h" "${_IMPORT_PREFIX}/include/Graphs/VFGEdge.h" "${_IMPORT_PREFIX}/include/Graphs/VFGNode.h" "${_IMPORT_PREFIX}/include/Graphs/WTO.h" "${_IMPORT_PREFIX}/include/MSSA/MSSAMuChi.h" "${_IMPORT_PREFIX}/include/MSSA/MemPartition.h" "${_IMPORT_PREFIX}/include/MSSA/MemRegion.h" "${_IMPORT_PREFIX}/include/MSSA/MemSSA.h" "${_IMPORT_PREFIX}/include/MSSA/SVFGBuilder.h" "${_IMPORT_PREFIX}/include/MTA/FSMPTA.h" "${_IMPORT_PREFIX}/include/MTA/LockAnalysis.h" "${_IMPORT_PREFIX}/include/MTA/MHP.h" "${_IMPORT_PREFIX}/include/MTA/MTA.h" "${_IMPORT_PREFIX}/include/MTA/MTASVFGBuilder.h" "${_IMPORT_PREFIX}/include/MTA/MTASlicer.h" "${_IMPORT_PREFIX}/include/MTA/MTAStat.h" "${_IMPORT_PREFIX}/include/MTA/TCT.h" "${_IMPORT_PREFIX}/include/MemoryModel/AbstractPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/AccessPath.h" "${_IMPORT_PREFIX}/include/MemoryModel/ConditionalPT.h" "${_IMPORT_PREFIX}/include/MemoryModel/MutablePointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PTATY.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToCache.h" "${_IMPORT_PREFIX}/include/MemoryModel/PersistentPointsToDS.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysis.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointerAnalysisImpl.h" "${_IMPORT_PREFIX}/include/MemoryModel/PointsTo.h" "${_IMPORT_PREFIX}/include/MemoryModel/SVFLoop.h" "${_IMPORT_PREFIX}/include/SABER/DoubleFreeChecker.h" "${_IMPORT_PREFIX}/include/SABER/FileChecker.h" "${_IMPORT_PREFIX}/include/SABER/LeakChecker.h" "${_IMPORT_PREFIX}/include/SABER/ProgSlice.h" "${_IMPORT_PREFIX}/include/SABER/SaberCheckerAPI.h" "${_IMPORT_PREFIX}/include/SABER/SaberCondAllocator.h" "${_IMPORT_PREFIX}/include/SABER/SaberSVFGBuilder.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkDDA.h" "${_IMPORT_PREFIX}/include/SABER/SrcSnkSolver.h" "${_IMPORT_PREFIX}/include/SVFIR/ObjTypeInfo.h" "${_IMPORT_PREFIX}/include/SVFIR/PAGBuilderFromFile.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFIR.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFStatements.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFType.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFValue.h" "${_IMPORT_PREFIX}/include/SVFIR/SVFVariables.h" "${_IMPORT_PREFIX}/include/Util/BitVector.h" "${_IMPORT_PREFIX}/include/Util/CDGBuilder.h" "${_IMPORT_PREFIX}/include/Util/CallGraphBuilder.h" "${_IMPORT_PREFIX}/include/Util/Casting.h" "${_IMPORT_PREFIX}/include/Util/CommandLine.h" "${_IMPORT_PREFIX}/include/Util/CoreBitVector.h" "${_IMPORT_PREFIX}/include/Util/CxtStmt.h" "${_IMPORT_PREFIX}/include/Util/DPItem.h" "${_IMPORT_PREFIX}/include/Util/ExtAPI.h" "${_IMPORT_PREFIX}/include/Util/GeneralType.h" "${_IMPORT_PREFIX}/include/Util/GraphReachSolver.h" "${_IMPORT_PREFIX}/include/Util/Hash.h" "${_IMPORT_PREFIX}/include/Util/NodeIDAllocator.h" "${_IMPORT_PREFIX}/include/Util/Options.h" "${_IMPORT_PREFIX}/include/Util/PTAStat.h" "${_IMPORT_PREFIX}/include/Util/SVFBugReport.h" "${_IMPORT_PREFIX}/include/Util/SVFLoopAndDomInfo.h" "${_IMPORT_PREFIX}/include/Util/SVFStat.h" "${_IMPORT_PREFIX}/include/Util/SVFUtil.h" "${_IMPORT_PREFIX}/include/Util/SparseBitVector.h" "${_IMPORT_PREFIX}/include/Util/ThreadAPI.h" "${_IMPORT_PREFIX}/include/Util/WorkList.h" "${_IMPORT_PREFIX}/include/Util/Z3Expr.h" "${_IMPORT_PREFIX}/include/Util/cJSON.h" "${_IMPORT_PREFIX}/include/Util/iterator.h" "${_IMPORT_PREFIX}/include/Util/iterator_range.h" "${_IMPORT_PREFIX}/include/WPA/Andersen.h" "${_IMPORT_PREFIX}/include/WPA/AndersenPWC.h" "${_IMPORT_PREFIX}/include/WPA/CSC.h" "${_IMPORT_PREFIX}/include/WPA/FlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/Steensgaard.h" "${_IMPORT_PREFIX}/include/WPA/TypeAnalysis.h" "${_IMPORT_PREFIX}/include/WPA/VersionedFlowSensitive.h" "${_IMPORT_PREFIX}/include/WPA/WPAFSSolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAPass.h" "${_IMPORT_PREFIX}/include/WPA/WPASolver.h" "${_IMPORT_PREFIX}/include/WPA/WPAStat.h"
   )
 else()
   set_property(TARGET SVF::SvfCore

package/SVF-osx/include/Graphs/CallGraph.h

@@ -502,6 +502,24 @@ struct GenericGraphTraits<Inverse<SVF::CallGraphNode*> > : public GenericGraphTr
 template<> struct GenericGraphTraits<SVF::CallGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::CallGraphNode,SVF::CallGraphEdge>* >
 {
     typedef SVF::CallGraphNode*NodeRef;
+
+    // Graph-intrinsic queries shared with the sliced-view specialisation
+    // (GenericGraphTraits<const SlicedThreadCallGraphView*>).
+    //@{
+    /// In-edges of n under this graph (whole CallGraph: all of them).
+    static void getInEdges(const SVF::CallGraph*, const SVF::CallGraphNode* n,
+                           std::vector<const SVF::CallGraphEdge*>& out)
+    {
+        out.clear();
+        for (SVF::CallGraphEdge* e : n->getInEdges())
+            out.push_back(e);
+    }
+    /// The CallGraph object whose nodes an analysis over this graph scans.
+    static const SVF::CallGraph* getCallGraph(const SVF::CallGraph* g)
+    {
+        return g;
+    }
+    //@}
 };
 
 } // End namespace llvm

package/SVF-osx/include/Graphs/DOTGraphTraits.h

@@ -66,18 +66,29 @@ public:
         return false;
     }
 
+    /// getNodeIdentifier - The value written after "Node" as the dot node id.
+    /// Defaults to the node reference reinterpreted as an address, which works
+    /// for pointer NodeRefs; value NodeRefs (e.g. sliced views) override this to
+    /// return a stable per-node address. (Node params below are templated so the
+    /// defaults accept any NodeRef, pointer or value.)
+    template <typename NodeT>
+    static const void *getNodeIdentifier(NodeT N)
+    {
+        return static_cast<const void *>(N);
+    }
+
     /// isNodeHidden - If the function returns true, the given node is not
     /// displayed in the graph.
-    template <typename GraphType>
-    static bool isNodeHidden(const void *, const GraphType &)
+    template <typename NodeT, typename GraphType>
+    static bool isNodeHidden(NodeT, const GraphType &)
     {
         return false;
     }
 
     /// getNodeLabel - Given a node and a pointer to the top level graph, return
     /// the label to print in the node.
-    template<typename GraphType>
-    std::string getNodeLabel(const void *, const GraphType &)
+    template<typename NodeT, typename GraphType>
+    std::string getNodeLabel(NodeT, const GraphType &)
     {
         return "";
     }
@@ -85,22 +96,22 @@ public:
     // getNodeIdentifierLabel - Returns a string representing the
     // address or other unique identifier of the node. (Only used if
     // non-empty.)
-    template <typename GraphType>
-    static std::string getNodeIdentifierLabel(const void *, const GraphType &)
+    template <typename NodeT, typename GraphType>
+    static std::string getNodeIdentifierLabel(NodeT, const GraphType &)
     {
         return "";
     }
 
-    template<typename GraphType>
-    static std::string getNodeDescription(const void *, const GraphType &)
+    template<typename NodeT, typename GraphType>
+    static std::string getNodeDescription(NodeT, const GraphType &)
     {
         return "";
     }
 
     /// If you want to specify custom node attributes, this is the place to do so
     ///
-    template<typename GraphType>
-    static std::string getNodeAttributes(const void *,
+    template<typename NodeT, typename GraphType>
+    static std::string getNodeAttributes(NodeT,
                                          const GraphType &)
     {
         return "";
@@ -108,8 +119,8 @@ public:
 
     /// If you want to override the dot attributes printed for a particular edge,
     /// override this method.
-    template<typename EdgeIter, typename GraphType>
-    static std::string getEdgeAttributes(const void *, EdgeIter,
+    template<typename NodeT, typename EdgeIter, typename GraphType>
+    static std::string getEdgeAttributes(NodeT, EdgeIter,
                                          const GraphType &)
     {
         return "";
@@ -117,8 +128,8 @@ public:
 
     /// getEdgeSourceLabel - If you want to label the edge source itself,
     /// implement this method.
-    template<typename EdgeIter>
-    static std::string getEdgeSourceLabel(const void *, EdgeIter)
+    template<typename NodeT, typename EdgeIter>
+    static std::string getEdgeSourceLabel(NodeT, EdgeIter)
     {
         return "";
     }
@@ -126,8 +137,8 @@ public:
     /// edgeTargetsEdgeSource - This method returns true if this outgoing edge
     /// should actually target another edge source, not a node.  If this method is
     /// implemented, getEdgeTarget should be implemented.
-    template<typename EdgeIter>
-    static bool edgeTargetsEdgeSource(const void *, EdgeIter)
+    template<typename NodeT, typename EdgeIter>
+    static bool edgeTargetsEdgeSource(NodeT, EdgeIter)
     {
         return false;
     }
@@ -135,8 +146,8 @@ public:
     /// getEdgeTarget - If edgeTargetsEdgeSource returns true, this method is
     /// called to determine which outgoing edge of Node is the target of this
     /// edge.
-    template<typename EdgeIter>
-    static EdgeIter getEdgeTarget(const void *, EdgeIter I)
+    template<typename NodeT, typename EdgeIter>
+    static EdgeIter getEdgeTarget(NodeT, EdgeIter I)
     {
         return I;
     }
@@ -150,14 +161,16 @@ public:
 
     /// numEdgeDestLabels - If hasEdgeDestLabels, this function returns the
     /// number of incoming edge labels the given node has.
-    static unsigned numEdgeDestLabels(const void *)
+    template<typename NodeT>
+    static unsigned numEdgeDestLabels(NodeT)
     {
         return 0;
     }
 
     /// getEdgeDestLabel - If hasEdgeDestLabels, this function returns the
     /// incoming edge label with the given index in the given node.
-    static std::string getEdgeDestLabel(const void *, unsigned)
+    template<typename NodeT>
+    static std::string getEdgeDestLabel(NodeT, unsigned)
     {
         return "";
     }

package/SVF-osx/include/Graphs/GraphPrinter.h

@@ -92,7 +92,7 @@ public:
         node_iterator E = GTraits::nodes_end(GT);
         for (; I != E; ++I)
         {
-            NodeRef *Node = *I;
+            NodeRef Node = *I;
             O << "node :" << Node << "'\n";
             child_iterator EI = GTraits::child_begin(Node);
             child_iterator EE = GTraits::child_end(Node);

package/SVF-osx/include/Graphs/GraphWriter.h

@@ -72,10 +72,9 @@ class GraphWriter
     using child_iterator = typename GTraits::ChildIteratorType;
     DOTTraits DTraits;
 
-    static_assert(std::is_pointer<NodeRef>::value,
-                  "FIXME: Currently GraphWriter requires the NodeRef type to be "
-                  "a pointer.\nThe pointer usage should be moved to "
-                  "DOTGraphTraits, and removed from GraphWriter itself.");
+    // NodeRef may be a pointer or a value type (e.g. a sliced-view contextual
+    // NodeRef). Node identity for the dot output is obtained from
+    // DOTGraphTraits::getNodeIdentifier (defaults to the pointer value).
 
     // Writes the edge labels of the node to O and returns true if there are any
     // edge labels not equal to the empty string "".
@@ -172,7 +171,7 @@ public:
     {
         std::string NodeAttributes = DTraits.getNodeAttributes(Node, G);
 
-        O << "\tNode" << static_cast<const void*>(Node) << " [";
+        O << "\tNode" << DTraits.getNodeIdentifier(Node) << " [";
         if (!NodeAttributes.empty()) O << NodeAttributes << ",";
         O << "label=\"{";
 
@@ -271,8 +270,8 @@ public:
             if (DTraits.getEdgeSourceLabel(Node, EI).empty())
                 edgeidx = -1;
 
-            emitEdge(static_cast<const void*>(Node), edgeidx,
-                     static_cast<const void*>(TargetNode), DestPort,
+            emitEdge(DTraits.getNodeIdentifier(Node), edgeidx,
+                     DTraits.getNodeIdentifier(TargetNode), DestPort,
                      DTraits.getEdgeAttributes(Node, EI, G));
         }
     }