svf-tools 1.0.312 → 1.0.313

package/lib/MemoryModel/MemModel.cpp

@@ -42,135 +42,27 @@ using namespace SVFUtil;
 
 u32_t StInfo::maxFieldLimit = 0;
 
-/*!
- * Analyse types of all flattened fields of this object
- */
-void ObjTypeInfo::analyzeGlobalStackObjType(const Value* val)
-{
-
-    const PointerType * refty = SVFUtil::dyn_cast<PointerType>(val->getType());
-    assert(SVFUtil::isa<PointerType>(refty) && "this value should be a pointer type!");
-    Type* elemTy = refty->getElementType();
-    bool isPtrObj = false;
-    // Find the inter nested array element
-    while (const ArrayType *AT= SVFUtil::dyn_cast<ArrayType>(elemTy))
-    {
-        elemTy = AT->getElementType();
-        if(elemTy->isPointerTy())
-            isPtrObj = true;
-        if(SVFUtil::isa<GlobalVariable>(val) && SVFUtil::cast<GlobalVariable>(val)->hasInitializer()
-                && SVFUtil::isa<ConstantArray>(SVFUtil::cast<GlobalVariable>(val)->getInitializer()))
-        {
-            setFlag(CONST_ARRAY_OBJ);
-        }
-        else
-            setFlag(VAR_ARRAY_OBJ);
-    }
-    if (const StructType *ST= SVFUtil::dyn_cast<StructType>(elemTy))
-    {
-        const std::vector<FieldInfo>& flattenFields = SymbolTableInfo::SymbolInfo()->getFlattenFieldInfoVec(ST);
-        for(std::vector<FieldInfo>::const_iterator it = flattenFields.begin(), eit = flattenFields.end();
-                it!=eit; ++it)
-        {
-            if((*it).getFlattenElemTy()->isPointerTy())
-                isPtrObj = true;
-        }
-        if(SVFUtil::isa<GlobalVariable>(val) && SVFUtil::cast<GlobalVariable>(val)->hasInitializer()
-                && SVFUtil::isa<ConstantStruct>(SVFUtil::cast<GlobalVariable>(val)->getInitializer()))
-            setFlag(CONST_STRUCT_OBJ);
-        else
-            setFlag(VAR_STRUCT_OBJ);
-    }
-    else if (elemTy->isPointerTy())
-    {
-        isPtrObj = true;
-    }
-
-    if(isPtrObj)
-        setFlag(HASPTR_OBJ);
-}
 
 /*!
  * Analyse types of heap and static objects
  */
-void ObjTypeInfo::analyzeHeapStaticObjType(const Value*)
+void ObjTypeInfo::analyzeHeapObjType(const Type*)
 {
     // TODO: Heap and static objects are considered as pointers right now.
     //       Refine this function to get more details about heap and static objects.
+    setFlag(HEAP_OBJ);
     setFlag(HASPTR_OBJ);
 }
 
 /*!
- * Return size of this Object
- */
-u32_t ObjTypeInfo::getObjSize(const Value* val)
-{
-
-    Type* ety  = SVFUtil::cast<PointerType>(val->getType())->getElementType();
-    u32_t numOfFields = 1;
-    if (SVFUtil::isa<StructType>(ety) || SVFUtil::isa<ArrayType>(ety))
-    {
-        numOfFields = SymbolTableInfo::SymbolInfo()->getFlattenFieldInfoVec(ety).size();
-    }
-    return numOfFields;
-}
-
-/*!
- * Initialize the type info of an object
+ * Analyse types of heap and static objects
  */
