svf-lib 1.0.732 → 1.0.736

package/SVF-osx/include/MemoryModel/PTAStat.h

@@ -57,49 +57,49 @@ public:
     static const char* ProcessCopyGepTime;	///< time of processing copys and geps
     static const char* UpdateCallGraphTime;	///< time of updating call graph
 
-    static const char* TotalNumOfPointers;	///< Total PAG value node
-    static const char* TotalNumOfObjects;	///< Total PAG object node
-    static const char* TotalNumOfFieldObjects;	///< Total PAG field object node
+    static const char* TotalNumOfPointers;	///< Total SVFIR value node
+    static const char* TotalNumOfObjects;	///< Total SVFIR object node
+    static const char* TotalNumOfFieldObjects;	///< Total SVFIR field object node
     static const char* MaxStructSize;	///< Max struct size
-    static const char* TotalNumOfEdges;	///< Total PAG edge number
-
-    static const char* NumOfAddrs;		///< PAG addr edge
-    static const char* NumOfLoads;		///< PAG load edge
-    static const char* NumOfStores;		///< PAG store edge
-    static const char* NumOfCopys;		///< PAG copy edge
-    static const char* NumOfGeps;		///< PAG gep edge
-    static const char* NumOfCalls;		///< PAG call edge
-    static const char* NumOfReturns;	///< PAG return edge
-
-    static const char* NumOfProcessedAddrs;		///< PAG processed addr edge
-    static const char* NumOfProcessedLoads;		///< PAG processed load edge
-    static const char* NumOfProcessedStores;	///< PAG processed store edge
-    static const char* NumOfProcessedCopys;		///< PAG processed copy edge
-    static const char* NumOfProcessedGeps;		///< PAG processed gep edge
+    static const char* TotalNumOfEdges;	///< Total SVFIR edge number
+
+    static const char* NumOfAddrs;		///< SVFIR addr edge
+    static const char* NumOfLoads;		///< SVFIR load edge
+    static const char* NumOfStores;		///< SVFIR store edge
+    static const char* NumOfCopys;		///< SVFIR copy edge
+    static const char* NumOfGeps;		///< SVFIR gep edge
+    static const char* NumOfCalls;		///< SVFIR call edge
+    static const char* NumOfReturns;	///< SVFIR return edge
+
+    static const char* NumOfProcessedAddrs;		///< SVFIR processed addr edge
+    static const char* NumOfProcessedLoads;		///< SVFIR processed load edge
+    static const char* NumOfProcessedStores;	///< SVFIR processed store edge
+    static const char* NumOfProcessedCopys;		///< SVFIR processed copy edge
+    static const char* NumOfProcessedGeps;		///< SVFIR processed gep edge
 
     static const char* NumOfSfr;                ///< num of field representatives
     static const char* NumOfFieldExpand;
 
     static const char* NumOfFunctionObjs;	///< Function numbers
-    static const char* NumOfGlobalObjs;	///< PAG global object node
-    static const char* NumOfHeapObjs;	///< PAG heap object node
-    static const char* NumOfStackObjs;	///< PAG stack object node
+    static const char* NumOfGlobalObjs;	///< SVFIR global object node
+    static const char* NumOfHeapObjs;	///< SVFIR heap object node
+    static const char* NumOfStackObjs;	///< SVFIR stack object node
 
-    static const char* NumOfObjsHasVarStruct;	///< PAG object node has var struct (maybe nested with array)
-    static const char* NumOfObjsHasVarArray;	///< PAG object node has var array (maybe nested with struct)
-    static const char* NumOfObjsHasConstStruct;	///< PAG object node has const struct (maybe nested with array)
-    static const char* NumOfObjsHasConstArray;	///< PAG object node has const array (maybe nested with struct)
-    static const char* NumOfNonPtrObjs;	///< PAG object node which is non pointer type object (do not have pts)
-    static const char* NumOfConstantObjs;	///< PAG object node which is purely constant
+    static const char* NumOfObjsHasVarStruct;	///< SVFIR object node has var struct (maybe nested with array)
+    static const char* NumOfObjsHasVarArray;	///< SVFIR object node has var array (maybe nested with struct)
+    static const char* NumOfObjsHasConstStruct;	///< SVFIR object node has const struct (maybe nested with array)
+    static const char* NumOfObjsHasConstArray;	///< SVFIR object node has const array (maybe nested with struct)
+    static const char* NumOfNonPtrObjs;	///< SVFIR object node which is non pointer type object (do not have pts)
+    static const char* NumOfConstantObjs;	///< SVFIR object node which is purely constant
 
     static const char* NumberOfFieldInsensitiveObj;
     static const char* NumberOfFieldSensitiveObj;
 
-    static const char* NumOfPointers;	///< PAG value node, each of them maps to a llvm value
-    static const char* NumOfGepFieldPointers;	///< PAG gep value node (field value, dynamically created dummy node)
+    static const char* NumOfPointers;	///< SVFIR value node, each of them maps to a llvm value
+    static const char* NumOfGepFieldPointers;	///< SVFIR gep value node (field value, dynamically created dummy node)
 
