svf-lib 1.0.1721 → 1.0.1723

package/SVF-linux/svf/include/AbstractExecution/IntervalValue.h

@@ -661,9 +661,9 @@ inline IntervalValue operator<(const IntervalValue &lhs, const IntervalValue &rh
             }
             // Return [0,0] means lhs is totally impossible to be less than rhs
             // i.e., lhs is totally greater than or equal to rhs
-            // When lhs.ub >= rhs.lb, e.g., lhs:[3, 4] rhs:[4，5]
-            // lhs.ub(4) >= rhs.lb(4)
-            else if (rhs.ub().geq(lhs.lb()))
+            // When lhs.lb >= rhs.ub, e.g., lhs:[4,5] rhs:[3，4]
+            // lhs.lb(4) >= rhs.ub(4)
+            else if (lhs.lb().geq(rhs.ub()))
             {
                 return IntervalValue(0, 0);
             }

package/SVF-linux/svf/include/AbstractExecution/SVFIR2ItvExeState.h

@@ -74,20 +74,20 @@ public:
     VAddrs getGepObjAddress(u32_t pointer, APOffset offset);
 
     /// Return the byte offset from one gep param offset
-    std::pair<APOffset, APOffset> getBytefromGepTypePair(const AccessPath::VarAndGepTypePair& gep_pair, const GepStmt *gep);
+    IntervalValue getByteOffsetfromGepTypePair(const AccessPath::IdxVarAndGepTypePair& gep_pair, const GepStmt *gep);
 
     /// Return the Index offset from one gep param offset
-    std::pair<APOffset, APOffset> getIndexfromGepTypePair(const AccessPath::VarAndGepTypePair& gep_pair, const GepStmt *gep);
+    IntervalValue getItvOfFlattenedElemIndexFromGepTypePair(const AccessPath::IdxVarAndGepTypePair& gep_pair, const GepStmt *gep);
 
     /// Return the byte offset expression of a GepStmt
     /// elemBytesize is the element byte size of an static alloc or heap alloc array
     /// e.g. GepStmt* gep = [i32*10], x, and x is [0,3]
-    /// std::pair<s32_t, s32_t> byteOffset = getGepByteOffset(gep);
+    /// std::pair<s32_t, s32_t> byteOffset = getByteOffset(gep);
     /// byteOffset should be [0, 12] since i32 is 4 bytes.
-    std::pair<APOffset, APOffset> getGepByteOffset(const GepStmt *gep);
+    IntervalValue getByteOffset(const GepStmt *gep);
 
     /// Return the offset expression of a GepStmt
-    std::pair<APOffset, APOffset> getGepOffset(const GepStmt *gep);
+    IntervalValue getItvOfFlattenedElemIndex(const GepStmt *gep);
 
 
     static z3::context &getContext()

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

@@ -61,8 +61,8 @@ public:
         NonOverlap, Overlap, Subset, Superset, Same
     };
 
-    typedef std::pair<const SVFVar*, const SVFType*> VarAndGepTypePair;
-    typedef std::vector<VarAndGepTypePair> OffsetVarAndGepTypePairs;
+    typedef std::pair<const SVFVar*, const SVFType*> IdxVarAndGepTypePair;
+    typedef std::vector<IdxVarAndGepTypePair> IdxVarAndGepTypePairs;
 
     /// Constructor
     AccessPath(APOffset o = 0) : fldIdx(o) {}
@@ -103,7 +103,7 @@ public:
     {
         fldIdx = idx;
     }
-    inline const OffsetVarAndGepTypePairs& getOffsetVarAndGepTypePairVec() const
+    inline const IdxVarAndGepTypePairs& getOffsetVarAndGepTypePairVec() const
     {
         return offsetVarAndGepTypePairs;
     }
@@ -163,7 +163,8 @@ private:
     NodeBS computeAllLocations() const;
 
     APOffset fldIdx;	///< Accumulated Constant Offsets
-    OffsetVarAndGepTypePairs offsetVarAndGepTypePairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>s
+    IdxVarAndGepTypePairs
+    offsetVarAndGepTypePairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>s
 };
 
 } // End namespace SVF
