svf-lib 1.0.765 → 1.0.769

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

@@ -45,6 +45,9 @@ class SVFVar;
 typedef GenericNode<SVFVar,SVFStmt> GenericPAGNodeTy;
 class SVFVar : public GenericPAGNodeTy
 {
+friend class IRGraph;
+friend class SVFIR;
+friend class VFG;
 
 public:
     /// Nine kinds of SVFIR variables
@@ -162,13 +165,11 @@ public:
     {
         return InEdgeKindToSetMap[kind];
     }
-
     /// Get outgoing SVFIR statements (edges)
     inline SVFStmt::SVFStmtSetTy& getOutgoingEdges(SVFStmt::PEDGEK kind)
     {
         return OutEdgeKindToSetMap[kind];
     }
-
     /// Has incoming SVFIR statements (edges)
     inline bool hasIncomingEdges(SVFStmt::PEDGEK kind) const
     {
@@ -178,18 +179,16 @@ public:
         else
             return false;
     }
-
-    /// Has incoming VariantGepEdges
-    inline bool hasIncomingVariantGepEdge() const
+    /// Has outgoing SVFIR statements (edges)
+    inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
-        if (it != InEdgeKindToSetMap.end())
-        {
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
+        if (it != OutEdgeKindToSetMap.end())
             return (!it->second.empty());
-        }
-        return false;
+        else
+            return false;
     }
-
+    
     /// Get incoming SVFStmt iterator
     inline SVFStmt::SVFStmtSetTy::iterator getIncomingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
@@ -206,16 +205,6 @@ public:
         return it->second.end();
     }
 
-    /// Has outgoing SVFIR statements (edges)
-    inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
-    {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
-        if (it != OutEdgeKindToSetMap.end())
-            return (!it->second.empty());
-        else
-            return false;
-    }
-
     /// Get outgoing SVFStmt iterator
     inline SVFStmt::SVFStmtSetTy::iterator getOutgoingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
@@ -233,6 +222,7 @@ public:
     }
     //@}
 
+private:
     ///  add methods of the components
     //@{
     inline void addInEdge(SVFStmt* inEdge)
@@ -248,7 +238,18 @@ public:
         OutEdgeKindToSetMap[kind].insert(outEdge);
         addOutgoingEdge(outEdge);
     }
+    /// Has incoming VariantGepEdges
+    inline bool hasIncomingVariantGepEdge() const
+    {
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
+        if (it != InEdgeKindToSetMap.end())
+        {
+            return (!it->second.empty());
+        }
+        return false;
+    }
 
+public:
     virtual const std::string toString() const;
 
     /// Dump to console for debugging

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

@@ -291,7 +291,7 @@ public:
     inline bool isZeroOffsettedGepCGEdge(ConstraintEdge *edge) const
     {
         if (NormalGepCGEdge *normalGepCGEdge = SVFUtil::dyn_cast<NormalGepCGEdge>(edge))
-            if (0 == normalGepCGEdge->getOffset())
+            if (0 == normalGepCGEdge->getFieldOffset())
                 return true;
         return false;
     }

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

@@ -304,9 +304,9 @@ public:
     }
 
     /// Get location set of the gep edge
-    inline Size_t getOffset() const
+    inline Size_t getFieldOffset() const
     {
-        return ls.accumulateConstantOffset();
+        return ls.accumulateConstantFieldIdx();
     }
 };
 

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

@@ -487,28 +487,28 @@ protected:
     {
         AddrVFGNode* sNode = new AddrVFGNode(totalVFGNode++,addr);
         addStmtVFGNode(sNode, addr);
-        setDef(addr->getDstNode(),sNode);
+        setDef(addr->getLHSVar(),sNode);
     }
     /// Add a Copy VFG node
     inline void addCopyVFGNode(const CopyStmt* copy)
     {
         CopyVFGNode* sNode = new CopyVFGNode(totalVFGNode++,copy);
         addStmtVFGNode(sNode, copy);
-        setDef(copy->getDstNode(),sNode);
+        setDef(copy->getLHSVar(),sNode);
     }
     /// Add a Gep VFG node
     inline void addGepVFGNode(const GepStmt* gep)
     {
         GepVFGNode* sNode = new GepVFGNode(totalVFGNode++,gep);
         addStmtVFGNode(sNode, gep);
-        setDef(gep->getDstNode(),sNode);
+        setDef(gep->getLHSVar(),sNode);
     }
     /// Add a Load VFG node
     void addLoadVFGNode(const LoadStmt* load)
     {
         LoadVFGNode* sNode = new LoadVFGNode(totalVFGNode++,load);
         addStmtVFGNode(sNode, load);
-        setDef(load->getDstNode(),sNode);
+        setDef(load->getLHSVar(),sNode);
     }
     /// Add a Store VFG node,
     /// To be noted store does not create a new pointer, we do not set def for any SVFIR node

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

@@ -104,7 +104,7 @@ public:
     inline LocationSet operator+ (const LocationSet& rhs) const
     {
         LocationSet ls(rhs);
-        ls.fldIdx += accumulateConstantOffset();
+        ls.fldIdx += accumulateConstantFieldIdx();
         OffsetValueVec::const_iterator it = getOffsetValueVec().begin();
         OffsetValueVec::const_iterator eit = getOffsetValueVec().end();
         for (; it != eit; ++it)
@@ -151,7 +151,7 @@ public:
 
     /// Get methods
     //@{
-    inline Size_t accumulateConstantOffset() const
+    inline Size_t accumulateConstantFieldIdx() const
     {
         return fldIdx;
     }
@@ -203,7 +203,7 @@ template <> struct std::hash<SVF::LocationSet> {
     size_t operator()(const SVF::LocationSet &ls) const {
         SVF::Hash<std::pair<SVF::NodeID, SVF::NodeID>> h;
         std::hash<SVF::LocationSet::OffsetValueVec> v;
-        return h(std::make_pair(ls.accumulateConstantOffset(), v(ls.getOffsetValueVec())));
+        return h(std::make_pair(ls.accumulateConstantFieldIdx(), v(ls.getOffsetValueVec())));
     }
 };
 

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

@@ -651,7 +651,7 @@ private:
     /// Add Offset(Gep) edge
     NormalGepStmt* addNormalGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Variant(Gep) edge
-    VariantGepStmt* addVariantGepStmt(NodeID src, NodeID dst);
+    VariantGepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Thread fork edge for parameter passing
     TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallBlockNode* cs);
     /// Add Thread join edge for parameter passing