-void ObjTypeInfo::init(const Value* val)
+void ObjTypeInfo::analyzeStaticObjType(const Type*)
 {
-
-    Size_t objSize = 1;
-    // Global variable
-    if (SVFUtil::isa<Function>(val))
-    {
-        setFlag(FUNCTION_OBJ);
-        analyzeGlobalStackObjType(val);
-        objSize = getObjSize(val);
-    }
-    else if(SVFUtil::isa<AllocaInst>(val))
-    {
-        setFlag(STACK_OBJ);
-        analyzeGlobalStackObjType(val);
-        objSize = getObjSize(val);
-    }
-    else if(SVFUtil::isa<GlobalVariable>(val))
-    {
-        setFlag(GLOBVAR_OBJ);
-        if(SymbolTableInfo::SymbolInfo()->isConstantObjSym(val))
-            setFlag(CONST_OBJ);
-        analyzeGlobalStackObjType(val);
-        objSize = getObjSize(val);
-    }
-    else if (SVFUtil::isa<Instruction>(val) && isHeapAllocExtCall(SVFUtil::cast<Instruction>(val)))
-    {
-        setFlag(HEAP_OBJ);
-        analyzeHeapStaticObjType(val);
-        // Heap object, label its field as infinite here
-        objSize = -1;
-    }
-    else if (SVFUtil::isa<Instruction>(val) && isStaticExtCall(SVFUtil::cast<Instruction>(val)))
-    {
-        setFlag(STATIC_OBJ);
-        analyzeHeapStaticObjType(val);
-        // static object allocated before main, label its field as infinite here
-        objSize = -1;
-    }
-    else if(ArgInProgEntryFunction(val))
-    {
-        setFlag(STATIC_OBJ);
-        analyzeHeapStaticObjType(val);
-        // user input data, label its field as infinite here
-        objSize = -1;
-    }
-    else
-        assert("what other object do we have??");
-
-    // Reset maxOffsetLimit if it is over the total fieldNum of this object
-    if(objSize > 0 && maxOffsetLimit > objSize)
-        maxOffsetLimit = objSize;
-
+    // TODO: Heap and static objects are considered as pointers right now.
+    //       Refine this function to get more details about heap and static objects.
+    setFlag(STATIC_OBJ);
+    setFlag(HASPTR_OBJ);
 }
 
 /*!
@@ -237,32 +129,14 @@ void MemObj::setFieldSensitive()
 {
     typeInfo->setMaxFieldOffsetLimit(StInfo::getMaxFieldLimit());
 }
-/*
- * Initial the memory object here
- */
-void MemObj::init(const Type* type)
-{
-    typeInfo = new ObjTypeInfo(StInfo::getMaxFieldLimit(),type);
-    typeInfo->setFlag(ObjTypeInfo::HEAP_OBJ);
-    typeInfo->setFlag(ObjTypeInfo::HASPTR_OBJ);
-}
 
-/*!
- * Constructor of a memory object
- */
-MemObj::MemObj(const Value *val, SymID id) :
-    refVal(val), GSymID(id), typeInfo(nullptr)
-{
-    init(val);
-}
 
 /*!
  * Constructor of a memory object
  */
-MemObj::MemObj(SymID id, const Type* type) :
-    refVal(nullptr), GSymID(id), typeInfo(nullptr)
+MemObj::MemObj(SymID id, ObjTypeInfo* ti, const Value *val) :
+    refVal(val), GSymID(id), typeInfo(ti)
 {
-    init(type);
 }
 
 /*!
@@ -299,303 +173,3 @@ void MemObj::destroy()
 }
 
 
-/*!
- * Compute gep offset
- */
-bool LocSymTableInfo::computeGepOffset(const User *V, LocationSet& ls)
-{
-
-    assert(V);
-    int baseIndex = -1;
-    int index = 0;
-    for (bridge_gep_iterator gi = bridge_gep_begin(*V), ge = bridge_gep_end(*V);
-            gi != ge; ++gi, ++index)
-    {
-        if(SVFUtil::isa<ConstantInt>(gi.getOperand()) == false)
-            baseIndex = index;
-    }
-
-    index = 0;
-    for (bridge_gep_iterator gi = bridge_gep_begin(*V), ge = bridge_gep_end(*V);
-            gi != ge; ++gi, ++index)
-    {
-
-        if (index <= baseIndex)
-        {
-            /// variant offset
-            // Handling pointer types
-            if (const PointerType* pty = SVFUtil::dyn_cast<PointerType>(*gi))
-            {
-                const Type* et = pty->getElementType();
-                Size_t sz = getTypeSizeInBytes(et);
-
-                Size_t num = 1;
-                if (const ArrayType* aty = SVFUtil::dyn_cast<ArrayType>(et))
-                    num = aty->getNumElements();
-                else
-                    num = StInfo::getMaxFieldLimit();
-
-                ls.addElemNumStridePair(std::make_pair(num, sz));
-            }
-            // Calculate the size of the array element
-            else if(const ArrayType* at = SVFUtil::dyn_cast<ArrayType>(*gi))
-            {
-                const Type* et = at->getElementType();
-                Size_t sz = getTypeSizeInBytes(et);
-                Size_t num = at->getNumElements();
-                ls.addElemNumStridePair(std::make_pair(num, sz));
-            }
-            else
-                assert(false && "what other types?");
-        }
-        // constant offset
-        else
-        {
-            assert(SVFUtil::isa<ConstantInt>(gi.getOperand()) && "expecting a constant");
-
-            ConstantInt *op = SVFUtil::cast<ConstantInt>(gi.getOperand());
-
-            //The actual index
-            Size_t idx = op->getSExtValue();
-
-            // Handling pointer types
-            // These GEP instructions are simply making address computations from the base pointer address
-            // e.g. idx1 = (char*) &MyVar + 4,  at this case gep only one offset index (idx)
-            if (const PointerType* pty = SVFUtil::dyn_cast<PointerType>(*gi))
-            {
-                const Type* et = pty->getElementType();
-                Size_t sz = getTypeSizeInBytes(et);
-                ls.setByteOffset(ls.getByteOffset() + idx * sz);
-            }
-            // Calculate the size of the array element
-            else if(const ArrayType* at = SVFUtil::dyn_cast<ArrayType>(*gi))
-            {
-                const Type* et = at->getElementType();
-                Size_t sz = getTypeSizeInBytes(et);
-                ls.setByteOffset(ls.getByteOffset() + idx * sz);
-            }
-            // Handling struct here
-            else if (const StructType *ST = SVFUtil::dyn_cast<StructType>(*gi))
-            {
-                assert(op && "non-const struct index in GEP");
-                const vector<u32_t> &so = SymbolTableInfo::SymbolInfo()->getFattenFieldOffsetVec(ST);
-                if ((unsigned)idx >= so.size())
-                {
-                    outs() << "!! Struct index out of bounds" << idx << "\n";
-                    assert(0);
-                }
-                //add the translated offset
-                ls.setByteOffset(ls.getByteOffset() + so[idx]);
-            }
-            else
-                assert(false && "what other types?");
-        }
-    }
-    return true;
-}
-
-/*!
- * Collect array information
- */
-void LocSymTableInfo::collectArrayInfo(const llvm::ArrayType*)
-{
-    /*
-    StInfo *stinfo = new StInfo();
-    typeToFieldInfo[ty] = stinfo;
-
-    /// If this is an array type, calculate the outmost array
-    /// information and append them to the inner elements' type
-    /// information later.
-    u64_t out_num = ty->getNumElements();
-    const Type* elemTy = ty->getElementType();
-    u32_t out_stride = getTypeSizeInBytes(elemTy);
-
-    /// Array itself only has one field which is the inner most element
-    stinfo->addOffsetWithType(0, elemTy);
-
-    while (const ArrayType* aty = dyn_cast<ArrayType>(elemTy)) {
-        out_num *= aty->getNumElements();
-        elemTy = aty->getElementType();
-        out_stride = getTypeSizeInBytes(elemTy);
-    }
-
-    /// Array's flatten field infor is the same as its element's
-    /// flatten infor with an additional slot for array's element
-    /// number and stride pair.
-    StInfo* elemStInfo = getStructInfo(elemTy);
-    u32_t nfE = elemStInfo->getFlattenFieldInfoVec().size();
-    for (u32_t j = 0; j < nfE; j++) {
-        u32_t off = elemStInfo->getFlattenFieldInfoVec()[j].getFlattenOffset();
-        const Type* fieldTy = elemStInfo->getFlattenFieldInfoVec()[j].getFlattenElemTy();
-        FieldInfo::ElemNumStridePairVec pair = elemStInfo->getFlattenFieldInfoVec()[j].getElemNumStridePairVect();
-        /// append the additional number
-        pair.push_back(std::make_pair(out_num, out_stride));
-        FieldInfo field(off, fieldTy, pair);
-        stinfo->getFlattenFieldInfoVec().push_back(field);
-    }
-    */
-}
-
-
-/*
- * Recursively collect the memory layout information for a struct type
- */
-void LocSymTableInfo::collectStructInfo(const StructType*)
-{
-    /*
-    StInfo *stinfo = new StInfo();
-    typeToFieldInfo[ty] = stinfo;
-
-    const StructLayout *stTySL = getDataLayout(getModule().getMainLLVMModule())->getStructLayout( const_cast<StructType *>(ty) );
-
-    u32_t field_idx = 0;
-    for (StructType::element_iterator it = ty->element_begin(), ie =
-                ty->element_end(); it != ie; ++it, ++field_idx) {
-        const Type *et = *it;
-
-        // The offset is where this element will be placed in the struct.
-        // This offset is computed after alignment with the current struct
-        u64_t eOffsetInBytes = stTySL->getElementOffset(field_idx);
-
-        //The offset is where this element will be placed in the exp. struct.
-        /// FIXME: As the layout size is uint_64, here we assume
-        /// offset with uint_32 (Size_t) is large enough and will not cause overflow
-        stinfo->addOffsetWithType(static_cast<u32_t>(eOffsetInBytes), et);
-
-        StInfo* fieldStinfo = getStructInfo(et);
-        u32_t nfE = fieldStinfo->getFlattenFieldInfoVec().size();
-        //Copy ST's info, whose element 0 is the size of ST itself.
-        for (u32_t j = 0; j < nfE; j++) {
-            u32_t oft = eOffsetInBytes + fieldStinfo->getFlattenFieldInfoVec()[j].getFlattenOffset();
-            const Type* elemTy = fieldStinfo->getFlattenFieldInfoVec()[j].getFlattenElemTy();
-            FieldInfo::ElemNumStridePairVec pair = fieldStinfo->getFlattenFieldInfoVec()[j].getElemNumStridePairVect();
-            pair.push_back(std::make_pair(1, 0));
-            FieldInfo newField(oft, elemTy, pair);
-            stinfo->getFlattenFieldInfoVec().push_back(newField);
-        }
-    }
-
-    //	verifyStructSize(stinfo,stTySL->getSizeInBytes());
-
-    //Record the size of the complete struct and update max_struct.
-    if (stTySL->getSizeInBytes() > maxStSize) {
-        maxStruct = ty;
-        maxStSize = stTySL->getSizeInBytes();
-    }
-    */
-}
-
-
-/*!
- * Given LocationSet from a Gep Instruction, return a new LocationSet which matches
- * the field information of this ObjTypeInfo by considering memory layout
- */
-LocationSet LocSymTableInfo::getModulusOffset(const MemObj* obj, const LocationSet& ls)
-{
-    const Type* ety = obj->getType();
-
-    if (SVFUtil::isa<StructType>(ety) || SVFUtil::isa<ArrayType>(ety))
-    {
-        /// Find an appropriate field for this LocationSet
-        const std::vector<FieldInfo>& infovec = SymbolTableInfo::SymbolInfo()->getFlattenFieldInfoVec(ety);
-        std::vector<FieldInfo>::const_iterator it = infovec.begin();
-        std::vector<FieldInfo>::const_iterator eit = infovec.end();
-        for (; it != eit; ++it)
-        {
-            const FieldInfo& fieldLS = *it;
-            LocationSet rhsLS(fieldLS);
-            LocationSet::LSRelation result = LocationSet::checkRelation(ls, rhsLS);
-            if (result == LocationSet::Same ||
-                    result == LocationSet::Superset ||
-                    result == LocationSet::Subset)
-                return ls;
-            else if (result == LocationSet::Overlap)
-            {
-                // TODO:
-                return ls;
-            }
-            else if (result == LocationSet::NonOverlap)
-            {
-                continue;
-            }
-
-            assert(false && "cannot find an appropriate field for specified LocationSet");
-            return ls;
-        }
-    }
-    else
-    {
-        if (obj->isStaticObj() || obj->isHeap())
-        {
-            // TODO: Objects which cannot find proper field for a certain offset including
-            //       arguments in main(), static objects allocated before main and heap
-            //       objects. Right now they're considered to have infinite fields. So we
-            //       just return the location set without modifying it.
-            return ls;
-        }
-        else
-        {
-            // TODO: Using new memory model (locMM) may create objects with spurious offset
-            //       as we simply return new offset by mod operation without checking its
-            //       correctness in LocSymTableInfo::getModulusOffset(). So the following
-            //       assertion may fail. Try to refine the new memory model.
-            assert(ls.isConstantOffset() && "expecting a constant location set");
-            return ls;
-        }
-    }
-
-    /// This location set represent one object
-    if (ls.isConstantOffset())
-    {
-        /// if the offset is negative, it's possible that we're looking for an obj node out of range
-        /// of current struct. Make the offset positive so we can still get a node within current
-        /// struct to represent this obj.
-        Size_t offset = ls.getOffset();
-        if(offset < 0)
-        {
-            writeWrnMsg("try to create a gep node with negative offset.");
-            offset = abs(offset);
-        }
-        u32_t maxOffset = obj->getMaxFieldOffsetLimit();
-        if (maxOffset != 0)
-            offset = offset % maxOffset;
-        else
-            offset = 0;
-    }
-    /// This location set represents multiple objects
-    else
-    {
-
-    }
-
-    return ls;
-}
-
-/*!
- * Verify struct size
- */
-void LocSymTableInfo::verifyStructSize(StInfo *stinfo, u32_t structSize)
-{
-
-    u32_t lastOff = stinfo->getFlattenFieldInfoVec().back().getFlattenByteOffset();
-    u32_t strideSize = 0;
-    FieldInfo::ElemNumStridePairVec::const_iterator pit = stinfo->getFlattenFieldInfoVec().back().elemStridePairBegin();
-    FieldInfo::ElemNumStridePairVec::const_iterator epit = stinfo->getFlattenFieldInfoVec().back().elemStridePairEnd();
-    for(; pit!=epit; ++pit)
-        strideSize += pit->first * pit->second;
-
-    u32_t lastSize = getTypeSizeInBytes(stinfo->getFlattenFieldInfoVec().back().getFlattenElemTy());
-    /// Please note this verify may not be complete as different machine has different alignment mechanism
-    assert((structSize == lastOff + strideSize + lastSize) && "struct size not consistent");
-
-}
-
-/*!
- * Get the size of this object
- */
-u32_t LocObjTypeInfo::getObjSize(const Value* val)
-{
-
-    Type* ety  = SVFUtil::cast<PointerType>(val->getType())->getElementType();
-    return LocSymTableInfo::SymbolInfo()->getTypeSizeInBytes(ety);
-}

