svf-lib 1.0.2079 → 1.0.2080

package/SVF-osx/Release-build/include/MemoryModel/PointerAnalysis.h

@@ -34,7 +34,7 @@
 #include <signal.h>
 
 #include "Graphs/CHG.h"
-#include "Graphs/PTACallGraph.h"
+#include "Graphs/CallGraph.h"
 #include "Graphs/SCC.h"
 #include "MemoryModel/AbstractPointsToDS.h"
 #include "MemoryModel/ConditionalPT.h"
@@ -103,7 +103,7 @@ public:
     typedef SVFIR::CallSiteToFunPtrMap CallSiteToFunPtrMap;
     typedef Set<const SVFFunction*> FunctionSet;
     typedef OrderedMap<const CallICFGNode*, FunctionSet> CallEdgeMap;
-    typedef SCCDetection<PTACallGraph*> CallGraphSCC;
+    typedef SCCDetection<CallGraph*> CallGraphSCC;
     typedef Set<const SVFGlobalValue*> VTableSet;
     typedef Set<const SVFFunction*> VFunSet;
     //@}
@@ -148,7 +148,7 @@ protected:
     /// Statistics
     PTAStat* stat;
     /// Call graph used for pointer analysis
-    PTACallGraph* ptaCallGraph;
+    CallGraph* callgraph;
     /// SCC for CallGraph
     CallGraphSCC* callGraphSCC;
     /// Interprocedural control-flow graph
@@ -165,12 +165,12 @@ public:
     /// Return number of resolved indirect call edges
     inline u32_t getNumOfResolvedIndCallEdge() const
     {
-        return getPTACallGraph()->getNumOfResolvedIndCallEdge();
+        return getCallGraph()->getNumOfResolvedIndCallEdge();
     }
     /// Return call graph
-    inline PTACallGraph* getPTACallGraph() const
+    inline CallGraph* getCallGraph() const
     {
-        return ptaCallGraph;
+        return callgraph;
     }
     /// Return call graph SCC
     inline CallGraphSCC* getCallGraphSCC() const
@@ -367,15 +367,15 @@ public:
     //@{
     inline CallEdgeMap& getIndCallMap()
     {
-        return getPTACallGraph()->getIndCallMap();
+        return getCallGraph()->getIndCallMap();
     }
     inline bool hasIndCSCallees(const CallICFGNode* cs) const
     {
-        return getPTACallGraph()->hasIndCSCallees(cs);
+        return getCallGraph()->hasIndCSCallees(cs);
     }
     inline const FunctionSet& getIndCSCallees(const CallICFGNode* cs) const
     {
-        return getPTACallGraph()->getIndCSCallees(cs);
+        return getCallGraph()->getIndCSCallees(cs);
     }
     //@}
 
@@ -388,7 +388,7 @@ public:
     inline void callGraphSCCDetection()
     {
         if(callGraphSCC==nullptr)
-            callGraphSCC = new CallGraphSCC(ptaCallGraph);
+            callGraphSCC = new CallGraphSCC(callgraph);
 
         callGraphSCC->find();
     }
@@ -400,13 +400,13 @@ public:
     /// Return TRUE if this edge is inside a CallGraph SCC, i.e., src node and dst node are in the same SCC on the SVFG.
     inline bool inSameCallGraphSCC(const SVFFunction* fun1,const SVFFunction* fun2)
     {
-        const PTACallGraphNode* src = ptaCallGraph->getCallGraphNode(fun1);
-        const PTACallGraphNode* dst = ptaCallGraph->getCallGraphNode(fun2);
+        const CallGraphNode* src = callgraph->getCallGraphNode(fun1);
+        const CallGraphNode* dst = callgraph->getCallGraphNode(fun2);
         return (getCallGraphSCCRepNode(src->getId()) == getCallGraphSCCRepNode(dst->getId()));
     }
     inline bool isInRecursion(const SVFFunction* fun) const
     {
-        return callGraphSCC->isInCycle(ptaCallGraph->getCallGraphNode(fun)->getId());
+        return callGraphSCC->isInCycle(callgraph->getCallGraphNode(fun)->getId());
     }
     /// Whether a local variable is in function recursions
     bool isLocalVarInRecursiveFun(NodeID id) const;

package/SVF-osx/Release-build/include/SABER/SaberSVFGBuilder.h

@@ -89,7 +89,7 @@ protected:
 
     /// Add actual parameter SVFGNode for 1st argument of a deallocation like external function
     /// In order to path sensitive leak detection
