svf-lib 1.0.1451 → 1.0.1453

package/SVF-linux/svf/include/MemoryModel/LocationSet.h

@@ -58,7 +58,8 @@ public:
         NonOverlap, Overlap, Subset, Superset, Same
     };
 
-    typedef std::vector<const SVFVar*> OffsetVarVec;
+    typedef std::pair<const SVFVar*, const SVFType*> VarAndGepTypePair;
+    typedef std::vector<VarAndGepTypePair> OffsetVarAndGepTypePairs;
 
     /// Constructor
     LocationSet(s32_t o = 0) : fldIdx(o)
@@ -66,7 +67,7 @@ public:
 
     /// Copy Constructor
     LocationSet(const LocationSet& ls)
-        : fldIdx(ls.fldIdx), offsetVars(ls.getOffsetVarVec())
+        : fldIdx(ls.fldIdx), offsetVarAndGepTypePairs(ls.getOffsetVarAndGepTypePairVec())
     {
     }
 
@@ -79,13 +80,13 @@ public:
     inline const LocationSet& operator= (const LocationSet& rhs)
     {
         fldIdx = rhs.fldIdx;
-        offsetVars = rhs.getOffsetVarVec();
+        offsetVarAndGepTypePairs = rhs.getOffsetVarAndGepTypePairVec();
         return *this;
     }
     inline bool operator==(const LocationSet& rhs) const
     {
         return this->fldIdx == rhs.fldIdx
-               && this->offsetVars == rhs.offsetVars;
+               && this->offsetVarAndGepTypePairs == rhs.offsetVarAndGepTypePairs;
     }
     //@}
 
@@ -99,9 +100,9 @@ public:
     {
         fldIdx = idx;
     }
-    inline const OffsetVarVec& getOffsetVarVec() const
+    inline const OffsetVarAndGepTypePairs& getOffsetVarAndGepTypePairVec() const
     {
-        return offsetVars;
+        return offsetVarAndGepTypePairs;
     }
     //@}
 
@@ -112,7 +113,7 @@ public:
     u32_t getElementNum(const SVFType* type) const;
 
 
-    bool addOffsetVar(const SVFVar* var);
+    bool addOffsetVarAndGepTypePair(const SVFVar* var, const SVFType* gepIterType);
 
     /// Return TRUE if this is a constant location set.
     bool isConstantOffset() const;
@@ -135,7 +136,7 @@ private:
     NodeBS computeAllLocations() const;
 
     s32_t fldIdx;	///< Accumulated Constant Offsets
-    OffsetVarVec offsetVars;	///< a vector of actual offset in the form of SVF Vars
+    OffsetVarAndGepTypePairs offsetVarAndGepTypePairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>s
 };
 
 } // End namespace SVF
@@ -145,8 +146,8 @@ 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::OffsetVarVec> v;
-        return h(std::make_pair(ls.accumulateConstantFieldIdx(), v(ls.getOffsetVarVec())));
+        std::hash<SVF::LocationSet::OffsetVarAndGepTypePairs> v;
+        return h(std::make_pair(ls.accumulateConstantFieldIdx(), v(ls.getOffsetVarAndGepTypePairVec())));
     }
 };
 

package/SVF-linux/svf/include/SVFIR/SVFStatements.h

@@ -444,9 +444,9 @@ public:
     {
         return ls;
     }
-    inline const LocationSet::OffsetVarVec getOffsetVarVec() const
+    inline const LocationSet::OffsetVarAndGepTypePairs getOffsetVarAndGepTypePairVec() const
     {
-        return getLocationSet().getOffsetVarVec();
+        return getLocationSet().getOffsetVarAndGepTypePairVec();
     }
     /// Return TRUE if this is a constant location set.
     inline bool isConstantOffset() const

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

@@ -306,7 +306,7 @@ public:
     /// Get location set of the gep edge
     inline s32_t getConstantFieldIdx() const
     {
-        return ls.accumulateConstantFieldIdx();
+        return ls.getConstantFieldIdx();
     }
 
 };

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

@@ -92,7 +92,7 @@ public:
 
     /// Get methods
     //@{
-    inline s32_t accumulateConstantFieldIdx() const
+    inline s32_t getConstantFieldIdx() const
     {
         return fldIdx;
     }
@@ -107,7 +107,7 @@ public:
     //@}
 
     /// Return accumulated constant offset given OffsetVarVec
-    s32_t accumulateConstantOffset() const;
+    s32_t computeConstantOffset() const;
 
     /// Return element number of a type.
     u32_t getElementNum(const SVFType* type) const;
@@ -147,7 +147,7 @@ template <> struct std::hash<SVF::LocationSet>
     {
         SVF::Hash<std::pair<SVF::NodeID, SVF::NodeID>> h;
         std::hash<SVF::LocationSet::OffsetVarAndGepTypePairs> v;
-        return h(std::make_pair(ls.accumulateConstantFieldIdx(), v(ls.getOffsetVarAndGepTypePairVec())));
+        return h(std::make_pair(ls.getConstantFieldIdx(), v(ls.getOffsetVarAndGepTypePairVec())));
     }
 };
 

package/SVF-osx/svf/include/SVFIR/SVFStatements.h

@@ -456,13 +456,13 @@ public:
     /// Return accumulated constant offset (when accessing array or struct) if this offset is a constant.
     inline s32_t accumulateConstantOffset() const
     {
-        return getLocationSet().accumulateConstantOffset();
+        return getLocationSet().computeConstantOffset();
     }
     /// Field index of the gep statement if it access the field of a struct
     inline s32_t getConstantFieldIdx() const
     {
         assert(isVariantFieldGep()==false && "Can't retrieve the LocationSet if using a variable field index (pointer arithmetic) for struct field access ");
-        return getLocationSet().accumulateConstantFieldIdx();
+        return getLocationSet().getConstantFieldIdx();
     }
     /// Gep statement with a variant field index (pointer arithmetic) for struct field access
     inline bool isVariantFieldGep() const

package/SVF-osx/svf/include/SVFIR/SVFVariables.h

@@ -399,7 +399,7 @@ public:
     /// offset of the base value variable
     inline s32_t getConstantFieldIdx() const
     {
-        return ls.accumulateConstantFieldIdx();
+        return ls.getConstantFieldIdx();
     }
 
     /// Return name of a LLVM value
@@ -466,7 +466,7 @@ public:
     /// offset of the mem object
     inline s32_t getConstantFieldIdx() const
     {
-        return ls.accumulateConstantFieldIdx();
+        return ls.getConstantFieldIdx();
     }
 
     /// Set the base object from which this GEP node came from.
@@ -484,15 +484,15 @@ public:
     /// Return the type of this gep object
     inline virtual const SVFType* getType() const
     {
-        return SymbolTableInfo::SymbolInfo()->getFlatternedElemType(mem->getType(), ls.accumulateConstantFieldIdx());
+        return SymbolTableInfo::SymbolInfo()->getFlatternedElemType(mem->getType(), ls.getConstantFieldIdx());
     }
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
     {
         if (value)
-            return value->getName() + "_" + std::to_string(ls.accumulateConstantFieldIdx());
-        return "offset_" + std::to_string(ls.accumulateConstantFieldIdx());
+            return value->getName() + "_" + std::to_string(ls.getConstantFieldIdx());
+        return "offset_" + std::to_string(ls.getConstantFieldIdx());
     }
 
     virtual const std::string toString() const;

package/package.json

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