package/lib/SVF-FE/SymbolTableInfo.cpp

@@ -47,10 +47,127 @@ using namespace SVFUtil;
 DataLayout* SymbolTableInfo::dl = nullptr;
 SymbolTableInfo* SymbolTableInfo::symInfo = nullptr;
 
+
+/*!
+ * Analyse types of all flattened fields of this object
+ */
+void SymbolTableInfo::analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val)
+{
+
+    const PointerType * refty = SVFUtil::dyn_cast<PointerType>(val->getType());
+    assert(SVFUtil::isa<PointerType>(refty) && "this value should be a pointer type!");
+    Type* elemTy = refty->getElementType();
+    bool isPtrObj = false;
+    // Find the inter nested array element
+    while (const ArrayType *AT= SVFUtil::dyn_cast<ArrayType>(elemTy))
+    {
+        elemTy = AT->getElementType();
+        if(elemTy->isPointerTy())
+            isPtrObj = true;
+        if(SVFUtil::isa<GlobalVariable>(val) && SVFUtil::cast<GlobalVariable>(val)->hasInitializer()
+                && SVFUtil::isa<ConstantArray>(SVFUtil::cast<GlobalVariable>(val)->getInitializer()))
+        {
+            typeinfo->setFlag(ObjTypeInfo::CONST_ARRAY_OBJ);
+        }
+        else
+            typeinfo->setFlag(ObjTypeInfo::VAR_ARRAY_OBJ);
+    }
+    if (const StructType *ST= SVFUtil::dyn_cast<StructType>(elemTy))
+    {
+        const std::vector<FieldInfo>& flattenFields = SymbolTableInfo::SymbolInfo()->getFlattenFieldInfoVec(ST);
+        for(std::vector<FieldInfo>::const_iterator it = flattenFields.begin(), eit = flattenFields.end();
+                it!=eit; ++it)
+        {
+            if((*it).getFlattenElemTy()->isPointerTy())
+                isPtrObj = true;
+        }
+        if(SVFUtil::isa<GlobalVariable>(val) && SVFUtil::cast<GlobalVariable>(val)->hasInitializer()
+                && SVFUtil::isa<ConstantStruct>(SVFUtil::cast<GlobalVariable>(val)->getInitializer()))
+            typeinfo->setFlag(ObjTypeInfo::CONST_STRUCT_OBJ);
+        else
+            typeinfo->setFlag(ObjTypeInfo::VAR_STRUCT_OBJ);
+    }
+    else if (elemTy->isPointerTy())
+    {
+        isPtrObj = true;
+    }
+
+    if(isPtrObj)
+        typeinfo->setFlag(ObjTypeInfo::HASPTR_OBJ);
+}
+
+/*!
+ * Initialize the type info of an object
+ */
+void SymbolTableInfo::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val){
+    
+    Size_t objSize = 1;
+    // Global variable
+    if (SVFUtil::isa<Function>(val))
+    {
+        typeinfo->setFlag(ObjTypeInfo::FUNCTION_OBJ);
+        analyzeGlobalStackObjType(typeinfo,val);
+        objSize = getObjSize(val);
+    }
+    else if(SVFUtil::isa<AllocaInst>(val))
+    {
+        typeinfo->setFlag(ObjTypeInfo::STACK_OBJ);
+        analyzeGlobalStackObjType(typeinfo,val);
+        objSize = getObjSize(val);
+    }
+    else if(SVFUtil::isa<GlobalVariable>(val))
+    {
+        typeinfo->setFlag(ObjTypeInfo::GLOBVAR_OBJ);
+        if(SymbolTableInfo::SymbolInfo()->isConstantObjSym(val))
+            typeinfo->setFlag(ObjTypeInfo::CONST_OBJ);
+        analyzeGlobalStackObjType(typeinfo,val);
+        objSize = getObjSize(val);
+    }
+    else if (SVFUtil::isa<Instruction>(val) && isHeapAllocExtCall(SVFUtil::cast<Instruction>(val)))
+    {
+        typeinfo->analyzeHeapObjType(val->getType());
+        // Heap object, label its field as infinite here
+        objSize = -1;
+    }
+    else if (SVFUtil::isa<Instruction>(val) && isStaticExtCall(SVFUtil::cast<Instruction>(val)))
+    {
+        typeinfo->analyzeStaticObjType(val->getType());
+        // static object allocated before main, label its field as infinite here
+        objSize = -1;
+    }
+    else if(ArgInProgEntryFunction(val))
+    {
+        typeinfo->analyzeStaticObjType(val->getType());
+        // user input data, label its field as infinite here
+        objSize = -1;
+    }
+    else
+        assert("what other object do we have??");
+
+    // Reset maxOffsetLimit if it is over the total fieldNum of this object
+    if(objSize > 0 && typeinfo->getMaxFieldOffsetLimit() > objSize)
+        typeinfo->setMaxFieldOffsetLimit(objSize);
+}
+
+/*!
+ * Return size of this Object
+ */
+u32_t SymbolTableInfo::getObjSize(const Value* val)
+{
+
+    Type* ety  = SVFUtil::cast<PointerType>(val->getType())->getElementType();
+    u32_t numOfFields = 1;
+    if (SVFUtil::isa<StructType>(ety) || SVFUtil::isa<ArrayType>(ety))
+    {
+        numOfFields = SymbolTableInfo::SymbolInfo()->getFlattenFieldInfoVec(ety).size();
+    }
+    return numOfFields;
+}
+
 /*
  * Initial the memory object here
  */
