svf-lib 1.0.2643 → 1.0.2655

package/SVF-linux-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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-x86_64/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
 {

package/SVF-linux-x86_64/include/Util/Options.h

@@ -3,7 +3,6 @@
 #ifndef OPTIONS_H_
 #define OPTIONS_H_
 
-#include <sstream>
 #include "Util/CommandLine.h"
 #include "Util/SVFStat.h"
 #include "MemoryModel/PTATY.h"

package/SVF-linux-x86_64/include/Util/PTAStat.h

@@ -30,13 +30,12 @@
 #ifndef ANDERSENSTAT_H_
 #define ANDERSENSTAT_H_
 
-#include "SVFIR/SVFValue.h"
-#include "MemoryModel/PointsTo.h"
-#include "Util/SVFStat.h"
 #include <iostream>
-#include <map>
 #include <string>
 
+#include "Util/SVFStat.h"
+#include "Util/GeneralType.h"
+
 namespace SVF
 {
 

package/SVF-linux-x86_64/include/Util/SVFBugReport.h

@@ -27,15 +27,11 @@
 #ifndef SVF_BUGRECODER_H
 #define SVF_BUGRECODER_H
 
-#include <vector>
-#include "SVFIR/SVFValue.h"
-#include "SVFIR/SVFVariables.h"
-#include "SVFIR/SVFStatements.h"
-#include "Graphs/ICFGNode.h"
 #include <string>
-#include <map>
+#include <vector>
+
 #include "Util/cJSON.h"
-#include <set>
+#include "Util/GeneralType.h"
 
 #define BRANCHFLAGMASK 0x00000010
 #define EVENTTYPEMASK 0x0000000f
@@ -43,6 +39,8 @@
 namespace SVF
 {
 
+class ICFGNode;
+
 /*!
  * Bug Detector Recoder
  */
@@ -84,7 +82,7 @@ public:
 
 public:
     enum BugType {FULLBUFOVERFLOW, PARTIALBUFOVERFLOW, NEVERFREE, PARTIALLEAK, DOUBLEFREE, FILENEVERCLOSE, FILEPARTIALCLOSE, FULLNULLPTRDEREFERENCE, PARTIALNULLPTRDEREFERENCE};
-    static const std::map<GenericBug::BugType, std::string> BugType2Str;
+    static const OrderedMap<GenericBug::BugType, std::string> BugType2Str;
 
 protected:
     BugType bugType;
@@ -424,4 +422,4 @@ public:
 };
 }
 
-#endif
+#endif

package/SVF-linux-x86_64/include/Util/SVFLoopAndDomInfo.h

@@ -31,13 +31,16 @@
 #ifndef SVFLOOPANDDOMINFO_H
 #define SVFLOOPANDDOMINFO_H
 
-#include "SVFIR/SVFType.h"
-#include "Graphs/GraphPrinter.h"
-#include "Util/Casting.h"
-#include "Graphs/BasicBlockG.h"
+#include <algorithm>
+#include <vector>
+
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
+
+class SVFBasicBlock;
+
 class SVFLoopAndDomInfo
 {
 

package/SVF-linux-x86_64/include/Util/SVFStat.h

@@ -31,6 +31,7 @@
 #define SVF_SVFSTAT_H
 
 #include "MemoryModel/PointsTo.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/include/Util/SVFUtil.h

@@ -30,12 +30,12 @@
 #ifndef AnalysisUtil_H_
 #define AnalysisUtil_H_
 
-#include "FastCluster/fastcluster.h"
-#include "SVFIR/SVFValue.h"
-#include "Util/SVFLoopAndDomInfo.h"
-#include "Util/ExtAPI.h"
-#include "MemoryModel/PointsTo.h"
 #include <time.h>
+
+#include "MemoryModel/PointsTo.h"
+#include "Util/Casting.h"
+#include "Util/ExtAPI.h"
+#include "Util/GeneralType.h"
 #include "Util/NodeIDAllocator.h"
 #include "Util/ThreadAPI.h"
 

package/SVF-linux-x86_64/include/Util/SparseBitVector.h

@@ -16,6 +16,8 @@
 #include <iterator>
 #include <list>
 
+#include "Util/Hash.h"
+
 // Appease GCC?
 #ifdef __has_builtin
 #  define HAS_CLZ __has_builtin(__builtin_clz)
@@ -1249,4 +1251,15 @@ void dump(const SparseBitVector<ElementSize> &LHS, std::ostream &out)
 
 } // End namespace SVF
 
+/// 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()));
+    }
+};
+
 #endif // SPARSEBITVECTOR_H

