svf-lib 1.0.1491 → 1.0.1493

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

@@ -92,44 +92,43 @@ template <class T> struct Hash
 
 template <typename Key, typename Hash = Hash<Key>,
           typename KeyEqual = std::equal_to<Key>,
-          typename Allocator = std::allocator<Key>>
+          typename Allocator = std::allocator<Key> >
 using Set = std::unordered_set<Key, Hash, KeyEqual, Allocator>;
 
 template <typename Key, typename Value, typename Hash = Hash<Key>,
           typename KeyEqual = std::equal_to<Key>,
-          typename Allocator = std::allocator<std::pair<const Key, Value>>>
-                  using Map = std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>;
-
-          template <typename Key, typename Compare = std::less<Key>,
-                    typename Allocator = std::allocator<Key>>
-          using OrderedSet = std::set<Key, Compare, Allocator>;
-
-          template <typename Key, typename Value, typename Compare = std::less<Key>,
-                    typename Allocator = std::allocator<std::pair<const Key, Value>>>
-                            using OrderedMap = std::map<Key, Value, Compare, Allocator>;
-
-                    typedef std::pair<NodeID, NodeID> NodePair;
-                    typedef OrderedSet<NodeID> OrderedNodeSet;
-                    typedef Set<NodeID> NodeSet;
-                    typedef Set<NodePair> NodePairSet;
-                    typedef Map<NodePair, NodeID> NodePairMap;
-                    typedef std::vector<NodeID> NodeVector;
-                    typedef std::vector<EdgeID> EdgeVector;
-                    typedef std::stack<NodeID> NodeStack;
-                    typedef std::list<NodeID> NodeList;
-                    typedef std::deque<NodeID> NodeDeque;
-                    typedef NodeSet EdgeSet;
-                    typedef std::vector<u32_t> CallStrCxt;
-                    typedef unsigned Version;
-                    typedef Set<Version> VersionSet;
-                    typedef std::pair<NodeID, Version> VersionedVar;
-                    typedef Set<VersionedVar> VersionedVarSet;
-
-                    /*!
-                     * Flatterned type information of StructType, ArrayType and
-                     * SingleValueType
-                     */
-                    class StInfo
+          typename Allocator = std::allocator<std::pair<const Key, Value> > >
+using Map = std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>;
+
+template <typename Key, typename Compare = std::less<Key>,
+          typename Allocator = std::allocator<Key> >
+using OrderedSet = std::set<Key, Compare, Allocator>;
+
+template <typename Key, typename Value, typename Compare = std::less<Key>,
+          typename Allocator = std::allocator<std::pair<const Key, Value> > >
+using OrderedMap = std::map<Key, Value, Compare, Allocator>;
+
+typedef std::pair<NodeID, NodeID> NodePair;
+typedef OrderedSet<NodeID> OrderedNodeSet;
+typedef Set<NodeID> NodeSet;
+typedef Set<NodePair> NodePairSet;
+typedef Map<NodePair, NodeID> NodePairMap;
+typedef std::vector<NodeID> NodeVector;
+typedef std::vector<EdgeID> EdgeVector;
+typedef std::stack<NodeID> NodeStack;
+typedef std::list<NodeID> NodeList;
+typedef std::deque<NodeID> NodeDeque;
+typedef NodeSet EdgeSet;
+typedef std::vector<u32_t> CallStrCxt;
+typedef unsigned Version;
+typedef Set<Version> VersionSet;
+typedef std::pair<NodeID, Version> VersionedVar;
+typedef Set<VersionedVar> VersionedVarSet;
+
+/*!
+ * Flattened type information of StructType, ArrayType and SingleValueType
+ */
+class StInfo
 {
     friend class SVFModuleWrite;
     friend class SVFModuleRead;

package/SVF-linux/svf/include/SVFIR/SymbolTableInfo.h

@@ -329,8 +329,13 @@ public:
 
     inline void addTypeInfo(const SVFType* ty)
     {
-        assert(!hasSVFTypeInfo(ty) && "this type info has been added before");
-        svfTypes.insert(ty);
+        bool inserted = svfTypes.insert(ty).second;
+        assert(inserted && "this type info has been added before");
+    }
+
+    inline void addStInfo(StInfo* stInfo)
+    {
+        stInfos.insert(stInfo);
     }
 
 protected:
@@ -341,11 +346,15 @@ protected:
     /// Create an objectInfo based on LLVM type (value is null, and type could be null, representing a dummy object)
     ObjTypeInfo* createObjTypeInfo(const SVFType* type);
 
+    /// (owned) All SVF Types
     /// 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.
     /// fsize[0] is always the size of the expanded struct.
     SVFTypeSet svfTypes;
+
+    /// @brief (owned) All StInfo
+    Set<StInfo*> stInfos;
 };
 
 

