svf-lib 1.0.769 → 1.0.773

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

@@ -46,6 +46,8 @@ typedef GenericGraph<ICFGNode,ICFGEdge> GenericICFGTy;
 class ICFG : public GenericICFGTy
 {
 
+friend class ICFGBuilder;
+
 public:
 
     typedef Map<NodeID, ICFGNode *> ICFGNodeIDToNodeMapTy;
@@ -109,7 +111,7 @@ public:
     /// update ICFG for indirect calls
     void updateCallGraph(PTACallGraph* callgraph);
 
-public:
+protected:
     /// Remove a SVFG edge
     inline void removeICFGEdge(ICFGEdge* edge)
     {
@@ -157,6 +159,7 @@ public:
         addGNode(node->getId(),node);
     }
 
+public:
     /// Get a basic block ICFGNode
     /// TODO:: need to fix the assertions
     //@{
@@ -172,11 +175,10 @@ public:
 
     FunExitBlockNode* getFunExitBlockNode(const SVFFunction*  fun);
 
-    GlobalBlockNode* getGlobalBlockNode() const
+    inline GlobalBlockNode* getGlobalBlockNode() const
     {
         return globalBlockNode;
     }
-    
     //@}
 
 private:

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

@@ -365,11 +365,11 @@ class CallBlockNode : public InterBlockNode
 {
 
 public:
-    typedef std::vector<const SVFVar *> ActualParmVFGNodeVec;
+    typedef std::vector<const SVFVar *> ActualParmNodeVec;
 private:
     const Instruction* cs;
     const RetBlockNode* ret;
-    ActualParmVFGNodeVec APNodes;
+    ActualParmNodeVec APNodes;
 public:
     CallBlockNode(NodeID id, const Instruction* c) : InterBlockNode(id, FunCallBlock), cs(c), ret(nullptr)
     {
@@ -415,7 +415,7 @@ public:
     }
 
     /// Return the set of actual parameters
-    inline const ActualParmVFGNodeVec &getActualParms() const
+    inline const ActualParmNodeVec &getActualParms() const
     {
         return APNodes;
     }

package/SVF-linux/include/MemoryModel/PointerAnalysis.h

@@ -293,9 +293,6 @@ protected:
     virtual void validateExpectedFailureTests(std::string fun);
     //@}
 
-    /// Whether to dump the graph for debugging purpose
-    bool dumpGraph();
-
     /// Reset all object node as field-sensitive.
     void resetObjFieldSensitive();
 

package/SVF-linux/include/MemoryModel/SVFStatements.h

@@ -753,6 +753,11 @@ public:
     void addOpVar(SVFVar* op){
         opVars.push_back(op);
     }
+
+    /// Return true if this is a phi at the function exit 
+    /// to receive one or multiple return values of this function
+    bool isFunctionRetPhi() const;
+
     virtual const std::string toString() const override;
 };
 

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

@@ -365,11 +365,11 @@ class CallBlockNode : public InterBlockNode
 {
 
 public:
-    typedef std::vector<const SVFVar *> ActualParmVFGNodeVec;
+    typedef std::vector<const SVFVar *> ActualParmNodeVec;
 private:
     const Instruction* cs;
     const RetBlockNode* ret;
-    ActualParmVFGNodeVec APNodes;
+    ActualParmNodeVec APNodes;
 public:
     CallBlockNode(NodeID id, const Instruction* c) : InterBlockNode(id, FunCallBlock), cs(c), ret(nullptr)
     {
@@ -415,7 +415,7 @@ public:
     }
 
     /// Return the set of actual parameters
-    inline const ActualParmVFGNodeVec &getActualParms() const
+    inline const ActualParmNodeVec &getActualParms() const
     {
         return APNodes;
     }

package/SVF-osx/include/MemoryModel/SVFVariables.h

@@ -45,6 +45,9 @@ class SVFVar;
 typedef GenericNode<SVFVar,SVFStmt> GenericPAGNodeTy;
 class SVFVar : public GenericPAGNodeTy
 {
+friend class IRGraph;
+friend class SVFIR;
+friend class VFG;
 
 public:
     /// Nine kinds of SVFIR variables
@@ -162,13 +165,11 @@ public:
     {
         return InEdgeKindToSetMap[kind];
     }
-
     /// Get outgoing SVFIR statements (edges)
     inline SVFStmt::SVFStmtSetTy& getOutgoingEdges(SVFStmt::PEDGEK kind)
     {
         return OutEdgeKindToSetMap[kind];
     }
-
     /// Has incoming SVFIR statements (edges)
     inline bool hasIncomingEdges(SVFStmt::PEDGEK kind) const
     {
@@ -178,18 +179,16 @@ public:
         else
             return false;
     }
-
-    /// Has incoming VariantGepEdges
-    inline bool hasIncomingVariantGepEdge() const
+    /// Has outgoing SVFIR statements (edges)
+    inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
-        if (it != InEdgeKindToSetMap.end())
-        {
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
+        if (it != OutEdgeKindToSetMap.end())
             return (!it->second.empty());
-        }
-        return false;
+        else
+            return false;
     }
-
+    
     /// Get incoming SVFStmt iterator
     inline SVFStmt::SVFStmtSetTy::iterator getIncomingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
@@ -206,16 +205,6 @@ public:
         return it->second.end();
     }
 
-    /// Has outgoing SVFIR statements (edges)
-    inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
-    {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
-        if (it != OutEdgeKindToSetMap.end())
-            return (!it->second.empty());
-        else
-            return false;
-    }
-
     /// Get outgoing SVFStmt iterator
     inline SVFStmt::SVFStmtSetTy::iterator getOutgoingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
@@ -233,6 +222,7 @@ public:
     }
     //@}
 
+private:
     ///  add methods of the components
     //@{
     inline void addInEdge(SVFStmt* inEdge)
@@ -248,7 +238,18 @@ public:
         OutEdgeKindToSetMap[kind].insert(outEdge);
         addOutgoingEdge(outEdge);
     }
+    /// Has incoming VariantGepEdges
+    inline bool hasIncomingVariantGepEdge() const
+    {
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
+        if (it != InEdgeKindToSetMap.end())
+        {
+            return (!it->second.empty());
+        }
+        return false;
+    }
 
+public:
     virtual const std::string toString() const;
 
     /// Dump to console for debugging

package/package.json

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