svf-tools 1.0.405 → 1.0.406

package/include/MemoryModel/SymbolTableInfo.h

@@ -98,9 +98,6 @@ private:
     /// Module
     SVFModule* mod;
 
-    /// Max field limit
-    static u32_t maxFieldLimit;
-
     /// Clean up memory
     void destroy();
 
@@ -513,7 +510,6 @@ private:
     /// Type vector of fields
     std::vector<const Type*> flattenElementTypes;
     /// Max field limit
-    static u32_t maxFieldLimit;
 
     StInfo(); ///< place holder
     StInfo(const StInfo& st); ///< place holder
@@ -529,16 +525,6 @@ public:
     {
     }
 
-    static inline void setMaxFieldLimit(u32_t limit)
-    {
-        maxFieldLimit = limit;
-    }
-
-    static inline u32_t getMaxFieldLimit()
-    {
-        return maxFieldLimit;
-    }
-
     ///  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
@@ -620,6 +606,8 @@ private:
     /// maximum number of field object can be created
     /// minimum number is 0 (field insensitive analysis)
     u32_t maxOffsetLimit;
+    /// Size of the object or number of elements
+    u32_t elemNum;
 
     void resetTypeForHeapStaticObj(const Type* type);
 public:
@@ -650,6 +638,19 @@ public:
         maxOffsetLimit = limit;
     }
 
+    /// Set the number of elements of this object 
+    inline void setNumOfElements(u32_t num)
+    {
+        elemNum = num;
+        setMaxFieldOffsetLimit(num);
+    }
+
+    /// Get the number of elements of this object 
+    inline u32_t getNumOfElements()
+    {
+        return elemNum;
+    }
+
     /// Flag for this object type
     //@{
     inline void setFlag(MEMTYPE mask)

package/lib/MemoryModel/SVFIR.cpp

@@ -455,7 +455,7 @@ NodeID SVFIR::addGepObjNode(const MemObj* obj, const LocationSet& ls)
     assert(0==GepObjVarMap.count(std::make_pair(base, ls))
            && "this node should not be created before");
 
-    NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, ls.accumulateConstantFieldIdx(), StInfo::getMaxFieldLimit());
+    NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, ls.accumulateConstantFieldIdx(), Options::MaxFieldLimit);
     GepObjVarMap[std::make_pair(base, ls)] = gepId;
     GepObjVar *node = new GepObjVar(obj, gepId, ls);
     memToFieldsMap[base].set(gepId);

package/lib/MemoryModel/SymbolTableInfo.cpp

@@ -41,10 +41,9 @@ using namespace SVFUtil;
 
 DataLayout* SymbolTableInfo::dl = nullptr;
 SymbolTableInfo* SymbolTableInfo::symInfo = nullptr;
-u32_t StInfo::maxFieldLimit = 0;
 
 
-ObjTypeInfo::ObjTypeInfo(const Type* t, u32_t max) : type(t), flags(0), maxOffsetLimit(max)
+ObjTypeInfo::ObjTypeInfo(const Type* t, u32_t max) : type(t), flags(0), maxOffsetLimit(max), elemNum(max)
 {
     assert(t && "no type information for this object?");
 }
@@ -93,7 +92,7 @@ SymbolTableInfo::TypeToFieldInfoMap::iterator SymbolTableInfo::getStructInfoIter
  */
 ObjTypeInfo* SymbolTableInfo::createObjTypeInfo(const Type* type)
 {
-    ObjTypeInfo* typeInfo = new ObjTypeInfo(type, StInfo::getMaxFieldLimit());
+    ObjTypeInfo* typeInfo = new ObjTypeInfo(type, Options::MaxFieldLimit);
     if(type && type->isPointerTy()){
         typeInfo->setFlag(ObjTypeInfo::HEAP_OBJ);
         typeInfo->setFlag(ObjTypeInfo::HASPTR_OBJ);
@@ -624,7 +623,7 @@ bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
  */
 void MemObj::setFieldSensitive()
 {
-    typeInfo->setMaxFieldOffsetLimit(StInfo::getMaxFieldLimit());
+    typeInfo->setMaxFieldOffsetLimit(typeInfo->getNumOfElements());
 }
 
 

package/lib/SVF-FE/SymbolTableBuilder.cpp

@@ -51,8 +51,6 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
 
     symInfo->setModule(svfModule);
 
-    StInfo::setMaxFieldLimit(Options::MaxFieldLimit);
-
     // Pointer #0 always represents the null pointer.
     assert(symInfo->totalSymNum++ == SymbolTableInfo::NullPtr && "Something changed!");
 
@@ -609,7 +607,7 @@ const Value* SymbolTableBuilder::getUniqueUseViaCastInst(const Value* val){
  */
 void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
     
-    u32_t objSize = 1;
+    s32_t objSize = 1;
     // Global variable
     if (SVFUtil::isa<Function>(val))
     {
@@ -652,6 +650,7 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
     else if(SVFUtil::isConstantData(val))
     {
         typeinfo->setFlag(ObjTypeInfo::CONST_DATA);
+        objSize = SymbolTableInfo::SymbolInfo()->getNumOfFlattenElements(val->getType());
     }
     else{
         assert("what other object do we have??");
@@ -660,7 +659,7 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
 
     // Reset maxOffsetLimit if it is over the total fieldNum of this object
     if(objSize > 0 && typeinfo->getMaxFieldOffsetLimit() > objSize)
-        typeinfo->setMaxFieldOffsetLimit(objSize);
+        typeinfo->setNumOfElements(objSize);
 }
 
 /*!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.405",
+  "version": "1.0.406",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {