remove getelementptr in SVFExt and llvmmodule

svf-llvm/include/SVF-LLVM/TypeInference.h

@@ -61,9 +61,6 @@ class TypeInference {
     /// Forward collect all possible infer sites starting from a value
     const Type *getOrInferLLVMObjType(const Value *startValue);
 
-    /// Default type
-    const Type *defaultTy(const Value *val);
-
     /// Validate type inference
     void validateTypeCheck(const CallBase *cs);
 
@@ -74,6 +71,9 @@ class TypeInference {
 
 protected:
     static const Type *infersiteToType(const Value *val);
+
+    /// Default type
+    const Type *defaultTy(const Value *val);
 };
 }
 #endif //SVF_TYPEINFERENCE_H

svf-llvm/lib/LLVMModule.cpp

@@ -1380,15 +1380,6 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
 
     symInfo->addTypeInfo(svftype);
     LLVMType2SVFType[T] = svftype;
-    if (const PointerType* pt = SVFUtil::dyn_cast<PointerType>(T))
-    {
-        //cast svftype to SVFPointerType
-        SVFPointerType* svfPtrType = SVFUtil::dyn_cast<SVFPointerType>(svftype);
-        assert(svfPtrType && "this is not SVFPointerType");
-        // TODO: getPtrElementType to be removed
-        if(!pt->isOpaque())
-            svfPtrType->setPtrElementType(getSVFType(LLVMUtil::getPtrElementType(pt)));
-    }
 
     return svftype;
 }

svf-llvm/lib/SVFIRExtAPI.cpp

@@ -30,6 +30,7 @@
 #include "SVF-LLVM/SVFIRBuilder.h"
 #include "Util/SVFUtil.h"
 #include "SVF-LLVM/SymbolTableBuilder.h"
+#include "SVF-LLVM/TypeInference.h"
 
 using namespace std;
 using namespace SVF;
@@ -43,12 +44,8 @@ const Type* SVFIRBuilder::getBaseTypeAndFlattenedFields(const Value* V, std::vec
 {
     assert(V);
     const Value* value = getBaseValueForExtArg(V);
-    const Type* T = value->getType();
-    // TODO: getPtrElementType need type inference
-    while (const PointerType *ptype = SVFUtil::dyn_cast<PointerType>(T))
-        T = getPtrElementType(ptype);
-
-    u32_t numOfElems = pag->getSymbolInfo()->getNumOfFlattenElements(LLVMModuleSet::getLLVMModuleSet()->getSVFType(T));
+    const Type *objType = TypeInference::getTypeInference()->getOrInferLLVMObjType(value);
+    u32_t numOfElems = pag->getSymbolInfo()->getNumOfFlattenElements(LLVMModuleSet::getLLVMModuleSet()->getSVFType(objType));
     /// use user-specified size for this copy operation if the size is a constaint int
     if(szValue && SVFUtil::isa<ConstantInt>(szValue))
     {
@@ -71,7 +68,7 @@ const Type* SVFIRBuilder::getBaseTypeAndFlattenedFields(const Value* V, std::vec
         ls.addOffsetVarAndGepTypePair(getPAG()->getGNode(getPAG()->getValueNode(svfOffset)), nullptr);
         fields.push_back(ls);
     }
-    return T;
+    return objType;
 }
 
 /*!

svf-llvm/lib/SymbolTableBuilder.cpp

@@ -612,11 +612,6 @@ const Type* SymbolTableBuilder::inferTypeOfHeapObjOrStaticObj(const Instruction
         assert( false && "not a heap allocation instruction?");
     }
 
-    if (inferedType == nullptr) {
-        // return a default type if the inferred type is empty
-        inferedType = getTypeInference()->defaultTy(startValue);
-    }
-
     getTypeInference()->typeEleNumDiffTest(originalPType, inferedType, startValue);
 
     return inferedType;

svf-llvm/lib/TypeInference.cpp

@@ -117,7 +117,7 @@ const Type *TypeInference::getOrInferLLVMObjType(const Value *startValue) {
     auto tIt = _valueToType.find(startValue);
     if (tIt != _valueToType.end()) {
         WARN_IFNOT(tIt->second, "empty type:" + VALUE_WITH_DBGINFO(startValue));
-        return tIt->second;
+        return tIt->second ? tIt->second : getTypeInference()->defaultTy(startValue);
     }
 
     INC_TRACE();
@@ -152,6 +152,8 @@ const Type *TypeInference::getOrInferLLVMObjType(const Value *startValue) {
         if (!canUpdate && !_valueToInferSites.count(curValue)) {
             workList.push({curValue, true});
         }
+        if (const GetElementPtrInst *gepInst = SVFUtil::dyn_cast<GetElementPtrInst>(curValue))
+            insertInferSite(gepInst);
         for (const auto &it: curValue->uses()) {
             if (LoadInst *loadInst = SVFUtil::dyn_cast<LoadInst>(it.getUser())) {
                 /*
@@ -256,6 +258,7 @@ const Type *TypeInference::getOrInferLLVMObjType(const Value *startValue) {
     }
     const Type* type = _valueToType[startValue];
     if (type == nullptr) {
+        type = getTypeInference()->defaultTy(startValue);
         WARN_MSG("empty type, trace ID is " + std::to_string(traceId) + ":" + VALUE_WITH_DBGINFO(startValue));
     }
     return type;
@@ -270,10 +273,6 @@ void TypeInference::validateTypeCheck(const CallBase *cs) {
     if (const Function *func = cs->getCalledFunction()) {
         if (func->getName().find(TYPEMALLOC) != std::string::npos) {
             const Type *objType = getOrInferLLVMObjType(cs);
-            if (!objType) {
-                // return an 8-bit integer type if the inferred type is empty
-                objType = Type::getInt8Ty(LLVMModuleSet::getLLVMModuleSet()->getContext());
-            }
             ConstantInt *pInt =
                     SVFUtil::dyn_cast<llvm::ConstantInt>(cs->getOperand(1));
             assert(pInt && "the second argument is a integer");