svf-lib 1.0.830 → 1.0.834

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

@@ -645,9 +645,9 @@ private:
     /// Add Store edge
     StoreStmt* addStoreStmt(NodeID src, NodeID dst, const IntraICFGNode* val);
     /// Add Call edge
-    CallPE* addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    CallPE* addCallPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry);
     /// Add Return edge
-    RetPE* addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    RetPE* addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit);
     /// Add Gep edge
     GepStmt* addGepStmt(NodeID src, NodeID dst, const LocationSet& ls, bool constGep);
     /// Add Offset(Gep) edge
@@ -655,9 +655,9 @@ private:
     /// Add Variant(Gep) edge
     GepStmt* addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls);
     /// Add Thread fork edge for parameter passing
-    TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    TDForkPE* addThreadForkPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry);
     /// Add Thread join edge for parameter passing
-    TDJoinPE* addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs);
+    TDJoinPE* addThreadJoinPE(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit);
     //@}
 
     /// Set a pointer points-to black hole (e.g. int2ptr)

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

@@ -481,7 +481,8 @@ private:
     CallPE(const CallPE &);  ///< place holder
     void operator=(const CallPE &); ///< place holder
 
-    const CallICFGNode* inst;		///< llvm instruction for this call
+    const CallICFGNode* call;		        /// the callsite statement calling from 
+    const FunEntryICFGNode* entry;		/// the function exit statement calling to
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -502,8 +503,8 @@ public:
     //@}
 
     /// constructor
-    CallPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, GEdgeKind k = SVFStmt::Call) :
-        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), inst(i)
+    CallPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunEntryICFGNode* e, GEdgeKind k = SVFStmt::Call) :
+        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), call(i), entry(e)
     {
     }
 
@@ -511,11 +512,15 @@ public:
     //@{
     inline const CallICFGNode* getCallInst() const
     {
-        return inst;
+        return call;
     }
     inline const CallICFGNode* getCallSite() const
     {
-        return inst;
+        return call;
+    }
+    inline const FunEntryICFGNode* getFunEntryICFGNode() const
+    {
+        return entry;
     }
     //@}
 
@@ -533,7 +538,8 @@ private:
     RetPE(const RetPE &);  ///< place holder
     void operator=(const RetPE &); ///< place holder
 
-    const CallICFGNode* inst;		/// the callsite instruction return to
+    const CallICFGNode* call;		        /// the callsite statement returning to
+    const FunExitICFGNode* exit;		/// the function exit statement returned from
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -554,8 +560,8 @@ public:
     //@}
 
     /// constructor
-    RetPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, GEdgeKind k = SVFStmt::Ret) :
-        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), inst(i)
+    RetPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunExitICFGNode* e, GEdgeKind k = SVFStmt::Ret) :
+        AssignStmt(s,d,makeEdgeFlagWithCallInst(k,i)), call(i), exit(e)
     {
     }
 
@@ -563,11 +569,15 @@ public:
     //@{
     inline const CallICFGNode* getCallInst() const
     {
-        return inst;
+        return call;
     }
     inline const CallICFGNode* getCallSite() const
     {
-        return inst;
+        return call;
+    }
+    inline const FunExitICFGNode* getFunExitICFGNode() const
+    {
+        return exit;
     }
     //@}
 
@@ -1022,8 +1032,8 @@ public:
     //@}
 
     /// constructor
-    TDForkPE(SVFVar* s, SVFVar* d, const CallICFGNode* i) :
-        CallPE(s,d,i,SVFStmt::ThreadFork)
+    TDForkPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunEntryICFGNode* entry) :
+        CallPE(s,d,i,entry,SVFStmt::ThreadFork)
     {
     }
 
@@ -1060,8 +1070,8 @@ public:
     //@}
 
     /// Constructor
-    TDJoinPE(SVFVar* s, SVFVar* d, const CallICFGNode* i) :
-        RetPE(s,d,i,SVFStmt::ThreadJoin)
+    TDJoinPE(SVFVar* s, SVFVar* d, const CallICFGNode* i, const FunExitICFGNode* e) :
+        RetPE(s,d,i,e, SVFStmt::ThreadJoin)
     {
     }
 

package/SVF-osx/include/SVF-FE/SVFIRBuilder.h

@@ -366,16 +366,16 @@ public:
         return edge;
     }
     /// Add Call edge
-    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline CallPE* addCallEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        CallPE *edge = pag->addCallPE(src, dst, cs);
+        CallPE *edge = pag->addCallPE(src, dst, cs, entry);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Return edge
-    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline RetPE* addRetEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        RetPE *edge = pag->addRetPE(src, dst, cs);
+        RetPE *edge = pag->addRetPE(src, dst, cs, exit);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -401,16 +401,16 @@ public:
         return edge;
     }
     /// Add Thread fork edge for parameter passing
-    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline TDForkPE* addThreadForkEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunEntryICFGNode* entry)
     {
-        TDForkPE *edge = pag->addThreadForkPE(src, dst, cs);
+        TDForkPE *edge = pag->addThreadForkPE(src, dst, cs, entry);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Thread join edge for parameter passing
-    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs)
+    inline TDJoinPE* addThreadJoinEdge(NodeID src, NodeID dst, const CallICFGNode* cs, const FunExitICFGNode* exit)
     {
-        TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs);
+        TDJoinPE *edge = pag->addThreadJoinPE(src, dst, cs, exit);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

package/package.json

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