-void MemObj::init(const Value *val)
+ObjTypeInfo* SymbolTableInfo::createObjTypeInfo(const Value *val)
 {
     const PointerType *refTy = nullptr;
 
@@ -67,11 +184,9 @@ void MemObj::init(const Value *val)
     if (refTy)
     {
         Type *objTy = refTy->getElementType();
-        if(Options::LocMemModel)
-            typeInfo = new LocObjTypeInfo(val, objTy, Options::MaxFieldLimit);
-        else
-            typeInfo = new ObjTypeInfo(val, objTy, Options::MaxFieldLimit);
-        typeInfo->init(val);
+        ObjTypeInfo* typeInfo = new ObjTypeInfo(val, objTy, Options::MaxFieldLimit);
+        initTypeInfo(typeInfo,val);
+        return typeInfo;
     }
     else
     {
@@ -79,9 +194,20 @@ void MemObj::init(const Value *val)
         writeWrnMsg(val->getName().str());
         writeWrnMsg("(" + getSourceLoc(val) + ")");
         assert(false && "Memory object must be held by a pointer-typed ref value.");
+        abort();
     }
 }
 
+/*
+ * Initial the memory object here (for a dummy object)
+ */
+ObjTypeInfo* SymbolTableInfo::createObjTypeInfo(const Type* type)
+{
+    ObjTypeInfo* typeInfo = new ObjTypeInfo(StInfo::getMaxFieldLimit(),type);
+    typeInfo->analyzeHeapObjType(type);
+    return typeInfo;
+}
+
 /*!
  * Get the symbol table instance
  */