-    virtual void AddExtActualParmSVFGNodes(PTACallGraph* callgraph);
+    virtual void AddExtActualParmSVFGNodes(CallGraph* callgraph);
 
     /// Collect memory pointed global pointers,
     /// note that this collection is recursively performed, for example gp-->obj-->obj'

package/SVF-osx/Release-build/include/SABER/SrcSnkDDA.h

@@ -76,13 +76,13 @@ private:
 protected:
     SaberSVFGBuilder memSSA;
     SVFG* svfg;
-    PTACallGraph* ptaCallGraph;
+    CallGraph* callgraph;
     SVFBugReport report; /// Bug Reporter
 
 public:
 
     /// Constructor
-    SrcSnkDDA() : _curSlice(nullptr), svfg(nullptr), ptaCallGraph(nullptr)
+    SrcSnkDDA() : _curSlice(nullptr), svfg(nullptr), callgraph(nullptr)
     {
         saberCondAllocator = std::make_unique<SaberCondAllocator>();
     }
@@ -95,9 +95,9 @@ public:
         _curSlice = nullptr;
 
         /// the following shared by multiple checkers, thus can not be released.
-        //if (ptaCallGraph != nullptr)
-        //    delete ptaCallGraph;
-        //ptaCallGraph = nullptr;
+        //if (callgraph != nullptr)
+        //    delete callgraph;
+        //callgraph = nullptr;
 
         //if(pathCondAllocator)
         //    delete pathCondAllocator;
@@ -129,9 +129,9 @@ public:
     }
 
     /// Get Callgraph
-    inline PTACallGraph* getCallgraph() const
+    inline CallGraph* getCallgraph() const
     {
-        return ptaCallGraph;
+        return callgraph;
     }
 
     /// Whether this svfg node may access global variable

package/SVF-osx/Release-build/include/SVF-LLVM/SVFIRBuilder.h

@@ -201,7 +201,7 @@ public:
     //}@
 
     /// connect PAG edges based on callgraph
-    void updateCallGraph(PTACallGraph* callgraph);
+    void updateCallGraph(CallGraph* callgraph);
 
 protected:
     /// Handle globals including (global variable and functions)

package/SVF-osx/Release-build/include/Util/CallGraphBuilder.h

@@ -31,7 +31,7 @@
 #ifndef INCLUDE_SVF_FE_CALLGRAPHBUILDER_H_
 #define INCLUDE_SVF_FE_CALLGRAPHBUILDER_H_
 
-#include "Graphs/PTACallGraph.h"
+#include "Graphs/CallGraph.h"
 #include "Graphs/ThreadCallGraph.h"
 
 namespace SVF
@@ -43,15 +43,15 @@ class CallGraphBuilder
 {
 
 protected:
-    PTACallGraph* callgraph;
+    CallGraph* callgraph;
     ICFG* icfg;
 public:
-    CallGraphBuilder(PTACallGraph* cg, ICFG* i): callgraph(cg),icfg(i)
+    CallGraphBuilder(CallGraph* cg, ICFG* i): callgraph(cg),icfg(i)
     {
     }
 
     /// Build normal callgraph
-    PTACallGraph* buildCallGraph(SVFModule* svfModule);
+    CallGraph* buildCallGraph(SVFModule* svfModule);
 
 };
 
@@ -64,7 +64,7 @@ public:
     }
 
     /// Build thread-aware callgraph
-    PTACallGraph* buildThreadCallGraph(SVFModule* svfModule);
+    CallGraph* buildThreadCallGraph(SVFModule* svfModule);
 
 };
 

package/SVF-osx/Release-build/include/Util/CxtStmt.h

@@ -35,6 +35,7 @@
 namespace SVF
 {
 
+class ICFGNode;
 /*!
  * Context-sensitive thread statement <c,s>
  */
@@ -42,7 +43,7 @@ class CxtStmt
 {
 public:
     /// Constructor
-    CxtStmt(const CallStrCxt& c, const SVFInstruction* f) :cxt(c), inst(f)
+    CxtStmt(const CallStrCxt& c, const ICFGNode* f) :cxt(c), inst(f)
     {
     }
     /// Copy constructor
@@ -59,7 +60,7 @@ public:
         return cxt;
     }
     /// Return current statement
-    inline const SVFInstruction* getStmt() const
+    inline const ICFGNode* getStmt() const
     {
         return inst;
     }
@@ -108,12 +109,12 @@ public:
     /// Dump CxtStmt
     inline void dump() const
     {
-        SVFUtil::outs() << "[ Current Stmt: " << inst->getSourceLoc() << " " << inst->toString() << "\t Contexts: " << cxtToStr() << "  ]\n";
+        SVFUtil::outs() << "[ Current Stmt: " << inst->toString() << "\t Contexts: " << cxtToStr() << "  ]\n";
     }
 
 protected:
     CallStrCxt cxt;
-    const SVFInstruction* inst;
+    const ICFGNode* inst;
 };
 
 
