svf-lib 1.0.2427 → 1.0.2429

package/SVF-linux-x86_64/include/Graphs/BasicBlockG.h

@@ -44,10 +44,7 @@ class FunObjVar;
 typedef GenericEdge<SVFBasicBlock> GenericBasicBlockEdgeTy;
 class BasicBlockEdge: public GenericBasicBlockEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
-public:
 public:
     /// Constructor
     BasicBlockEdge(SVFBasicBlock* s, SVFBasicBlock* d) : GenericBasicBlockEdgeTy(s, d, 0)
@@ -73,8 +70,6 @@ typedef GenericNode<SVFBasicBlock, BasicBlockEdge> GenericBasicBlockNodeTy;
 class SVFBasicBlock : public GenericBasicBlockNodeTy
 {
     friend class LLVMModuleSet;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SVFIRBuilder;
     friend class FunObjVar;
     friend class ICFGBuilder;

package/SVF-linux-x86_64/include/Graphs/CHG.h

@@ -77,8 +77,6 @@ protected:
 typedef GenericEdge<CHNode> GenericCHEdgeTy;
 class CHEdge: public GenericCHEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef enum
@@ -107,8 +105,6 @@ private:
 typedef GenericNode<CHNode, CHEdge> GenericCHNodeTy;
 class CHNode: public GenericCHNodeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef enum
@@ -232,8 +228,6 @@ private:
 typedef GenericGraph<CHNode, CHEdge> GenericCHGraphTy;
 class CHGraph: public CommonCHGraph, public GenericCHGraphTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class CHGBuilder;
 
 public:

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

@@ -49,8 +49,6 @@ template <typename, typename> class GenericGraphReader;
 template<class NodeTy>
 class GenericEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     /// Node type
@@ -142,8 +140,6 @@ protected:
 template<class NodeTy,class EdgeTy>
 class GenericNode: public SVFValue
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef NodeTy NodeType;
@@ -340,8 +336,6 @@ public:
 template<class NodeTy, class EdgeTy>
 class GenericGraph
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class GenericGraphWriter<NodeTy, EdgeTy>;
     friend class GenericGraphReader<NodeTy, EdgeTy>;
 

package/SVF-linux-x86_64/include/Graphs/ICFG.h

@@ -47,8 +47,6 @@ typedef GenericGraph<ICFGNode,ICFGEdge> GenericICFGTy;
 class ICFG : public GenericICFGTy
 {
     friend class ICFGBuilder;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class ICFGSimplification;
 
 public:

package/SVF-linux-x86_64/include/Graphs/ICFGEdge.h

@@ -43,8 +43,6 @@ class RetPE;
 typedef GenericEdge<ICFGNode> GenericICFGEdgeTy;
 class ICFGEdge : public GenericICFGEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     /// ten types of ICFG edge
@@ -112,8 +110,6 @@ public:
  */
 class IntraCFGEdge : public ICFGEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class ICFG;
     friend class SVFIRBuilder;
 
@@ -181,8 +177,6 @@ private:
  */
 class CallCFGEdge : public ICFGEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     std::vector<const CallPE*> callPEs;
@@ -232,8 +226,6 @@ public:
  */
 class RetCFGEdge : public ICFGEdge
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const RetPE* retPE;

package/SVF-linux-x86_64/include/Graphs/ICFGNode.h

@@ -53,8 +53,6 @@ typedef GenericNode<ICFGNode, ICFGEdge> GenericICFGNodeTy;
 
 class ICFGNode : public GenericICFGNodeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
 
@@ -194,14 +192,9 @@ public:
  */
 class IntraICFGNode : public ICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 private:
     bool isRet;
 
-    /// Constructor to create empty IntraICFGNode (for SVFIRReader/deserialization)
-    IntraICFGNode(NodeID id) : ICFGNode(id, IntraBlock), isRet(false) {}
-
 public:
     IntraICFGNode(NodeID id, const SVFBasicBlock* b, bool isReturn) : ICFGNode(id, IntraBlock), isRet(isReturn)
     {
@@ -277,17 +270,12 @@ 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 FunObjVar* f);
 
@@ -347,15 +335,10 @@ 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 FunObjVar* f);
 
@@ -415,8 +398,6 @@ public:
  */
 class CallICFGNode : public InterICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef std::vector<const ValVar *> ActualParmNodeVec;
@@ -431,9 +412,6 @@ protected:
     s32_t virtualFunIdx;            /// virtual function index of the virtual table(s) at a virtual call
     std::string funNameOfVcall;     /// the function name of this virtual call
 
-    /// Constructor to create empty CallICFGNode (for SVFIRReader/deserialization)
-    CallICFGNode(NodeID id) : InterICFGNode(id, FunCallBlock), ret{} {}
-
 public:
     CallICFGNode(NodeID id, const SVFBasicBlock* b, const SVFType* ty,
                  const FunObjVar* cf, bool iv, bool ivc, s32_t vfi,
@@ -591,19 +569,11 @@ public:
  */
 class RetICFGNode : public InterICFGNode
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const SVFVar *actualRet;
     const CallICFGNode* callBlockNode;
 
-    /// Constructor to create empty RetICFGNode (for SVFIRReader/deserialization)
-    RetICFGNode(NodeID id)
-        : InterICFGNode(id, FunRetBlock), actualRet{}, callBlockNode{}
-    {
-    }
-
 public:
     RetICFGNode(NodeID id, CallICFGNode* cb) :
         InterICFGNode(id, FunRetBlock), actualRet(nullptr), callBlockNode(cb)

package/SVF-linux-x86_64/include/Graphs/IRGraph.h

@@ -50,8 +50,6 @@ class ObjTypeInfo;
  */
 class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SVFIRBuilder;
     friend class SymbolTableBuilder;
 

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

@@ -51,8 +51,6 @@ class SVFVar;
 */
 class AccessPath
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     enum LSRelation

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

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

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

@@ -41,8 +41,6 @@ namespace SVF
  */
 class ObjTypeInfo
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SymbolTableBuilder;
 
 public:

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

@@ -45,8 +45,6 @@ class SVFIR : public IRGraph
     friend class ExternalPAG;
     friend class PAGBuilderFromFile;
     friend class TypeBasedHeapCloning;
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class BVDataPTAImpl;
 
 public:

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

@@ -51,8 +51,6 @@ class SVFBasicBlock;
 typedef GenericEdge<SVFVar> GenericPAGEdgeTy;
 class SVFStmt : public GenericPAGEdgeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     /// Types of SVFIR statements
@@ -233,8 +231,6 @@ private:
 */
 class AssignStmt : public SVFStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     AssignStmt();                      ///< place holder
@@ -248,8 +244,6 @@ private:
 protected:
     /// constructor
     AssignStmt(SVFVar* s, SVFVar* d, GEdgeFlag k) : SVFStmt(s, d, k) {}
-    /// Constructor to create empty AssignStmt (for SVFIRReader/serialization)
-    AssignStmt(GEdgeFlag k) : SVFStmt(k) {}
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -309,12 +303,8 @@ public:
  */
 class AddrStmt: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty AddrStmt (for SVFIRReader/serialization)
-    AddrStmt() : AssignStmt(SVFStmt::Addr) {}
     AddrStmt(const AddrStmt&);       ///< place holder
     void operator=(const AddrStmt&); ///< place holder
 
@@ -360,11 +350,8 @@ public:
  */
 class CopyStmt: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
 private:
-    /// Constructs empty CopyStmt (for SVFIRReader/serialization)
-    CopyStmt() : AssignStmt(SVFStmt::Copy) {}
     CopyStmt(const CopyStmt&);       ///< place holder
     void operator=(const CopyStmt&); ///< place holder
 public:
@@ -448,12 +435,8 @@ private:
  */
 class StoreStmt: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty StoreStmt (for SVFIRReader/serialization)
-    StoreStmt() : AssignStmt(SVFStmt::Store) {}
     StoreStmt(const StoreStmt&);      ///< place holder
     void operator=(const StoreStmt&); ///< place holder
 
@@ -485,12 +468,8 @@ public:
  */
 class LoadStmt: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty LoadStmt (for SVFIRReader/serialization)
-    LoadStmt(): AssignStmt(SVFStmt::Load) {}
     LoadStmt(const LoadStmt&);       ///< place holder
     void operator=(const LoadStmt&); ///< place holder
 
@@ -522,12 +501,8 @@ public:
  */
 class GepStmt: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty GepStmt (for SVFIRReader/serialization)
-    GepStmt() : AssignStmt(SVFStmt::Gep) {}
     GepStmt(const GepStmt &);  ///< place holder
     void operator=(const GepStmt &); ///< place holder
 
@@ -607,8 +582,6 @@ public:
  */
 class CallPE: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     CallPE(const CallPE&);         ///< place holder
@@ -616,9 +589,6 @@ private:
 
     const CallICFGNode* call;      /// the callsite statement calling from
     const FunEntryICFGNode* entry; /// the function exit statement calling to
-protected:
-    /// Constructs empty CallPE (for SVFIRReader/serialization)
-    CallPE(GEdgeFlag k = SVFStmt::Call) : AssignStmt(k), call{}, entry{} {}
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -667,8 +637,6 @@ public:
  */
 class RetPE: public AssignStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     RetPE(const RetPE&);          ///< place holder
@@ -677,10 +645,6 @@ private:
     const CallICFGNode* call;    /// the callsite statement returning to
     const FunExitICFGNode* exit; /// the function exit statement returned from
 
-protected:
-    /// Constructs empty RetPE (for SVFIRReader/serialization)
-    RetPE(GEdgeFlag k = SVFStmt::Ret) : AssignStmt(k), call{}, exit{} {}
-
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -728,8 +692,6 @@ public:
 */
 class MultiOpndStmt : public SVFStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef std::vector<SVFVar*> OPVars;
@@ -747,8 +709,6 @@ protected:
     OPVars opVars;
     /// Constructor, only used by subclasses but not external users
     MultiOpndStmt(SVFVar* r, const OPVars& opnds, GEdgeFlag k);
-    /// Constructs empty MultiOpndStmt (for SVFIRReader/serialization)
-    MultiOpndStmt(GEdgeFlag k) : SVFStmt(k) {}
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -810,15 +770,11 @@ public:
  */
 class PhiStmt: public MultiOpndStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef std::vector<const ICFGNode*> OpICFGNodeVec;
 
 private:
-    /// Constructs empty PhiStmt (for SVFIRReader/serialization)
-    PhiStmt() : MultiOpndStmt(SVFStmt::Phi) {}
     PhiStmt(const PhiStmt&);        ///< place holder
     void operator=(const PhiStmt&); ///< place holder
 
@@ -878,12 +834,8 @@ public:
  */
 class SelectStmt: public MultiOpndStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty SelectStmt (for SVFIRReader/serialization)
-    SelectStmt() : MultiOpndStmt(SVFStmt::Select), condition{} {}
     SelectStmt(const SelectStmt&);     ///< place holder
     void operator=(const SelectStmt&); ///< place holder
 
@@ -933,12 +885,8 @@ public:
  */
 class CmpStmt: public MultiOpndStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty CmpStmt (for SVFIRReader/serialization)
-    CmpStmt() : MultiOpndStmt(SVFStmt::Cmp) {}
     CmpStmt(const CmpStmt&);        ///< place holder
     void operator=(const CmpStmt&); ///< place holder
 
@@ -1019,12 +967,8 @@ public:
  */
 class BinaryOPStmt: public MultiOpndStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty BinaryOPStmt (for SVFIRReader/serialization)
-    BinaryOPStmt() : MultiOpndStmt(SVFStmt::BinaryOp) {}
     BinaryOPStmt(const BinaryOPStmt&);   ///< place holder
     void operator=(const BinaryOPStmt&); ///< place holder
     u32_t opcode;
@@ -1089,12 +1033,8 @@ public:
  */
 class UnaryOPStmt: public SVFStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty UnaryOPStmt (for SVFIRReader/serialization)
-    UnaryOPStmt() : SVFStmt(SVFStmt::UnaryOp) {}
     UnaryOPStmt(const UnaryOPStmt&);    ///< place holder
     void operator=(const UnaryOPStmt&); ///< place holder
     SVFVar* getSrcNode(); ///< place holder, use getOpVar() instead
@@ -1156,15 +1096,11 @@ public:
  */
 class BranchStmt: public SVFStmt
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     typedef std::vector<std::pair<const ICFGNode*, s32_t>> SuccAndCondPairVec;
 
 private:
-    /// Constructs empty BranchStmt (for SVFIRReader/serialization)
-    BranchStmt() : SVFStmt(SVFStmt::Branch), cond{}, brInst{} {}
     BranchStmt(const BranchStmt&);     ///< place holder
     void operator=(const BranchStmt&); ///< place holder
     SVFVar* getSrcNode();              ///< place holder, not allowed
@@ -1246,12 +1182,8 @@ public:
  */
 class TDForkPE: public CallPE
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty TDForkPE (for SVFIRReader/serialization)
-    TDForkPE() : CallPE(SVFStmt::ThreadFork) {}
     TDForkPE(const TDForkPE&);       ///< place holder
     void operator=(const TDForkPE&); ///< place holder
 
@@ -1287,12 +1219,8 @@ public:
  */
 class TDJoinPE: public RetPE
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
-    /// Constructs empty TDJoinPE (for SVFIRReader/serialization)
-    TDJoinPE() : RetPE(SVFStmt::ThreadJoin) {}
     TDJoinPE(const TDJoinPE&);       ///< place holder
     void operator=(const TDJoinPE&); ///< place holder
 

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

@@ -45,8 +45,6 @@ class SVFPointerType;
  */
 class StInfo
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     /// flattened field indices of a struct (ignoring arrays)
@@ -155,8 +153,7 @@ public:
 
 class SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
     friend class LLVMModuleSet;
 
 public:
@@ -276,8 +273,6 @@ std::ostream& operator<<(std::ostream& os, const SVFType& type);
 
 class SVFPointerType : public SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     SVFPointerType(u32_t i, u32_t byteSize = 1)
@@ -295,8 +290,6 @@ public:
 
 class SVFIntegerType : public SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     short signAndWidth; ///< For printing
@@ -323,8 +316,6 @@ public:
 
 class SVFFunctionType : public SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const SVFType* retTy;
@@ -362,8 +353,6 @@ public:
 
 class SVFStructType : public SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     /// @brief Field for printing & debugging
@@ -404,8 +393,6 @@ public:
 
 class SVFArrayType : public SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     unsigned numOfElement; /// For printing & debugging
@@ -444,8 +431,6 @@ public:
 
 class SVFOtherType : public SVFType
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     std::string repr; /// Field representation for printing

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

@@ -47,8 +47,7 @@ class SVFVar;
 typedef GenericNode<SVFVar, SVFStmt> GenericPAGNodeTy;
 class SVFVar : public GenericPAGNodeTy
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
     friend class SVFIRBuilder;
     friend class IRGraph;
     friend class SVFIR;
@@ -248,14 +247,9 @@ public:
  */
 class ValVar: public SVFVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const ICFGNode* icfgNode; // icfgnode related to valvar
-protected:
-    /// Constructor to create an empty ValVar (for SVFIRReader/deserialization)
-    ValVar(NodeID i, PNODEK ty = ValNode) : SVFVar(i, ty), icfgNode(nullptr) {}
 
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -304,12 +298,8 @@ public:
  */
 class ObjVar: public SVFVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 protected:
-    /// Constructor to create an empty ObjVar (for SVFIRReader/deserialization)
-    ObjVar(NodeID i, PNODEK ty = ObjNode) : SVFVar(i, ty) {}
     /// Constructor
     ObjVar(NodeID i, const SVFType* svfType, PNODEK ty = ObjNode) :
         SVFVar(i, svfType, ty)
@@ -354,17 +344,11 @@ public:
  */
 class ArgValVar: public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const FunObjVar* cgNode;
     u32_t argNo;
 
-protected:
-    /// Constructor to create function argument (for SVFIRReader/deserialization)
-    ArgValVar(NodeID i, PNODEK ty = ArgValNode) : ValVar(i, ty) {}
-
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -426,17 +410,12 @@ public:
  */
 class GepValVar: public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     AccessPath ap;	// AccessPath
     const ValVar* base;	// base node
     const SVFType* gepValType;
 
-    /// Constructor to create empty GeValVar (for SVFIRReader/deserialization)
-    GepValVar(NodeID i) : ValVar(i, GepValNode), gepValType{} {}
-
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -522,18 +501,12 @@ public:
  */
 class BaseObjVar : public ObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SVFIRBuilder;
 private:
     ObjTypeInfo* typeInfo;
 
     const ICFGNode* icfgNode; /// ICFGNode related to the creation of this object
 
-protected:
-    /// Constructor to create empty ObjVar (for SVFIRReader/deserialization)
-    BaseObjVar(NodeID i, const ICFGNode* node, PNODEK ty = BaseObjNode) : ObjVar(i, ty), icfgNode(node) {}
-
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -725,18 +698,12 @@ public:
  */
 class GepObjVar: public ObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     APOffset apOffset = 0;
 
     const BaseObjVar* base;
 
-    /// Constructor to create empty GepObjVar (for SVFIRReader/deserialization)
-    //  only for reading from file when we don't have BaseObjVar*
-    GepObjVar(NodeID i, PNODEK ty = GepObjNode) : ObjVar(i, ty), base{} {}
-
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -835,13 +802,6 @@ public:
 class HeapObjVar: public BaseObjVar
 {
 
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-protected:
-    /// Constructor to create heap object var
-    HeapObjVar(NodeID i, const ICFGNode* node) : BaseObjVar(i, node, HeapObjNode) {}
-
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -898,13 +858,6 @@ public:
 class StackObjVar: public BaseObjVar
 {
 
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-protected:
-    /// Constructor to create stack object var
-    StackObjVar(NodeID i, const ICFGNode* node) : BaseObjVar(i, node, StackObjNode) {}
-
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -954,8 +907,6 @@ class CallGraphNode;
 
 class FunObjVar : public BaseObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
     friend class SVFIRBuilder;
     friend class LLVMModuleSet;
 
@@ -981,11 +932,6 @@ private:
     std::vector<const ArgValVar*> allArgs;    /// all formal arguments of this function
     const SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
 
-
-private:
-    /// Constructor to create empty ObjVar (for SVFIRReader/deserialization)
-    FunObjVar(NodeID i, const ICFGNode* node) : BaseObjVar(i,node, FunObjNode) {}
-
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -1231,8 +1177,7 @@ public:
 };
 class FunValVar : public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
 private:
     const FunObjVar* funObjVar;
 
@@ -1282,8 +1227,6 @@ public:
 
 class GlobalValVar : public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1323,8 +1266,6 @@ public:
 
 class ConstAggValVar: public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1375,8 +1316,6 @@ public:
 
 class ConstDataValVar : public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1426,8 +1365,6 @@ public:
 
 class BlackHoleValVar : public ConstDataValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1478,8 +1415,7 @@ public:
 
 class ConstFPValVar : public ConstDataValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
 private:
     double dval;
 
@@ -1529,8 +1465,7 @@ public:
 
 class ConstIntValVar : public ConstDataValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
 private:
     u64_t zval;
     s64_t sval;
@@ -1586,8 +1521,6 @@ public:
 
 class ConstNullPtrValVar : public ConstDataValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1635,12 +1568,6 @@ public:
 
 class GlobalObjVar : public BaseObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    /// Constructor to create empty ObjVar (for SVFIRReader/deserialization)
-    GlobalObjVar(NodeID i, const ICFGNode* node) : BaseObjVar(i, node, GlobalObjNode) {}
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1684,8 +1611,6 @@ public:
 
 class ConstAggObjVar : public BaseObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     ///  Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1739,12 +1664,6 @@ public:
 
 class ConstDataObjVar : public BaseObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-protected:
-    /// Constructor to create empty DummyObjVar (for SVFIRReader/deserialization)
-    ConstDataObjVar(NodeID i, const ICFGNode* node) : BaseObjVar(i, node, ConstDataObjNode) {}
 
 public:
     //@{ Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1796,12 +1715,6 @@ public:
 
 class ConstFPObjVar : public ConstDataObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    /// Constructor to create empty DummyObjVar (for SVFIRReader/deserialization)
-    ConstFPObjVar(NodeID i, const ICFGNode* node) : ConstDataObjVar(i, node) {}
 
 private:
     float dval;
@@ -1859,12 +1772,6 @@ public:
 
 class ConstIntObjVar : public ConstDataObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    /// Constructor to create empty DummyObjVar (for SVFIRReader/deserialization)
-    ConstIntObjVar(NodeID i, const ICFGNode* node) : ConstDataObjVar(i, node) {}
 
 private:
     u64_t zval;
@@ -1929,12 +1836,6 @@ public:
 
 class ConstNullPtrObjVar : public ConstDataObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    /// Constructor to create empty DummyObjVar (for SVFIRReader/deserialization)
-    ConstNullPtrObjVar(NodeID i, const ICFGNode* node) : ConstDataObjVar(i, node) {}
 
 public:
     //@{ Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -1988,14 +1889,9 @@ public:
  */
 class RetValPN : public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 private:
     const FunObjVar* callGraphNode;
-private:
-    /// Constructor to create empty RetValPN (for SVFIRReader/deserialization)
-    RetValPN(NodeID i) : ValVar(i, RetValNode) {}
 
 public:
     //@{ Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -2045,14 +1941,9 @@ public:
  */
 class VarArgValPN : public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-private:
-    const FunObjVar* callGraphNode;
 
 private:
-    /// Constructor to create empty VarArgValPN (for SVFIRReader/deserialization)
-    VarArgValPN(NodeID i) : ValVar(i, VarargValNode) {}
+    const FunObjVar* callGraphNode;
 
 public:
     //@{ Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -2101,8 +1992,6 @@ public:
  */
 class DummyValVar: public ValVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     //@{ Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -2153,12 +2042,6 @@ public:
  */
 class DummyObjVar: public BaseObjVar
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
-
-private:
-    /// Constructor to create empty DummyObjVar (for SVFIRReader/deserialization)
-    DummyObjVar(NodeID i, const ICFGNode* node) : BaseObjVar(i, node, DummyObjNode) {}
 
 public:
     //@{ Methods for support type inquiry through isa, cast, and dyn_cast:

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

@@ -19,8 +19,6 @@ class BVDataPTAImpl;
 /// all symbols have been allocated through endSymbolAllocation.
 class NodeIDAllocator
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     /// Allocation strategy to use.

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

@@ -40,8 +40,7 @@ namespace SVF
 {
 class SVFLoopAndDomInfo
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
+
 public:
     typedef Set<const SVFBasicBlock*> BBSet;
     typedef std::vector<const SVFBasicBlock*> BBList;

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

@@ -258,8 +258,6 @@ inline unsigned countPopulation(T Value)
 /// kept up to date.  They are also significantly more memory intensive.
 template <unsigned ElementSize = 128> struct SparseBitVectorElement
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
 public:
     using BitWord = unsigned long;
@@ -500,8 +498,6 @@ public:
 template <unsigned ElementSize = 128>
 class SparseBitVector
 {
-    friend class SVFIRWriter;
-    friend class SVFIRReader;
 
     using ElementList = std::list<SparseBitVectorElement<ElementSize>>;
     using ElementListIter = typename ElementList::iterator;

package/package.json

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