svf-lib 1.0.745 → 1.0.749

package/SVF-linux/include/MemoryModel/SVFStatements.h

@@ -41,15 +41,15 @@ namespace SVF
 class SVFVar;
 
 /*
- * SVFIR edge between nodes
+ * SVFIR program statements (PAGEdges)
  */
 typedef GenericEdge<SVFVar> GenericPAGEdgeTy;
 class SVFStmt : public GenericPAGEdgeTy
 {
 
 public:
-    /// Thirteen kinds of SVFIR edges
-    /// Gep represents offset edge for field sensitivity
+    /// Types of SVFIR statements
+    /// Gep represents (base + offset) for field sensitivity
     /// ThreadFork/ThreadJoin is to model parameter passings between thread spawners and spawnees.
     enum PEDGEK
     {
@@ -175,9 +175,10 @@ public:
     }
     //@}
 
-    typedef GenericNode<SVFVar,SVFStmt>::GEdgeSetTy PAGEdgeSetTy;
-    typedef Map<EdgeID, PAGEdgeSetTy> PAGEdgeToSetMapTy;
-    typedef PAGEdgeToSetMapTy PAGKindToEdgeSetMapTy;
+    typedef GenericNode<SVFVar,SVFStmt>::GEdgeSetTy SVFStmtSetTy;
+    typedef Map<EdgeID, SVFStmtSetTy> PAGEdgeToSetMapTy;
+    typedef PAGEdgeToSetMapTy KindToSVFStmtMapTy;
+    typedef SVFStmtSetTy PAGEdgeSetTy;
 
 private:
     typedef Map<const ICFGNode*, u32_t> Inst2LabelMap;
@@ -191,7 +192,7 @@ private:
 
 
 /*!
- * Copy edge
+ * Address statement (memory allocations)
  */
 class AddrStmt: public SVFStmt
 {
@@ -226,7 +227,7 @@ public:
 
 
 /*!
- * Copy edge
+ * Copy statements (simple assignment and casting)
  */
 class CopyStmt: public SVFStmt
 {
@@ -259,6 +260,9 @@ public:
     virtual const std::string toString() const override;
 };
 
+/*
+* Program statements with multiple operands including BinaryOPStmt, CmpStmt and PhiStmt
+*/
 class MultiOpndStmt : public SVFStmt{
 public:
     typedef std::vector<SVFVar*> OPVars;
@@ -323,7 +327,8 @@ public:
 };
 
 /*!
- * Phi instruction edge
+ * Phi statement (e.g., p = phi(q,r) which receives values from variables q and r from different paths)
+ * it is typically at a joint point of the control-flow graph
  */
 class PhiStmt: public MultiOpndStmt
 {
@@ -369,7 +374,7 @@ public:
 
 
 /*!
- * Compare instruction edge
+ * Comparison statement
  */
 class CmpStmt: public MultiOpndStmt
 {
@@ -382,7 +387,7 @@ private:
     SVFVar* getSrcID();  ///< place holder, use getOpVarID(pos) instead
     SVFVar* getDstID();    ///< place holder, use getResID() instead
 
-    u32_t opcode;
+    u32_t predicate;
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -405,13 +410,13 @@ public:
     //@}
 
     /// constructor
-    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t oc) : MultiOpndStmt(s,opnds,SVFStmt::Cmp), opcode(oc)
+    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre) : MultiOpndStmt(s,opnds,SVFStmt::Cmp), predicate(pre)
     {
     }
 
-    u32_t getOpcode() const
+    u32_t getPredicate() const
     {
-        return opcode;
+        return predicate;
     }
     
     virtual const std::string toString() const override;
@@ -419,7 +424,7 @@ public:
 
 
 /*!
- * Binary instruction edge
+ * Binary statement
  */
 class BinaryOPStmt: public MultiOpndStmt
 {
@@ -469,7 +474,7 @@ public:
 };
 
 /*!
- * Unary instruction edge
+ * Unary statement
  */
 class UnaryOPStmt: public SVFStmt
 {
@@ -586,7 +591,7 @@ public:
 };
 
 /*!
- * Store edge
+ * Store statement
  */
 class StoreStmt: public SVFStmt
 {
@@ -623,7 +628,7 @@ public:
 
 
 /*!
- * Load edge
+ * Load statement
  */
 class LoadStmt: public SVFStmt
 {
@@ -659,7 +664,7 @@ public:
 
 
 /*!
- * Gep edge
+ * Gep statement for field access and pointer arithmetic
  */
 class GepStmt: public SVFStmt
 {
@@ -699,7 +704,7 @@ protected:
 
 
 /*!
- * Gep edge with a fixed offset
+ * Gep statement with a fixed offset
  */
 class NormalGepStmt : public GepStmt
 {
@@ -749,7 +754,7 @@ public:
 };
 
 /*!
- * Gep edge with a variant offset
+ * Gep statement with a variant offset
  */
 class VariantGepStmt : public GepStmt
 {
@@ -788,7 +793,7 @@ public:
 
 
 /*!
- * Call edge
+ * Call 
  */
 class CallPE: public SVFStmt
 {
@@ -840,7 +845,7 @@ public:
 
 
 /*!
- * Return edge
+ * Return 
  */
 class RetPE: public SVFStmt
 {
@@ -892,7 +897,7 @@ public:
 
 
 /*!
- * Thread Fork Edge
+ * Thread Fork 
  */
 class TDForkPE: public CallPE
 {
@@ -930,7 +935,7 @@ public:
 
 
 /*!
- * Thread Join Edge
+ * Thread Join 
  */
 class TDJoinPE: public RetPE
 {

package/SVF-linux/include/MemoryModel/SVFVariables.h

@@ -40,14 +40,14 @@ namespace SVF
 
 class SVFVar;
 /*
- * SVFIR node
+ * SVFIR program variables (PAGNodes)
  */
 typedef GenericNode<SVFVar,SVFStmt> GenericPAGNodeTy;
 class SVFVar : public GenericPAGNodeTy
 {
 
 public:
-    /// Nine kinds of SVFIR nodes
+    /// Nine kinds of SVFIR variables
     /// ValNode: llvm pointer value
     /// ObjNode: memory object
     /// RetNode: unique return node
@@ -76,8 +76,8 @@ public:
 
 protected:
     const Value* value; ///< value of this SVFIR node
-    SVFStmt::PAGKindToEdgeSetMapTy InEdgeKindToSetMap;
-    SVFStmt::PAGKindToEdgeSetMapTy OutEdgeKindToSetMap;
+    SVFStmt::KindToSVFStmtMapTy InEdgeKindToSetMap;
+    SVFStmt::KindToSVFStmtMapTy OutEdgeKindToSetMap;
     bool isTLPointer;	/// top-level pointer
     bool isATPointer;	/// address-taken pointer
 
@@ -157,22 +157,22 @@ public:
         return nullptr;
     }
 
-    /// Get incoming SVFIR edges
-    inline SVFStmt::PAGEdgeSetTy& getIncomingEdges(SVFStmt::PEDGEK kind)
+    /// Get incoming SVFIR statements (edges)
+    inline SVFStmt::SVFStmtSetTy& getIncomingEdges(SVFStmt::PEDGEK kind)
     {
         return InEdgeKindToSetMap[kind];
     }
 
-    /// Get outgoing SVFIR edges
-    inline SVFStmt::PAGEdgeSetTy& getOutgoingEdges(SVFStmt::PEDGEK kind)
+    /// Get outgoing SVFIR statements (edges)
+    inline SVFStmt::SVFStmtSetTy& getOutgoingEdges(SVFStmt::PEDGEK kind)
     {
         return OutEdgeKindToSetMap[kind];
     }
 
-    /// Has incoming SVFIR edges
+    /// Has incoming SVFIR statements (edges)
     inline bool hasIncomingEdges(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = InEdgeKindToSetMap.find(kind);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(kind);
         if (it != InEdgeKindToSetMap.end())
             return (!it->second.empty());
         else
@@ -182,7 +182,7 @@ public:
     /// Has incoming VariantGepEdges
     inline bool hasIncomingVariantGepEdge() const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
         if (it != InEdgeKindToSetMap.end())
         {
             return (!it->second.empty());
@@ -191,25 +191,25 @@ public:
     }
 
     /// Get incoming SVFStmt iterator
-    inline SVFStmt::PAGEdgeSetTy::iterator getIncomingEdgesBegin(SVFStmt::PEDGEK kind) const
+    inline SVFStmt::SVFStmtSetTy::iterator getIncomingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = InEdgeKindToSetMap.find(kind);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(kind);
         assert(it!=InEdgeKindToSetMap.end() && "The node does not have such kind of edge");
         return it->second.begin();
     }
 
     /// Get incoming SVFStmt iterator
-    inline SVFStmt::PAGEdgeSetTy::iterator getIncomingEdgesEnd(SVFStmt::PEDGEK kind) const
+    inline SVFStmt::SVFStmtSetTy::iterator getIncomingEdgesEnd(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = InEdgeKindToSetMap.find(kind);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(kind);
         assert(it!=InEdgeKindToSetMap.end() && "The node does not have such kind of edge");
         return it->second.end();
     }
 
-    /// Has outgoing SVFIR edges
+    /// Has outgoing SVFIR statements (edges)
     inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
         if (it != OutEdgeKindToSetMap.end())
             return (!it->second.empty());
         else
@@ -217,17 +217,17 @@ public:
     }
 
     /// Get outgoing SVFStmt iterator
-    inline SVFStmt::PAGEdgeSetTy::iterator getOutgoingEdgesBegin(SVFStmt::PEDGEK kind) const
+    inline SVFStmt::SVFStmtSetTy::iterator getOutgoingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
         assert(it!=OutEdgeKindToSetMap.end() && "The node does not have such kind of edge");
         return it->second.begin();
     }
 
     /// Get outgoing SVFStmt iterator
-    inline SVFStmt::PAGEdgeSetTy::iterator getOutgoingEdgesEnd(SVFStmt::PEDGEK kind) const
+    inline SVFStmt::SVFStmtSetTy::iterator getOutgoingEdgesEnd(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::PAGKindToEdgeSetMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
         assert(it!=OutEdgeKindToSetMap.end() && "The node does not have such kind of edge");
         return it->second.end();
     }
@@ -268,7 +268,7 @@ public:
 
 
 /*
- * Value(Pointer) node
+ * Value (Pointer) variable
  */
 class ValVar: public SVFVar
 {
@@ -312,7 +312,7 @@ public:
 
 
 /*
- * Memory Object node
+ * Memory Object variable
  */
 class ObjVar: public SVFVar
 {
@@ -377,9 +377,9 @@ public:
 
 
 /*
- * Gep Value (Pointer) node, this node can be dynamic generated for field sensitive analysis
- * e.g. memcpy, temp gep value node needs to be created
- * Each Gep Value node is connected to base value node via gep edge
+ * Gep Value (Pointer) variable, this variable can be dynamic generated for field sensitive analysis
+ * e.g. memcpy, temp gep value variable needs to be created
+ * Each Gep Value variable is connected to base value variable via gep edge
  */
 class GepValVar: public ValVar
 {
@@ -416,7 +416,7 @@ public:
     {
     }
 
-    /// offset of the base value node
+    /// offset of the base value variable
     inline u32_t getOffset() const
     {
         return ls.getOffset();
@@ -445,8 +445,8 @@ public:
 
 
 /*
- * Gep Obj node, this is dynamic generated for field sensitive analysis
- * Each gep obj node is one field of a MemObj (base)
+ * Gep Obj variable, this is dynamic generated for field sensitive analysis
+ * Each gep obj variable is one field of a MemObj (base)
  */
 class GepObjPN: public ObjVar
 {
@@ -521,7 +521,7 @@ public:
 };
 
 /*
- * Field-insensitive Gep Obj node, this is dynamic generated for field sensitive analysis
+ * Field-insensitive Gep Obj variable, this is dynamic generated for field sensitive analysis
  * Each field-insensitive gep obj node represents all fields of a MemObj (base)
  */
 class FIObjVar: public ObjVar
@@ -649,7 +649,7 @@ public:
 
 
 /*
- * Dummy node
+ * Dummy variable without any LLVM value
  */
 class DummyValVar: public ValVar
 {
@@ -688,7 +688,7 @@ public:
 
 
 /*
- * Dummy node
+ * Dummy object variable
  */
 class DummyObjVar: public ObjVar
 {

package/SVF-linux/include/SVF-FE/SVFIRBuilder.h

@@ -269,13 +269,13 @@ public:
 
 public:
 
-    NodeID getGepValNode(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx);
+    NodeID getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx);
 
     void setCurrentBBAndValueForPAGEdge(PAGEdge* edge);
 
     inline PAGEdge* addBlackHoleAddrEdge(NodeID node)
     {
-        PAGEdge *edge = pag->addBlackHoleAddrPE(node);
+        PAGEdge *edge = pag->addBlackHoleAddrStmt(node);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -283,42 +283,42 @@ public:
     /// Add Address edge
     inline AddrStmt* addAddrEdge(NodeID src, NodeID dst)
     {
-        AddrStmt *edge = pag->addAddrPE(src, dst);
+        AddrStmt *edge = pag->addAddrStmt(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
     inline CopyStmt* addCopyEdge(NodeID src, NodeID dst)
     {
-        CopyStmt *edge = pag->addCopyPE(src, dst);
+        CopyStmt *edge = pag->addCopyStmt(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
-    inline PhiStmt* addPhiNode(NodeID res, NodeID opnd)
+    inline PhiStmt* addPhiStmt(NodeID res, NodeID opnd)
     {
-        PhiStmt *edge = pag->addPhiNode(res,opnd);
+        PhiStmt *edge = pag->addPhiStmt(res,opnd);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
-    inline CmpStmt* addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
+    inline CmpStmt* addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t predict)
     {
-        CmpStmt *edge = pag->addCmpPE(op1, op2, dst, opcode);
+        CmpStmt *edge = pag->addCmpStmt(op1, op2, dst, predict);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
     inline BinaryOPStmt* addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
     {
-        BinaryOPStmt *edge = pag->addBinaryOPPE(op1, op2, dst, opcode);
+        BinaryOPStmt *edge = pag->addBinaryOPStmt(op1, op2, dst, opcode);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Unary edge
     inline UnaryOPStmt* addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
     {
-        UnaryOPStmt *edge = pag->addUnaryOPPE(src, dst, opcode);
+        UnaryOPStmt *edge = pag->addUnaryOPStmt(src, dst, opcode);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -331,7 +331,7 @@ public:
     /// Add Load edge
     inline LoadStmt* addLoadEdge(NodeID src, NodeID dst)
     {
-        LoadStmt *edge = pag->addLoadPE(src, dst);
+        LoadStmt *edge = pag->addLoadStmt(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -343,7 +343,7 @@ public:
             node = pag->getICFG()->getIntraBlockNode(inst);
         else
             node = nullptr;
-        StoreStmt *edge = pag->addStorePE(src, dst, node);
+        StoreStmt *edge = pag->addStoreStmt(src, dst, node);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -364,21 +364,21 @@ public:
     /// Add Gep edge
     inline GepStmt* addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
     {
-        GepStmt *edge = pag->addGepPE(src, dst, ls, constGep);
+        GepStmt *edge = pag->addGepStmt(src, dst, ls, constGep);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Offset(Gep) edge
     inline NormalGepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        NormalGepStmt *edge = pag->addNormalGepPE(src, dst, ls);
+        NormalGepStmt *edge = pag->addNormalGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Variant(Gep) edge
     inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst)
     {
-        VariantGepStmt *edge = pag->addVariantGepPE(src, dst);
+        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

package/SVF-linux/include/Util/IRAnnotator.h

@@ -99,7 +99,7 @@ private:
             SVF::Size_t locationSetOffset = std::stoi(llvm::cast<llvm::MDString>(mdNode->getOperand(1))->getString().str());
 
             LocationSet locationSet = LocationSet(locationSetOffset);
-            SVF::NodeID gepnodeId = pag->getGepObjNode(baseNodeId, locationSet);
+            SVF::NodeID gepnodeId = pag->getGepObjVar(baseNodeId, locationSet);
 
             assert(nodeId == gepnodeId && "nodeId != gepnodeId");
         }

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

@@ -243,13 +243,15 @@ public:
     // TypeAnalysis.cpp
     static const llvm::cl::opt<bool> GenICFG;
 
-    //WPAPass.cpp
+    // WPAPass.cpp
     static const llvm::cl::opt<bool> AnderSVFG;
     static const llvm::cl::opt<bool> SABERFULLSVFG;
     static const llvm::cl::opt<bool> PrintAliases;
     static llvm::cl::bits<PointerAnalysis::PTATY> PASelected;
     static llvm::cl::bits<WPAPass::AliasCheckRule> AliasRule;
 
+    // DOTGraphTraits
+    static const llvm::cl::opt<bool> ShowHiddenNode;
 };
 }  // namespace SVF
 

package/SVF-linux/include/Util/TypeBasedHeapCloning.h

@@ -97,8 +97,8 @@ protected:
     const NodeBS &getGepObjs(NodeID base);
 
     /// Returns the GEP object node(s) of base for ls. This may include clones.
-    /// If there are no GEP objects, then getGepObjNode is called on the SVFIR
-    /// (through base's getGepObjNode) which will create one.
+    /// If there are no GEP objects, then getGepObjVar is called on the SVFIR
+    /// (through base's getGepObjVar) which will create one.
     const NodeBS getGepObjClones(NodeID base, unsigned offset);
 
     /// Initialise the pointees of p at loc (which is type tildet *). reuse indicates

package/SVF-linux/include/WPA/Andersen.h

@@ -383,7 +383,7 @@ protected:
 
             for (NodeID o : fldInsenObjs)
             {
-                const NodeBS &allFields = consCG->getAllFieldsObjNode(o);
+                const NodeBS &allFields = consCG->getAllFieldsObjVars(o);
                 for (NodeID f : allFields) addPts(it->first, f);
             }
         }

package/SVF-linux/include/WPA/FlowSensitiveTBHC.h

@@ -73,7 +73,7 @@ public:
     virtual bool processPhi(const PHISVFGNode* phi) override;
     virtual bool processCopy(const CopySVFGNode* copy) override;
 
-    virtual inline const NodeBS& getAllFieldsObjNode(NodeID id) override;
+    virtual inline const NodeBS& getAllFieldsObjVars(NodeID id) override;
 
     virtual inline bool updateInFromIn(const SVFGNode* srcStmt, NodeID srcVar, const SVFGNode* dstStmt, NodeID dstVar) override;
     virtual inline bool updateInFromOut(const SVFGNode* srcStmt, NodeID srcVar, const SVFGNode* dstStmt, NodeID dstVar) override;

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

@@ -310,9 +310,9 @@ public:
     {
         return pag->isBlkObjOrConstantObj(id);
     }
-    inline NodeBS& getAllFieldsObjNode(NodeID id)
+    inline NodeBS& getAllFieldsObjVars(NodeID id)
     {
-        return pag->getAllFieldsObjNode(id);
+        return pag->getAllFieldsObjVars(id);
     }
     inline NodeID getBaseObjVar(NodeID id)
     {

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

@@ -358,9 +358,9 @@ public:
     {
         return pag->getGepObjVar(id,ls);
     }
-    virtual inline const NodeBS& getAllFieldsObjNode(NodeID id)
+    virtual inline const NodeBS& getAllFieldsObjVars(NodeID id)
     {
-        return pag->getAllFieldsObjNode(id);
+        return pag->getAllFieldsObjVars(id);
     }
     inline void setObjFieldInsensitive(NodeID id)
     {

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

@@ -354,7 +354,7 @@ public:
         {
             if(pag->getBaseObjVar(cit->get_id())==cit->get_id())
             {
-                NodeBS& fields = pag->getAllFieldsObjNode(cit->get_id());
+                NodeBS& fields = pag->getAllFieldsObjVars(cit->get_id());
                 for(NodeBS::iterator it = fields.begin(), eit = fields.end(); it!=eit; ++it)
                 {
                     CVar cvar(cit->get_cond(),*it);

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

@@ -61,7 +61,7 @@ public:
     typedef Map<const RetBlockNode*,const SVFVar*> CSToRetMap;
     typedef Map<const SVFFunction*,const SVFVar*> FunToRetMap;
     typedef Map<const SVFFunction*,SVFStmtSet> FunToPAGEdgeSetMap;
-    typedef Map<const ICFGNode*,SVFStmtList> Inst2PAGEdgesMap;
+    typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
     typedef std::pair<NodeID, Size_t> NodeOffset;
     typedef std::pair<NodeID, LocationSet> NodeLocationSet;
@@ -73,8 +73,8 @@ public:
 private:
     /// ValueNodes - This map indicates the Node that a particular Value* is
     /// represented by.  This contains entries for all pointers.
-    Inst2PAGEdgesMap inst2SVFStmtsMap;	///< Map a instruction to its PAGEdges
-    Inst2PAGEdgesMap inst2PTASVFStmtsMap;	///< Map a instruction to its PointerAnalysis related PAGEdges
+    ICFGNode2SVFStmtsMap icfgNode2SVFStmtsMap;	///< Map an ICFGNode to its SVFStmts
+    ICFGNode2SVFStmtsMap icfgNode2PTASVFStmtsMap;	///< Map an ICFGNode to its PointerAnalysis related SVFStmts
     GepValueVarMap GepValObjMap;	///< Map a pair<base,off> to a gep value node id
     NodeLocationSetMap GepObjVarMap;	///< Map a pair<base,off> to a gep obj node id
     MemObjToFieldsMap memToFieldsMap;	///< Map a mem object id to all its fields
@@ -171,29 +171,29 @@ public:
     /// Whether this instruction has SVFIR Edge
     inline bool hasSVFStmtList(const ICFGNode* inst) const
     {
-        return inst2SVFStmtsMap.find(inst)!=inst2SVFStmtsMap.end();
+        return icfgNode2SVFStmtsMap.find(inst)!=icfgNode2SVFStmtsMap.end();
     }
     inline bool hasPTASVFStmtList(const ICFGNode* inst) const
     {
-        return inst2PTASVFStmtsMap.find(inst)!=inst2PTASVFStmtsMap.end();
+        return icfgNode2PTASVFStmtsMap.find(inst)!=icfgNode2PTASVFStmtsMap.end();
     }
     /// Given an instruction, get all its PAGEdges
     inline SVFStmtList& getSVFStmtList(const ICFGNode* inst)
     {
-        return inst2SVFStmtsMap[inst];
+        return icfgNode2SVFStmtsMap[inst];
     }
     /// Given an instruction, get all its PTA PAGEdges
     inline SVFStmtList& getPTASVFStmtList(const ICFGNode* inst)
     {
-        return inst2PTASVFStmtsMap[inst];
+        return icfgNode2PTASVFStmtsMap[inst];
     }
     /// Add a SVFStmt into instruction map
     inline void addToSVFStmtList(ICFGNode* inst, SVFStmt* edge)
     {
         edge->setICFGNode(inst);
-        inst2SVFStmtsMap[inst].push_back(edge);
+        icfgNode2SVFStmtsMap[inst].push_back(edge);
         if (edge->isPTAEdge())
-            inst2PTASVFStmtsMap[inst].push_back(edge);
+            icfgNode2PTASVFStmtsMap[inst].push_back(edge);
     }
     /// Get global PAGEdges (not in a procedure)
     inline SVFStmtSet& getGlobalSVFStmtSet()
@@ -454,8 +454,8 @@ public:
 
     /// Get all fields of an object
     //@{
-    NodeBS& getAllFieldsObjNode(const MemObj* obj);
-    NodeBS& getAllFieldsObjNode(NodeID id);
+    NodeBS& getAllFieldsObjVars(const MemObj* obj);
+    NodeBS& getAllFieldsObjVars(NodeID id);
     NodeBS getFieldsAfterCollapse(NodeID id);
     //@}
     inline NodeID addDummyValNode()
@@ -631,7 +631,7 @@ private:
     /// Add phi node information
     PhiStmt*  addPhiStmt(NodeID res, NodeID opnd);
     /// Add Copy edge
-    CmpStmt* addCmpStmt(NodeID op1, NodeID op2, NodeID dst, u32_t opcode);
+    CmpStmt* addCmpStmt(NodeID op1, NodeID op2, NodeID dst, u32_t predict);
     /// Add Copy edge
     BinaryOPStmt* addBinaryOPStmt(NodeID op1, NodeID op2, NodeID dst, u32_t opcode);
     /// Add Unary edge