svf-tools 1.0.677 → 1.0.679

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.677",
+  "version": "1.0.679",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/include/Graphs/CHG.h

@@ -61,7 +61,8 @@ public:
     virtual const VFunSet &getCSVFsBasedonCHA(CallSite cs) = 0;
     virtual bool csHasVtblsBasedonCHA(CallSite cs) = 0;
     virtual const VTableSet &getCSVtblsBasedonCHA(CallSite cs) = 0;
-    virtual void getVFnsFromVtbls(CallSite cs, const VTableSet &vtbls, VFunSet &virtualFunctions) = 0;
+    virtual void getVFnsFromVtbls(CallSite cs, const VTableSet& vtbls,
+                                  VFunSet& virtualFunctions) = 0;
 
     CHGKind getKind(void) const
     {
@@ -76,17 +77,19 @@ protected:
 typedef GenericEdge<CHNode> GenericCHEdgeTy;
 class CHEdge: public GenericCHEdgeTy
 {
+    friend class SVFIRWriter;
+
 public:
     typedef enum
     {
         INHERITANCE = 0x1, // inheritance relation
-        INSTANTCE = 0x2 // template-instance relation
+        INSTANTCE = 0x2    // template-instance relation
     } CHEDGETYPE;
 
-    typedef GenericNode<CHNode,CHEdge>::GEdgeSetTy CHEdgeSetTy;
+    typedef GenericNode<CHNode, CHEdge>::GEdgeSetTy CHEdgeSetTy;
 
-    CHEdge(CHNode *s, CHNode *d, CHEDGETYPE et, GEdgeFlag k = 0):
-        GenericCHEdgeTy(s,d,k)
+    CHEdge(CHNode* s, CHNode* d, CHEDGETYPE et, GEdgeFlag k = 0)
+        : GenericCHEdgeTy(s, d, k)
     {
         edgeType = et;
     }
@@ -100,9 +103,11 @@ private:
     CHEDGETYPE edgeType;
 };
 
-typedef GenericNode<CHNode,CHEdge> GenericCHNodeTy;
+typedef GenericNode<CHNode, CHEdge> GenericCHNodeTy;
 class CHNode: public GenericCHNodeTy
 {
+    friend class SVFIRWriter;
+
 public:
     typedef enum
     {
@@ -204,9 +209,10 @@ private:
 };
 
 /// class hierarchy graph
-typedef GenericGraph<CHNode,CHEdge> GenericCHGraphTy;
+typedef GenericGraph<CHNode, CHEdge> GenericCHGraphTy;
 class CHGraph: public CommonCHGraph, public GenericCHGraphTy
 {
+    friend class SVFIRWriter;
     friend class CHGBuilder;
 
 public:
@@ -311,7 +317,7 @@ private:
     u32_t classNum;
     u32_t vfID;
     double buildingCHGTime;
-    Map<std::string, CHNode *> classNameToNodeMap;
+    Map<std::string, CHNode*> classNameToNodeMap;
     NameToCHNodesMap classNameToDescendantsMap;
     NameToCHNodesMap classNameToAncestorsMap;
     NameToCHNodesMap classNameToInstAndDescsMap;
@@ -331,19 +337,26 @@ namespace SVF
  * GenericGraphTraits specializations for generic graph algorithms.
  * Provide graph traits for traversing from a constraint node using standard graph traversals.
  */
-template<> struct GenericGraphTraits<SVF::CHNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::CHNode,SVF::CHEdge>*  >
+template <>
+struct GenericGraphTraits<SVF::CHNode*>
+    : public GenericGraphTraits<SVF::GenericNode<SVF::CHNode, SVF::CHEdge>*>
 {
 };
 
-/// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse traversal.
-template<>
-struct GenericGraphTraits<Inverse<SVF::CHNode*> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::CHNode,SVF::CHEdge>* > >
+/// Inverse GenericGraphTraits specializations for call graph node, it is used
+/// for inverse traversal.
+template <>
+struct GenericGraphTraits<Inverse<SVF::CHNode*>>
+            : public GenericGraphTraits<
+              Inverse<SVF::GenericNode<SVF::CHNode, SVF::CHEdge>*>>
 {
 };
 
-template<> struct GenericGraphTraits<SVF::CHGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::CHNode,SVF::CHEdge>* >
+template <>
+struct GenericGraphTraits<SVF::CHGraph*>
+    : public GenericGraphTraits<SVF::GenericGraph<SVF::CHNode, SVF::CHEdge>*>
 {
-    typedef SVF::CHNode *NodeRef;
+    typedef SVF::CHNode* NodeRef;
 };
 
 } // End namespace llvm

package/svf/include/Graphs/GenericGraph.h

@@ -36,6 +36,10 @@
 
 namespace SVF
 {
+/// Forward declaration of some friend classes
+///@{
+template <typename, typename> class GenericGraphWriter;
+///@}
 
 /*!
  * Generic edge on the graph as base class
@@ -43,6 +47,7 @@ namespace SVF
 template<class NodeTy>
 class GenericEdge
 {
+    friend class SVFIRWriter;
 
 public:
     /// Node type
@@ -133,6 +138,7 @@ protected:
 template<class NodeTy,class EdgeTy>
 class GenericNode
 {
+    friend class SVFIRWriter;
 
 public:
     typedef NodeTy NodeType;
@@ -331,9 +337,11 @@ public:
  * Generic graph for program representation
  * It is base class and needs to be instantiated
  */
-template<class NodeTy,class EdgeTy>
+template<class NodeTy, class EdgeTy>
 class GenericGraph
 {
+    friend class SVFIRWriter;
+    friend class GenericGraphWriter<NodeTy, EdgeTy>;
 
 public:
     typedef NodeTy NodeType;
@@ -348,9 +356,7 @@ public:
     //@}
 
     /// Constructor
-    GenericGraph(): edgeNum(0),nodeNum(0)
-    {
-    }
+    GenericGraph() : edgeNum(0), nodeNum(0) {}
 
     /// Destructor
     virtual ~GenericGraph()

package/svf/include/Graphs/ICFG.h

@@ -46,8 +46,8 @@ class PTACallGraph;
 typedef GenericGraph<ICFGNode,ICFGEdge> GenericICFGTy;
 class ICFG : public GenericICFGTy
 {
-
     friend class ICFGBuilder;
+    friend class SVFIRWriter;
 
 public:
 
@@ -141,6 +141,11 @@ public:
         return it->second;
     }
 
+    inline const ICFGNodeToSVFLoopVec& getIcfgNodeToSVFLoopVec() const
+    {
+        return icfgNodeToSVFLoopVec;
+    }
+
 protected:
     /// Remove a SVFG edge
     inline void removeICFGEdge(ICFGEdge* edge)

package/svf/include/Graphs/ICFGEdge.h

@@ -43,6 +43,7 @@ class RetPE;
 typedef GenericEdge<ICFGNode> GenericICFGEdgeTy;
 class ICFGEdge : public GenericICFGEdgeTy
 {
+    friend class SVFIRWriter;
 
 public:
     /// ten types of ICFG edge
@@ -59,19 +60,18 @@ public:
 
 public:
     /// Constructor
-    ICFGEdge(ICFGNode* s, ICFGNode* d, GEdgeFlag k) : GenericICFGEdgeTy(s,d,k)
+    ICFGEdge(ICFGNode* s, ICFGNode* d, GEdgeFlag k) : GenericICFGEdgeTy(s, d, k)
     {
     }
     /// Destructor
-    ~ICFGEdge()
-    {
-    }
+    ~ICFGEdge() {}
 
     /// Get methods of the components
     //@{
     inline bool isCFGEdge() const
     {
-        return getEdgeKind() == IntraCF || getEdgeKind() == CallCF || getEdgeKind() == RetCF;
+        return getEdgeKind() == IntraCF || getEdgeKind() == CallCF ||
+               getEdgeKind() == RetCF;
     }
     inline bool isCallCFGEdge() const
     {
@@ -86,7 +86,7 @@ public:
         return getEdgeKind() == IntraCF;
     }
     //@}
-    typedef GenericNode<ICFGNode,ICFGEdge>::GEdgeSetTy ICFGEdgeSetTy;
+    typedef GenericNode<ICFGNode, ICFGEdge>::GEdgeSetTy ICFGEdgeSetTy;
     typedef ICFGEdgeSetTy SVFGEdgeSetTy;
     /// Compute the unique edgeFlag value from edge kind and CallSiteID.
     static inline GEdgeFlag makeEdgeFlagWithInvokeID(GEdgeKind k, CallSiteID cs)
@@ -96,7 +96,7 @@ public:
 
     /// Overloading operator << for dumping ICFG node ID
     //@{
-    friend OutStream& operator<< (OutStream &o, const ICFGEdge &edge)
+    friend OutStream& operator<<(OutStream& o, const ICFGEdge& edge)
     {
         o << edge.toString();
         return o;
@@ -106,29 +106,30 @@ public:
     virtual const std::string toString() const;
 };
 
-
 /*!
  * Intra ICFG edge representing control-flows between basic blocks within a function
  */
 class IntraCFGEdge : public ICFGEdge
 {
+    friend class SVFIRWriter;
 
 public:
     /// Constructor
-    IntraCFGEdge(ICFGNode* s, ICFGNode* d): ICFGEdge(s,d,IntraCF), conditionVar(nullptr), branchCondVal(0)
+    IntraCFGEdge(ICFGNode* s, ICFGNode* d)
+        : ICFGEdge(s, d, IntraCF), conditionVar(nullptr), branchCondVal(0)
     {
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
-    static inline bool classof(const IntraCFGEdge *)
+    static inline bool classof(const IntraCFGEdge*)
     {
         return true;
     }
-    static inline bool classof(const ICFGEdge *edge)
+    static inline bool classof(const ICFGEdge* edge)
     {
         return edge->getEdgeKind() == IntraCF;
     }
-    static inline bool classof(const GenericICFGEdgeTy *edge)
+    static inline bool classof(const GenericICFGEdgeTy* edge)
     {
         return edge->getEdgeKind() == IntraCF;
     }
@@ -154,10 +155,15 @@ public:
     virtual const std::string toString() const;
 
 private:
-    /// conditionVar is a boolean (for if/else) or numeric condition variable (for switch)
-    /// branchCondVal is the value when this condition should hold to execute this CFGEdge.
-    /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
-    /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
+    /// conditionVar is a boolean (for if/else) or numeric condition variable
+    /// (for switch).
+    /// branchCondVal is the value when this condition should hold to execute
+    /// this CFGEdge.
+    /// E.g., Inst1: br %cmp label 0, label 1,
+    ///       Inst2: label 0
+    ///       Inst3: label 1;
+    /// for edge between Inst1 and Inst 2, the first element is %cmp and
+    /// the second element is 0
     const SVFValue* conditionVar;
     s64_t branchCondVal;
 };
@@ -167,18 +173,20 @@ private:
  */
 class CallCFGEdge : public ICFGEdge
 {
+    friend class SVFIRWriter;
 
 private:
-    const SVFInstruction*  cs;
+    const SVFInstruction* cs;
     std::vector<const CallPE*> callPEs;
+
 public:
     /// Constructor
-    CallCFGEdge(ICFGNode* s, ICFGNode* d, const SVFInstruction*  c):
-        ICFGEdge(s,d,CallCF),cs(c)
+    CallCFGEdge(ICFGNode* s, ICFGNode* d, const SVFInstruction* c)
+        : ICFGEdge(s, d, CallCF), cs(c)
     {
     }
     /// Return callsite ID
-    inline const SVFInstruction*  getCallSite() const
+    inline const SVFInstruction* getCallSite() const
     {
         return cs;
     }
@@ -194,15 +202,15 @@ public:
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
-    static inline bool classof(const CallCFGEdge *)
+    static inline bool classof(const CallCFGEdge*)
     {
         return true;
     }
-    static inline bool classof(const ICFGEdge *edge)
+    static inline bool classof(const ICFGEdge* edge)
     {
         return edge->getEdgeKind() == CallCF;
     }
-    static inline bool classof(const GenericICFGEdgeTy *edge)
+    static inline bool classof(const GenericICFGEdgeTy* edge)
     {
         return edge->getEdgeKind() == CallCF;
     }
@@ -215,25 +223,27 @@ public:
  */
 class RetCFGEdge : public ICFGEdge
 {
+    friend class SVFIRWriter;
 
 private:
-    const SVFInstruction*  cs;
+    const SVFInstruction* cs;
     const RetPE* retPE;
+
 public:
     /// Constructor
-    RetCFGEdge(ICFGNode* s, ICFGNode* d, const SVFInstruction*  c):
-        ICFGEdge(s,d,RetCF),cs(c),retPE(nullptr)
+    RetCFGEdge(ICFGNode* s, ICFGNode* d, const SVFInstruction* c)
+        : ICFGEdge(s, d, RetCF), cs(c), retPE(nullptr)
     {
     }
     /// Return callsite ID
-    inline const SVFInstruction*  getCallSite() const
+    inline const SVFInstruction* getCallSite() const
     {
         return cs;
     }
     /// Add call parameter edge to this CallCFGEdge
     inline void addRetPE(const RetPE* ret)
     {
-        assert(retPE==nullptr && "we can only have one retPE for each RetCFGEdge");
+        assert(!retPE && "we can only have one retPE for each RetCFGEdge");
         retPE = ret;
     }
     /// Add get parameter edge to this CallCFGEdge
@@ -243,15 +253,15 @@ public:
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
-    static inline bool classof(const RetCFGEdge *)
+    static inline bool classof(const RetCFGEdge*)
     {
         return true;
     }
-    static inline bool classof(const ICFGEdge *edge)
+    static inline bool classof(const ICFGEdge* edge)
     {
         return edge->getEdgeKind() == RetCF;
     }
-    static inline bool classof(const GenericICFGEdgeTy *edge)
+    static inline bool classof(const GenericICFGEdgeTy* edge)
     {
         return edge->getEdgeKind() == RetCF;
     }

package/svf/include/Graphs/ICFGNode.h

@@ -53,13 +53,19 @@ typedef GenericNode<ICFGNode, ICFGEdge> GenericICFGNodeTy;
 
 class ICFGNode : public GenericICFGNodeTy
 {
+    friend class SVFIRWriter;
 
 public:
     /// 22 kinds of ICFG node
     /// Gep represents offset edge for field sensitivity
     enum ICFGNodeK
     {
-        IntraBlock, FunEntryBlock, FunExitBlock, FunCallBlock, FunRetBlock, GlobalBlock
+        IntraBlock,
+        FunEntryBlock,
+        FunExitBlock,
+        FunCallBlock,
+        FunRetBlock,
+        GlobalBlock
     };
 
     typedef ICFGEdge::ICFGEdgeSetTy::iterator iterator;
@@ -174,6 +180,7 @@ public:
  */
 class IntraICFGNode : public ICFGNode
 {
+    friend class SVFIRWriter;
 private:
     const SVFInstruction *inst;
 
@@ -250,6 +257,7 @@ public:
  */
 class FunEntryICFGNode : public InterICFGNode
 {
+    friend class SVFIRWriter;
 
 public:
     typedef std::vector<const SVFVar *> FormalParmNodeVec;
@@ -307,6 +315,7 @@ public:
  */
 class FunExitICFGNode : public InterICFGNode
 {
+    friend class SVFIRWriter;
 
 private:
     const SVFVar *formalRet;
@@ -362,6 +371,7 @@ public:
  */
 class CallICFGNode : public InterICFGNode
 {
+    friend class SVFIRWriter;
 
 public:
     typedef std::vector<const SVFVar *> ActualParmNodeVec;
@@ -370,7 +380,8 @@ private:
     const RetICFGNode* ret;
     ActualParmNodeVec APNodes;
 public:
-    CallICFGNode(NodeID id, const SVFInstruction* c) : InterICFGNode(id, FunCallBlock), cs(c), ret(nullptr)
+    CallICFGNode(NodeID id, const SVFInstruction* c)
+        : InterICFGNode(id, FunCallBlock), cs(c), ret(nullptr)
     {
         fun = cs->getFunction();
         bb = cs->getParent();
@@ -457,6 +468,7 @@ public:
  */
 class RetICFGNode : public InterICFGNode
 {
+    friend class SVFIRWriter;
 
 private:
     const SVFInstruction* cs;

package/svf/include/Graphs/IRGraph.h

@@ -1,4 +1,4 @@
-//===- SVFIR.h -- SVF IR Graph or PAG (Program Assignment Graph)--------------------------------------//
+//===- SVFIR.h -- SVF IR Graph or PAG (Program Assignment Graph)--------------//
 //
 //                     SVF: Static Value-Flow Analysis
 //
@@ -44,21 +44,24 @@ typedef SVFVar PAGNode;
 typedef SVFStmt PAGEdge;
 
 /*
-* Graph representation of SVF IR. It can be seen as a program assignment graph (PAG)
-*/
-class IRGraph : public GenericGraph<SVFVar,SVFStmt>
+ * Graph representation of SVF IR.
+ * It can be seen as a program assignment graph (PAG).
+ */
+class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 {
+    friend class SVFIRWriter;
+
 public:
     typedef Set<const SVFStmt*> SVFStmtSet;
     typedef Map<const SVFValue*,SVFStmtSet> ValueToEdgeMap;
 
 protected:
-    SVFStmt::KindToSVFStmtMapTy KindToSVFStmtSetMap;  // < SVFIR edge map containing all PAGEdges
-    SVFStmt::KindToSVFStmtMapTy KindToPTASVFStmtSetMap;  // < SVFIR edge map containing only pointer-related edges, i.e, both LHS and RHS are of pointer type
+    SVFStmt::KindToSVFStmtMapTy KindToSVFStmtSetMap; ///< SVFIR edge map containing all PAGEdges
+    SVFStmt::KindToSVFStmtMapTy KindToPTASVFStmtSetMap; ///< SVFIR edge map containing only pointer-related edges, i.e., both LHS and RHS are of pointer type
     bool fromFile; ///< Whether the SVFIR is built according to user specified data from a txt file
-    NodeID nodeNumAfterPAGBuild; // initial node number after building SVFIR, excluding later added nodes, e.g., gepobj nodes
+    NodeID nodeNumAfterPAGBuild; ///< initial node number after building SVFIR, excluding later added nodes, e.g., gepobj nodes
     u32_t totalPTAPAGEdge;
-    ValueToEdgeMap valueToEdgeMap;	///< Map llvm::Values to all corresponding PAGEdges
+    ValueToEdgeMap valueToEdgeMap; ///< Map llvm::Values to all corresponding PAGEdges
     SymbolTableInfo* symInfo;
 
     /// Add a node into the graph
@@ -73,10 +76,14 @@ protected:
     //// Return true if this edge exits
     SVFStmt* hasNonlabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind);
     /// Return true if this labeled edge exits, including store, call and load
-    /// two store edge can have same dst and src but located in different basic blocks, thus flags are needed to distinguish them
-    SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind, const ICFGNode* cs);
-    /// Return MultiOpndStmt since it has more than one operands (we use operand 2 here to make the flag)
-    SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind, const SVFVar* op2);
+    /// two store edge can have same dst and src but located in different basic
+    /// blocks, thus flags are needed to distinguish them
+    SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind,
+                            const ICFGNode* cs);
+    /// Return MultiOpndStmt since it has more than one operands (we use operand
+    /// 2 here to make the flag)
+    SVFStmt* hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind,
+                            const SVFVar* op2);
 
     /// Map a value to a set of edges
     inline void mapValueToEdge(const SVFValue* V, SVFStmt *edge)
@@ -94,7 +101,8 @@ protected:
     }
 
 public:
-    IRGraph(bool buildFromFile): fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0)
+    IRGraph(bool buildFromFile)
+        : fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0)
     {
         symInfo = SymbolTableInfo::SymbolInfo();
         // insert dummy value if a correct value cannot be found
@@ -237,7 +245,7 @@ template<> struct GenericGraphTraits<Inverse<SVF::SVFVar *> > : public GenericGr
 
 template<> struct GenericGraphTraits<SVF::IRGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::SVFVar,SVF::SVFStmt>* >
 {
-    typedef SVF::SVFVar *NodeRef;
+    typedef SVF::SVFVar* NodeRef;
 };
 
 } // End namespace llvm

package/svf/include/MemoryModel/LocationSet.h

@@ -52,6 +52,8 @@ class SVFVar;
 class LocationSet
 {
     friend class SymbolTableInfo;
+    friend class SVFIRWriter;
+
 public:
     enum LSRelation
     {
@@ -62,12 +64,12 @@ public:
     typedef std::vector<VarAndGepTypePair> OffsetVarAndGepTypePairs;
 
     /// Constructor
-    LocationSet(s32_t o = 0) : fldIdx(o)
-    {}
+    LocationSet(s32_t o = 0) : fldIdx(o) {}
 
     /// Copy Constructor
     LocationSet(const LocationSet& ls)
-        : fldIdx(ls.fldIdx), offsetVarAndGepTypePairs(ls.getOffsetVarAndGepTypePairVec())
+        : fldIdx(ls.fldIdx),
+          offsetVarAndGepTypePairs(ls.getOffsetVarAndGepTypePairVec())
     {
     }
 
@@ -75,9 +77,9 @@ public:
 
     /// Overload operators
     //@{
-    LocationSet operator+ (const LocationSet& rhs) const;
-    bool operator< (const LocationSet& rhs) const;
-    inline const LocationSet& operator= (const LocationSet& rhs)
+    LocationSet operator+(const LocationSet& rhs) const;
+    bool operator<(const LocationSet& rhs) const;
+    inline const LocationSet& operator=(const LocationSet& rhs)
     {
         fldIdx = rhs.fldIdx;
         offsetVarAndGepTypePairs = rhs.getOffsetVarAndGepTypePairVec();
@@ -85,8 +87,8 @@ public:
     }
     inline bool operator==(const LocationSet& rhs) const
     {
-        return this->fldIdx == rhs.fldIdx
-               && this->offsetVarAndGepTypePairs == rhs.offsetVarAndGepTypePairs;
+        return this->fldIdx == rhs.fldIdx &&
+               this->offsetVarAndGepTypePairs == rhs.offsetVarAndGepTypePairs;
     }
     //@}
 

package/svf/include/MemoryModel/SVFLoop.h

@@ -37,6 +37,8 @@ namespace SVF
 
 class SVFLoop
 {
+    friend class SVFIRWriter;
+
     typedef Set<const ICFGEdge *> ICFGEdgeSet;
     typedef Set<const ICFGNode *> ICFGNodeSet;
 private: