svf-lib 1.0.722 → 1.0.726

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

@@ -172,18 +172,12 @@ public:
     {
 
     }
-    /// Initialize the object type
-    void init(const Value* value);
 
-    /// Get the size of this object,
-    /// derived classes can override this to get more precise object size
-    virtual u32_t getObjSize(const Value* val);
-
-    /// Analyse types of gobal and stack objects
-    void analyzeGlobalStackObjType(const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(const Type* type);
 
     /// Analyse types of heap and static objects
-    void analyzeHeapStaticObjType(const Value* val);
+    void analyzeStaticObjType(const Type* type);
 
     /// Get LLVM type
     inline const Type* getType() const
@@ -295,25 +289,15 @@ private:
 public:
 
     /// Constructor
-    MemObj(const Value *val, SymID id);
-
-    /// Constructor for black hole and constant obj
-    MemObj(SymID id, const Type* type = nullptr);
+    MemObj(SymID id, ObjTypeInfo* ti, const Value *val = nullptr);
 
     /// Destructor
     ~MemObj()
     {
         destroy();
     }
-
-    /// Initialize the object
-    void init(const Value *val);
-
-    /// Initialize black hole and constant object
-    void init(const Type* type);
-
     /// Get obj type
-    const llvm::Type* getType() const;
+    const Type* getType() const;
 
     /// Get max field offset limit
     inline Size_t getMaxFieldOffsetLimit() const

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

@@ -193,7 +193,7 @@ public:
     {
         this->kind = Standard;
     }
-    ~CHGraph();
+    ~CHGraph() override = default;
 
     void buildCHG();
     void buildInternalMaps();

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

@@ -206,7 +206,7 @@ public:
     {
         assert(isBlkObjOrConstantObj(symId));
         assert(objMap.find(symId)==objMap.end());
-        objMap[symId] = new MemObj(symId);;
+        objMap[symId] = new MemObj(symId, createObjTypeInfo());;
     }
 
     inline MemObj* getBlkObj() const
@@ -242,7 +242,7 @@ public:
     inline const MemObj* createDummyObj(SymID symId, const Type* type)
     {
         assert(objMap.find(symId)==objMap.end() && "this dummy obj has been created before");
-        MemObj* memObj = new MemObj(symId, type);
+        MemObj* memObj = new MemObj(symId, createObjTypeInfo(type));
         objMap[symId] = memObj;
         return memObj;
     }
@@ -433,6 +433,18 @@ protected:
     /// Collect simple type (non-aggregate) info
     virtual void collectSimpleTypeInfo(const Type* T);
 
+    /// Create an objectInfo based on LLVM value
+    ObjTypeInfo* createObjTypeInfo(const Value *val);
+    /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
+    ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+
+    /// Initialize TypeInfo based on LLVM Value
+    void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
+    /// Analyse types of all flattened fields of this object
+    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return size of this object based on LLVM value
+    u32_t getObjSize(const Value* val);
+
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
     /// fsize[i] is the number of fields in the largest such struct, else fsize[i] = 1.
@@ -447,60 +459,6 @@ protected:
 };
 
 
-
-
-/*!
- * Bytes/bits-level modeling of memory locations to handle weakly type languages.
- * (declared with one type but accessed as another)
- * Abstract memory objects are created according to the static allocated size.
- */
-class LocSymTableInfo : public SymbolTableInfo
-{
-
-public:
-    /// Constructor
-    LocSymTableInfo()
-    {
-    }
-    /// Destructor
-    virtual ~LocSymTableInfo()
-    {
-    }
-    /// Compute gep offset
-    virtual bool computeGepOffset(const User *V, LocationSet& ls);
-    /// Given an offset from a Gep Instruction, return it modulus offset by considering memory layout
-    virtual LocationSet getModulusOffset(const MemObj* obj, const LocationSet& ls);
-
-    /// Verify struct size construction
-    void verifyStructSize(StInfo *stInfo, u32_t structSize);
-
-protected:
-    /// Collect the struct info
-    virtual void collectStructInfo(const StructType *T);
-    /// Collect the array info
-    virtual void collectArrayInfo(const ArrayType *T);
-};
-
-
-class LocObjTypeInfo : public ObjTypeInfo
-{
-
-public:
-    /// Constructor
-    LocObjTypeInfo(const Value* val, Type* t, Size_t max) : ObjTypeInfo(val,t,max)
-    {
-
-    }
-    /// Destructor
-    virtual ~LocObjTypeInfo()
-    {
-
-    }
-    /// Get the size of this object
-    u32_t getObjSize(const Value* val);
-
-};
-
 } // End namespace SVF
 
 #endif /* INCLUDE_SVF_FE_SYMBOLTABLEINFO_H_ */

package/SVF-linux/include/WPA/Andersen.h

@@ -53,19 +53,14 @@ class AndersenBase:  public WPAConstraintSolver, public BVDataPTAImpl
 public:
 
     /// Constructor
-	AndersenBase(PAG* _pag, PTATY type = Andersen_BASE, bool alias_check = true)
+    AndersenBase(PAG* _pag, PTATY type = Andersen_BASE, bool alias_check = true)
         :  BVDataPTAImpl(_pag, type, alias_check), consCG(nullptr)
     {
         iterationForPrintStat = OnTheFlyIterBudgetForStat;
     }
 
     /// Destructor
-    virtual ~AndersenBase()
-    {
-        if (consCG != nullptr)
-            delete consCG;
-        consCG = nullptr;
-    }
+    ~AndersenBase() override;
 
     /// Andersen analysis
     virtual void analyze() override;

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

