svf-tools 1.0.309 → 1.0.313

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;
@@ -579,6 +702,9 @@ void SymbolTableInfo::destroy()
         if (iter->second)
             delete iter->second;
     }
+
+    delete dl;
+    dl = nullptr;
 }
 
 /*!
@@ -656,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;
         }
@@ -1089,3 +1215,4 @@ u32_t SymbolTableInfo::getTypeSizeInBytes(const StructType *sty, u32_t field_idx
 
 
 
+

package/lib/Util/Options.cpp

@@ -26,8 +26,8 @@ namespace SVF
         llvm::cl::desc("Method of allocating (LLVM) values and memory objects as node IDs"),
         llvm::cl::values(
             clEnumValN(NodeIDAllocator::Strategy::DENSE, "dense", "allocate objects together and values together, separately"),
-            clEnumValN(NodeIDAllocator::Strategy::SEQ, "seq", "allocate values and objects sequentially, intermixed"),
-            clEnumValN(NodeIDAllocator::Strategy::DEBUG, "debug", "allocate value and objects sequentially, intermixed, except GEP objects as offsets (default)")));
+            clEnumValN(NodeIDAllocator::Strategy::SEQ, "seq", "allocate values and objects sequentially, intermixed (default)"),
+            clEnumValN(NodeIDAllocator::Strategy::DEBUG, "debug", "allocate value and objects sequentially, intermixed, except GEP objects as offsets")));
 
     const llvm::cl::opt<unsigned> Options::MaxFieldLimit(
         "field-limit",
@@ -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/lib/WPA/Andersen.cpp

@@ -28,9 +28,9 @@
  */
 
 #include "Util/Options.h"
+#include "SVF-FE/CommonCHG.h"
 #include "SVF-FE/LLVMUtil.h"
 #include "MemoryModel/PointsTo.h"
-#include "Util/Options.h"
 #include "WPA/Andersen.h"
 #include "WPA/Steensgaard.h"
 
@@ -57,6 +57,18 @@ double AndersenBase::timeOfProcessCopyGep = 0;
 double AndersenBase::timeOfProcessLoadStore = 0;
 double AndersenBase::timeOfUpdateCallGraph = 0;
 
+/*!
+ * Destructor
+ */
+AndersenBase::~AndersenBase()
+{
+  delete consCG;
+  consCG = nullptr;
+
+  auto * chg = getCHGraph();
+  delete chg;
+  chg = nullptr;
+}
 
 /*!
  * Initilize analysis

package/package.json

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

package/tools/Example/svf-ex.cpp

@@ -160,9 +160,9 @@ int main(int argc, char ** argv)
     SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
     svfModule->buildSymbolTableInfo();
 
-	/// Build Program Assignment Graph (PAG)
-	PAGBuilder builder;
-	PAG* pag = builder.build(svfModule);
+    /// Build Program Assignment Graph (PAG)
+    PAGBuilder builder;
+    PAG* pag = builder.build(svfModule);
 
     /// Create Andersen's pointer analysis
     Andersen* ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
@@ -199,7 +199,10 @@ int main(int argc, char ** argv)
     PAG::releasePAG();
 
     LLVMModuleSet::getLLVMModuleSet()->dumpModulesToFile(".svf.bc");
+    SVF::LLVMModuleSet::releaseLLVMModuleSet();
+    delete svfModule;
 
+    llvm::llvm_shutdown();
     return 0;
 }