@@ -89,10 +215,7 @@ SymbolTableInfo* SymbolTableInfo::SymbolInfo()
 {
     if (symInfo == nullptr)
     {
-        if(Options::LocMemModel)
-            symInfo = new LocSymTableInfo();
-        else
-            symInfo = new SymbolTableInfo();
+        symInfo = new SymbolTableInfo();
         symInfo->setModelConstants(Options::ModelConsts);
     }
     return symInfo;
@@ -659,8 +782,8 @@ void SymbolTableInfo::collectObj(const Value *val)
             DBOUT(DMemModel,
                   outs() << "create a new obj sym " << id << "\n");
 
-            // create a memory object
-            MemObj* mem = new MemObj(val, id);
+            // create a memory object  
+            MemObj* mem = new MemObj(id, createObjTypeInfo(val), val);
             assert(objMap.find(id) == objMap.end());
             objMap[id] = mem;
         }
@@ -1092,3 +1215,4 @@ u32_t SymbolTableInfo::getTypeSizeInBytes(const StructType *sty, u32_t field_idx
 
 
 
+

package/lib/Util/Options.cpp

@@ -629,14 +629,6 @@ namespace SVF
         llvm::cl::desc("add svf.main()")
     );
 
-    
-    // SymbolTableInfo.cpp
-    const llvm::cl::opt<bool> Options::LocMemModel(
-        "loc-mm", 
-        llvm::cl::init(false),
-        llvm::cl::desc("Bytes/bits modeling of memory locations")
-    );
-
     const llvm::cl::opt<bool> Options::ModelConsts(
         "model-consts", 
         llvm::cl::init(false),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.312",
+  "version": "1.0.313",
   "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": {