svf-lib 1.0.806 → 1.0.810

package/SVF-linux/include/Graphs/VFGNode.h

@@ -569,7 +569,7 @@ public:
     u32_t getNumSuccessors() const{
         return brstmt->getNumSuccessors();
     }
-    const std::vector<const ICFGNode*>& getSuccessors() const{
+    const BranchStmt::SuccAndCondPairVec& getSuccessors() const{
         return brstmt->getSuccessors();
     }
     const ICFGNode* getSuccessor (u32_t i) const{

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

@@ -131,8 +131,12 @@ public:
     }
     //@}
 
+    /// Return accumulated constant offset given OffsetValueVec
     s64_t accumulateConstantOffset() const;
 
+    /// Return element number of a type. 
+    u32_t getElementNum(const Type* type) const;
+
     bool addOffsetValue(const Value* offsetValue, const Type* type);
 
     /// Return TRUE if this is a constant location set.

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

@@ -637,7 +637,7 @@ private:
     /// Add Unary edge
     UnaryOPStmt* addUnaryOPStmt(NodeID src, NodeID dst, u32_t opcode);
     /// Add BranchStmt
-    BranchStmt* addBranchStmt(NodeID br, NodeID cond, std::vector<const ICFGNode*> succs);
+    BranchStmt* addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs);
     /// Add Load edge
     LoadStmt* addLoadStmt(NodeID src, NodeID dst);
     /// Add Store edge

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

@@ -438,6 +438,10 @@ public:
         return ls;
     }
 