package/SVF-linux-x86_64/include/Util/ThreadAPI.h

@@ -30,7 +30,7 @@
 #ifndef THREADAPI_H_
 #define THREADAPI_H_
 
-#include "SVFIR/SVFValue.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/include/Util/WorkList.h

@@ -36,8 +36,6 @@
 #ifndef WORKLIST_H_
 #define WORKLIST_H_
 
-#include "SVFIR/SVFValue.h"
-
 #include <assert.h>
 #include <cstdlib>
 #include <vector>
@@ -45,6 +43,8 @@
 #include <list>
 #include <set>
 
+#include "Util/GeneralType.h"
+
 namespace SVF
 {
 

package/SVF-linux-x86_64/include/Util/Z3Expr.h

@@ -30,7 +30,7 @@
 #define Z3_EXAMPLE_Z3EXPR_H
 
 #include "z3++.h"
-#include "SVFIR/SVFType.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {

package/SVF-linux-x86_64/include/WPA/Andersen.h

@@ -37,17 +37,17 @@
 
 #include "MemoryModel/PTATY.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
-#include "WPA/WPAStat.h"
+#include "MemoryModel/PointsTo.h"
 #include "WPA/WPASolver.h"
-#include "SVFIR/SVFIR.h"
 #include "Graphs/ConsG.h"
+#include "Util/GeneralType.h"
 #include "Util/Options.h"
 
 namespace SVF
 {
 
-
 class ThreadCallGraph;
+class SVFIR;
 
 /*!
  * Abstract class of inclusion-based Pointer Analysis

package/SVF-linux-x86_64/include/WPA/AndersenPWC.h

@@ -34,11 +34,12 @@
 #include "WPA/Andersen.h"
 #include "WPA/CSC.h"
 #include "MemoryModel/PTATY.h"
-#include "MemoryModel/PointsTo.h"
 
 namespace SVF
 {
 
+class PointsTo;
+
 /*!
  * Selective Cycle Detection Based Andersen Analysis
  */

package/SVF-linux-x86_64/include/WPA/CSC.h

@@ -30,17 +30,17 @@
 #ifndef PROJECT_CSC_H
 #define PROJECT_CSC_H
 
-#include "Graphs/ConsG.h"
+#include <limits.h>
+
 #include "Graphs/SCC.h"
-#include "SVFIR/SVFValue.h" // for NodeBS
+#include "Util/GeneralType.h"
 #include "Util/WorkList.h"
-#include <limits.h>
-#include <map>
-#include <stack>
 
 namespace SVF
 {
 
+class ConstraintGraph;
+
 typedef SCCDetection<ConstraintGraph *> CGSCC;
 
 /*!

package/SVF-linux-x86_64/include/WPA/FlowSensitive.h

@@ -30,8 +30,7 @@
 #ifndef FLOWSENSITIVEANALYSIS_H_
 #define FLOWSENSITIVEANALYSIS_H_
 
-#include "FastCluster/fastcluster.h"
-#include "Graphs/SVFGOPT.h"
+#include "Graphs/SVFG.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "MSSA/SVFGBuilder.h"
 #include "WPA/WPAFSSolver.h"

package/SVF-linux-x86_64/include/WPA/Steensgaard.h

@@ -9,9 +9,14 @@
 #define INCLUDE_WPA_STEENSGAARD_H_
 
 #include "WPA/Andersen.h"
+#include "Util/GeneralType.h"
 
 namespace SVF
 {
+
+class ConstraintGraph;
+class SVFIR;
+
 /*!
  * Equivalence-based Pointer Analysis
  */