svf-tools 1.0.830 → 1.0.832

package/svf-llvm/lib/LLVMUtil.cpp

@@ -438,7 +438,7 @@ const Value* LLVMUtil::getFirstUseViaCastInst(const Value* val)
 /*!
  * Return the type of the object from a heap allocation
  */
-const Type* LLVMUtil::getTypeOfHeapAlloc(const Instruction *inst)
+const Type* LLVMUtil::inferTypeOfHeapObjOrStaticObj(const Instruction *inst)
 {
     const PointerType* type = SVFUtil::dyn_cast<PointerType>(inst->getType());
     const SVFInstruction* svfinst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(inst);
@@ -982,37 +982,6 @@ bool LLVMUtil::isValVtbl(const Value* val)
                            vtblLabelBeforeDemangle) == 0;
 }
 
-bool LLVMUtil::isLoadVtblInst(const LoadInst* loadInst)
-{
-    const Value* loadSrc = loadInst->getPointerOperand();
-    const Type* valTy = loadSrc->getType();
-    const Type* elemTy = valTy;
-    for (u32_t i = 0; i < 3; ++i)
-    {
-        // TODO: getPtrElementType to be removed
-        if (const PointerType* ptrTy = SVFUtil::dyn_cast<PointerType>(elemTy))
-            elemTy = LLVMUtil::getPtrElementType(ptrTy);
-        else
-            return false;
-    }
-    if (const FunctionType* functy = SVFUtil::dyn_cast<FunctionType>(elemTy))
-    {
-        const Type* paramty = functy->getParamType(0);
-        std::string className = "";
-        if(const PointerType* ptrTy = SVFUtil::dyn_cast<PointerType>(paramty))
-        {
-            // TODO: getPtrElementType need type inference
-            if(const StructType* st = SVFUtil::dyn_cast<StructType>(getPtrElementType(ptrTy)))
-                className = LLVMUtil::getClassNameFromType(st);
-        }
-        if (className.size() > 0)
-        {
-            return true;
-        }
-    }
-    return false;
-}
-
 /*
  * a virtual callsite follows the following instruction sequence pattern:
  * %vtable = load this

package/svf-llvm/lib/SymbolTableBuilder.cpp

@@ -577,7 +577,7 @@ void SymbolTableBuilder::handleGlobalInitializerCE(const Constant* C)
 ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value* val)
 {
     /// TODO: getPtrElementType to be removed
-    const PointerType* refTy = nullptr;
+    const Type* objTy = nullptr;
 
     const Instruction* I = SVFUtil::dyn_cast<Instruction>(val);
 
@@ -585,15 +585,17 @@ ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value* val)
     // (1) A heap/static object from a callsite
     if (I && isNonInstricCallSite(LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(I)))
     {
-        refTy = getRefTypeOfHeapAllocOrStatic(I);
+        objTy = inferTypeOfHeapObjOrStaticObj(I);
     }
     // (2) Other objects (e.g., alloca, global, etc.)
     else
-        refTy = SVFUtil::dyn_cast<PointerType>(val->getType());
+    {
+        if(const PointerType* refTy = SVFUtil::dyn_cast<PointerType>(val->getType()))
+            objTy = getPtrElementType(refTy);
+    }
 
-    if (refTy)
+    if (objTy)
     {
-        Type* objTy = getPtrElementType(refTy);
         ObjTypeInfo* typeInfo = new ObjTypeInfo(
             LLVMModuleSet::getLLVMModuleSet()->getSVFType(objTy),
             Options::MaxFieldLimit());
@@ -761,9 +763,8 @@ u32_t SymbolTableBuilder::analyzeHeapObjType(ObjTypeInfo* typeinfo, const Value*
     if(const Value* castUse = getFirstUseViaCastInst(val))
     {
         typeinfo->setFlag(ObjTypeInfo::HEAP_OBJ);
-        const Type* objTy = getTypeOfHeapAlloc(SVFUtil::cast<Instruction>(val));
-        typeinfo->resetTypeForHeapStaticObj(LLVMModuleSet::getLLVMModuleSet()->getSVFType(objTy));
         analyzeObjType(typeinfo,castUse);
+        const Type* objTy = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(typeinfo->getType());
         if(SVFUtil::isa<ArrayType>(objTy))
             return getNumOfElements(objTy);
         else if(const StructType* st = SVFUtil::dyn_cast<StructType>(objTy))
@@ -792,7 +793,6 @@ void SymbolTableBuilder::analyzeStaticObjType(ObjTypeInfo* typeinfo, const Value
     if(const Value* castUse = getFirstUseViaCastInst(val))
     {
         typeinfo->setFlag(ObjTypeInfo::STATIC_OBJ);
-        typeinfo->resetTypeForHeapStaticObj(LLVMModuleSet::getLLVMModuleSet()->getSVFType(castUse->getType()));
         analyzeObjType(typeinfo,castUse);
     }
     else