@@ -172,18 +172,12 @@ public:
     {
 
     }
-    /// Initialize the object type
-    void init(const Value* value);
 
-    /// Get the size of this object,
-    /// derived classes can override this to get more precise object size
-    virtual u32_t getObjSize(const Value* val);
-
-    /// Analyse types of gobal and stack objects
-    void analyzeGlobalStackObjType(const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(const Type* type);
 
     /// Analyse types of heap and static objects
-    void analyzeHeapStaticObjType(const Value* val);
+    void analyzeStaticObjType(const Type* type);
 
     /// Get LLVM type
     inline const Type* getType() const
@@ -295,25 +289,15 @@ private:
 public:
 
     /// Constructor
-    MemObj(const Value *val, SymID id);
-
-    /// Constructor for black hole and constant obj
-    MemObj(SymID id, const Type* type = nullptr);
+    MemObj(SymID id, ObjTypeInfo* ti, const Value *val = nullptr);
 
     /// Destructor
     ~MemObj()
     {
         destroy();
     }
-
-    /// Initialize the object
-    void init(const Value *val);
-
-    /// Initialize black hole and constant object
-    void init(const Type* type);
-
     /// Get obj type
-    const llvm::Type* getType() const;
+    const Type* getType() const;
 
     /// Get max field offset limit
     inline Size_t getMaxFieldOffsetLimit() const

package/SVF-osx/include/SVF-FE/CHG.h

@@ -193,7 +193,7 @@ public:
     {
         this->kind = Standard;
     }
-    ~CHGraph();
+    ~CHGraph() override = default;
 
     void buildCHG();
     void buildInternalMaps();

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

@@ -206,7 +206,7 @@ public:
     {
         assert(isBlkObjOrConstantObj(symId));
         assert(objMap.find(symId)==objMap.end());
-        objMap[symId] = new MemObj(symId);;
+        objMap[symId] = new MemObj(symId, createObjTypeInfo());;
     }
 
     inline MemObj* getBlkObj() const
@@ -242,7 +242,7 @@ public:
     inline const MemObj* createDummyObj(SymID symId, const Type* type)
     {
         assert(objMap.find(symId)==objMap.end() && "this dummy obj has been created before");
-        MemObj* memObj = new MemObj(symId, type);
+        MemObj* memObj = new MemObj(symId, createObjTypeInfo(type));
         objMap[symId] = memObj;
         return memObj;
     }
@@ -433,6 +433,18 @@ protected:
     /// Collect simple type (non-aggregate) info
     virtual void collectSimpleTypeInfo(const Type* T);
 
+    /// Create an objectInfo based on LLVM value
+    ObjTypeInfo* createObjTypeInfo(const Value *val);
+    /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
+    ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+
+    /// Initialize TypeInfo based on LLVM Value
+    void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
+    /// Analyse types of all flattened fields of this object
+    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return size of this object based on LLVM value
+    u32_t getObjSize(const Value* val);
+
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
     /// fsize[i] is the number of fields in the largest such struct, else fsize[i] = 1.
@@ -447,60 +459,6 @@ protected:
 };
 
 
-
-
-/*!
- * Bytes/bits-level modeling of memory locations to handle weakly type languages.
- * (declared with one type but accessed as another)
- * Abstract memory objects are created according to the static allocated size.
- */
-class LocSymTableInfo : public SymbolTableInfo
-{
-
-public:
-    /// Constructor
-    LocSymTableInfo()
-    {
-    }
-    /// Destructor
-    virtual ~LocSymTableInfo()
-    {
-    }
-    /// Compute gep offset
-    virtual bool computeGepOffset(const User *V, LocationSet& ls);
-    /// Given an offset from a Gep Instruction, return it modulus offset by considering memory layout
-    virtual LocationSet getModulusOffset(const MemObj* obj, const LocationSet& ls);
-
-    /// Verify struct size construction
-    void verifyStructSize(StInfo *stInfo, u32_t structSize);
-
-protected:
-    /// Collect the struct info
-    virtual void collectStructInfo(const StructType *T);
-    /// Collect the array info
-    virtual void collectArrayInfo(const ArrayType *T);
-};
-
-
-class LocObjTypeInfo : public ObjTypeInfo
-{
-
-public:
-    /// Constructor
-    LocObjTypeInfo(const Value* val, Type* t, Size_t max) : ObjTypeInfo(val,t,max)
-    {
-
-    }
-    /// Destructor
-    virtual ~LocObjTypeInfo()
-    {
-
-    }
-    /// Get the size of this object
-    u32_t getObjSize(const Value* val);
-
-};
-
 } // End namespace SVF
 
 #endif /* INCLUDE_SVF_FE_SYMBOLTABLEINFO_H_ */

package/SVF-osx/include/WPA/Andersen.h

@@ -53,19 +53,14 @@ class AndersenBase:  public WPAConstraintSolver, public BVDataPTAImpl
 public:
 
     /// Constructor
-	AndersenBase(PAG* _pag, PTATY type = Andersen_BASE, bool alias_check = true)
+    AndersenBase(PAG* _pag, PTATY type = Andersen_BASE, bool alias_check = true)
         :  BVDataPTAImpl(_pag, type, alias_check), consCG(nullptr)
     {
         iterationForPrintStat = OnTheFlyIterBudgetForStat;
     }
 
     /// Destructor
-    virtual ~AndersenBase()
-    {
-        if (consCG != nullptr)
-            delete consCG;
-        consCG = nullptr;
-    }
+    ~AndersenBase() override;
 
     /// Andersen analysis
     virtual void analyze() override;

package/package.json

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