[WIP] remove getPtrElement

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

@@ -470,7 +470,6 @@ void viewCFGOnly(const Function* fun);
 const ConstantStruct *getVtblStruct(const GlobalValue *vtbl);
 
 bool isValVtbl(const Value* val);
-bool isLoadVtblInst(const LoadInst* loadInst);
 bool isVirtualCallSite(const CallBase* cs);
 bool isConstructor(const Function* F);
 bool isDestructor(const Function* F);

svf-llvm/lib/LLVMUtil.cpp

@@ -962,37 +962,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

svf/lib/MemoryModel/AccessPath.cpp

@@ -58,25 +58,16 @@
 
 /// Return element number of a type
 /// (1) StructType or Array, return flattened number elements.
-/// (2) PointerType, return the element number of the pointee
-/// (3) non-pointer SingleValueType, return 1
+/// (2) non-pointer SingleValueType, return 1
 u32_t AccessPath::getElementNum(const SVFType* type) const
 {
+    assert(!SVFUtil::isa<SVFPointerType>(type) && "can't be pointer type");
 
     if (SVFUtil::isa<SVFArrayType, SVFStructType>(type))
     {
         return SymbolTableInfo::SymbolInfo()->getNumOfFlattenElements(type);
     }
-    else if (type->isSingleValueType())
-    {
-        /// This is a pointer arithmetic
-        // TODO: getPtrElementType to be removed
-        if(const SVFPointerType* pty = SVFUtil::dyn_cast<SVFPointerType>(type))
-            return getElementNum(pty->getPtrElementType());
-        else
-            return 1;
-    }
-    else if (SVFUtil::isa<SVFFunctionType>(type))
+    else if (type->isSingleValueType() || SVFUtil::isa<SVFFunctionType>(type))
     {
         return 1;
     }

svf/lib/MemoryModel/PointerAnalysis.cpp

@@ -248,9 +248,6 @@ void PointerAnalysis::dumpAllTypes()
 
         const SVFType* type = node->getValue()->getType();
         pag->getSymbolInfo()->printFlattenFields(type);
-        // TODO: getPtrElementType to be removed
-        if (const SVFPointerType* ptType = SVFUtil::dyn_cast<SVFPointerType>(type))
-            pag->getSymbolInfo()->printFlattenFields(ptType->getPtrElementType());
     }
 }
 

svf/lib/SVFIR/SVFType.cpp

@@ -20,8 +20,7 @@
 
 void SVFPointerType::print(std::ostream& os) const
 {
-    // TODO: getPtrElementType to be removed
-    os << *getPtrElementType() << '*';
+    os << *ptrElementType << '*';
 }
 
 void SVFIntegerType::print(std::ostream& os) const

svf/lib/SVFIR/SymbolTableInfo.cpp

@@ -258,11 +258,7 @@
     }
     else if (const SVFPointerType* pt= SVFUtil::dyn_cast<SVFPointerType>(type))
     {
-        // TODO: getPtrElementType to be removed
-        u32_t eSize = getNumOfFlattenElements(pt->getPtrElementType());
-        outs() << "  {Type: " << *pt << "}\n"
-               << "\t [target size = " << eSize << "]\n"
-               << "\n";
+        outs() << *pt << "\n";
     }
     else if (const SVFFunctionType* fu =
                  SVFUtil::dyn_cast<SVFFunctionType>(type))