+    inline s64_t accumulateConstantOffset() const
+    {
+        return ls.accumulateConstantOffset();
+    }
     /// offset of the gep statement
     inline s64_t getConstantFieldIdx() const
     {
@@ -835,6 +839,8 @@ public:
  */
 class BranchStmt: public SVFStmt
 {
+public:
+    typedef std::vector<std::pair<const ICFGNode*, s64_t> > SuccAndCondPairVec;
 private:
     BranchStmt();                      ///< place holder
     BranchStmt(const BranchStmt &);  ///< place holder
@@ -844,9 +850,10 @@ private:
     NodeID getSrcID();  ///< place holder, use getOpVarID(pos) instead
     NodeID getDstID();    ///< place holder, use getResID() instead
 
-    std::vector<const ICFGNode*> successors;
+    SuccAndCondPairVec successors;
     const SVFVar* cond;
     const SVFVar* brInst;
+
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -865,7 +872,7 @@ public:
     //@}
 
     /// constructor
-    BranchStmt(SVFVar* inst, SVFVar* c, const std::vector<const ICFGNode*>& succs) : SVFStmt(c,inst,SVFStmt::Branch), successors(succs), cond(c), brInst(inst)
+    BranchStmt(SVFVar* inst, SVFVar* c, const SuccAndCondPairVec& succs) : SVFStmt(c,inst,SVFStmt::Branch), successors(succs), cond(c), brInst(inst)
     {
     }
 
@@ -878,18 +885,31 @@ public:
     const SVFVar* getBranchInst() const{
         return brInst;
     }
+    
+    /// For example if(c) {stmt1} else {stmt2}
+    /// successor(0): stmt1, 1
+    /// successor(1): stmt2, 0 
+
+    /// For example switch(c) case 0: {stmt1; break;} case 1: {stmt2; break;} default {stmt3: break}
+    /// successor(0): stmt1, 0
+    /// successor(1): stmt2, 1 
+    /// successor(3): stmt3, -1 
+
     /// Successors of this branch statement
     ///@{
     u32_t getNumSuccessors() const{
         return successors.size();
     }
-    const std::vector<const ICFGNode*>& getSuccessors() const{
+    const SuccAndCondPairVec& getSuccessors() const{
         return successors;
     }
     const ICFGNode* getSuccessor (u32_t i) const{
-        return successors.at(i);
+        return successors.at(i).first;
     }
-    ///@}
+    s64_t getSuccessorCondValue (u32_t i) const{ 
+        return successors.at(i).second;
+    }
+    //@}
     virtual const std::string toString() const override;
 };
 

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

@@ -364,7 +364,11 @@ public:
     }
 
     ///Get a reference to the components of struct_info.
-    const std::vector<u32_t>& getFlattenedFieldIdxVec(const Type *T);
+    /// Flatterned full offset information of a struct including its array fields 
+    const std::vector<u32_t>& getFlattenedOffsetVec(const StructType *T);
+    /// Flatterned field index information of a struct ignoring any array field
+    const std::vector<u32_t>& getFlattenedFieldIdxVec(const StructType *T);
+
     const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
 
     ///  struct A { int id; int salary; }; struct B { char name[20]; struct A a;}   B b;
@@ -501,25 +505,32 @@ public:
 
 
 /*!
- * Struct information
+ * Flatterned type information of StructType, ArrayType and SingleValueType
  */
 class StInfo
 {
 
 private:
-    /// flattened field indices of a struct
+    /// flattened field indices of a struct (ignoring arrays)
     std::vector<u32_t> fldIdxVec;
+    /// flattened full offset (including array strides)
+    std::vector<u32_t> fullOffsetVec;
     /// Types of all fields of a struct
     Map<u32_t, const Type*> fldIdx2TypeMap;
     /// All field infos after flattening a struct
     std::vector<FlattenedFieldInfo> finfo;
-
+    /// stride represents the number of repetitive elements if this StInfo represent an ArrayType. stride is 1 by default.
+    u32_t stride; 
     /// Max field limit
     static u32_t maxFieldLimit;
 
+    StInfo(); ///< place holder
+    StInfo(const StInfo& st); ///< place holder
+    void operator=(const StInfo&); ///< place holder
+
 public:
     /// Constructor
-    StInfo()
+    StInfo(u32_t s) : stride(s)
     {
     }
     /// Destructor
@@ -560,6 +571,10 @@ public:
     {
         return fldIdxVec;
     }
+    inline std::vector<u32_t>& getFlattenedOffsetVec()
+    {
+        return fullOffsetVec;
+    }
     inline std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec()
     {
         return finfo;
@@ -567,11 +582,17 @@ public:
     //@}
 
     /// Add field (index and offset) with its corresponding type
-    inline void addFldWithType(u32_t fldIdx, const Type* type)
+    inline void addFldWithType(u32_t fldIdx, const Type* type, u32_t fullOffset)
     {
         fldIdxVec.push_back(fldIdx);
+        fullOffsetVec.push_back(fullOffset);
         fldIdx2TypeMap[fldIdx] = type;
     }
+
+    /// Array Type can have 
+    inline u32_t getStride() const {
+        return stride;
+    }
 };
 
 /*!

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

@@ -331,7 +331,7 @@ public:
         return edge;
     }
     /// Add Branch statement 
-    inline BranchStmt* addBranchStmt(NodeID br, NodeID cond, const std::vector<const ICFGNode*> succs){
+    inline BranchStmt* addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs){
         BranchStmt *edge = pag->addBranchStmt(br, cond, succs);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;

package/SVF-osx/include/DDA/DDAVFSolver.h

@@ -290,7 +290,7 @@ protected:
     virtual inline void buildSVFG(SVFIR* pag)
     {
         _ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
-        _svfg = svfgBuilder.buildPTROnlySVFGWithoutOPT(_ander);
+        _svfg = svfgBuilder.buildPTROnlySVFG(_ander);
         _pag = _svfg->getPAG();
     }
     /// Reset visited map for next points-to query

package/SVF-osx/include/MSSA/SVFGBuilder.h

@@ -74,9 +74,7 @@ public:
     static SVFG* globalSvfg;
 
     SVFG* buildPTROnlySVFG(BVDataPTAImpl* pta);
-    SVFG* buildPTROnlySVFGWithoutOPT(BVDataPTAImpl* pta);
     SVFG* buildFullSVFG(BVDataPTAImpl* pta);
-    SVFG* buildFullSVFGWithoutOPT(BVDataPTAImpl* pta);
 
     /// Clean up
     static void releaseSVFG()

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

@@ -131,8 +131,12 @@ public:
     }
     //@}
 
+    /// Return accumulated constant offset given OffsetValueVec
     s64_t accumulateConstantOffset() const;
 
+    /// Return element number of a type. 
+    u32_t getElementNum(const Type* type) const;
+
     bool addOffsetValue(const Value* offsetValue, const Type* type);
 
     /// Return TRUE if this is a constant location set.

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

@@ -438,6 +438,10 @@ public:
         return ls;
     }
 
+    inline s64_t accumulateConstantOffset() const
+    {
+        return ls.accumulateConstantOffset();
+    }
     /// offset of the gep statement
     inline s64_t getConstantFieldIdx() const
     {

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

@@ -364,7 +364,11 @@ public:
     }
 
     ///Get a reference to the components of struct_info.
-    const std::vector<u32_t>& getFlattenedFieldIdxVec(const Type *T);
+    /// Flatterned full offset information of a struct including its array fields 
+    const std::vector<u32_t>& getFlattenedOffsetVec(const StructType *T);
+    /// Flatterned field index information of a struct ignoring any array field
+    const std::vector<u32_t>& getFlattenedFieldIdxVec(const StructType *T);
+
     const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
 
     ///  struct A { int id; int salary; }; struct B { char name[20]; struct A a;}   B b;
@@ -501,25 +505,32 @@ public:
 
 
 /*!
- * Struct information
+ * Flatterned type information of StructType, ArrayType and SingleValueType
  */
 class StInfo
 {
 
 private:
-    /// flattened field indices of a struct
+    /// flattened field indices of a struct (ignoring arrays)
     std::vector<u32_t> fldIdxVec;
+    /// flattened full offset (including array strides)
+    std::vector<u32_t> fullOffsetVec;
     /// Types of all fields of a struct
     Map<u32_t, const Type*> fldIdx2TypeMap;
     /// All field infos after flattening a struct
     std::vector<FlattenedFieldInfo> finfo;
-
+    /// stride represents the number of repetitive elements if this StInfo represent an ArrayType. stride is 1 by default.
+    u32_t stride; 
     /// Max field limit
     static u32_t maxFieldLimit;
 
+    StInfo(); ///< place holder
+    StInfo(const StInfo& st); ///< place holder
+    void operator=(const StInfo&); ///< place holder
+
 public:
     /// Constructor
-    StInfo()
+    StInfo(u32_t s) : stride(s)
     {
     }
     /// Destructor
@@ -560,6 +571,10 @@ public:
     {
         return fldIdxVec;
     }
+    inline std::vector<u32_t>& getFlattenedOffsetVec()
+    {
+        return fullOffsetVec;
+    }
     inline std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec()
     {
         return finfo;
@@ -567,11 +582,17 @@ public:
     //@}
 
     /// Add field (index and offset) with its corresponding type
-    inline void addFldWithType(u32_t fldIdx, const Type* type)
+    inline void addFldWithType(u32_t fldIdx, const Type* type, u32_t fullOffset)
     {
         fldIdxVec.push_back(fldIdx);
+        fullOffsetVec.push_back(fullOffset);
         fldIdx2TypeMap[fldIdx] = type;
     }
+
+    /// Array Type can have 
+    inline u32_t getStride() const {
+        return stride;
+    }
 };
 
 /*!

package/package.json

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