svf-tools 1.0.807 → 1.0.809

package/svf/lib/MemoryModel/AccessPath.cpp

@@ -140,16 +140,17 @@ APOffset AccessPath::computeConstantByteOffset() const
             {
                 u32_t flattenIdx = structType->getTypeInfo()->getFlattenedFieldIdxVec()[structField];
                 type2 = structType->getTypeInfo()->getOriginalElemType(flattenIdx);
-                totalConstOffset += type2->getLLVMByteSize();
+                totalConstOffset += type2->getByteSize();
             }
         }
         else
         {
             /// for (2) i = 0, op: 0, type: [10 x i8]*(Ptr), type2: [10 x i8](Arr)
             ///         i = 1, op: 8, type: [10 x i8](Arr), type2: i8
-            totalConstOffset += op->getSExtValue() * type2->getLLVMByteSize();
+            totalConstOffset += op->getSExtValue() * type2->getByteSize();
         }
     }
+    totalConstOffset = Options::MaxFieldLimit() > totalConstOffset? totalConstOffset: Options::MaxFieldLimit();
     return totalConstOffset;
 }
 
@@ -246,14 +247,14 @@ bool AccessPath::operator< (const AccessPath& rhs) const
         return (fldIdx < rhs.fldIdx);
     else
     {
-        const OffsetVarAndGepTypePairs& pairVec = getOffsetVarAndGepTypePairVec();
-        const OffsetVarAndGepTypePairs& rhsPairVec = rhs.getOffsetVarAndGepTypePairVec();
+        const IdxVarAndGepTypePairs& pairVec = getOffsetVarAndGepTypePairVec();
+        const IdxVarAndGepTypePairs& rhsPairVec = rhs.getOffsetVarAndGepTypePairVec();
         if (pairVec.size() != rhsPairVec.size())
             return (pairVec.size() < rhsPairVec.size());
         else
         {
-            OffsetVarAndGepTypePairs::const_iterator it = pairVec.begin();
-            OffsetVarAndGepTypePairs::const_iterator rhsIt = rhsPairVec.begin();
+            IdxVarAndGepTypePairs::const_iterator it = pairVec.begin();
+            IdxVarAndGepTypePairs::const_iterator rhsIt = rhsPairVec.begin();
             for (; it != pairVec.end() && rhsIt != rhsPairVec.end(); ++it, ++rhsIt)
             {
                 return (*it) < (*rhsIt);
@@ -293,9 +294,9 @@ std::string AccessPath::dump() const
 
     rawstr << "AccessPath\tField_Index: " << getConstantFieldIdx();
     rawstr << ",\tNum-Stride: {";
-    const OffsetVarAndGepTypePairs& vec = getOffsetVarAndGepTypePairVec();
-    OffsetVarAndGepTypePairs::const_iterator it = vec.begin();
-    OffsetVarAndGepTypePairs::const_iterator eit = vec.end();
+    const IdxVarAndGepTypePairs& vec = getOffsetVarAndGepTypePairVec();
+    IdxVarAndGepTypePairs::const_iterator it = vec.begin();
+    IdxVarAndGepTypePairs::const_iterator eit = vec.end();
     for (; it != eit; ++it)
     {
         const SVFType* ty = it->second;

package/svf/lib/SVFIR/SVFFileSystem.cpp

@@ -24,21 +24,21 @@ SVFType* createSVFType(SVFType::GNodeK kind, bool isSingleValTy)
         ABORT_MSG("Creation of RAW SVFType isn't allowed");
     case SVFType::SVFPointerTy:
         ABORT_IFNOT(isSingleValTy, "Pointer type must be single-valued");
-        return new SVFPointerType();
+        return new SVFPointerType(0);
     case SVFType::SVFIntegerTy:
         ABORT_IFNOT(isSingleValTy, "Integer type must be single-valued");
-        return new SVFIntegerType();
+        return new SVFIntegerType(0);
     case SVFType::SVFFunctionTy:
         ABORT_IFNOT(!isSingleValTy, "Function type must be multi-valued");
         return new SVFFunctionType(nullptr);
     case SVFType::SVFStructTy:
         ABORT_IFNOT(!isSingleValTy, "Struct type must be multi-valued");
-        return new SVFStructType();
+        return new SVFStructType(0);
     case SVFType::SVFArrayTy:
         ABORT_IFNOT(!isSingleValTy, "Array type must be multi-valued");
-        return new SVFArrayType();
+        return new SVFArrayType(0);
     case SVFType::SVFOtherTy:
-        return new SVFOtherType(isSingleValTy);
+        return new SVFOtherType(0, isSingleValTy);
     }
 }
 

package/svf/lib/SVFIR/SVFType.cpp

@@ -4,13 +4,6 @@
 namespace SVF
 {
 
-__attribute__((weak))
-u32_t SVFType::getLLVMByteSize() const
-{
-    assert("SVFType::getLLVMByteSize should be implemented or supported by fronted" && false);
-    abort();
-}
-
 __attribute__((weak))
 std::string SVFType::toString() const
 {

package/svf-llvm/lib/LLVMModule.cpp

@@ -1256,14 +1256,24 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
     assert(LLVMType2SVFType.find(T) == LLVMType2SVFType.end() &&
            "SVFType has been added before");
 
+    // add SVFType's LLVM byte size iff T isSized(), otherwise byteSize is 0(default value)
+    u32_t byteSize = 0;
+    if (T->isSized())
+    {
+        const llvm::DataLayout &DL = LLVMModuleSet::getLLVMModuleSet()->
+                                     getMainLLVMModule()->getDataLayout();
+        Type *mut_T = const_cast<Type *>(T);
+        byteSize = DL.getTypeAllocSize(mut_T);
+    }
+
     SVFType* svftype;
     if (SVFUtil::isa<PointerType>(T))
     {
-        svftype = new SVFPointerType();
+        svftype = new SVFPointerType(byteSize);
     }
     else if (const IntegerType* intT = SVFUtil::dyn_cast<IntegerType>(T))
     {
-        auto svfIntT = new SVFIntegerType();
+        auto svfIntT = new SVFIntegerType(byteSize);
         unsigned signWidth = intT->getBitWidth();
         assert(signWidth < INT16_MAX && "Integer width too big");
         svfIntT->setSignAndWidth(intT->getSignBit() ? -signWidth : signWidth);
@@ -1273,14 +1283,14 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
         svftype = new SVFFunctionType(getSVFType(ft->getReturnType()));
     else if (const StructType* st = SVFUtil::dyn_cast<StructType>(T))
     {
-        auto svfst = new SVFStructType();
+        auto svfst = new SVFStructType(byteSize);
         if (st->hasName())
             svfst->setName(st->getName().str());
         svftype = svfst;
     }
     else if (const auto at = SVFUtil::dyn_cast<ArrayType>(T))
     {
-        auto svfat = new SVFArrayType();
+        auto svfat = new SVFArrayType(byteSize);
         svfat->setNumOfElement(at->getNumElements());
         svfat->setTypeOfElement(getSVFType(at->getElementType()));
         svftype = svfat;
@@ -1288,7 +1298,7 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
     else
     {
         std::string buffer;
-        auto ot = new SVFOtherType(T->isSingleValueType());
+        auto ot = new SVFOtherType(byteSize, T->isSingleValueType());
         llvm::raw_string_ostream(buffer) << *T;
         ot->setRepr(std::move(buffer));
         svftype = ot;
@@ -1303,6 +1313,7 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
         assert(svfPtrType && "this is not SVFPointerType");
         svfPtrType->setPtrElementType(getSVFType(LLVMUtil::getPtrElementType(pt)));
     }
+
     return svftype;
 }
 

package/svf-llvm/lib/LLVMUtil.cpp

@@ -1268,15 +1268,6 @@ s64_t LLVMUtil::getCaseValue(const SwitchInst &switchInst, SuccBBAndCondValPair
 
 namespace SVF
 {
-// getLLVMByteSize
-u32_t SVFType::getLLVMByteSize() const
-{
-    const llvm::DataLayout &DL = LLVMModuleSet::getLLVMModuleSet()->
-                                 getMainLLVMModule()->getDataLayout();
-    const Type* T = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(this);
-    Type* mut_T = const_cast<Type*>(T);
-    return  DL.getTypeAllocSize(mut_T);
-}
 
 std::string SVFValue::toString() const
 {

package/svf-llvm/lib/SymbolTableBuilder.cpp

@@ -818,7 +818,7 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val,
         if(const ConstantInt* sz = SVFUtil::dyn_cast<ConstantInt>(allocaInst->getArraySize()))
         {
             elemNum = sz->getZExtValue() * getNumOfElements(objTy);
-            byteSize = sz->getZExtValue() * typeinfo->getType()->getLLVMByteSize();
+            byteSize = sz->getZExtValue() * typeinfo->getType()->getByteSize();
         }
         /// if ArraySize is not constant, byteSize is not static determined.
         else
@@ -836,7 +836,7 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val,
             typeinfo->setFlag(ObjTypeInfo::CONST_GLOBAL_OBJ);
         analyzeObjType(typeinfo,val);
         elemNum = getNumOfElements(objTy);
-        byteSize = typeinfo->getType()->getLLVMByteSize();
+        byteSize = typeinfo->getType()->getByteSize();
     }
     /// if val is heap alloc
     else if (SVFUtil::isa<Instruction>(val) &&
@@ -858,13 +858,13 @@ void SymbolTableBuilder::initTypeInfo(ObjTypeInfo* typeinfo, const Value* val,
         analyzeStaticObjType(typeinfo,val);
         // user input data, label its field as infinite here
         elemNum = typeinfo->getMaxFieldOffsetLimit();
-        byteSize = typeinfo->getType()->getLLVMByteSize();
+        byteSize = typeinfo->getType()->getByteSize();
     }
     else if(LLVMUtil::isConstDataOrAggData(val))
     {
         typeinfo->setFlag(ObjTypeInfo::CONST_DATA);
         elemNum = getNumOfFlattenElements(val->getType());
-        byteSize = typeinfo->getType()->getLLVMByteSize();
+        byteSize = typeinfo->getType()->getByteSize();
     }
     else
     {