svf-tools 1.0.309 → 1.0.313

package/include/MemoryModel/MemModel.h

@@ -172,18 +172,12 @@ public:
     {
 
     }
-    /// Initialize the object type
-    void init(const Value* value);
 
-    /// Get the size of this object,
-    /// derived classes can override this to get more precise object size
-    virtual u32_t getObjSize(const Value* val);
-
-    /// Analyse types of gobal and stack objects
-    void analyzeGlobalStackObjType(const Value* val);
+    /// Analyse types of heap and static objects
+    void analyzeHeapObjType(const Type* type);
 
     /// Analyse types of heap and static objects
-    void analyzeHeapStaticObjType(const Value* val);
+    void analyzeStaticObjType(const Type* type);
 
     /// Get LLVM type
     inline const Type* getType() const
@@ -295,25 +289,15 @@ private:
 public:
 
     /// Constructor
-    MemObj(const Value *val, SymID id);
-
-    /// Constructor for black hole and constant obj
-    MemObj(SymID id, const Type* type = nullptr);
+    MemObj(SymID id, ObjTypeInfo* ti, const Value *val = nullptr);
 
     /// Destructor
     ~MemObj()
     {
         destroy();
     }
-
-    /// Initialize the object
-    void init(const Value *val);
-
-    /// Initialize black hole and constant object
-    void init(const Type* type);
-
     /// Get obj type
-    const llvm::Type* getType() const;
+    const Type* getType() const;
 
     /// Get max field offset limit
     inline Size_t getMaxFieldOffsetLimit() const

package/include/MemoryModel/PersistentPointsToCache.h

@@ -45,21 +45,27 @@ public:
         initStats();
     }
 
+    /// Clear the cache.
+    void clear()
+    {
+      for (const Data *d : idToPts) delete d;
+      idToPts.clear();
+      ptsToId.clear();
+
+      unionCache.clear();
+      complementCache.clear();
+      intersectionCache.clear();
+    }
+
     /// Resets the cache removing everything except the emptyData it was initialised with.
     void reset(void)
     {
-        for (const Data *d : idToPts) delete d;
-        idToPts.clear();
-        ptsToId.clear();
+        clear();
 
         // Put the empty data back in.
         ptsToId[Data()] = emptyPointsToId();
         idToPts.push_back(new Data());
 
-        unionCache.clear();
-        complementCache.clear();
-        intersectionCache.clear();
-
         idCounter = 1;
         // Cache is empty...
         initStats();

package/include/MemoryModel/PointerAnalysisImpl.h

@@ -91,6 +91,7 @@ public:
     {
         delete ptD;
         ptD = nullptr;
+        ptCache.clear();
     }
 
     /// Get points-to and reverse points-to

package/include/SVF-FE/CHG.h

@@ -193,7 +193,7 @@ public:
     {
         this->kind = Standard;
     }
-    ~CHGraph();
+    ~CHGraph() override = default;
 
     void buildCHG();
     void buildInternalMaps();

package/include/SVF-FE/SymbolTableInfo.h

@@ -206,7 +206,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,7 +242,7 @@ 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;
     }
@@ -433,6 +433,18 @@ protected:
     /// Collect simple type (non-aggregate) info
     virtual void collectSimpleTypeInfo(const Type* T);
 
+    /// Create an objectInfo based on LLVM value
+    ObjTypeInfo* createObjTypeInfo(const Value *val);
+    /// 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);
+
+    /// Initialize TypeInfo based on LLVM Value
+    void initTypeInfo(ObjTypeInfo* typeinfo, const Value* value);
+    /// Analyse types of all flattened fields of this object
+    void analyzeGlobalStackObjType(ObjTypeInfo* typeinfo, const Value* val);
+    /// Return size of this object based on LLVM value
+    u32_t getObjSize(const Value* val);
+
     /// 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 +459,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/SVFBasicTypes.h

@@ -138,7 +138,9 @@ template <> struct Hash<NodePair>
         // and u64_t. If NodeID is not actually u32_t or size_t
         // is not u64_t we should be fine since we get a
         // consistent result.
-        return ((uint64_t)(p.first) << 32) | (uint64_t)(p.second);
+        uint32_t first = (uint32_t)(p.first);
+        uint32_t second = (uint32_t)(p.second);
+        return ((uint64_t)(first) << 32) | (uint64_t)(second);
     }
 };
 
@@ -266,7 +268,7 @@ template <> struct std::hash<SVF::NodePair> {
         // consistent result.
         uint32_t first = (uint32_t)(p.first);
         uint32_t second = (uint32_t)(p.second);
-        return ((uint64_t)(p.first) << 32) | (uint64_t)(p.second);
+        return ((uint64_t)(first) << 32) | (uint64_t)(second);
     }
 };
 

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;
 }
 
 /*!