-    static const char* NumOfMemObjects;	///< PAG object node, each of them maps to a llvm value
-    static const char* NumOfGepFieldObjects;	///< PAG gep object node (field obj, dynamically created dummy node)
+    static const char* NumOfMemObjects;	///< SVFIR object node, each of them maps to a llvm value
+    static const char* NumOfGepFieldObjects;	///< SVFIR gep object node (field obj, dynamically created dummy node)
 
     static const char* AveragePointsToSetSize;		///< Average points-to size of all variables
     static const char* AverageTopLevPointsToSetSize; ///< Average points-to size of top-level variables

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

@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "Graphs/PAG.h"
+#include "MemoryModel/SVFIR.h"
 #include "MemoryModel/ConditionalPT.h"
 #include "MemoryModel/AbstractPointsToDS.h"
 #include "MemoryModel/MutablePointsToDS.h"
@@ -106,7 +106,7 @@ public:
     //@{
     typedef llvm::AliasAnalysis AliasAnalysis;
     typedef Set<const CallBlockNode*> CallSiteSet;
-    typedef PAG::CallSiteToFunPtrMap CallSiteToFunPtrMap;
+    typedef SVFIR::CallSiteToFunPtrMap CallSiteToFunPtrMap;
     typedef Set<const SVFFunction*> FunctionSet;
     typedef OrderedMap<const CallBlockNode*, FunctionSet> CallEdgeMap;
     typedef SCCDetection<PTACallGraph*> CallGraphSCC;
@@ -143,8 +143,8 @@ protected:
     u32_t OnTheFlyIterBudgetForStat;
     //@}
 
-    /// PAG
-    static PAG* pag;
+    /// SVFIR
+    static SVFIR* pag;
     /// Module
     SVFModule* svfMod;
     /// Pointer analysis Type
@@ -186,7 +186,7 @@ public:
     }
 
     /// Constructor
-    PointerAnalysis(PAG* pag, PTATY ty = Default_PTA, bool alias_check = true);
+    PointerAnalysis(SVFIR* pag, PTATY ty = Default_PTA, bool alias_check = true);
 
     /// Type of pointer analysis
     inline PTATY getAnalysisTy() const
@@ -200,9 +200,9 @@ public:
         return ptaImplTy;
     }
 
-    /// Get/set PAG
+    /// Get/set SVFIR
     ///@{
-    inline PAG* getPAG() const
+    inline SVFIR* getPAG() const
     {
         return pag;
     }
@@ -227,7 +227,7 @@ public:
     /// Destructor
     virtual ~PointerAnalysis();
 
-    /// Initialization of a pointer analysis, including building symbol table and PAG etc.
+    /// Initialization of a pointer analysis, including building symbol table and SVFIR etc.
     virtual void initialize();
 
     /// Finalization of a pointer analysis, including checking alias correctness
@@ -344,7 +344,7 @@ public:
     ///@{
     inline bool isFIObjNode(NodeID id) const
     {
-        return (SVFUtil::isa<FIObjPN>(pag->getPAGNode(id)));
+        return (SVFUtil::isa<FIObjPN>(pag->getGNode(id)));
     }
     inline NodeID getBaseObjNode(NodeID id)
     {

package/SVF-osx/include/MemoryModel/PointerAnalysisImpl.h

@@ -68,7 +68,7 @@ public:
     };
 
     /// Constructor
-    BVDataPTAImpl(PAG* pag, PointerAnalysis::PTATY type, bool alias_check = true);
+    BVDataPTAImpl(SVFIR* pag, PointerAnalysis::PTATY type, bool alias_check = true);
 
     /// Destructor
     virtual ~BVDataPTAImpl()
@@ -261,7 +261,7 @@ public:
     typedef Map<NodeID,CPtSet> PtrToCPtsMap;	 /// map a pointer to its conditional points-to set
 
     /// Constructor
-    CondPTAImpl(PAG* pag, PointerAnalysis::PTATY type) : PointerAnalysis(pag, type), normalized(false)
+    CondPTAImpl(SVFIR* pag, PointerAnalysis::PTATY type) : PointerAnalysis(pag, type), normalized(false)
     {
         if (type == PathS_DDA || type == Cxt_DDA)
             ptD = new MutPTDataTy();
@@ -574,7 +574,7 @@ public:
     {
         for (OrderedNodeSet::iterator nIter = this->getAllValidPtrs().begin(); nIter != this->getAllValidPtrs().end(); ++nIter)
         {
-            const PAGNode* node = this->getPAG()->getPAGNode(*nIter);
+            const PAGNode* node = this->getPAG()->getGNode(*nIter);
             if (this->getPAG()->isValidTopLevelPtr(node))
             {
                 if (SVFUtil::isa<DummyObjPN>(node))