package/SVF-linux/svf-llvm/include/SVF-LLVM/LLVMModule.h

@@ -84,11 +84,10 @@ private:
     SVFValue2LLVMValueMap SVFValue2LLVMValue;
     LLVMType2SVFTypeMap LLVMType2SVFType;
     Type2TypeInfoMap Type2TypeInfo;
-    Set<const StInfo*> StInfos;
 
     /// Constructor
     LLVMModuleSet();
-    ~LLVMModuleSet();
+    ~LLVMModuleSet() = default;
 
     void build();
 
@@ -330,8 +329,8 @@ private:
     SVFType* addSVFTypeInfo(const Type* t);
     /// Collect a type info
     StInfo* collectTypeInfo(const Type* ty);
-    /// Collect the struct info; nf contains the number of fields after flattening
-    StInfo* collectStructInfo(const StructType *T, u32_t& nf);
+    /// Collect the struct info and set the number of fields after flattening
+    StInfo* collectStructInfo(const StructType* structTy, u32_t& numFields);
     /// Collect the array info
     StInfo* collectArrayInfo(const ArrayType* T);
     /// Collect simple type (non-aggregate) info

package/SVF-osx/svf/include/Graphs/CHG.h

@@ -78,6 +78,7 @@ typedef GenericEdge<CHNode> GenericCHEdgeTy;
 class CHEdge: public GenericCHEdgeTy
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef enum
@@ -107,6 +108,7 @@ typedef GenericNode<CHNode, CHEdge> GenericCHNodeTy;
 class CHNode: public GenericCHNodeTy
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef enum
@@ -118,7 +120,7 @@ public:
 
     typedef std::vector<const SVFFunction*> FuncVector;
 
-    CHNode (const std::string name, NodeID i = 0, GNodeK k = 0):
+    CHNode (const std::string& name, NodeID i = 0, GNodeK k = 0):
         GenericCHNodeTy(i, k), vtable(nullptr), className(name), flags(0)
     {
     }
@@ -213,6 +215,7 @@ typedef GenericGraph<CHNode, CHEdge> GenericCHGraphTy;
 class CHGraph: public CommonCHGraph, public GenericCHGraphTy
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
     friend class CHGBuilder;
 
 public:

package/SVF-osx/svf/include/Graphs/GenericGraph.h

@@ -39,6 +39,7 @@ namespace SVF
 /// Forward declaration of some friend classes
 ///@{
 template <typename, typename> class GenericGraphWriter;
