svf-tools 1.0.310 → 1.0.314

package/include/SVF-FE/SymbolTableInfo.h

@@ -42,6 +42,8 @@ namespace SVF
 class SymbolTableInfo
 {
 
+friend class MemModelBuilder;
+
 public:
     /// various maps defined
     //{@
@@ -142,6 +144,11 @@ public:
     {
         return mod;
     }
+        /// Module
+    inline void setModule(SVFModule* m)
+    {
+        mod = m;
+    }
 
     /// Get target machine data layout
     inline static DataLayout* getDataLayout(Module* mod)
@@ -157,22 +164,6 @@ public:
     u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
     //@}
 
-    /// Start building memory model
-    void buildMemModel(SVFModule* svfModule);
-
-    /// collect the syms
-    //@{
-    void collectSym(const Value *val);
-
-    void collectVal(const Value *val);
-
-    void collectObj(const Value *val);
-
-    void collectRet(const Function *val);
-
-    void collectVararg(const Function *val);
-    //@}
-
     /// special value
     // @{
     static bool isNullPtrSym(const Value *val);
@@ -206,7 +197,7 @@ public:
     {
         assert(isBlkObjOrConstantObj(symId));
         assert(objMap.find(symId)==objMap.end());
-        objMap[symId] = new MemObj(symId);;
+        objMap[symId] = new MemObj(symId, createObjTypeInfo());;
     }
 
     inline MemObj* getBlkObj() const
@@ -242,19 +233,12 @@ public:
     inline const MemObj* createDummyObj(SymID symId, const Type* type)
     {
         assert(objMap.find(symId)==objMap.end() && "this dummy obj has been created before");
-        MemObj* memObj = new MemObj(symId, type);
+        MemObj* memObj = new MemObj(symId, createObjTypeInfo(type));
         objMap[symId] = memObj;
         return memObj;
     }
     // @}
 
-    /// Handle constant expression
-    // @{
-    void handleGlobalCE(const GlobalVariable *G);
-    void handleGlobalInitializerCE(const Constant *C, u32_t offset);
-    void handleCE(const Value *val);
-    // @}
-
     /// Get different kinds of syms
     //@{
     SymID getValSym(const Value *val)
@@ -433,6 +417,9 @@ protected:
     /// Collect simple type (non-aggregate) info
     virtual void collectSimpleTypeInfo(const Type* T);
 
+    /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
+    ObjTypeInfo* createObjTypeInfo(const Type *type = nullptr);
+
     /// Every type T is mapped to StInfo
     /// which contains size (fsize) , offset(foffset)
     /// fsize[i] is the number of fields in the largest such struct, else fsize[i] = 1.
@@ -447,60 +434,6 @@ protected:
 };
 
 
-
-
-/*!
- * Bytes/bits-level modeling of memory locations to handle weakly type languages.
- * (declared with one type but accessed as another)
- * Abstract memory objects are created according to the static allocated size.
- */
-class LocSymTableInfo : public SymbolTableInfo
-{
-
-public:
-    /// Constructor
-    LocSymTableInfo()
-    {
-    }
-    /// Destructor
-    virtual ~LocSymTableInfo()
-    {
-    }
-    /// Compute gep offset
-    virtual bool computeGepOffset(const User *V, LocationSet& ls);
-    /// Given an offset from a Gep Instruction, return it modulus offset by considering memory layout
-    virtual LocationSet getModulusOffset(const MemObj* obj, const LocationSet& ls);
-
-    /// Verify struct size construction
-    void verifyStructSize(StInfo *stInfo, u32_t structSize);
-
-protected:
-    /// Collect the struct info
-    virtual void collectStructInfo(const StructType *T);
-    /// Collect the array info
-    virtual void collectArrayInfo(const ArrayType *T);
-};
-
-
-class LocObjTypeInfo : public ObjTypeInfo
-{
-
-public:
-    /// Constructor
-    LocObjTypeInfo(const Value* val, Type* t, Size_t max) : ObjTypeInfo(val,t,max)
-    {
-
-    }
-    /// Destructor
-    virtual ~LocObjTypeInfo()
-    {
-
-    }
-    /// Get the size of this object
-    u32_t getObjSize(const Value* val);
-
-};
-
 } // End namespace SVF
 
 #endif /* INCLUDE_SVF_FE_SYMBOLTABLEINFO_H_ */

package/include/Util/NodeIDAllocator.h

@@ -68,7 +68,7 @@ public:
     NodeID allocateValueId(void);
 
     /// Notify the allocator that all symbols have had IDs allocated.
-    void endSymbolAllocation(void);
+    NodeID endSymbolAllocation(void);
 
     /// Returns the total number of memory objects.
     NodeID getNumObjects(void) const { return numObjects; }

package/include/Util/SVFModule.h

@@ -31,6 +31,9 @@
 #define SVFMODULE_H_
 
 #include "Util/BasicTypes.h"
+#include "Util/ExtAPI.h"
+#include "Util/NodeIDAllocator.h"
+#include "Util/ThreadAPI.h"
 
 namespace SVF
 {
@@ -68,6 +71,19 @@ public:
     {
     }
 
+    ~SVFModule()
+    {
+      for (auto * f : FunctionSet)
+        delete f;
+
+      auto * extAPI = ExtAPI::getExtAPI();
+      delete extAPI;
+      extAPI = nullptr;
+      NodeIDAllocator::unset();
+      auto * threadAPI = SVF::ThreadAPI::getThreadAPI();
+      delete threadAPI;
+      threadAPI = nullptr;
+    }
 
     static inline void setPagFromTXT(std::string txt)
     {

package/include/WPA/Andersen.h

@@ -53,19 +53,14 @@ class AndersenBase:  public WPAConstraintSolver, public BVDataPTAImpl
 public:
 
     /// Constructor
-	AndersenBase(PAG* _pag, PTATY type = Andersen_BASE, bool alias_check = true)
+    AndersenBase(PAG* _pag, PTATY type = Andersen_BASE, bool alias_check = true)
         :  BVDataPTAImpl(_pag, type, alias_check), consCG(nullptr)
     {
         iterationForPrintStat = OnTheFlyIterBudgetForStat;
     }
 
     /// Destructor
-    virtual ~AndersenBase()
-    {
-        if (consCG != nullptr)
-            delete consCG;
-        consCG = nullptr;
-    }
+    ~AndersenBase() override;
 
     /// Andersen analysis
     virtual void analyze() override;

package/lib/Graphs/PAG.cpp

@@ -867,18 +867,11 @@ LocationSet PAG::getLocationSetFromBaseNode(NodeID nodeId)
  */
 void PAG::destroy()
 {
-    for (PAGEdge::PAGKindToEdgeSetMapTy::iterator I =
-                PAGEdgeKindToSetMap.begin(), E = PAGEdgeKindToSetMap.end(); I != E;
-            ++I)
-    {
-        for (PAGEdge::PAGEdgeSetTy::iterator edgeIt = I->second.begin(),
-                endEdgeIt = I->second.end(); edgeIt != endEdgeIt; ++edgeIt)
-        {
-            delete *edgeIt;
-        }
-    }
     SymbolTableInfo::releaseSymbolInfo();
     symInfo = nullptr;
+
+    delete icfg;
+    icfg = nullptr;
 }
 
 /*!