@@ -124,7 +125,7 @@ class CxtThreadStmt : public CxtStmt
 {
 public:
     /// Constructor
-    CxtThreadStmt(NodeID t, const CallStrCxt& c, const SVFInstruction* f) :CxtStmt(c,f), tid(t)
+    CxtThreadStmt(NodeID t, const CallStrCxt& c, const ICFGNode* f) :CxtStmt(c,f), tid(t)
     {
     }
     /// Copy constructor
@@ -174,7 +175,7 @@ public:
     /// Dump CxtThreadStmt
     inline void dump() const
     {
-        SVFUtil::outs() << "[ Current Thread id: " << tid << "  Stmt: " << inst->getSourceLoc() << " " << inst->toString() << "\t Contexts: " << cxtToStr() << "  ]\n";
+        SVFUtil::outs() << "[ Current Thread id: " << tid << "  Stmt: " << inst->toString() << "\t Contexts: " << cxtToStr() << "  ]\n";
     }
 
 private:
@@ -189,7 +190,7 @@ class CxtThread
 {
 public:
     /// Constructor
-    CxtThread(const CallStrCxt& c, const SVFInstruction* fork) : cxt(c), forksite(fork), inloop(false), incycle(false)
+    CxtThread(const CallStrCxt& c, const ICFGNode* fork) : cxt(c), forksite(fork), inloop(false), incycle(false)
     {
     }
     /// Copy constructor
@@ -207,7 +208,7 @@ public:
         return cxt;
     }
     /// Return forksite
-    inline const SVFInstruction* getThread() const
+    inline const ICFGNode* getThread() const
     {
         return forksite;
     }
@@ -282,7 +283,7 @@ public:
 
         if(forksite)
         {
-            SVFUtil::outs() << "[ Thread: $" << forksite->getSourceLoc() << "$ "
+            SVFUtil::outs() << "[ Thread: "
                             << forksite->toString()  << "\t Contexts: " << cxtToStr()
                             << loop << cycle <<"  ]\n";
         }
@@ -294,7 +295,7 @@ public:
     }
 protected:
     CallStrCxt cxt;
-    const SVFInstruction* forksite;
+    const ICFGNode* forksite;
     bool inloop;
     bool incycle;
 };
@@ -484,8 +485,8 @@ template <> struct std::hash<SVF::CxtStmt>
 {
     size_t operator()(const SVF::CxtStmt& cs) const
     {
-        std::hash<SVF::SVFInstruction*> h;
-        SVF::SVFInstruction* inst = const_cast<SVF::SVFInstruction*> (cs.getStmt());
+        std::hash<SVF::ICFGNode*> h;
+        SVF::ICFGNode* inst = const_cast<SVF::ICFGNode*> (cs.getStmt());
         return h(inst);
     }
 };

package/SVF-osx/Release-build/include/Util/Options.h

@@ -151,36 +151,17 @@ public:
     static const Option<std::string> WriteSVFG;
     static const Option<std::string> ReadSVFG;
 
-    // FSMPTA.cpp
-    static const Option<bool> UsePCG;
-    static const Option<bool> IntraLock;
-    static const Option<bool> ReadPrecisionTDEdge;
-    static const Option<u32_t> AddModelFlag;
-
     // LockAnalysis.cpp
+    static const Option<bool> IntraLock;
     static const Option<bool> PrintLockSpan;
 
     // MHP.cpp
     static const Option<bool> PrintInterLev;
     static const Option<bool> DoLockAnalysis;
 
-    // MTA.cpp
-    static const Option<bool> AndersenAnno;
-    static const Option<bool> FSAnno;
-
-    // MTAAnnotator.cpp
-    static const Option<u32_t> AnnoFlag;
-
-    // MTAResultValidator.cpp
-    static const Option<bool> PrintValidRes;
-
-    static const Option<bool> LockValid;
     //MTAStat.cpp
     static const Option<bool> AllPairMHP;
 
-    // PCG.cpp
-    //const Option<bool> TDPrint
-
     // TCT.cpp
     static const Option<bool> TCTDotGraph;
 