+template <typename, typename> class GenericGraphReader;
 ///@}
 
 /*!
@@ -48,6 +49,7 @@ template<class NodeTy>
 class GenericEdge
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     /// Node type
@@ -139,6 +141,7 @@ template<class NodeTy,class EdgeTy>
 class GenericNode
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef NodeTy NodeType;
@@ -341,7 +344,9 @@ template<class NodeTy, class EdgeTy>
 class GenericGraph
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
     friend class GenericGraphWriter<NodeTy, EdgeTy>;
+    friend class GenericGraphReader<NodeTy, EdgeTy>;
 
 public:
     typedef NodeTy NodeType;

package/SVF-osx/svf/include/Graphs/ICFG.h

@@ -48,6 +48,7 @@ class ICFG : public GenericICFGTy
 {
     friend class ICFGBuilder;
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
 

package/SVF-osx/svf/include/Graphs/ICFGEdge.h

@@ -44,6 +44,7 @@ typedef GenericEdge<ICFGNode> GenericICFGEdgeTy;
 class ICFGEdge : public GenericICFGEdgeTy
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     /// ten types of ICFG edge
@@ -112,6 +113,7 @@ public:
 class IntraCFGEdge : public ICFGEdge
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     /// Constructor
@@ -174,6 +176,7 @@ private:
 class CallCFGEdge : public ICFGEdge
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 private:
     const SVFInstruction* cs;
@@ -224,6 +227,7 @@ public:
 class RetCFGEdge : public ICFGEdge
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 private:
     const SVFInstruction* cs;

package/SVF-osx/svf/include/Graphs/ICFGNode.h

@@ -54,6 +54,7 @@ typedef GenericNode<ICFGNode, ICFGEdge> GenericICFGNodeTy;
 class ICFGNode : public GenericICFGNodeTy
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     /// 22 kinds of ICFG node
@@ -79,7 +80,6 @@ public:
     /// Constructor
     ICFGNode(NodeID i, ICFGNodeK k) : GenericICFGNodeTy(i, k), fun(nullptr), bb(nullptr)
     {
-
     }
 
     /// Return the function of this ICFGNode
@@ -151,7 +151,6 @@ class GlobalICFGNode : public ICFGNode
 public:
     GlobalICFGNode(NodeID id) : ICFGNode(id, GlobalBlock)
     {
-        bb = nullptr;
     }
 
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -181,9 +180,13 @@ public:
 class IntraICFGNode : public ICFGNode
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 private:
     const SVFInstruction *inst;
 
+    /// Constructor to create empty IntraICFGNode (for SVFIRReader/deserialization)
+    IntraICFGNode(NodeID id) : ICFGNode(id, IntraBlock), inst(nullptr) {}
+
 public:
     IntraICFGNode(NodeID id, const SVFInstruction *i) : ICFGNode(id, IntraBlock), inst(i)
     {
@@ -258,11 +261,16 @@ public:
 class FunEntryICFGNode : public InterICFGNode
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef std::vector<const SVFVar *> FormalParmNodeVec;
 private:
     FormalParmNodeVec FPNodes;
+
+    /// Constructor to create empty FunEntryICFGNode (for SVFIRReader/deserialization)
+    FunEntryICFGNode(NodeID id) : InterICFGNode(id, FunEntryBlock) {}
+
 public:
     FunEntryICFGNode(NodeID id, const SVFFunction* f);
 
@@ -316,9 +324,14 @@ public:
 class FunExitICFGNode : public InterICFGNode
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 private:
     const SVFVar *formalRet;
+
+    /// Constructor to create empty FunExitICFGNode (for SVFIRReader/deserialization)
+    FunExitICFGNode(NodeID id) : InterICFGNode(id, FunExitBlock), formalRet{} {}
+
 public:
     FunExitICFGNode(NodeID id, const SVFFunction* f);
 
@@ -372,6 +385,7 @@ public:
 class CallICFGNode : public InterICFGNode
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef std::vector<const SVFVar *> ActualParmNodeVec;
@@ -379,6 +393,10 @@ private:
     const SVFInstruction* cs;
     const RetICFGNode* ret;
     ActualParmNodeVec APNodes;
+
+    /// Constructor to create empty CallICFGNode (for SVFIRReader/deserialization)
+    CallICFGNode(NodeID id) : InterICFGNode(id, FunCallBlock), cs{}, ret{} {}
+
 public:
     CallICFGNode(NodeID id, const SVFInstruction* c)
         : InterICFGNode(id, FunCallBlock), cs(c), ret(nullptr)
@@ -469,11 +487,19 @@ public:
 class RetICFGNode : public InterICFGNode
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 private:
     const SVFInstruction* cs;
     const SVFVar *actualRet;
     const CallICFGNode* callBlockNode;
+
+    /// Constructor to create empty RetICFGNode (for SVFIRReader/deserialization)
+    RetICFGNode(NodeID id)
+        : InterICFGNode(id, FunRetBlock), cs{}, actualRet{}, callBlockNode{}
+    {
+    }
+
 public:
     RetICFGNode(NodeID id, const SVFInstruction* c, CallICFGNode* cb) :
         InterICFGNode(id, FunRetBlock), cs(c), actualRet(nullptr), callBlockNode(cb)

package/SVF-osx/svf/include/Graphs/IRGraph.h

@@ -50,6 +50,7 @@ typedef SVFStmt PAGEdge;
 class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef Set<const SVFStmt*> SVFStmtSet;

package/SVF-osx/svf/include/MemoryModel/LocationSet.h

@@ -53,6 +53,7 @@ class LocationSet
 {
     friend class SymbolTableInfo;
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     enum LSRelation

package/SVF-osx/svf/include/MemoryModel/SVFLoop.h

@@ -38,6 +38,7 @@ namespace SVF
 class SVFLoop
 {
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
     typedef Set<const ICFGEdge *> ICFGEdgeSet;
     typedef Set<const ICFGNode *> ICFGNodeSet;

package/SVF-osx/svf/include/SVFIR/SVFIR.h

@@ -47,6 +47,7 @@ class SVFIR : public IRGraph
     friend class PAGBuilderFromFile;
     friend class TypeBasedHeapCloning;
     friend class SVFIRWriter;
+    friend class SVFIRReader;
 
 public:
     typedef Set<const CallICFGNode*> CallSiteSet;