svf-lib 1.0.1728 → 1.0.1730

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

@@ -73,11 +73,8 @@ public:
     /// Return the field address given a pointer points to a struct object and an offset
     VAddrs getGepObjAddress(u32_t pointer, APOffset offset);
 
-    /// Return the byte offset from one gep param offset
-    IntervalValue getByteOffsetfromGepTypePair(const AccessPath::IdxVarAndGepTypePair& gep_pair, const GepStmt *gep);
-
-    /// Return the Index offset from one gep param offset
-    IntervalValue getItvOfFlattenedElemIndexFromGepTypePair(const AccessPath::IdxVarAndGepTypePair& gep_pair, const GepStmt *gep);
+    /// Return the value range of Integer SVF Type, e.g. unsigned i8 Type->[0, 255], signed i8 Type->[-128, 127]
+    IntervalValue getRangeLimitFromType(const SVFType* type);
 
     /// Return the byte offset expression of a GepStmt
     /// elemBytesize is the element byte size of an static alloc or heap alloc array

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*> IdxVarAndGepTypePair;
-    typedef std::vector<IdxVarAndGepTypePair> IdxVarAndGepTypePairs;
+    typedef std::pair<const SVFVar*, const SVFType*> IdxOperandPair;
+    typedef std::vector<IdxOperandPair> IdxOperandPairs;
 
     /// Constructor
     AccessPath(APOffset o = 0) : fldIdx(o) {}
@@ -70,7 +70,7 @@ public:
     /// Copy Constructor
     AccessPath(const AccessPath& ap)
         : fldIdx(ap.fldIdx),
-          offsetVarAndGepTypePairs(ap.getOffsetVarAndGepTypePairVec())
+          idxOperandPairs(ap.getIdxOperandPairVec())
     {
     }
 
@@ -83,13 +83,13 @@ public:
     inline const AccessPath& operator=(const AccessPath& rhs)
     {
         fldIdx = rhs.fldIdx;
-        offsetVarAndGepTypePairs = rhs.getOffsetVarAndGepTypePairVec();
+        idxOperandPairs = rhs.getIdxOperandPairVec();
         return *this;
     }
     inline bool operator==(const AccessPath& rhs) const
     {
         return this->fldIdx == rhs.fldIdx &&
-               this->offsetVarAndGepTypePairs == rhs.offsetVarAndGepTypePairs;
+               this->idxOperandPairs == rhs.idxOperandPairs;
     }
     //@}
 
@@ -103,9 +103,9 @@ public:
     {
         fldIdx = idx;
     }
-    inline const IdxVarAndGepTypePairs& getOffsetVarAndGepTypePairVec() const
+    inline const IdxOperandPairs& getIdxOperandPairVec() const
     {
-        return offsetVarAndGepTypePairs;
+        return idxOperandPairs;
     }
     //@}
 
@@ -151,6 +151,9 @@ public:
         return computeAllLocations().intersects(RHS.computeAllLocations());
     }
 
+    /// Return byte offset from the beginning of the structure to the field where it is located for struct type
+    u32_t getStructFieldOffset(const SVFVar* idxOperandVar, const SVFStructType* idxOperandType) const;
+
     /// Dump location set
     std::string dump() const;
 
@@ -163,8 +166,7 @@ private:
     NodeBS computeAllLocations() const;
 
     APOffset fldIdx;	///< Accumulated Constant Offsets
-    IdxVarAndGepTypePairs
-    offsetVarAndGepTypePairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>s
+    IdxOperandPairs idxOperandPairs;	///< a vector of actual offset in the form of <SVF Var, iterator type>
 };
 
 } // End namespace SVF
@@ -174,9 +176,9 @@ 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::IdxVarAndGepTypePairs> v;
+        std::hash<SVF::AccessPath::IdxOperandPairs> v;
         return h(std::make_pair(ap.getConstantFieldIdx(),
-                                v(ap.getOffsetVarAndGepTypePairVec())));
+                                v(ap.getIdxOperandPairVec())));
     }
 };
 

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

@@ -492,10 +492,9 @@ public:
     {
         return ap;
     }
-    inline const AccessPath::IdxVarAndGepTypePairs
-    getOffsetVarAndGepTypePairVec() const
+    inline const AccessPath::IdxOperandPairs getOffsetVarAndGepTypePairVec() const
     {
-        return getAccessPath().getOffsetVarAndGepTypePairVec();
+        return getAccessPath().getIdxOperandPairVec();
     }
     /// Return TRUE if this is a constant location set.
     inline bool isConstantOffset() const

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

@@ -339,13 +339,13 @@ public:
         return fun;
     }
 
-    /// Return actual return parameter
+    /// Return formal return parameter
     inline const SVFVar *getFormalRet() const
     {
         return formalRet;
     }
 
-    /// Add actual return parameter
+    /// Add formal return parameter
     inline void addFormalRet(const SVFVar *fr)
     {
         formalRet = fr;

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

@@ -416,7 +416,7 @@ public:
     inline const SVFBasicBlock* getExitBB() const
     {
         assert(hasBasicBlock() && "function does not have any Basicblock, external function?");
-        assert((!isNotRet && exitBlock) && "ensure the function has a single basic block containing a return instruction!");
+        assert((hasReturn() && exitBlock) && "ensure the function has a single basic block containing a return instruction!");
         return exitBlock;
     }
 
@@ -461,9 +461,9 @@ public:
         return isUncalled;
     }
 
-    inline bool isNotRetFunction() const
+    inline bool hasReturn() const
     {
-        return isNotRet;
+        return  !isNotRet;
     }
 
     inline const std::vector<std::string>& getAnnotations() const

package/package.json

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