package/SVF-osx/Release-build/include/Util/SVFUtil.h

@@ -404,7 +404,7 @@ inline bool isArgOfUncalledFunction(const SVFValue* svfval)
 //@{
 inline const SVFValue* getForkedFun(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->getForkedFun(cs);
+    return ThreadAPI::getThreadAPI()->getForkedFun(cs.getInstruction());
 }
 inline const SVFValue* getForkedFun(const SVFInstruction *inst)
 {
@@ -490,7 +490,7 @@ inline bool isReallocExtCall(const SVFInstruction *inst)
 ///@{
 inline bool isThreadForkCall(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->isTDFork(cs);
+    return ThreadAPI::getThreadAPI()->isTDFork(cs.getInstruction());
 }
 inline bool isThreadForkCall(const SVFInstruction *inst)
 {
@@ -498,23 +498,11 @@ inline bool isThreadForkCall(const SVFInstruction *inst)
 }
 //@}
 
-/// Return true if this is a hare_parallel_for call
-///@{
-inline bool isHareParForCall(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->isHareParFor(cs);
-}
-inline bool isHareParForCall(const SVFInstruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->isHareParFor(inst);
-}
-//@}
-
 /// Return true if this is a thread join call
 ///@{
 inline bool isThreadJoinCall(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->isTDJoin(cs);
+    return ThreadAPI::getThreadAPI()->isTDJoin(cs.getInstruction());
 }
 inline bool isThreadJoinCall(const SVFInstruction *inst)
 {
@@ -526,7 +514,7 @@ inline bool isThreadJoinCall(const SVFInstruction *inst)
 ///@{
 inline bool isThreadExitCall(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->isTDExit(cs);
+    return ThreadAPI::getThreadAPI()->isTDExit(cs.getInstruction());
 }
 inline bool isThreadExitCall(const SVFInstruction *inst)
 {
@@ -538,7 +526,7 @@ inline bool isThreadExitCall(const SVFInstruction *inst)
 ///@{
 inline bool isLockAquireCall(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->isTDAcquire(cs);
+    return ThreadAPI::getThreadAPI()->isTDAcquire(cs.getInstruction());
 }
 inline bool isLockAquireCall(const SVFInstruction *inst)
 {
@@ -550,7 +538,7 @@ inline bool isLockAquireCall(const SVFInstruction *inst)
 ///@{
 inline bool isLockReleaseCall(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->isTDRelease(cs);
+    return ThreadAPI::getThreadAPI()->isTDRelease(cs.getInstruction());
 }
 inline bool isLockReleaseCall(const SVFInstruction *inst)
 {
@@ -562,7 +550,7 @@ inline bool isLockReleaseCall(const SVFInstruction *inst)
 //@{
 inline bool isBarrierWaitCall(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->isTDBarWait(cs);
+    return ThreadAPI::getThreadAPI()->isTDBarWait(cs.getInstruction());
 }
 inline bool isBarrierWaitCall(const SVFInstruction *inst)
 {
@@ -574,7 +562,7 @@ inline bool isBarrierWaitCall(const SVFInstruction *inst)
 //@{
 inline const SVFValue* getActualParmAtForkSite(const CallSite cs)
 {
-    return ThreadAPI::getThreadAPI()->getActualParmAtForkSite(cs);
+    return ThreadAPI::getThreadAPI()->getActualParmAtForkSite(cs.getInstruction());
 }
 inline const SVFValue* getActualParmAtForkSite(const SVFInstruction *inst)
 {
@@ -582,29 +570,6 @@ inline const SVFValue* getActualParmAtForkSite(const SVFInstruction *inst)
 }
 //@}
 
-/// Return the task function of the parallel_for routine
-//@{
-inline const SVFValue* getTaskFuncAtHareParForSite(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getTaskFuncAtHareParForSite(cs);
-}
-inline const SVFValue* getTaskFuncAtHareParForSite(const SVFInstruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getTaskFuncAtHareParForSite(inst);
-}
-//@}
-
-/// Return the task data argument of the parallel_for routine
-//@{
-inline const SVFValue* getTaskDataAtHareParForSite(const CallSite cs)
-{
-    return ThreadAPI::getThreadAPI()->getTaskDataAtHareParForSite(cs);
-}
-inline const SVFValue* getTaskDataAtHareParForSite(const SVFInstruction *inst)
-{
-    return ThreadAPI::getThreadAPI()->getTaskDataAtHareParForSite(inst);
-}
-//@}
 
 inline bool isProgExitCall(const CallSite cs)
 {