@@ -173,7 +174,7 @@ template <> struct std::hash<SVF::AccessPath>
     size_t operator()(const SVF::AccessPath &ap) const
     {
         SVF::Hash<std::pair<SVF::NodeID, SVF::NodeID>> h;
-        std::hash<SVF::AccessPath::OffsetVarAndGepTypePairs> v;
+        std::hash<SVF::AccessPath::IdxVarAndGepTypePairs> v;
         return h(std::make_pair(ap.getConstantFieldIdx(),
                                 v(ap.getOffsetVarAndGepTypePairVec())));
     }

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

@@ -342,6 +342,7 @@ public:
     AddrStmt(SVFVar* s, SVFVar* d) : AssignStmt(s, d, SVFStmt::Addr) {}
 
     virtual const std::string toString() const override;
+
 };
 
 /*!
@@ -491,7 +492,8 @@ public:
     {
         return ap;
     }
-    inline const AccessPath::OffsetVarAndGepTypePairs getOffsetVarAndGepTypePairVec() const
+    inline const AccessPath::IdxVarAndGepTypePairs
+    getOffsetVarAndGepTypePairVec() const
     {
         return getAccessPath().getOffsetVarAndGepTypePairVec();
     }

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

@@ -264,12 +264,13 @@ private:
     getPointerToTy; /// Return a pointer to the current type
     StInfo* typeinfo;   ///< SVF's TypeInfo
     bool isSingleValTy; ///< The type represents a single value, not struct or
+    u32_t byteSize; ///< LLVM Byte Size
     ///< array
 
 protected:
-    SVFType(bool svt, SVFTyKind k)
+    SVFType(bool svt, SVFTyKind k, u32_t Sz)
         : kind(k), getPointerToTy(nullptr), typeinfo(nullptr),
-          isSingleValTy(svt)
+          isSingleValTy(svt), byteSize(Sz)
     {
     }
 
@@ -299,7 +300,6 @@ public:
         return getPointerToTy;
     }
 
-    u32_t getLLVMByteSize() const;
 
     inline void setTypeInfo(StInfo* ti)
     {
@@ -318,6 +318,13 @@ public:
         return typeinfo;
     }
 
+    /// if Type is not sized, byteSize is 0
+    /// if Type is sized, byteSize is the LLVM Byte Size.
+    inline u32_t getByteSize() const
+    {
+        return byteSize;
+    }
+
     inline bool isPointerTy() const
     {
         return kind == SVFPointerTy;
@@ -350,8 +357,8 @@ private:
     const SVFType* ptrElementType;
 
 public:
-    SVFPointerType()
-        : SVFType(true, SVFPointerTy), ptrElementType(nullptr)
+    SVFPointerType(u32_t byteSize)
+        : SVFType(true, SVFPointerTy, byteSize), ptrElementType(nullptr)
     {
     }
 
@@ -382,7 +389,7 @@ private:
     short signAndWidth; ///< For printing
 
 public:
-    SVFIntegerType() : SVFType(true, SVFIntegerTy) {}
+    SVFIntegerType(u32_t byteSize) : SVFType(true, SVFIntegerTy, byteSize) {}
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFIntegerTy;
@@ -411,7 +418,7 @@ private:
 
 public:
     SVFFunctionType(const SVFType* rt)
-        : SVFType(false, SVFFunctionTy), retTy(rt)
+        : SVFType(false, SVFFunctionTy, 0), retTy(rt)
     {
     }
     static inline bool classof(const SVFType* node)
@@ -436,7 +443,7 @@ private:
     std::string name;
 
 public:
-    SVFStructType() : SVFType(false, SVFStructTy) {}
+    SVFStructType(u32_t byteSize) : SVFType(false, SVFStructTy, byteSize) {}
 
     static inline bool classof(const SVFType* node)
     {
@@ -469,8 +476,8 @@ private:
     const SVFType* typeOfElement; /// For printing & debugging
 
 public:
-    SVFArrayType()
-        : SVFType(false, SVFArrayTy), numOfElement(0), typeOfElement(nullptr)
+    SVFArrayType(u32_t byteSize)
+        : SVFType(false, SVFArrayTy, byteSize), numOfElement(0), typeOfElement(nullptr)
     {
     }
 
@@ -508,7 +515,7 @@ private:
     std::string repr; /// Field representation for printing
 
 public:
-    SVFOtherType(bool isSingleValueTy) : SVFType(isSingleValueTy, SVFOtherTy) {}
+    SVFOtherType(u32_t byteSize, bool isSingleValueTy) : SVFType(isSingleValueTy, SVFOtherTy, byteSize) {}
 
     static inline bool classof(const SVFType* node)
     {

package/SVF-osx/svf/include/AbstractExecution/IntervalValue.h

@@ -659,9 +659,9 @@ inline IntervalValue operator<(const IntervalValue &lhs, const IntervalValue &rh
             }
             // Return [0,0] means lhs is totally impossible to be less than rhs
             // i.e., lhs is totally greater than or equal to rhs
-            // When lhs.ub >= rhs.lb, e.g., lhs:[3, 4] rhs:[4，5]
-            // lhs.ub(4) >= rhs.lb(4)
-            else if (rhs.ub().geq(lhs.lb()))
+            // When lhs.lb >= rhs.ub, e.g., lhs:[4,5] rhs:[3，4]
+            // lhs.lb(4) >= rhs.ub(4)
+            else if (lhs.lb().geq(rhs.ub()))
             {
                 return IntervalValue(0, 0);
             }

package/SVF-osx/svf/include/AbstractExecution/SVFIR2ItvExeState.h

@@ -74,20 +74,20 @@ public:
     VAddrs getGepObjAddress(u32_t pointer, APOffset offset);
 
     /// Return the byte offset from one gep param offset
-    std::pair<APOffset, APOffset> getBytefromGepTypePair(const AccessPath::VarAndGepTypePair& gep_pair, const GepStmt *gep);
+    IntervalValue getByteOffsetfromGepTypePair(const AccessPath::IdxVarAndGepTypePair& gep_pair, const GepStmt *gep);
 
     /// Return the Index offset from one gep param offset
-    std::pair<APOffset, APOffset> getIndexfromGepTypePair(const AccessPath::VarAndGepTypePair& gep_pair, const GepStmt *gep);
+    IntervalValue getItvOfFlattenedElemIndexFromGepTypePair(const AccessPath::IdxVarAndGepTypePair& gep_pair, const GepStmt *gep);
 
     /// Return the byte offset expression of a GepStmt
     /// elemBytesize is the element byte size of an static alloc or heap alloc array
     /// e.g. GepStmt* gep = [i32*10], x, and x is [0,3]
-    /// std::pair<s32_t, s32_t> byteOffset = getGepByteOffset(gep);
+    /// std::pair<s32_t, s32_t> byteOffset = getByteOffset(gep);
     /// byteOffset should be [0, 12] since i32 is 4 bytes.
-    std::pair<APOffset, APOffset> getGepByteOffset(const GepStmt *gep);
+    IntervalValue getByteOffset(const GepStmt *gep);
 
     /// Return the offset expression of a GepStmt
-    std::pair<APOffset, APOffset> getGepOffset(const GepStmt *gep);
+    IntervalValue getItvOfFlattenedElemIndex(const GepStmt *gep);
 
     static z3::context &getContext()
     {

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

@@ -57,8 +57,8 @@ public:
         NonOverlap, Overlap, Subset, Superset, Same
     };
 
-    typedef std::pair<const SVFVar*, const SVFType*> VarAndGepTypePair;
-    typedef std::vector<VarAndGepTypePair> OffsetVarAndGepTypePairs;
+    typedef std::pair<const SVFVar*, const SVFType*> IdxVarAndGepTypePair;
+    typedef std::vector<IdxVarAndGepTypePair> IdxVarAndGepTypePairs;
 
     /// Constructor
     AccessPath(APOffset o = 0) : fldIdx(o) {}
@@ -99,7 +99,7 @@ public:
     {
         fldIdx = idx;
     }
-    inline const OffsetVarAndGepTypePairs& getOffsetVarAndGepTypePairVec() const
+    inline const IdxVarAndGepTypePairs& getOffsetVarAndGepTypePairVec() const
     {
         return offsetVarAndGepTypePairs;
     }
@@ -158,7 +158,8 @@ private:
     NodeBS computeAllLocations() const;
 
     APOffset fldIdx;	///< Accumulated Constant Offsets
-    OffsetVarAndGepTypePairs offsetVarAndGepTypePairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>s
+    IdxVarAndGepTypePairs
+    offsetVarAndGepTypePairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>s
 };
 
 } // End namespace SVF
@@ -168,7 +169,7 @@ template <> struct std::hash<SVF::AccessPath>
     size_t operator()(const SVF::AccessPath &ap) const
     {
         SVF::Hash<std::pair<SVF::NodeID, SVF::NodeID>> h;
-        std::hash<SVF::AccessPath::OffsetVarAndGepTypePairs> v;
+        std::hash<SVF::AccessPath::IdxVarAndGepTypePairs> v;
         return h(std::make_pair(ap.getConstantFieldIdx(),
                                 v(ap.getOffsetVarAndGepTypePairVec())));
     }

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

@@ -341,6 +341,7 @@ public:
     AddrStmt(SVFVar* s, SVFVar* d) : AssignStmt(s, d, SVFStmt::Addr) {}
 
     virtual const std::string toString() const override;
+
 };
 
 /*!
@@ -490,7 +491,8 @@ public:
     {
         return ap;
     }
-    inline const AccessPath::OffsetVarAndGepTypePairs getOffsetVarAndGepTypePairVec() const
+    inline const AccessPath::IdxVarAndGepTypePairs
+    getOffsetVarAndGepTypePairVec() const
     {
         return getAccessPath().getOffsetVarAndGepTypePairVec();
     }

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

@@ -264,12 +264,13 @@ private:
     getPointerToTy; /// Return a pointer to the current type
     StInfo* typeinfo;   ///< SVF's TypeInfo
     bool isSingleValTy; ///< The type represents a single value, not struct or
+    u32_t byteSize; ///< LLVM Byte Size
     ///< array
 
 protected:
-    SVFType(bool svt, SVFTyKind k)
+    SVFType(bool svt, SVFTyKind k, u32_t Sz)
         : kind(k), getPointerToTy(nullptr), typeinfo(nullptr),
-          isSingleValTy(svt)
+          isSingleValTy(svt), byteSize(Sz)
     {
     }
 
@@ -299,8 +300,6 @@ public:
         return getPointerToTy;
     }
 
-    u32_t getLLVMByteSize() const;
-
     inline void setTypeInfo(StInfo* ti)
     {
         typeinfo = ti;
@@ -318,6 +317,13 @@ public:
         return typeinfo;
     }
 
+    /// if Type is not sized, byteSize is 0
+    /// if Type is sized, byteSize is the LLVM Byte Size.
+    inline u32_t getByteSize() const
+    {
+        return byteSize;
+    }
+
     inline bool isPointerTy() const
     {
         return kind == SVFPointerTy;
@@ -350,8 +356,8 @@ private:
     const SVFType* ptrElementType;
 
 public:
-    SVFPointerType()
-        : SVFType(true, SVFPointerTy), ptrElementType(nullptr)
+    SVFPointerType(u32_t byteSize)
+        : SVFType(true, SVFPointerTy, byteSize), ptrElementType(nullptr)
     {
     }
 
@@ -382,7 +388,7 @@ private:
     short signAndWidth; ///< For printing
 
 public:
-    SVFIntegerType() : SVFType(true, SVFIntegerTy) {}
+    SVFIntegerType(u32_t byteSize) : SVFType(true, SVFIntegerTy, byteSize) {}
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFIntegerTy;
@@ -411,7 +417,7 @@ private:
 
 public:
     SVFFunctionType(const SVFType* rt)
-        : SVFType(false, SVFFunctionTy), retTy(rt)
+        : SVFType(false, SVFFunctionTy, 0), retTy(rt)
     {
     }
     static inline bool classof(const SVFType* node)
@@ -436,7 +442,7 @@ private:
     std::string name;
 
 public:
-    SVFStructType() : SVFType(false, SVFStructTy) {}
+    SVFStructType(u32_t byteSize) : SVFType(false, SVFStructTy, byteSize) {}
 
     static inline bool classof(const SVFType* node)
     {
@@ -469,8 +475,8 @@ private:
     const SVFType* typeOfElement; /// For printing & debugging
 
 public:
-    SVFArrayType()
-        : SVFType(false, SVFArrayTy), numOfElement(0), typeOfElement(nullptr)
+    SVFArrayType(u32_t byteSize)
+        : SVFType(false, SVFArrayTy, byteSize), numOfElement(0), typeOfElement(nullptr)
     {
     }
 
@@ -507,7 +513,7 @@ private:
     std::string repr; /// Field representation for printing
 
 public:
-    SVFOtherType(bool isSingleValueTy) : SVFType(isSingleValueTy, SVFOtherTy) {}
+    SVFOtherType(u32_t byteSize, bool isSingleValueTy) : SVFType(isSingleValueTy, SVFOtherTy, byteSize) {}
 
     static inline bool classof(const SVFType* node)
     {

package/package.json

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