svf-lib 1.0.2643 → 1.0.2655

package/SVF-linux-aarch64/include/MTA/TCT.h

@@ -30,13 +30,14 @@
 #ifndef TCTNodeDetector_H_
 #define TCTNodeDetector_H_
 
+#include <vector>
+
 #include "MemoryModel/PointerAnalysis.h"
 #include "Graphs/SCC.h"
 #include "Graphs/ThreadCallGraph.h"
 #include "Util/CxtStmt.h"
+#include "Util/GeneralType.h"
 #include "Util/SVFUtil.h"
-#include <set>
-#include <vector>
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/MemoryModel/AbstractPointsToDS.h

@@ -53,8 +53,6 @@
 #ifndef ABSTRACT_POINTSTO_H_
 #define ABSTRACT_POINTSTO_H_
 
-#include "SVFIR/SVFType.h"
-
 namespace SVF
 {
 /// Basic points-to data structure

package/SVF-linux-aarch64/include/MemoryModel/AccessPath.h

@@ -33,13 +33,17 @@
 #ifndef AccessPath_H_
 #define AccessPath_H_
 
+#include <utility>
+#include <vector>
 
-#include "SVFIR/SVFValue.h"
-
+#include "Util/GeneralType.h"
+#include "Util/Hash.h"
 
 namespace SVF
 {
 
+class SVFStructType;
+class SVFType;
 class SVFVar;
 class ValVar;
 

package/SVF-linux-aarch64/include/MemoryModel/MutablePointsToDS.h

@@ -39,7 +39,6 @@
 #include<fstream>
 
 #include "MemoryModel/AbstractPointsToDS.h"
-#include "SVFIR/SVFType.h"
 #include "Util/SVFUtil.h"
 
 namespace SVF

package/SVF-linux-aarch64/include/MemoryModel/PersistentPointsToCache.h

@@ -19,7 +19,7 @@
 #include <vector>
 #include <functional>
 
-#include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/MemoryModel/PersistentPointsToDS.h

@@ -16,7 +16,6 @@
 
 #include "MemoryModel/AbstractPointsToDS.h"
 #include "MemoryModel/PersistentPointsToCache.h"
-#include "MemoryModel/PointsTo.h"
 #include "Util/SVFUtil.h"
 
 namespace SVF

package/SVF-linux-aarch64/include/MemoryModel/PointerAnalysis.h

@@ -34,13 +34,8 @@
 #include <signal.h>
 
 #include "Graphs/CHG.h"
-#include "Graphs/ThreadCallGraph.h"
+#include "Graphs/CallGraph.h"
 #include "Graphs/SCC.h"
-#include "MemoryModel/AbstractPointsToDS.h"
-#include "MemoryModel/ConditionalPT.h"
-#include "MemoryModel/MutablePointsToDS.h"
-#include "MemoryModel/PersistentPointsToDS.h"
-#include "MemoryModel/PointsTo.h"
 #include "MemoryModel/PTATY.h"
 #include "SVFIR/SVFIR.h"
 
@@ -48,9 +43,9 @@ namespace SVF
 {
 
 class CommonCHGraph;
-
 class ICFG;
 class PTAStat;
+
 /*
  * Pointer Analysis Base Class
  */

package/SVF-linux-aarch64/include/MemoryModel/PointerAnalysisImpl.h

@@ -30,9 +30,13 @@
 #ifndef INCLUDE_MEMORYMODEL_POINTERANALYSISIMPL_H_
 #define INCLUDE_MEMORYMODEL_POINTERANALYSISIMPL_H_
 
-#include <Graphs/ConsG.h>
+#include "Graphs/ConsG.h"
 #include "MemoryModel/PTATY.h"
 #include "MemoryModel/PointerAnalysis.h"
+#include "MemoryModel/AbstractPointsToDS.h"
+#include "MemoryModel/MutablePointsToDS.h"
+#include "MemoryModel/PersistentPointsToDS.h"
+#include "MemoryModel/ConditionalPT.h"
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/MemoryModel/PointsTo.h

@@ -12,9 +12,10 @@
 #ifndef POINTSTO_H_
 #define POINTSTO_H_
 
+#include <memory>
 #include <vector>
 
-#include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 #include "Util/BitVector.h"
 #include "Util/CoreBitVector.h"
 #include "Util/SparseBitVector.h"

package/SVF-linux-aarch64/include/MemoryModel/SVFLoop.h

@@ -30,11 +30,14 @@
 #ifndef SVF_SVFLOOP_H
 #define SVF_SVFLOOP_H
 
-#include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
+class ICFGEdge;
+class ICFGNode;
+
 class SVFLoop
 {
 

package/SVF-linux-aarch64/include/SABER/ProgSlice.h

@@ -40,7 +40,6 @@
 #include "SABER/SaberCondAllocator.h"
 #include "Util/WorkList.h"
 #include "Graphs/SVFG.h"
-#include "Util/DPItem.h"
 #include "Util/SVFBugReport.h"
 
 namespace SVF

package/SVF-linux-aarch64/include/SABER/SaberCheckerAPI.h

@@ -30,9 +30,8 @@
 #ifndef SABERCHECKERAPI_H_
 #define SABERCHECKERAPI_H_
 
-#include "Util/SVFUtil.h"
 #include "Graphs/ICFGNode.h"
-#include "SVFIR/SVFVariables.h" // add header
+#include "SVFIR/SVFVariables.h"
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/SABER/SaberSVFGBuilder.h

@@ -30,15 +30,19 @@
 #ifndef SABERSVFGBUILDER_H_
 #define SABERSVFGBUILDER_H_
 
+#include "Graphs/SVFG.h"
 #include "MSSA/SVFGBuilder.h"
-#include "SVFIR/SVFValue.h"
+#include "Util/GeneralType.h"
 #include "Util/WorkList.h"
 
 
 namespace SVF
 {
 
+class BVDataPTAImpl;
+class CallICFGNode;
 class SaberCondAllocator;
+class ValVar;
 
 class SaberSVFGBuilder : public SVFGBuilder
 {

package/SVF-linux-aarch64/include/SABER/SrcSnkDDA.h

@@ -37,7 +37,7 @@
 #ifndef SRCSNKANALYSIS_H_
 #define SRCSNKANALYSIS_H_
 
-#include "Graphs/SVFGOPT.h"
+#include "Graphs/SVFG.h"
 #include "SABER/ProgSlice.h"
 #include "SABER/SaberSVFGBuilder.h"
 #include "Util/GraphReachSolver.h"

package/SVF-linux-aarch64/include/SVF-LLVM/LLVMLoopAnalysis.h

@@ -31,7 +31,6 @@
 #define SVF_LLVMLOOPANALYSIS_H
 
 #include "SVFIR/SVFIR.h"
-#include "MemoryModel/SVFLoop.h"
 #include "SVF-LLVM/BasicTypes.h"
 
 namespace SVF

package/SVF-linux-aarch64/include/SVF-LLVM/LLVMUtil.h

@@ -38,6 +38,8 @@
 namespace SVF
 {
 
+class SVFBasicBlock;
+
 namespace LLVMUtil
 {
 

package/SVF-linux-aarch64/include/SVFIR/ObjTypeInfo.h

@@ -30,12 +30,13 @@
 #ifndef INCLUDE_SVFIR_OBJTYPEINFO_H_
 #define INCLUDE_SVFIR_OBJTYPEINFO_H_
 
+#include "Util/GeneralType.h"
 
-#include "Util/SVFUtil.h"
-#include "MemoryModel/AccessPath.h"
 namespace SVF
 {
 
+class SVFType;
+
 /*!
  * Type Info of an abstract memory object
  */

package/SVF-linux-aarch64/include/SVFIR/PAGBuilderFromFile.h

@@ -31,6 +31,7 @@
 #define INCLUDE_SVFIR_PAGBUILDERFROMFILE_H_
 
 #include "SVFIR/SVFIR.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/SVFIR/SVFIR.h

@@ -30,7 +30,10 @@
 #ifndef INCLUDE_SVFIR_H_
 #define INCLUDE_SVFIR_H_
 
+#include "Graphs/ICFG.h"
 #include "Graphs/IRGraph.h"
+#include "Util/GeneralType.h"
+#include "Util/SVFUtil.h"
 
 namespace SVF
 {
@@ -44,7 +47,6 @@ class SVFIR : public IRGraph
     friend class SVFIRBuilder;
     friend class ExternalPAG;
     friend class PAGBuilderFromFile;
-    friend class TypeBasedHeapCloning;
     friend class BVDataPTAImpl;
     friend class GraphDBClient;
     friend class GraphDBSVFIRBuilder;

package/SVF-linux-aarch64/include/SVFIR/SVFStatements.h

@@ -33,6 +33,7 @@
 
 #include "Graphs/GenericGraph.h"
 #include "MemoryModel/AccessPath.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/SVFIR/SVFType.h

@@ -30,10 +30,8 @@
 #ifndef INCLUDE_SVFIR_SVFTYPE_H_
 #define INCLUDE_SVFIR_SVFTYPE_H_
 
-#include "Util/SparseBitVector.h"
 #include "Util/GeneralType.h"
 
-
 namespace SVF
 {
 class SVFType;
@@ -557,21 +555,6 @@ public:
     void print(std::ostream& os) const override;
 };
 
-// TODO: be explicit that this is a pair of 32-bit unsigneds?
-template <> struct Hash<NodePair>
-{
-    size_t operator()(const NodePair& p) const
-    {
-        // Make sure our assumptions are sound: use u32_t
-        // 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.
-        uint32_t first = (uint32_t)(p.first);
-        uint32_t second = (uint32_t)(p.second);
-        return ((uint64_t)(first) << 32) | (uint64_t)(second);
-    }
-};
-
 #if !defined NDBUG && defined USE_SVF_DBOUT
 // TODO: This comes from the following link
 // https://github.com/llvm/llvm-project/blob/75e33f71c2dae584b13a7d1186ae0a038ba98838/llvm/include/llvm/Support/Debug.h#L64
@@ -642,46 +625,4 @@ enum AliasResult
 
 } // End namespace SVF
 
-template <> struct std::hash<SVF::NodePair>
-{
-    size_t operator()(const SVF::NodePair& p) const
-    {
-        // Make sure our assumptions are sound: use u32_t
-        // 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.
-        uint32_t first = (uint32_t)(p.first);
-        uint32_t second = (uint32_t)(p.second);
-        return ((uint64_t)(first) << 32) | (uint64_t)(second);
-    }
-};
-
-/// Specialise hash for SparseBitVectors.
-template <unsigned N> struct std::hash<SVF::SparseBitVector<N>>
-{
-    size_t operator()(const SVF::SparseBitVector<N>& sbv) const
-    {
-        SVF::Hash<std::pair<std::pair<size_t, size_t>, size_t>> h;
-        return h(std::make_pair(std::make_pair(sbv.count(), sbv.find_first()),
-                                sbv.find_last()));
-    }
-};
-
-template <typename T> struct std::hash<std::vector<T>>
-{
-    size_t operator()(const std::vector<T>& v) const
-    {
-        // TODO: repetition with CBV.
-        size_t h = v.size();
-
-        SVF::Hash<T> hf;
-        for (const T& t : v)
-        {
-            h ^= hf(t) + 0x9e3779b9 + (h << 6) + (h >> 2);
-        }
-
-        return h;
-    }
-};
-
 #endif /* INCLUDE_SVFIR_SVFTYPE_H_ */

package/SVF-linux-aarch64/include/SVFIR/SVFValue.h

@@ -32,13 +32,12 @@
 #ifndef INCLUDE_SVFIR_SVFVALUE_H_
 #define INCLUDE_SVFIR_SVFVALUE_H_
 
-#include "SVFIR/SVFType.h"
-#include "Graphs/GraphPrinter.h"
-
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
 
+class SVFType;
 
 class SVFValue
 {

package/SVF-linux-aarch64/include/SVFIR/SVFVariables.h

@@ -32,14 +32,20 @@
 #ifndef INCLUDE_SVFIR_SVFVARIABLE_H_
 #define INCLUDE_SVFIR_SVFVARIABLE_H_
 
+#include "Graphs/BasicBlockG.h"
 #include "Graphs/GenericGraph.h"
 #include "SVFIR/ObjTypeInfo.h"
 #include "SVFIR/SVFStatements.h"
+#include "Util/GeneralType.h"
+#include "Util/SVFLoopAndDomInfo.h"
+#include "Util/SVFUtil.h"
 
 namespace SVF
 {
 
+class FunObjVar;
 class SVFVar;
+
 /*
  * Program variables in SVFIR (based on PAG nodes)
  * These represent variables in the program analysis graph
@@ -2322,4 +2328,4 @@ public:
 
 } // End namespace SVF
 
-#endif /* INCLUDE_SVFIR_SVFVARIABLE_H_ */
+#endif /* INCLUDE_SVFIR_SVFVARIABLE_H_ */

package/SVF-linux-aarch64/include/Util/CDGBuilder.h

@@ -30,11 +30,17 @@
 #define SVF_CDGBUILDER_H
 
 #include "Graphs/CDG.h"
-#include "SVFIR/SVFValue.h"
+#include "Util/GeneralType.h"
 
 // control dependence builder
 namespace SVF
 {
+
+class FunObjVar;
+class ICFGNode;
+class SVFBasicBlock;
+class SVFLoopAndDomInfo;
+
 class CDGBuilder
 {
 public:
@@ -104,4 +110,4 @@ private:
 }
 
 
-#endif //SVF_CDGBUILDER_H
+#endif //SVF_CDGBUILDER_H

package/SVF-linux-aarch64/include/Util/CallGraphBuilder.h

@@ -31,8 +31,6 @@
 #ifndef INCLUDE_SVF_FE_CALLGRAPHBUILDER_H_
 #define INCLUDE_SVF_FE_CALLGRAPHBUILDER_H_
 
-#include "Graphs/ThreadCallGraph.h"
-
 namespace SVF
 {
 

package/SVF-linux-aarch64/include/Util/CoreBitVector.h

@@ -15,7 +15,7 @@
 #include <assert.h>
 #include <vector>
 
-#include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-aarch64/include/Util/CxtStmt.h

@@ -30,8 +30,6 @@
 #ifndef INCLUDE_UTIL_CXTSTMT_H_
 #define INCLUDE_UTIL_CXTSTMT_H_
 
-#include "SVFIR/SVFValue.h"
-
 namespace SVF
 {
 

package/SVF-linux-aarch64/include/Util/DPItem.h

@@ -31,6 +31,7 @@
 #define DPITEM_H_
 
 #include "MemoryModel/ConditionalPT.h"
+#include "Util/GeneralType.h"
 #include <algorithm>    // std::sort
 
 namespace SVF
@@ -615,4 +616,4 @@ struct std::hash<SVF::ContextCond>
         return h(cc.getContexts());
     }
 };
-#endif /* DPITEM_H_ */
+#endif /* DPITEM_H_ */

package/SVF-linux-aarch64/include/Util/ExtAPI.h

@@ -30,11 +30,10 @@
 #ifndef __ExtAPI_H
 #define __ExtAPI_H
 
-#include "SVFIR/SVFValue.h"
-#include <Util/config.h>
+#include "Util/GeneralType.h"
+
 #include <string>
 #include <vector>
-#include <map>
 
 /// For a more detailed explanation of how External APIs are handled in SVF, please refer to the SVF Wiki: https://github.com/SVF-tools/SVF/wiki/Handling-External-APIs-with-extapi.c
 
@@ -115,4 +114,4 @@ private:
 };
 } // End namespace SVF
 
-#endif
+#endif

package/SVF-linux-aarch64/include/Util/GeneralType.h

@@ -38,57 +38,12 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-#include <memory>
+
+#include "Util/Hash.h"
 #include "Util/SparseBitVector.h"
 
 namespace SVF
 {
-typedef std::ostream OutStream;
-typedef unsigned u32_t;
-typedef signed s32_t;
-typedef unsigned long long u64_t;
-typedef signed long long s64_t;
-typedef unsigned char u8_t;
-typedef signed char s8_t;
-typedef unsigned short u16_t;
-typedef signed short s16_t;
-
-typedef u32_t NodeID;
-typedef u32_t EdgeID;
-typedef unsigned CallSiteID;
-typedef unsigned ThreadID;
-typedef s64_t APOffset;
-
-typedef SparseBitVector<> NodeBS;
-typedef unsigned PointsToID;
-
-/// provide extra hash function for std::pair handling
-template <class T> struct Hash;
-
-template <class S, class T> struct Hash<std::pair<S, T>>
-{
-    // Pairing function from: http://szudzik.com/ElegantPairing.pdf
-    static size_t szudzik(size_t a, size_t b)
-    {
-        return a > b ? b * b + a : a * a + a + b;
-    }
-
-    size_t operator()(const std::pair<S, T>& t) const
-    {
-        Hash<decltype(t.first)> first;
-        Hash<decltype(t.second)> second;
-        return szudzik(first(t.first), second(t.second));
-    }
-};
-
-template <class T> struct Hash
-{
-    size_t operator()(const T& t) const
-    {
-        std::hash<T> h;
-        return h(t);
-    }
-};
 
 template <typename Key, typename Hash = Hash<Key>,
           typename KeyEqual = std::equal_to<Key>,
@@ -108,6 +63,25 @@ template <typename Key, typename Value, typename Hash = Hash<Key>,
                     typename Allocator = std::allocator<std::pair<const Key, Value>>>
                             using OrderedMap = std::map<Key, Value, Compare, Allocator>;
 
+                    typedef std::ostream OutStream;
+                    typedef unsigned u32_t;
+                    typedef signed s32_t;
+                    typedef unsigned long long u64_t;
+                    typedef signed long long s64_t;
+                    typedef unsigned char u8_t;
+                    typedef signed char s8_t;
+                    typedef unsigned short u16_t;
+                    typedef signed short s16_t;
+
+                    typedef u32_t NodeID;
+                    typedef u32_t EdgeID;
+                    typedef unsigned CallSiteID;
+                    typedef unsigned ThreadID;
+                    typedef s64_t APOffset;
+
+                    typedef SparseBitVector<> NodeBS;
+                    typedef unsigned PointsToID;
+
                     typedef std::pair<NodeID, NodeID> NodePair;
                     typedef OrderedSet<NodeID> OrderedNodeSet;
                     typedef Set<NodeID> NodeSet;
@@ -124,4 +98,34 @@ template <typename Key, typename Value, typename Hash = Hash<Key>,
                     typedef Set<Version> VersionSet;
                     typedef std::pair<NodeID, Version> VersionedVar;
                     typedef Set<VersionedVar> VersionedVarSet;
-}
+
+// TODO: be explicit that this is a pair of 32-bit unsigneds?
+                    template <> struct Hash<NodePair>
+{
+    size_t operator()(const NodePair& p) const
+    {
+        // Make sure our assumptions are sound: use u32_t
+        // 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.
+        uint32_t first = (uint32_t)(p.first);
+        uint32_t second = (uint32_t)(p.second);
+        return ((uint64_t)(first) << 32) | (uint64_t)(second);
+    }
+};
+
+}  // namespace SVF
+
+template <> struct std::hash<SVF::NodePair>
+{
+    size_t operator()(const SVF::NodePair& p) const
+    {
+        // Make sure our assumptions are sound: use u32_t
+        // 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.
+        uint32_t first = (uint32_t)(p.first);
+        uint32_t second = (uint32_t)(p.second);
+        return ((uint64_t)(first) << 32) | (uint64_t)(second);
+    }
+};

package/SVF-linux-aarch64/include/Util/Hash.h

@@ -0,0 +1,56 @@
+#ifndef Hash_H
+#define Hash_H
+
+#include <vector>
+
+namespace SVF
+{
+
+/// provide extra hash function for std::pair handling
+template <class T> struct Hash;
+
+template <class S, class T> struct Hash<std::pair<S, T>>
+{
+    // Pairing function from: http://szudzik.com/ElegantPairing.pdf
+    static size_t szudzik(size_t a, size_t b)
+    {
+        return a > b ? b * b + a : a * a + a + b;
+    }
+
+    size_t operator()(const std::pair<S, T>& t) const
+    {
+        Hash<decltype(t.first)> first;
+        Hash<decltype(t.second)> second;
+        return szudzik(first(t.first), second(t.second));
+    }
+};
+
+template <class T> struct Hash
+{
+    size_t operator()(const T& t) const
+    {
+        std::hash<T> h;
+        return h(t);
+    }
+};
+
+}  // namespace SVF
+
+template <typename T> struct std::hash<std::vector<T>>
+{
+    size_t operator()(const std::vector<T>& v) const
+    {
+        // TODO: repetition with CBV.
+        size_t h = v.size();
+
+        SVF::Hash<T> hf;
+        for (const T& t : v)
+        {
+            h ^= hf(t) + 0x9e3779b9 + (h << 6) + (h >> 2);
+        }
+
+        return h;
+    }
+};
+
+#endif // Hash_H

package/SVF-linux-aarch64/include/Util/NodeIDAllocator.h

@@ -4,8 +4,8 @@
 #define NODEIDALLOCATOR_H_
 
 #include "FastCluster/fastcluster.h"
-#include "SVFIR/SVFType.h"
 #include "MemoryModel/PointsTo.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {