svf-lib 1.0.862 → 1.0.866

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

@@ -39,30 +39,6 @@
 namespace SVF
 {
 
-/*!
- * Field information of an aggregate object
- */
-class FlattenedFieldInfo
-{
-private:
-    u32_t flattenedFldIdx;
-    const Type* flattenedElemTy;
-public:
-    FlattenedFieldInfo(u32_t idx, const Type* ty) :
-        flattenedFldIdx(idx), flattenedElemTy(ty)
-    {
-    }
-    inline u32_t getFlattenFldIdx() const
-    {
-        return flattenedFldIdx;
-    }
-    inline const Type* getFlattenElemTy() const
-    {
-        return flattenedElemTy;
-    }
-};
-
-
 /*
  * Location set represents a set of locations in a memory block with following offsets:
  *     { offset + \sum_{i=0}^N (stride_i * j_i) | 0 \leq j_i < M_i }

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

@@ -503,7 +503,7 @@ public:
     /// Return the type of this gep object
     inline virtual const Type* getType() const
     {
-        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantFieldIdx());
+        return SymbolTableInfo::SymbolInfo()->getFlatternedElemType(mem->getType(), ls.accumulateConstantFieldIdx());
     }
 
     /// Return name of a LLVM value

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

@@ -358,13 +358,12 @@ public:
     /// Flatterned element idx of an array or struct by considering stride
     u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
 
-    const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
-
     ///  struct A { int id; int salary; }; struct B { char name[20]; struct A a;}   B b;
-    ///  OriginalFieldType of b with field_idx 1 : Struct A
-    ///  FlatternedFieldType of b with field_idx 1 : int
-    const Type* getOriginalFieldType(const Type* baseType, u32_t field_idx);
-    const Type* getFlatternedFieldType(const Type* baseType, u32_t field_idx);
+    ///  OriginalElemType of b with field_idx 1 : Struct A
+    ///  FlatternedElemType of b with field_idx 1 : int
+    const Type* getOriginalElemType(const Type* baseType, u32_t origId);
+    /// Return the type of a flattened element given a flattened index
+    const Type* getFlatternedElemType(const Type* baseType, u32_t flatten_idx);
     //@}
 
     /// Collect type info
@@ -381,6 +380,9 @@ public:
     virtual void dump();
 
 protected:
+    /// Return the flattened field type for struct type only
+    const std::vector<const Type*>& getFlattenFieldTypes(const StructType *T);
+
     /// Collect the struct info
     virtual void collectStructInfo(const StructType *T);
     /// Collect the array info
@@ -507,13 +509,15 @@ private:
     /// Types of all fields of a struct
     Map<u32_t, const Type*> fldIdx2TypeMap;
     /// All field infos after flattening a struct
-    std::vector<FlattenedFieldInfo> finfo;
+    std::vector<const Type*> finfo;
     /// stride represents the number of repetitive elements if this StInfo represent an ArrayType. stride is 1 by default.
     u32_t stride; 
     /// number of elements after flattenning (including array elements)
     u32_t numOfFlattenElements; 
     /// number of fields after flattenning (ignoring array elements)
     u32_t numOfFlattenFields; 
+    /// Type vector of fields
+    std::vector<const Type*> flattenElementTypes;
     /// Max field limit
     static u32_t maxFieldLimit;
 
@@ -545,8 +549,7 @@ public:
     ///  OriginalFieldType of b with field_idx 1 : Struct A
     ///  FlatternedFieldType of b with field_idx 1 : int
     //{@
-    const Type* getOriginalFieldType(u32_t fldIdx);
-    const Type* getFlatternedFieldType(u32_t fldIdx);
+    const Type* getOriginalElemType(u32_t fldIdx);
 
     inline std::vector<u32_t>& getFlattenedFieldIdxVec()
     {
@@ -556,7 +559,11 @@ public:
     {
         return elemIdxVec;
     }
-    inline std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec()
+    inline std::vector<const Type*>& getFlattenElementTypes()
+    {
+        return flattenElementTypes;
+    }
+    inline std::vector<const Type*>& getFlattenFieldTypes()
     {
         return finfo;
     }

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

@@ -39,30 +39,6 @@
 namespace SVF
 {
 
-/*!
- * Field information of an aggregate object
- */
-class FlattenedFieldInfo
-{
-private:
-    u32_t flattenedFldIdx;
-    const Type* flattenedElemTy;
-public:
-    FlattenedFieldInfo(u32_t idx, const Type* ty) :
-        flattenedFldIdx(idx), flattenedElemTy(ty)
-    {
-    }
-    inline u32_t getFlattenFldIdx() const
-    {
-        return flattenedFldIdx;
-    }
-    inline const Type* getFlattenElemTy() const
-    {
-        return flattenedElemTy;
-    }
-};
-
-
 /*
  * Location set represents a set of locations in a memory block with following offsets:
  *     { offset + \sum_{i=0}^N (stride_i * j_i) | 0 \leq j_i < M_i }

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

@@ -503,7 +503,7 @@ public:
     /// Return the type of this gep object
     inline virtual const Type* getType() const
     {
-        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantFieldIdx());
+        return SymbolTableInfo::SymbolInfo()->getFlatternedElemType(mem->getType(), ls.accumulateConstantFieldIdx());
     }
 
     /// Return name of a LLVM value

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

@@ -358,13 +358,12 @@ public:
     /// Flatterned element idx of an array or struct by considering stride
     u32_t getFlattenedElemIdx(const Type *T, s64_t origId);
 
-    const std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec(const Type *T);
-
     ///  struct A { int id; int salary; }; struct B { char name[20]; struct A a;}   B b;
-    ///  OriginalFieldType of b with field_idx 1 : Struct A
-    ///  FlatternedFieldType of b with field_idx 1 : int
-    const Type* getOriginalFieldType(const Type* baseType, u32_t field_idx);
-    const Type* getFlatternedFieldType(const Type* baseType, u32_t field_idx);
+    ///  OriginalElemType of b with field_idx 1 : Struct A
+    ///  FlatternedElemType of b with field_idx 1 : int
+    const Type* getOriginalElemType(const Type* baseType, u32_t origId);
+    /// Return the type of a flattened element given a flattened index
+    const Type* getFlatternedElemType(const Type* baseType, u32_t flatten_idx);
     //@}
 
     /// Collect type info
@@ -381,6 +380,9 @@ public:
     virtual void dump();
 
 protected:
+    /// Return the flattened field type for struct type only
+    const std::vector<const Type*>& getFlattenFieldTypes(const StructType *T);
+
     /// Collect the struct info
     virtual void collectStructInfo(const StructType *T);
     /// Collect the array info
@@ -507,7 +509,7 @@ private:
     /// Types of all fields of a struct
     Map<u32_t, const Type*> fldIdx2TypeMap;
     /// All field infos after flattening a struct
-    std::vector<FlattenedFieldInfo> finfo;
+    std::vector<const Type*> finfo;
     /// stride represents the number of repetitive elements if this StInfo represent an ArrayType. stride is 1 by default.
     u32_t stride; 
     /// number of elements after flattenning (including array elements)
@@ -547,8 +549,7 @@ public:
     ///  OriginalFieldType of b with field_idx 1 : Struct A
     ///  FlatternedFieldType of b with field_idx 1 : int
     //{@
-    const Type* getOriginalFieldType(u32_t fldIdx);
-    const Type* getFlatternedFieldType(u32_t fldIdx);
+    const Type* getOriginalElemType(u32_t fldIdx);
 
     inline std::vector<u32_t>& getFlattenedFieldIdxVec()
     {
@@ -562,7 +563,7 @@ public:
     {
         return flattenElementTypes;
     }
-    inline std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec()
+    inline std::vector<const Type*>& getFlattenFieldTypes()
     {
         return finfo;
     }

package/package.json

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