svf-lib 1.0.765 → 1.0.766

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/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

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

@@ -664,7 +664,7 @@ public:
 
 
 /*!
- * Gep statement for field access and pointer arithmetic
+ * Gep statement for struct field access, array access and pointer arithmetic
  */
 class GepStmt: public SVFStmt
 {
@@ -673,6 +673,8 @@ private:
     GepStmt(const GepStmt &);  ///< place holder
     void operator=(const GepStmt &); ///< place holder
 
+    LocationSet ls;	///< location set of the gep edge
+
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -692,19 +694,24 @@ public:
     }
     //@}
 
+    inline const LocationSet& getLocationSet() const
+    {
+        return ls;
+    }
+
 protected:
     /// constructor
-    GepStmt(SVFVar* s, SVFVar* d, PEDGEK k) : SVFStmt(s,d,k)
+    GepStmt(SVFVar* s, SVFVar* d, const LocationSet& l, PEDGEK k) : SVFStmt(s,d,k), ls(l)
     {
-
     }
 
     virtual const std::string toString() const;
+
 };
 
 
 /*!
- * Gep statement with a fixed offset
+ * Gep statement with a fixed field index for struct field access 
  */
 class NormalGepStmt : public GepStmt
 {
@@ -713,8 +720,6 @@ private:
     NormalGepStmt(const NormalGepStmt&); ///< place holder
     void operator=(const NormalGepStmt&); ///< place holder
 
-    LocationSet ls;	///< location set of the gep edge
-
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -737,24 +742,20 @@ public:
     //@}
 
     /// constructor
-    NormalGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,SVFStmt::NormalGep), ls(l)
+    NormalGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,l, SVFStmt::NormalGep)
     {}
 
     /// offset of the gep edge
-    inline u32_t getOffset() const
+    inline u32_t getFieldOffset() const
     {
-        return ls.accumulateConstantOffset();
-    }
-    inline const LocationSet& getLocationSet() const
-    {
-        return ls;
+        return getLocationSet().accumulateConstantFieldIdx();
     }
 
     virtual const std::string toString() const override;
 };
 
 /*!
- * Gep statement with a variant offset
+ * Gep statement with a variant field index for struct field access 
  */
 class VariantGepStmt : public GepStmt
 {
@@ -785,7 +786,7 @@ public:
     //@}
 
     /// constructor
-    VariantGepStmt(SVFVar* s, SVFVar* d) : GepStmt(s,d,SVFStmt::VariantGep) {}
+    VariantGepStmt(SVFVar* s, SVFVar* d, const LocationSet& l) : GepStmt(s,d,l, SVFStmt::VariantGep) {}
 
     virtual const std::string toString() const override;
 

package/SVF-osx/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-osx/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-osx/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-osx/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.765",
+  "version": "1.0.766",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {