svf-lib 1.0.764 → 1.0.768

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

@@ -417,17 +417,17 @@ public:
     }
 
     /// offset of the base value variable
-    inline u32_t getOffset() const
+    inline u32_t getFieldOffset() const
     {
-        return ls.accumulateConstantOffset();
+        return ls.accumulateConstantFieldIdx();
     }
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::utostr(getOffset());
-        return "offset_" + llvm::utostr(getOffset());
+            return value->getName().str() + "_" + llvm::utostr(getFieldOffset());
+        return "offset_" + llvm::utostr(getFieldOffset());
     }
 
     inline const Type* getType() const
@@ -492,9 +492,9 @@ public:
     }
 
     /// offset of the mem object
-    inline u32_t getOffset() const
+    inline u32_t getFieldOffset() const
     {
-        return ls.accumulateConstantOffset();
+        return ls.accumulateConstantFieldIdx();
     }
 
     /// Set the base object from which this GEP node came from.
@@ -512,15 +512,15 @@ public:
     /// Return the type of this gep object
     inline virtual const Type* getType() const
     {
-        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantOffset());
+        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantFieldIdx());
     }
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::itostr(ls.accumulateConstantOffset());
-        return "offset_" + llvm::itostr(ls.accumulateConstantOffset());
+            return value->getName().str() + "_" + llvm::itostr(ls.accumulateConstantFieldIdx());
+        return "offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
     }
 
     virtual const std::string toString() const;

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

@@ -46,18 +46,18 @@ public:
     {
     }
 
-    unsigned int getOffset(void) const
+    u32_t getFieldOffset(void) const
     {
         return offset;
     }
 
-    void setOffset(unsigned int offset)
+    void setOffset(u32_t offset)
     {
         this->offset = offset;
     }
 
 private:
-    unsigned int offset;
+    u32_t offset;
 };
 
 class DCHNode : public GenericNode<DCHNode, DCHEdge>

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

@@ -381,9 +381,9 @@ public:
         return edge;
     }
     /// Add Variant(Gep) edge
-    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst)
+    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst);
+        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

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

@@ -64,7 +64,7 @@ private:
     void writePAGgepNode(SVF::NodeID nodeId, GepObjVar* gepNode)
     {
         auto baseNodeId = gepNode->getBaseNode();
-        auto locationSetOffset = gepNode->getOffset();
+        auto locationSetOffset = gepNode->getFieldOffset();
 
         LLVMContext &context = mainModule->getContext();
         llvm::SmallVector<llvm::Metadata *, 32> operands;

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