svf-lib 1.0.718 → 1.0.722

package/SVF-linux/include/Graphs/GenericGraph.h

@@ -157,7 +157,8 @@ public:
     /// Destructor
     virtual ~GenericNode()
     {
-
+      for (auto * edge : OutEdges)
+        delete edge;
     }
 
     /// Get ID
@@ -352,13 +353,8 @@ public:
     /// Release memory
     void destroy()
     {
-        for (iterator I = IDToNodeMap.begin(), E = IDToNodeMap.end(); I != E; ++I){
-            // NodeType* node = I->second;
-            // for(typename NodeType::iterator it = node->InEdgeBegin(), eit = node->InEdgeEnd(); it!=eit; ++it)
-            //         delete *it;
-        }
-        for (iterator I = IDToNodeMap.begin(), E = IDToNodeMap.end(); I != E; ++I)
-            delete I->second;
+        for (auto &entry : IDToNodeMap)
+          delete entry.second;
     }
     /// Iterators
     //@{
@@ -411,6 +407,7 @@ public:
         iterator it = IDToNodeMap.find(node->getId());
         assert(it != IDToNodeMap.end() && "can not find the node");
         IDToNodeMap.erase(it);
+        delete node;
     }
 
     /// Get total number of node/edge

package/SVF-linux/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/SVF-linux/include/MemoryModel/PointerAnalysisImpl.h

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

package/SVF-linux/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/SVF-linux/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/SVF-osx/include/Graphs/GenericGraph.h

@@ -157,7 +157,8 @@ public:
     /// Destructor
     virtual ~GenericNode()
     {
-
+      for (auto * edge : OutEdges)
+        delete edge;
     }
 
     /// Get ID
@@ -352,13 +353,8 @@ public:
     /// Release memory
     void destroy()
     {
-        for (iterator I = IDToNodeMap.begin(), E = IDToNodeMap.end(); I != E; ++I){
-            // NodeType* node = I->second;
-            // for(typename NodeType::iterator it = node->InEdgeBegin(), eit = node->InEdgeEnd(); it!=eit; ++it)
-            //         delete *it;
-        }
-        for (iterator I = IDToNodeMap.begin(), E = IDToNodeMap.end(); I != E; ++I)
-            delete I->second;
+        for (auto &entry : IDToNodeMap)
+          delete entry.second;
     }
     /// Iterators
     //@{
@@ -411,6 +407,7 @@ public:
         iterator it = IDToNodeMap.find(node->getId());
         assert(it != IDToNodeMap.end() && "can not find the node");
         IDToNodeMap.erase(it);
+        delete node;
     }
 
     /// Get total number of node/edge

package/SVF-osx/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/SVF-osx/include/MemoryModel/PointerAnalysisImpl.h

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

package/SVF-osx/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/SVF-osx/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.718",
+  "version": "1.0.722",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {