svf-lib 1.0.2104 → 1.0.2106

package/SVF-linux/Release-build/include/AE/Svfexe/AbsExtAPI.h

@@ -55,7 +55,7 @@ public:
      * @brief Constructor for AbsExtAPI.
      * @param abstractTrace Reference to a map of ICFG nodes to abstract states.
      */
-    AbsExtAPI(Map<const ICFGNode*, AbstractState>& abstractTrace);
+    AbsExtAPI(Map<const ICFGNode*, AbstractState>& traces);
 
     /**
      * @brief Initializes the external function map.

package/SVF-linux/Release-build/include/AE/Svfexe/AbstractInterpretation.h

@@ -298,7 +298,53 @@ private:
     std::vector<std::unique_ptr<AEDetector>> detectors;
     AbsExtAPI* utils;
 
-
+    // according to varieties of cmp insts,
+    // maybe var X var, var X const, const X var, const X const
+    // we accept 'var X const' 'var X var' 'const X const'
+    // if 'const X var', we need to reverse op0 op1 and its predicate 'var X' const'
+    // X' is reverse predicate of X
+    // == -> !=, != -> ==, > -> <=, >= -> <, < -> >=, <= -> >
+
+    Map<s32_t, s32_t> _reverse_predicate =
+    {
+        {CmpStmt::Predicate::FCMP_OEQ, CmpStmt::Predicate::FCMP_ONE},  // == -> !=
+        {CmpStmt::Predicate::FCMP_UEQ, CmpStmt::Predicate::FCMP_UNE},  // == -> !=
+        {CmpStmt::Predicate::FCMP_OGT, CmpStmt::Predicate::FCMP_OLE},  // > -> <=
+        {CmpStmt::Predicate::FCMP_OGE, CmpStmt::Predicate::FCMP_OLT},  // >= -> <
+        {CmpStmt::Predicate::FCMP_OLT, CmpStmt::Predicate::FCMP_OGE},  // < -> >=
+        {CmpStmt::Predicate::FCMP_OLE, CmpStmt::Predicate::FCMP_OGT},  // <= -> >
+        {CmpStmt::Predicate::FCMP_ONE, CmpStmt::Predicate::FCMP_OEQ},  // != -> ==
+        {CmpStmt::Predicate::FCMP_UNE, CmpStmt::Predicate::FCMP_UEQ},  // != -> ==
+        {CmpStmt::Predicate::ICMP_EQ, CmpStmt::Predicate::ICMP_NE},  // == -> !=
+        {CmpStmt::Predicate::ICMP_NE, CmpStmt::Predicate::ICMP_EQ},  // != -> ==
+        {CmpStmt::Predicate::ICMP_UGT, CmpStmt::Predicate::ICMP_ULE},  // > -> <=
+        {CmpStmt::Predicate::ICMP_ULT, CmpStmt::Predicate::ICMP_UGE},  // < -> >=
+        {CmpStmt::Predicate::ICMP_UGE, CmpStmt::Predicate::ICMP_ULT},  // >= -> <
+        {CmpStmt::Predicate::ICMP_SGT, CmpStmt::Predicate::ICMP_SLE},  // > -> <=
+        {CmpStmt::Predicate::ICMP_SLT, CmpStmt::Predicate::ICMP_SGE},  // < -> >=
+        {CmpStmt::Predicate::ICMP_SGE, CmpStmt::Predicate::ICMP_SLT},  // >= -> <
+    };
+
+
+    Map<s32_t, s32_t> _switch_lhsrhs_predicate =
+    {
+        {CmpStmt::Predicate::FCMP_OEQ, CmpStmt::Predicate::FCMP_OEQ},  // == -> ==
+        {CmpStmt::Predicate::FCMP_UEQ, CmpStmt::Predicate::FCMP_UEQ},  // == -> ==
+        {CmpStmt::Predicate::FCMP_OGT, CmpStmt::Predicate::FCMP_OLT},  // > -> <
+        {CmpStmt::Predicate::FCMP_OGE, CmpStmt::Predicate::FCMP_OLE},  // >= -> <=
+        {CmpStmt::Predicate::FCMP_OLT, CmpStmt::Predicate::FCMP_OGT},  // < -> >
+        {CmpStmt::Predicate::FCMP_OLE, CmpStmt::Predicate::FCMP_OGE},  // <= -> >=
+        {CmpStmt::Predicate::FCMP_ONE, CmpStmt::Predicate::FCMP_ONE},  // != -> !=
+        {CmpStmt::Predicate::FCMP_UNE, CmpStmt::Predicate::FCMP_UNE},  // != -> !=
+        {CmpStmt::Predicate::ICMP_EQ, CmpStmt::Predicate::ICMP_EQ},  // == -> ==
+        {CmpStmt::Predicate::ICMP_NE, CmpStmt::Predicate::ICMP_NE},  // != -> !=
+        {CmpStmt::Predicate::ICMP_UGT, CmpStmt::Predicate::ICMP_ULT},  // > -> <
+        {CmpStmt::Predicate::ICMP_ULT, CmpStmt::Predicate::ICMP_UGT},  // < -> >
+        {CmpStmt::Predicate::ICMP_UGE, CmpStmt::Predicate::ICMP_ULE},  // >= -> <=
+        {CmpStmt::Predicate::ICMP_SGT, CmpStmt::Predicate::ICMP_SLT},  // > -> <
+        {CmpStmt::Predicate::ICMP_SLT, CmpStmt::Predicate::ICMP_SGT},  // < -> >
+        {CmpStmt::Predicate::ICMP_SGE, CmpStmt::Predicate::ICMP_SLE},  // >= -> <=
+    };
 
 };
 }

package/SVF-osx/Release-build/include/CFL/CFGrammar.h

@@ -192,7 +192,7 @@ public:
         return this->rawProductions;
     }
 
-    inline const Map<Kind,  Set<Attribute>>& getKindToAttrsMap() const
+    inline const Map<Kind, Set<Attribute>>& getKindToAttrsMap() const
     {
         return this->kindToAttrsMap;
     }
@@ -223,7 +223,7 @@ public:
 
     void setRawProductions(SymbolMap<Symbol, Productions>& rawProductions);
 
-    void setKindToAttrsMap(const Map<Kind,  Set<Attribute>>& kindToAttrsMap);
+    void setKindToAttrsMap(const Map<Kind, Set<Attribute>>& kindToAttrsMap);
 
     void setAttributeKinds(const Set<Kind>& attributeKind);
 
@@ -282,7 +282,7 @@ private:
     Map<std::string, Kind> terminals;
     Map<std::string, Kind> EBNFSigns; /// Map contains Signs' String and associated Symbols
     Set<Kind> attributeKinds;
-    Map<Kind,  Set<Attribute>> kindToAttrsMap;
+    Map<Kind, Set<Attribute>> kindToAttrsMap;
     SymbolMap<Symbol, Productions> rawProductions;
     u32_t totalKind;
 };

package/SVF-osx/Release-build/include/CFL/CFLGraphBuilder.h

@@ -60,7 +60,7 @@ protected:
     Map<Kind, std::string> kindToLabelMap;
 
     /// Map to maintain attributes associated with each kind
-    Map<CFGrammar::Kind,  Set<CFGrammar::Attribute>> kindToAttrsMap;
+    Map<CFGrammar::Kind, Set<CFGrammar::Attribute>> kindToAttrsMap;
 
     Kind current;
     CFLGraph *cflGraph;
@@ -87,7 +87,7 @@ public:
     /// Method to build a CFL graph by copying nodes and edges from any graph
     /// inherited from GenericGraph
     template<class N, class E>
-    CFLGraph* build(GenericGraph<N,E>* graph, GrammarBase *grammar, BuildDirection direction = BuildDirection::plain);
+    CFLGraph* build(GenericGraph<N, E>* graph, GrammarBase *grammar, BuildDirection direction = BuildDirection::plain);
 
     /// Method to build a CFL graph from external file
     CFLGraph* build(std::string fileName, GrammarBase *grammar, BuildDirection direction = BuildDirection::plain);
@@ -108,7 +108,7 @@ public:
     }
 
     /// Returns a reference to the map that associates Kinds with their corresponding attributes
-    Map<CFGrammar::Kind,  Set<CFGrammar::Attribute>>& getKindToAttrsMap()
+    Map<CFGrammar::Kind, Set<CFGrammar::Attribute>>& getKindToAttrsMap()
     {
         return this->kindToAttrsMap;
     }

package/SVF-osx/Release-build/include/DDA/ContextDDA.h

@@ -51,7 +51,7 @@ typedef CxtStmtDPItem<SVFGNode> CxtLocDPItem;
 /*!
  * Context-, Flow- Sensitive Demand-driven Analysis
  */
-class ContextDDA : public CondPTAImpl<ContextCond>, public DDAVFSolver<CxtVar,CxtPtSet,CxtLocDPItem>
+class ContextDDA : public CondPTAImpl<ContextCond>, public DDAVFSolver<CxtVar, CxtPtSet, CxtLocDPItem>
 {
 
 public:
@@ -90,7 +90,7 @@ public:
         ContextCond cxt;
         for (PointsTo::iterator piter = pts.begin(); piter != pts.end(); ++piter)
         {
-            CxtVar var(cxt,*piter);
+            CxtVar var(cxt, *piter);
             tmpCPts.set(var);
         }
         return tmpCPts;

package/SVF-osx/Release-build/include/DDA/DDAClient.h

@@ -125,7 +125,7 @@ private:
 class FunptrDDAClient : public DDAClient
 {
 private:
-    typedef OrderedMap<NodeID,const CallICFGNode*> VTablePtrToCallSiteMap;
+    typedef OrderedMap<NodeID, const CallICFGNode*> VTablePtrToCallSiteMap;
     VTablePtrToCallSiteMap vtableToCallSiteMap;
 public:
     FunptrDDAClient(SVFModule* module) : DDAClient(module) {}
@@ -156,7 +156,7 @@ public:
     virtual void performStat(PointerAnalysis* pta);
 
 private:
-    typedef OrderedMap<NodeID,const CallICFGNode*> VTablePtrToCallSiteMap;
+    typedef OrderedMap<NodeID, const CallICFGNode*> VTablePtrToCallSiteMap;
     VTablePtrToCallSiteMap vtableToCallSiteMap;
     PAGNodeSet loadSrcNodes;
     PAGNodeSet storeDstNodes;

package/SVF-osx/Release-build/include/DDA/DDAVFSolver.h

@@ -54,8 +54,8 @@ public:
     typedef SVFIR::CallSiteSet CallSiteSet;
     typedef OrderedSet<DPIm> DPTItemSet;
     typedef OrderedMap<DPIm, CPtSet> DPImToCPtSetMap;
-    typedef OrderedMap<DPIm,CVar> DPMToCVarMap;
-    typedef OrderedMap<DPIm,DPIm> DPMToDPMMap;
+    typedef OrderedMap<DPIm, CVar> DPMToCVarMap;
+    typedef OrderedMap<DPIm, DPIm> DPMToDPMMap;
     typedef OrderedMap<NodeID, DPTItemSet> LocToDPMVecMap;
     typedef OrderedSet<const SVFGEdge* > ConstSVFGEdgeSet;
     typedef SVFGEdge::SVFGEdgeSetTy SVFGEdgeSet;
@@ -198,7 +198,7 @@ protected:
             startNewPTCompFromLoadSrc(loadpts,dpm);
             for(typename CPtSet::iterator it = loadpts.begin(), eit = loadpts.end(); it!=eit; ++it)
             {
-                backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm,*it,load));
+                backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm, *it,load));
             }
         }
         else if(const StoreSVFGNode* store = SVFUtil::dyn_cast<StoreSVFGNode>(node))
@@ -223,7 +223,7 @@ protected:
                 {
                     if(propagateViaObj(*it,getLoadCVar(dpm)))
                     {
-                        backtraceToStoreSrc(pts,getDPImWithOldCond(dpm,*it,store));
+                        backtraceToStoreSrc(pts,getDPImWithOldCond(dpm, *it,store));
 
                         if(isStrongUpdate(storepts,store))
                         {
@@ -233,7 +233,7 @@ protected:
                         else
                         {
                             DOSTAT(rmSUStat(dpm,store);)
-                            backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm,*it,store));
+                            backtraceAlongIndirectVF(pts,getDPImWithOldCond(dpm, *it,store));
                         }
                     }
                     else

package/SVF-osx/Release-build/include/DDA/FlowDDA.h

@@ -50,7 +50,7 @@ typedef StmtDPItem<SVFGNode> LocDPItem;
 /*!
  * Flow sensitive demand-driven analysis on value-flow graph
  */
-class FlowDDA : public BVDataPTAImpl, public DDAVFSolver<NodeID,PointsTo,LocDPItem>
+class FlowDDA : public BVDataPTAImpl, public DDAVFSolver<NodeID, PointsTo, LocDPItem>
 {
 
 public:
@@ -59,7 +59,7 @@ public:
     typedef BVDataPTAImpl::FunctionSet	FunctionSet;
     /// Constructor
     FlowDDA(SVFIR* _pag, DDAClient* client): BVDataPTAImpl(_pag, PointerAnalysis::FlowS_DDA),
-        DDAVFSolver<NodeID,PointsTo,LocDPItem>(),
+        DDAVFSolver<NodeID, PointsTo, LocDPItem>(),
         _client(client)
     {
     }

package/SVF-osx/Release-build/include/Graphs/CFLGraph.h

@@ -72,7 +72,7 @@ public:
 };
 
 
-typedef GenericNode<CFLNode,CFLEdge> GenericCFLNodeTy;
+typedef GenericNode<CFLNode, CFLEdge> GenericCFLNodeTy;
 class CFLNode: public GenericCFLNodeTy
 {
 public:
@@ -151,13 +151,13 @@ public:
 };
 
 /// Edge-labeled graph for CFL Reachability analysis
-typedef GenericGraph<CFLNode,CFLEdge> GenericCFLGraphTy;
+typedef GenericGraph<CFLNode, CFLEdge> GenericCFLGraphTy;
 class CFLGraph: public GenericCFLGraphTy
 {
 public:
     typedef CFGrammar::Symbol Symbol;
     typedef CFGrammar::Kind Kind;
-    typedef GenericNode<CFLNode,CFLEdge>::GEdgeSetTy CFLEdgeSet;
+    typedef GenericNode<CFLNode, CFLEdge>::GEdgeSetTy CFLEdgeSet;
     Kind startKind;
 
     CFLGraph(Kind kind)
@@ -195,17 +195,17 @@ 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::CFLNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::CFLNode,SVF::CFLEdge>*  >
+template<> struct GenericGraphTraits<SVF::CFLNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::CFLNode, SVF::CFLEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::CFLNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::CFLNode,SVF::CFLEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::CFLNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::CFLNode, SVF::CFLEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::CFLGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::CFLNode,SVF::CFLEdge>* >
+template<> struct GenericGraphTraits<SVF::CFLGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::CFLNode, SVF::CFLEdge>* >
 {
     typedef SVF::CFLNode *NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/CallGraph.h

@@ -163,14 +163,14 @@ public:
 
     virtual const std::string toString() const;
 
-    typedef GenericNode<CallGraphNode,CallGraphEdge>::GEdgeSetTy CallGraphEdgeSet;
+    typedef GenericNode<CallGraphNode, CallGraphEdge>::GEdgeSetTy CallGraphEdgeSet;
 
 };
 
 /*
  * Call Graph node representing a function
  */
-typedef GenericNode<CallGraphNode,CallGraphEdge> GenericCallGraphNodeTy;
+typedef GenericNode<CallGraphNode, CallGraphEdge> GenericCallGraphNodeTy;
 class CallGraphNode : public GenericCallGraphNodeTy
 {
 
@@ -214,7 +214,7 @@ public:
 /*!
  * Pointer Analysis Call Graph used internally for various pointer analysis
  */
-typedef GenericGraph<CallGraphNode,CallGraphEdge> GenericCallGraphTy;
+typedef GenericGraph<CallGraphNode, CallGraphEdge> GenericCallGraphTy;
 class CallGraph : public GenericCallGraphTy
 {
 
@@ -451,17 +451,17 @@ 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::CallGraphNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::CallGraphNode,SVF::CallGraphEdge>*  >
+template<> struct GenericGraphTraits<SVF::CallGraphNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::CallGraphNode, SVF::CallGraphEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::CallGraphNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::CallGraphNode,SVF::CallGraphEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::CallGraphNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::CallGraphNode, SVF::CallGraphEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::CallGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::CallGraphNode,SVF::CallGraphEdge>* >
+template<> struct GenericGraphTraits<SVF::CallGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::CallGraphNode, SVF::CallGraphEdge>* >
 {
     typedef SVF::CallGraphNode *NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/ConsG.h

@@ -41,7 +41,7 @@ namespace SVF
  * ConstraintNodes are same as PAGNodes
  * ConstraintEdges are self-defined edges (initialized with ConstraintEdges)
  */
-class ConstraintGraph :  public GenericGraph<ConstraintNode,ConstraintEdge>
+class ConstraintGraph :  public GenericGraph<ConstraintNode, ConstraintEdge>
 {
 
 public:
@@ -387,17 +387,17 @@ public:
  * GenericGraphTraits specializations for the generic graph algorithms.
  * Provide graph traits for traversing from a constraint node using standard graph traversals.
  */
-template<> struct GenericGraphTraits<SVF::ConstraintNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::ConstraintNode,SVF::ConstraintEdge>*  >
+template<> struct GenericGraphTraits<SVF::ConstraintNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::ConstraintNode, SVF::ConstraintEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for Value flow node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::ConstraintNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::ConstraintNode,SVF::ConstraintEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::ConstraintNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::ConstraintNode, SVF::ConstraintEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::ConstraintGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::ConstraintNode,SVF::ConstraintEdge>* >
+template<> struct GenericGraphTraits<SVF::ConstraintGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::ConstraintNode, SVF::ConstraintEdge>* >
 {
     typedef SVF::ConstraintNode *NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/ConsGEdge.h

@@ -82,7 +82,7 @@ public:
                edge->getEdgeKind() == VariantGep;
     }
     /// Constraint edge type
-    typedef GenericNode<ConstraintNode,ConstraintEdge>::GEdgeSetTy ConstraintEdgeSetTy;
+    typedef GenericNode<ConstraintNode, ConstraintEdge>::GEdgeSetTy ConstraintEdgeSetTy;
 
 };
 

package/SVF-osx/Release-build/include/Graphs/ConsGNode.h

@@ -36,7 +36,7 @@ namespace SVF
 /*!
  * Constraint node
  */
-typedef GenericNode<ConstraintNode,ConstraintEdge> GenericConsNodeTy;
+typedef GenericNode<ConstraintNode, ConstraintEdge> GenericConsNodeTy;
 class ConstraintNode : public GenericConsNodeTy
 {
 

package/SVF-osx/Release-build/include/Graphs/GenericGraph.h

@@ -137,7 +137,7 @@ protected:
 /*!
  * Generic node on the graph as base class
  */
-template<class NodeTy,class EdgeTy>
+template<class NodeTy, class EdgeTy>
 class GenericNode
 {
     friend class SVFIRWriter;
@@ -506,7 +506,7 @@ inline mapped_iter<ItTy, FuncTy> map_iter(ItTy I, FuncTy F)
 /*!
  * GenericGraphTraits for nodes
  */
-template<class NodeTy,class EdgeTy> struct GenericGraphTraits<SVF::GenericNode<NodeTy,EdgeTy>*  >
+template<class NodeTy, class EdgeTy> struct GenericGraphTraits<SVF::GenericNode<NodeTy, EdgeTy>*  >
 {
     typedef NodeTy NodeType;
     typedef EdgeTy EdgeType;
@@ -517,7 +517,7 @@ template<class NodeTy,class EdgeTy> struct GenericGraphTraits<SVF::GenericNode<N
     }
 
     // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
-    typedef mapped_iter<typename SVF::GenericNode<NodeTy,EdgeTy>::iterator, decltype(&edge_dest)> ChildIteratorType;
+    typedef mapped_iter<typename SVF::GenericNode<NodeTy, EdgeTy>::iterator, decltype(&edge_dest)> ChildIteratorType;
 
     static NodeType* getEntryNode(NodeType* pagN)
     {
@@ -545,8 +545,8 @@ template<class NodeTy,class EdgeTy> struct GenericGraphTraits<SVF::GenericNode<N
 /*!
  * Inverse GenericGraphTraits for node which is used for inverse traversal.
  */
-template<class NodeTy,class EdgeTy>
-struct GenericGraphTraits<Inverse<SVF::GenericNode<NodeTy,EdgeTy>* > >
+template<class NodeTy, class EdgeTy>
+struct GenericGraphTraits<Inverse<SVF::GenericNode<NodeTy, EdgeTy>* > >
 {
     typedef NodeTy NodeType;
     typedef EdgeTy EdgeType;
@@ -557,7 +557,7 @@ struct GenericGraphTraits<Inverse<SVF::GenericNode<NodeTy,EdgeTy>* > >
     }
 
     // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
-    typedef mapped_iter<typename SVF::GenericNode<NodeTy,EdgeTy>::iterator, decltype(&edge_dest)> ChildIteratorType;
+    typedef mapped_iter<typename SVF::GenericNode<NodeTy, EdgeTy>::iterator, decltype(&edge_dest)> ChildIteratorType;
 
     static inline NodeType* getEntryNode(Inverse<NodeType* > G)
     {
@@ -582,9 +582,9 @@ struct GenericGraphTraits<Inverse<SVF::GenericNode<NodeTy,EdgeTy>* > >
 /*!
  * GraphTraints
  */
-template<class NodeTy,class EdgeTy> struct GenericGraphTraits<SVF::GenericGraph<NodeTy,EdgeTy>* > : public GenericGraphTraits<SVF::GenericNode<NodeTy,EdgeTy>*  >
+template<class NodeTy, class EdgeTy> struct GenericGraphTraits<SVF::GenericGraph<NodeTy, EdgeTy>* > : public GenericGraphTraits<SVF::GenericNode<NodeTy, EdgeTy>*  >
 {
-    typedef SVF::GenericGraph<NodeTy,EdgeTy> GenericGraphTy;
+    typedef SVF::GenericGraph<NodeTy, EdgeTy> GenericGraphTy;
     typedef NodeTy NodeType;
     typedef EdgeTy EdgeType;
 

package/SVF-osx/Release-build/include/Graphs/ICFG.h

@@ -43,7 +43,7 @@ class CallGraph;
 /*!
  * Interprocedural Control-Flow Graph (ICFG)
  */
-typedef GenericGraph<ICFGNode,ICFGEdge> GenericICFGTy;
+typedef GenericGraph<ICFGNode, ICFGEdge> GenericICFGTy;
 class ICFG : public GenericICFGTy
 {
     friend class ICFGBuilder;
@@ -364,17 +364,17 @@ 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::ICFGNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::ICFGNode,SVF::ICFGEdge>*  >
+template<> struct GenericGraphTraits<SVF::ICFGNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::ICFGNode, SVF::ICFGEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::ICFGNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::ICFGNode,SVF::ICFGEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::ICFGNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::ICFGNode, SVF::ICFGEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::ICFG*> : public GenericGraphTraits<SVF::GenericGraph<SVF::ICFGNode,SVF::ICFGEdge>* >
+template<> struct GenericGraphTraits<SVF::ICFG*> : public GenericGraphTraits<SVF::GenericGraph<SVF::ICFGNode, SVF::ICFGEdge>* >
 {
     typedef SVF::ICFGNode *NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/ICFGEdge.h

@@ -192,6 +192,12 @@ public:
     {
         callPEs.push_back(callPE);
     }
+    /// Return call ICFGNode at the callsite
+    inline const CallICFGNode* getCallSite() const
+    {
+        assert(SVFUtil::isa<CallICFGNode>(getSrcNode()) && "not a CallICFGNode?");
+        return SVFUtil::cast<CallICFGNode>(getSrcNode());
+    }
     /// Add get parameter edge to this CallCFGEdge
     inline const std::vector<const CallPE*>& getCallPEs() const
     {
@@ -243,6 +249,9 @@ public:
     {
         return retPE;
     }
+    /// Return call ICFGNode at the callsite
+    const CallICFGNode* getCallSite() const;
+
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const RetCFGEdge*)

package/SVF-osx/Release-build/include/Graphs/IRGraph.h

@@ -53,7 +53,7 @@ class IRGraph : public GenericGraph<SVFVar, SVFStmt>
 
 public:
     typedef Set<const SVFStmt*> SVFStmtSet;
-    typedef Map<const SVFValue*,SVFStmtSet> ValueToEdgeMap;
+    typedef Map<const SVFValue*, SVFStmtSet> ValueToEdgeMap;
 
 protected:
     SVFStmt::KindToSVFStmtMapTy KindToSVFStmtSetMap; ///< SVFIR edge map containing all PAGEdges
@@ -234,16 +234,16 @@ namespace SVF
  * GenericGraphTraits specializations of SVFIR to be used for the generic graph algorithms.
  * Provide graph traits for traversing from a SVFIR node using standard graph traversals.
  */
-template<> struct GenericGraphTraits<SVF::SVFVar*> : public GenericGraphTraits<SVF::GenericNode<SVF::SVFVar,SVF::SVFStmt>*  >
+template<> struct GenericGraphTraits<SVF::SVFVar*> : public GenericGraphTraits<SVF::GenericNode<SVF::SVFVar, SVF::SVFStmt>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for SVFIR node, it is used for inverse traversal.
-template<> struct GenericGraphTraits<Inverse<SVF::SVFVar *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::SVFVar,SVF::SVFStmt>* > >
+template<> struct GenericGraphTraits<Inverse<SVF::SVFVar *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::SVFVar, SVF::SVFStmt>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::IRGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::SVFVar,SVF::SVFStmt>* >
+template<> struct GenericGraphTraits<SVF::IRGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::SVFVar, SVF::SVFStmt>* >
 {
     typedef SVF::SVFVar* NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/SCC.h

@@ -113,7 +113,7 @@ public:
         NodeBS _subNodes; /// nodes in the scc represented by this node
     };
 
-    typedef Map<NodeID,GNodeSCCInfo > GNODESCCInfoMap;
+    typedef Map<NodeID, GNodeSCCInfo > GNODESCCInfoMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
 
     SCCDetection(const GraphType &GT)

package/SVF-osx/Release-build/include/Graphs/SVFG.h

@@ -434,8 +434,8 @@ protected:
     }
 
     /// Add memory SSA PHI SVFG node
-    inline void addIntraMSSAPHISVFGNode(ICFGNode* BlockICFGNode, const Map<u32_t,const MRVer*>::const_iterator opVerBegin,
-                                        const  Map<u32_t,const MRVer*>::const_iterator opVerEnd, const MRVer* resVer, const NodeID nodeId)
+    inline void addIntraMSSAPHISVFGNode(ICFGNode* BlockICFGNode, const Map<u32_t, const MRVer*>::const_iterator opVerBegin,
+                                        const  Map<u32_t, const MRVer*>::const_iterator opVerEnd, const MRVer* resVer, const NodeID nodeId)
     {
         IntraMSSAPHISVFGNode* sNode = new IntraMSSAPHISVFGNode(nodeId, resVer);
         addSVFGNode(sNode, BlockICFGNode);
@@ -481,7 +481,7 @@ namespace SVF
 //struct GenericGraphTraits<Inverse<SVF::SVFGNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::SVFGNode,SVF::SVFGEdge>* > > {
 //};
 
-template<> struct GenericGraphTraits<SVF::SVFG*> : public GenericGraphTraits<SVF::GenericGraph<SVF::SVFGNode,SVF::SVFGEdge>* >
+template<> struct GenericGraphTraits<SVF::SVFG*> : public GenericGraphTraits<SVF::GenericGraph<SVF::SVFGNode, SVF::SVFGEdge>* >
 {
     typedef SVF::SVFGNode *NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/SVFGNode.h

@@ -276,7 +276,7 @@ public:
 class MSSAPHISVFGNode : public MRSVFGNode
 {
 public:
-    typedef Map<u32_t,const MRVer*> OPVers;
+    typedef Map<u32_t, const MRVer*> OPVers;
 
 protected:
     const MRVer* ver;

package/SVF-osx/Release-build/include/Graphs/VFG.h

@@ -46,7 +46,7 @@ class CallICFGNode;
 /*!
  *  Value Flow Graph (VFG)
  */
-typedef GenericGraph<VFGNode,VFGEdge> GenericVFGTy;
+typedef GenericGraph<VFGNode, VFGEdge> GenericVFGTy;
 class VFG : public GenericVFGTy
 {
 
@@ -60,7 +60,7 @@ public:
     typedef OrderedMap<NodeID, VFGNode *> VFGNodeIDToNodeMapTy;
     typedef Set<VFGNode*> VFGNodeSet;
     typedef Map<const PAGNode*, NodeID> PAGNodeToDefMapTy;
-    typedef Map<std::pair<NodeID,const CallICFGNode*>, ActualParmVFGNode *> PAGNodeToActualParmMapTy;
+    typedef Map<std::pair<NodeID, const CallICFGNode*>, ActualParmVFGNode *> PAGNodeToActualParmMapTy;
     typedef Map<const PAGNode*, ActualRetVFGNode *> PAGNodeToActualRetMapTy;
     typedef Map<const PAGNode*, FormalParmVFGNode *> PAGNodeToFormalParmMapTy;
     typedef Map<const PAGNode*, FormalRetVFGNode *> PAGNodeToFormalRetMapTy;
@@ -644,17 +644,17 @@ 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::VFGNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::VFGNode,SVF::VFGEdge>*  >
+template<> struct GenericGraphTraits<SVF::VFGNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::VFGNode, SVF::VFGEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::VFGNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::VFGNode,SVF::VFGEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::VFGNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::VFGNode, SVF::VFGEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::VFG*> : public GenericGraphTraits<SVF::GenericGraph<SVF::VFGNode,SVF::VFGEdge>* >
+template<> struct GenericGraphTraits<SVF::VFG*> : public GenericGraphTraits<SVF::GenericGraph<SVF::VFGNode, SVF::VFGEdge>* >
 {
     typedef SVF::VFGNode *NodeRef;
 };

package/SVF-osx/Release-build/include/Graphs/VFGEdge.h

@@ -114,7 +114,7 @@ public:
         return getEdgeKind() == TheadMHPIndirectVF;
     }
     //@}
-    typedef GenericNode<VFGNode,VFGEdge>::GEdgeSetTy VFGEdgeSetTy;
+    typedef GenericNode<VFGNode, VFGEdge>::GEdgeSetTy VFGEdgeSetTy;
     typedef VFGEdgeSetTy SVFGEdgeSetTy;
     /// Compute the unique edgeFlag value from edge kind and CallSiteID.
     static inline GEdgeFlag makeEdgeFlagWithInvokeID(GEdgeKind k, CallSiteID cs)

package/SVF-osx/Release-build/include/Graphs/VFGNode.h

@@ -42,7 +42,7 @@ namespace SVF
  * Interprocedural control-flow graph node, representing different kinds of program statements
  * including top-level pointers (ValVar) and address-taken objects (ObjVar)
  */
-typedef GenericNode<VFGNode,VFGEdge> GenericVFGNodeTy;
+typedef GenericNode<VFGNode, VFGEdge> GenericVFGNodeTy;
 class VFGNode : public GenericVFGNodeTy
 {
 
@@ -318,7 +318,7 @@ public:
 class CmpVFGNode: public VFGNode
 {
 public:
-    typedef Map<u32_t,const PAGNode*> OPVers;
+    typedef Map<u32_t, const PAGNode*> OPVers;
 protected:
     const PAGNode* res;
     OPVers opVers;
@@ -389,7 +389,7 @@ public:
 class BinaryOPVFGNode: public VFGNode
 {
 public:
-    typedef Map<u32_t,const PAGNode*> OPVers;
+    typedef Map<u32_t, const PAGNode*> OPVers;
 protected:
     const PAGNode* res;
     OPVers opVers;
@@ -459,7 +459,7 @@ public:
 class UnaryOPVFGNode: public VFGNode
 {
 public:
-    typedef Map<u32_t,const PAGNode*> OPVers;
+    typedef Map<u32_t, const PAGNode*> OPVers;
 protected:
     const PAGNode* res;
     OPVers opVers;
@@ -630,7 +630,7 @@ class PHIVFGNode : public VFGNode
 {
 
 public:
-    typedef Map<u32_t,const PAGNode*> OPVers;
+    typedef Map<u32_t, const PAGNode*> OPVers;
 protected:
     const PAGNode* res;
     OPVers opVers;
@@ -705,7 +705,7 @@ class IntraPHIVFGNode : public PHIVFGNode
 {
 
 public:
-    typedef Map<u32_t,const ICFGNode*> OPIncomingBBs;
+    typedef Map<u32_t, const ICFGNode*> OPIncomingBBs;
 
 private:
     OPIncomingBBs opIncomingBBs;

package/SVF-osx/Release-build/include/Graphs/WTO.h

@@ -714,7 +714,7 @@ protected:
         void visit(const WTONodeT& node) override
         {
             _nodeToWTOCycleDepth.insert(
-                                    std::make_pair(node.getICFGNode(), _wtoCycleDepth));
+                std::make_pair(node.getICFGNode(), _wtoCycleDepth));
         }
 
     }; // end class WTOCycleDepthBuilder

package/SVF-osx/Release-build/include/MSSA/MSSAMuChi.h

@@ -630,7 +630,7 @@ class MSSAPHI : public MSSADEF
 {
 
 public:
-    typedef Map<u32_t,const MRVer*> OPVers;
+    typedef Map<u32_t, const MRVer*> OPVers;
 private:
     const SVFBasicBlock* bb;
     OPVers opVers;

package/SVF-osx/Release-build/include/MSSA/MemRegion.h

@@ -310,7 +310,7 @@ protected:
     {
         for(MRSet::const_iterator it = funToMRsMap[fun].begin(), eit = funToMRsMap[fun].end(); it!=eit; ++it)
         {
-            if(isAliasedMR(cpts,*it))
+            if(isAliasedMR(cpts, *it))
                 aliasMRs.insert(*it);
         }
     }

package/SVF-osx/Release-build/include/MSSA/MemSSA.h

@@ -189,27 +189,27 @@ private:
     inline void AddLoadMU(const SVFBasicBlock* bb, const LoadStmt* load, const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
-            AddLoadMU(bb,load,*iter);
+            AddLoadMU(bb,load, *iter);
     }
     inline void AddStoreCHI(const SVFBasicBlock* bb, const StoreStmt* store, const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
-            AddStoreCHI(bb,store,*iter);
+            AddStoreCHI(bb,store, *iter);
     }
     inline void AddCallSiteMU(const CallICFGNode* cs,  const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
-            AddCallSiteMU(cs,*iter);
+            AddCallSiteMU(cs, *iter);
     }
     inline void AddCallSiteCHI(const CallICFGNode* cs,  const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
-            AddCallSiteCHI(cs,*iter);
+            AddCallSiteCHI(cs, *iter);
     }
     inline void AddMSSAPHI(const SVFBasicBlock* bb, const MRSet& mrSet)
     {
         for (MRSet::iterator iter = mrSet.begin(), eiter = mrSet.end(); iter != eiter; ++iter)
-            AddMSSAPHI(bb,*iter);
+            AddMSSAPHI(bb, *iter);
     }
     inline void AddLoadMU(const SVFBasicBlock* bb, const LoadStmt* load, const MemRegion* mr)
     {

package/SVF-osx/Release-build/include/MTA/LockAnalysis.h

@@ -183,7 +183,7 @@ public:
             const CxtLock& lock = *it;
             for(CxtLockSet::const_iterator lit = lockset2.begin(), elit = lockset2.end(); lit!=elit; ++lit)
             {
-                if(isAliasedLocks(lock,*lit))
+                if(isAliasedLocks(lock, *lit))
                     return true;
             }
         }
@@ -362,7 +362,7 @@ private:
         {
             for(CxtLockSet::const_iterator it = srclockset.begin(), eit = srclockset.end(); it!=eit; ++it)
             {
-                addCxtStmtToSpan(tgr,*it);
+                addCxtStmtToSpan(tgr, *it);
             }
             pushToCTSWorkList(tgr);
         }

package/SVF-osx/Release-build/include/MTA/MHP.h

@@ -49,13 +49,13 @@ public:
     typedef Set<const SVFFunction*> FunSet;
     typedef FIFOWorkList<CxtThreadStmt> CxtThreadStmtWorkList;
     typedef Set<CxtThreadStmt> CxtThreadStmtSet;
-    typedef Map<CxtThreadStmt,NodeBS> ThreadStmtToThreadInterleav;
-    typedef Map<const ICFGNode*,CxtThreadStmtSet> InstToThreadStmtSetMap;
+    typedef Map<CxtThreadStmt, NodeBS> ThreadStmtToThreadInterleav;
+    typedef Map<const ICFGNode*, CxtThreadStmtSet> InstToThreadStmtSetMap;
     typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
 
     typedef Set<CxtStmt> LockSpan;
 
-    typedef std::pair<const SVFFunction*,const SVFFunction*> FuncPair;
+    typedef std::pair<const SVFFunction*, const SVFFunction*> FuncPair;
     typedef Map<FuncPair, bool> FuncPairToBool;
 
     /// Constructor
@@ -284,8 +284,8 @@ public:
 
     typedef SVFLoopAndDomInfo::LoopBBs LoopBBs;
     typedef TCT::InstVec InstVec;
-    typedef Map<CxtStmt,ValDomain> CxtStmtToAliveFlagMap;
-    typedef Map<CxtStmt,NodeBS> CxtStmtToTIDMap;
+    typedef Map<CxtStmt, ValDomain> CxtStmtToAliveFlagMap;
+    typedef Map<CxtStmt, NodeBS> CxtStmtToTIDMap;
     typedef Set<NodePair> ThreadPairSet;
     typedef Map<CxtStmt, LoopBBs> CxtStmtToLoopMap;
     typedef FIFOWorkList<CxtStmt> CxtStmtWorkList;

package/SVF-osx/Release-build/include/MTA/TCT.h

@@ -143,9 +143,9 @@ public:
     typedef std::vector<const ICFGNode*> InstVec;
     typedef Set<const ICFGNode*> InstSet;
     typedef Set<const CallGraphNode*> PTACGNodeSet;
-    typedef Map<CxtThread,TCTNode*> CxtThreadToNodeMap;
-    typedef Map<CxtThread,CallStrCxt> CxtThreadToForkCxt;
-    typedef Map<CxtThread,const SVFFunction*> CxtThreadToFun;
+    typedef Map<CxtThread, TCTNode*> CxtThreadToNodeMap;
+    typedef Map<CxtThread, CallStrCxt> CxtThreadToForkCxt;
+    typedef Map<CxtThread, const SVFFunction*> CxtThreadToFun;
     typedef Map<const ICFGNode*, LoopBBs> InstToLoopMap;
     typedef FIFOWorkList<CxtThreadProc> CxtThreadProcVec;
     typedef Set<CxtThreadProc> CxtThreadProcSet;
@@ -588,17 +588,17 @@ namespace SVF
  * graphs by the generic graph algorithms.
  * Provide graph traits for traversing from a constraint node using standard graph traversals.
  */
-template<> struct GenericGraphTraits<SVF::TCTNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::TCTNode,SVF::TCTEdge>*  >
+template<> struct GenericGraphTraits<SVF::TCTNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::TCTNode, SVF::TCTEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for Value flow node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::TCTNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::TCTNode,SVF::TCTEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::TCTNode *> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::TCTNode, SVF::TCTEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::TCT*> : public GenericGraphTraits<SVF::GenericGraph<SVF::TCTNode,SVF::TCTEdge>* >
+template<> struct GenericGraphTraits<SVF::TCT*> : public GenericGraphTraits<SVF::GenericGraph<SVF::TCTNode, SVF::TCTEdge>* >
 {
     typedef SVF::TCTNode *NodeRef;
 };

package/SVF-osx/Release-build/include/MemoryModel/PointerAnalysisImpl.h

@@ -245,9 +245,9 @@ public:
     typedef CondStdSet<CVar>  CPtSet;
     typedef PTData<CVar, Set<CVar>, CVar, CPtSet> PTDataTy;
     typedef MutablePTData<CVar, Set<CVar>, CVar, CPtSet> MutPTDataTy;
-    typedef Map<NodeID,PointsTo> PtrToBVPtsMap; /// map a pointer to its BitVector points-to representation
+    typedef Map<NodeID, PointsTo> PtrToBVPtsMap; /// map a pointer to its BitVector points-to representation
     typedef Map<NodeID, NodeSet> PtrToNSMap;
-    typedef Map<NodeID,CPtSet> PtrToCPtsMap;	 /// map a pointer to its conditional points-to set
+    typedef Map<NodeID, CPtSet> PtrToCPtsMap;	 /// map a pointer to its conditional points-to set
 
     /// Constructor
     CondPTAImpl(SVFIR* pag, PointerAnalysis::PTATY type) : PointerAnalysis(pag, type), normalized(false)
@@ -328,7 +328,7 @@ public:
         {
             for (typename CPtSet::const_iterator it2 = cpts2.begin(); it2 != cpts2.end(); ++it2)
             {
-                if(isSameVar(*it1,*it2))
+                if(isSameVar(*it1, *it2))
                     return true;
             }
         }
@@ -346,7 +346,7 @@ public:
                 NodeBS& fields = pag->getAllFieldsObjVars(cit->get_id());
                 for(NodeBS::iterator it = fields.begin(), eit = fields.end(); it!=eit; ++it)
                 {
-                    CVar cvar(cit->get_cond(),*it);
+                    CVar cvar(cit->get_cond(), *it);
                     expandedCpts.set(cvar);
                 }
             }
@@ -407,7 +407,7 @@ protected:
             bool hasObj = false;
             for (typename CPtSet::const_iterator it1 = cpts1.begin(); it1 != cpts1.end(); ++it1)
             {
-                if(isSameVar(*it1,*it2))
+                if(isSameVar(*it1, *it2))
                 {
                     hasObj = true;
                     break;

package/SVF-osx/Release-build/include/SABER/LeakChecker.h

@@ -43,7 +43,7 @@ class LeakChecker : public SrcSnkDDA
 {
 
 public:
-    typedef Map<const SVFGNode*,const CallICFGNode*> SVFGNodeToCSIDMap;
+    typedef Map<const SVFGNode*, const CallICFGNode*> SVFGNodeToCSIDMap;
     typedef FIFOWorkList<const CallICFGNode*> CSWorkList;
     typedef ProgSlice::VFWorkList WorkList;
     typedef NodeBS SVFGNodeBS;

package/SVF-osx/Release-build/include/SABER/SaberCondAllocator.h

@@ -50,10 +50,10 @@ public:
 
     typedef Z3Expr Condition;   /// z3 condition
     typedef Map<u32_t, const ICFGNode*> IndexToTermInstMap; /// id to instruction map for z3
-    typedef Map<u32_t,Condition> CondPosMap;		///< map a branch to its Condition
+    typedef Map<u32_t, Condition> CondPosMap;		///< map a branch to its Condition
     typedef Map<const SVFBasicBlock*, CondPosMap > BBCondMap;	/// map bb to a Condition
     typedef Set<const SVFBasicBlock*> BasicBlockSet;
-    typedef Map<const SVFFunction*,  BasicBlockSet> FunToExitBBsMap;  ///< map a function to all its basic blocks calling program exit
+    typedef Map<const SVFFunction*, BasicBlockSet> FunToExitBBsMap;  ///< map a function to all its basic blocks calling program exit
     typedef Map<const SVFBasicBlock*, Condition> BBToCondMap;	///< map a basic block to its condition during control-flow guard computation
     typedef FIFOWorkList<const SVFBasicBlock*> CFWorkList;	///< worklist for control-flow guard computation
     typedef Map<const SVFGNode*, Set<const SVFGNode*>> SVFGNodeToSVFGNodeSetMap;

package/SVF-osx/Release-build/include/SABER/SrcSnkDDA.h

@@ -46,7 +46,7 @@
 namespace SVF
 {
 
-typedef GraphReachSolver<SVFG*,CxtDPItem> CFLSrcSnkSolver;
+typedef GraphReachSolver<SVFG*, CxtDPItem> CFLSrcSnkSolver;
 
 /*!
  * General source-sink analysis, which serves as a base analysis to be extended for various clients
@@ -56,7 +56,7 @@ class SrcSnkDDA : public CFLSrcSnkSolver
 
 public:
     typedef ProgSlice::SVFGNodeSet SVFGNodeSet;
-    typedef Map<const SVFGNode*,ProgSlice*> SVFGNodeToSliceMap;
+    typedef Map<const SVFGNode*, ProgSlice*> SVFGNodeToSliceMap;
     typedef SVFGNodeSet::const_iterator SVFGNodeSetIter;
     typedef CxtDPItem DPIm;
     typedef Set<DPIm> DPImSet;							///< dpitem set

package/SVF-osx/Release-build/include/SABER/SrcSnkSolver.h

@@ -104,7 +104,7 @@ protected:
             child_iterator EE = GTraits::child_end(v);
             for (; EI != EE; ++EI)
             {
-                FWProcessOutgoingEdge(item,*(EI.getCurrent()) );
+                FWProcessOutgoingEdge(item, *(EI.getCurrent()) );
             }
         }
     }
@@ -123,7 +123,7 @@ protected:
             inv_child_iterator EE = InvGTraits::child_end(v);
             for (; EI != EE; ++EI)
             {
-                BWProcessIncomingEdge(item,*(EI.getCurrent()) );
+                BWProcessIncomingEdge(item, *(EI.getCurrent()) );
             }
         }
     }

package/SVF-osx/Release-build/include/SVF-LLVM/DCHG.h

@@ -457,17 +457,17 @@ 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::DCHNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::DCHNode,SVF::DCHEdge>*  >
+template<> struct GenericGraphTraits<SVF::DCHNode*> : public GenericGraphTraits<SVF::GenericNode<SVF::DCHNode, SVF::DCHEdge>*  >
 {
 };
 
 /// Inverse GenericGraphTraits specializations for call graph node, it is used for inverse traversal.
 template<>
-struct GenericGraphTraits<Inverse<SVF::DCHNode*> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::DCHNode,SVF::DCHEdge>* > >
+struct GenericGraphTraits<Inverse<SVF::DCHNode*> > : public GenericGraphTraits<Inverse<SVF::GenericNode<SVF::DCHNode, SVF::DCHEdge>* > >
 {
 };
 
-template<> struct GenericGraphTraits<SVF::DCHGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::DCHNode,SVF::DCHEdge>* >
+template<> struct GenericGraphTraits<SVF::DCHGraph*> : public GenericGraphTraits<SVF::GenericGraph<SVF::DCHNode, SVF::DCHEdge>* >
 {
     typedef SVF::DCHNode *NodeRef;
 };

package/SVF-osx/Release-build/include/SVF-LLVM/GEPTypeBridgeIterator.h

@@ -17,9 +17,9 @@ template<typename ItTy = User::const_op_iterator>
 class generic_bridge_gep_type_iterator : public std::iterator<std::forward_iterator_tag, Type*, ptrdiff_t>
 {
 
-    typedef std::iterator<std::forward_iterator_tag,Type*, ptrdiff_t> super;
+    typedef std::iterator<std::forward_iterator_tag, Type*, ptrdiff_t> super;
     ItTy OpIt;
-    PointerIntPair<Type*,1> CurTy;
+    PointerIntPair<Type*, 1> CurTy;
     unsigned AddrSpace;
     generic_bridge_gep_type_iterator() {}
 public:

package/SVF-osx/Release-build/include/SVFIR/SVFIR.h

@@ -52,27 +52,27 @@ class SVFIR : public IRGraph
 
 public:
     typedef Set<const CallICFGNode*> CallSiteSet;
-    typedef OrderedMap<const CallICFGNode*,NodeID> CallSiteToFunPtrMap;
-    typedef Map<NodeID,CallSiteSet> FunPtrToCallSitesMap;
-    typedef Map<NodeID,NodeBS> MemObjToFieldsMap;
+    typedef OrderedMap<const CallICFGNode*, NodeID> CallSiteToFunPtrMap;
+    typedef Map<NodeID, CallSiteSet> FunPtrToCallSitesMap;
+    typedef Map<NodeID, NodeBS> MemObjToFieldsMap;
     typedef std::vector<const SVFStmt*> SVFStmtList;
     typedef std::vector<const SVFVar*> SVFVarList;
-    typedef Map<const SVFVar*,PhiStmt*> PHINodeMap;
-    typedef Map<const SVFFunction*,SVFVarList> FunToArgsListMap;
-    typedef Map<const CallICFGNode*,SVFVarList> CSToArgsListMap;
-    typedef Map<const RetICFGNode*,const SVFVar*> CSToRetMap;
-    typedef Map<const SVFFunction*,const SVFVar*> FunToRetMap;
-    typedef Map<const SVFFunction*,SVFStmtSet> FunToPAGEdgeSetMap;
-    typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
+    typedef Map<const SVFVar*, PhiStmt*> PHINodeMap;
+    typedef Map<const SVFFunction*, SVFVarList> FunToArgsListMap;
+    typedef Map<const CallICFGNode*, SVFVarList> CSToArgsListMap;
+    typedef Map<const RetICFGNode*, const SVFVar*> CSToRetMap;
+    typedef Map<const SVFFunction*, const SVFVar*> FunToRetMap;
+    typedef Map<const SVFFunction*, SVFStmtSet> FunToPAGEdgeSetMap;
+    typedef Map<const ICFGNode*, SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
     typedef std::pair<NodeID, APOffset> NodeOffset;
     typedef std::pair<NodeID, AccessPath> NodeAccessPath;
-    typedef Map<NodeOffset,NodeID> NodeOffsetMap;
-    typedef Map<NodeAccessPath,NodeID> NodeAccessPathMap;
+    typedef Map<NodeOffset, NodeID> NodeOffsetMap;
+    typedef Map<NodeAccessPath, NodeID> NodeAccessPathMap;
     typedef Map<const SVFValue*, NodeAccessPathMap> GepValueVarMap;
     typedef std::pair<const SVFType*, std::vector<AccessPath>> SVFTypeLocSetsPair;
     typedef Map<NodeID, SVFTypeLocSetsPair> TypeLocSetsMap;
-    typedef Map<NodePair,NodeID> NodePairSetMap;
+    typedef Map<NodePair, NodeID> NodePairSetMap;
 
 private:
     /// ValueNodes - This map indicates the Node that a particular SVFValue* is

package/SVF-osx/Release-build/include/SVFIR/SVFStatements.h

@@ -214,7 +214,7 @@ public:
     }
     //@}
 
-    typedef GenericNode<SVFVar,SVFStmt>::GEdgeSetTy SVFStmtSetTy;
+    typedef GenericNode<SVFVar, SVFStmt>::GEdgeSetTy SVFStmtSetTy;
     typedef Map<EdgeID, SVFStmtSetTy> PAGEdgeToSetMapTy;
     typedef PAGEdgeToSetMapTy KindToSVFStmtMapTy;
     typedef SVFStmtSetTy PAGEdgeSetTy;

package/SVF-osx/Release-build/include/SVFIR/SVFValue.h

@@ -58,9 +58,9 @@ public:
 
 private:
     BBList reachableBBs;    ///< reachable BasicBlocks from the function entry.
-    Map<const SVFBasicBlock*,BBSet> dtBBsMap;   ///< map a BasicBlock to BasicBlocks it Dominates
-    Map<const SVFBasicBlock*,BBSet> pdtBBsMap;   ///< map a BasicBlock to BasicBlocks it PostDominates
-    Map<const SVFBasicBlock*,BBSet> dfBBsMap;    ///< map a BasicBlock to its Dominate Frontier BasicBlocks
+    Map<const SVFBasicBlock*, BBSet> dtBBsMap;   ///< map a BasicBlock to BasicBlocks it Dominates
+    Map<const SVFBasicBlock*, BBSet> pdtBBsMap;   ///< map a BasicBlock to BasicBlocks it PostDominates
+    Map<const SVFBasicBlock*, BBSet> dfBBsMap;    ///< map a BasicBlock to its Dominate Frontier BasicBlocks
     Map<const SVFBasicBlock*, LoopBBs> bb2LoopMap;  ///< map a BasicBlock (if it is in a loop) to all the BasicBlocks in this loop
     Map<const SVFBasicBlock*, u32_t> bb2PdomLevel;  ///< map a BasicBlock to its level in pdom tree, used in findNearestCommonPDominator
     Map<const SVFBasicBlock*, const SVFBasicBlock*> bb2PIdom;  ///< map a BasicBlock to its immediate dominator in pdom tree, used in findNearestCommonPDominator
@@ -72,12 +72,12 @@ public:
 
     virtual ~SVFLoopAndDomInfo() {}
 
-    inline const Map<const SVFBasicBlock*,BBSet>& getDomFrontierMap() const
+    inline const Map<const SVFBasicBlock*, BBSet>& getDomFrontierMap() const
     {
         return dfBBsMap;
     }
 
-    inline Map<const SVFBasicBlock*,BBSet>& getDomFrontierMap()
+    inline Map<const SVFBasicBlock*, BBSet>& getDomFrontierMap()
     {
         return dfBBsMap;
     }
@@ -105,43 +105,43 @@ public:
         bb2LoopMap[bb].push_back(loopBB);
     }
 
-    inline const Map<const SVFBasicBlock*,BBSet>& getPostDomTreeMap() const
+    inline const Map<const SVFBasicBlock*, BBSet>& getPostDomTreeMap() const
     {
         return pdtBBsMap;
     }
 
-    inline Map<const SVFBasicBlock*,BBSet>& getPostDomTreeMap()
+    inline Map<const SVFBasicBlock*, BBSet>& getPostDomTreeMap()
     {
         return pdtBBsMap;
     }
 
-    inline const Map<const SVFBasicBlock*,u32_t>& getBBPDomLevel() const
+    inline const Map<const SVFBasicBlock*, u32_t>& getBBPDomLevel() const
     {
         return bb2PdomLevel;
     }
 
-    inline Map<const SVFBasicBlock*,u32_t>& getBBPDomLevel()
+    inline Map<const SVFBasicBlock*, u32_t>& getBBPDomLevel()
     {
         return bb2PdomLevel;
     }
 
-    inline const Map<const SVFBasicBlock*,const SVFBasicBlock*>& getBB2PIdom() const
+    inline const Map<const SVFBasicBlock*, const SVFBasicBlock*>& getBB2PIdom() const
     {
         return bb2PIdom;
     }
 
-    inline Map<const SVFBasicBlock*,const SVFBasicBlock*>& getBB2PIdom()
+    inline Map<const SVFBasicBlock*, const SVFBasicBlock*>& getBB2PIdom()
     {
         return bb2PIdom;
     }
 
 
-    inline Map<const SVFBasicBlock*,BBSet>& getDomTreeMap()
+    inline Map<const SVFBasicBlock*, BBSet>& getDomTreeMap()
     {
         return dtBBsMap;
     }
 
-    inline const Map<const SVFBasicBlock*,BBSet>& getDomTreeMap() const
+    inline const Map<const SVFBasicBlock*, BBSet>& getDomTreeMap() const
     {
         return dtBBsMap;
     }
@@ -487,12 +487,12 @@ public:
         return loopAndDom->loopContainsBB(lp,bb);
     }
 
-    inline const Map<const SVFBasicBlock*,BBSet>& getDomTreeMap() const
+    inline const Map<const SVFBasicBlock*, BBSet>& getDomTreeMap() const
     {
         return loopAndDom->getDomTreeMap();
     }
 
-    inline const Map<const SVFBasicBlock*,BBSet>& getDomFrontierMap() const
+    inline const Map<const SVFBasicBlock*, BBSet>& getDomFrontierMap() const
     {
         return loopAndDom->getDomFrontierMap();
     }

package/SVF-osx/Release-build/include/Util/Casting.h

@@ -228,7 +228,7 @@ struct isa_impl_wrap<To, FromTy, FromTy>
     // When From == SimpleType, we are as simple as we are going to get.
     static bool doit(const FromTy &Val)
     {
-        return isa_impl_cl<To,FromTy>::doit(Val);
+        return isa_impl_cl<To, FromTy>::doit(Val);
     }
 };
 
@@ -306,7 +306,7 @@ template<class To, class FromTy>
 struct cast_retty_wrap<To, FromTy, FromTy>
 {
     // When the simplified type is equal to the from type, use it directly.
-    using ret_type = typename cast_retty_impl<To,FromTy>::ret_type;
+    using ret_type = typename cast_retty_impl<To, FromTy>::ret_type;
 };
 
 template<class To, class From>
@@ -330,7 +330,7 @@ template<class To, class From, class SimpleFrom> struct cast_convert_val
     }
 };
 
-template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy>
+template<class To, class FromTy> struct cast_convert_val<To, FromTy, FromTy>
 {
     // This _is_ a simple type, just cast it.
     static typename cast_retty<To, FromTy>::ret_type doit(const FromTy &Val)

package/SVF-osx/Release-build/include/Util/GraphReachSolver.h

@@ -104,7 +104,7 @@ protected:
             child_iterator EE = GTraits::child_end(v);
             for (; EI != EE; ++EI)
             {
-                FWProcessOutgoingEdge(item,*(EI.getCurrent()) );
+                FWProcessOutgoingEdge(item, *(EI.getCurrent()) );
             }
         }
     }
@@ -123,7 +123,7 @@ protected:
             inv_child_iterator EE = InvGTraits::child_end(v);
             for (; EI != EE; ++EI)
             {
-                BWProcessIncomingEdge(item,*(EI.getCurrent()) );
+                BWProcessIncomingEdge(item, *(EI.getCurrent()) );
             }
         }
     }

package/package.json

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