svf-lib 1.0.840 → 1.0.844

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

@@ -34,6 +34,8 @@ namespace SVF
 {
 
 class ICFGNode;
+class CallPE;
+class RetPE;
 
 /*!
  * Interprocedural control-flow and value-flow edge, representing the control- and value-flow dependence between two nodes
@@ -157,8 +159,6 @@ private:
     s64_t branchCondVal;
 };
 
-
-
 /*!
  * Call ICFG edge representing parameter passing/return from a caller to a callee
  */
@@ -167,6 +167,7 @@ class CallCFGEdge : public ICFGEdge
 
 private:
 	const Instruction*  cs;
+    std::vector<const CallPE*> callPEs;
 public:
     /// Constructor
     CallCFGEdge(ICFGNode* s, ICFGNode* d, const Instruction*  c):
@@ -178,6 +179,14 @@ public:
     {
         return cs;
     }
+    /// Add call parameter edge to this CallCFGEdge
+    inline void addCallPE(const CallPE* callPE){
+        callPEs.push_back(callPE);
+    }
+    /// Add get parameter edge to this CallCFGEdge
+    inline const std::vector<const CallPE*>& getCallPEs() const{
+        return callPEs;
+    }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const CallCFGEdge *)
@@ -204,10 +213,11 @@ class RetCFGEdge : public ICFGEdge
 
 private:
 	const Instruction*  cs;
+    const RetPE* retPE;
 public:
     /// Constructor
     RetCFGEdge(ICFGNode* s, ICFGNode* d, const Instruction*  c):
-        ICFGEdge(s,d,RetCF),cs(c)
+        ICFGEdge(s,d,RetCF),cs(c),retPE(nullptr)
     {
     }
     /// Return callsite ID
@@ -215,6 +225,15 @@ public:
     {
         return cs;
     }
+    /// Add call parameter edge to this CallCFGEdge
+    inline void addRetPE(const RetPE* ret){
+        assert(retPE==nullptr && "we can only have one retPE for each RetCFGEdge");
+        retPE = ret;
+    }
+    /// Add get parameter edge to this CallCFGEdge
+    inline const RetPE* getRetPE() const{
+        return retPE;
+    }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const RetCFGEdge *)

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

@@ -384,7 +384,7 @@ public:
     }
 
     /// Return callsite
-    inline const RetICFGNode* getRetBlock() const
+    inline const RetICFGNode* getRetICFGNode() const
     {
     	assert(ret && "RetICFGNode not set?");
         return ret;

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

@@ -128,7 +128,7 @@ protected:
     /// Add control-flow edges for top level pointers
     //@{
     ICFGEdge* addIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode);
-    ICFGEdge* addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, NodeID branchID);
+    ICFGEdge* addConditionalIntraEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Value* condition, s64_t branchCondVal);
     ICFGEdge* addCallEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Instruction* cs);
     ICFGEdge* addRetEdge(ICFGNode* srcNode, ICFGNode* dstNode, const Instruction* cs);
     //@}

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

@@ -34,6 +34,8 @@ namespace SVF
 {
 
 class ICFGNode;
+class CallPE;
+class RetPE;
 
 /*!
  * Interprocedural control-flow and value-flow edge, representing the control- and value-flow dependence between two nodes
@@ -112,15 +114,8 @@ class IntraCFGEdge : public ICFGEdge
 {
 
 public:
-    /// the first element is a boolean (for if/else) or numeric condition value (for switch)
-    /// the second element is the value when this condition should hold to execute this CFGEdge.
-    /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
-    /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
-
-    typedef std::pair<const Value*,NodeID> BranchCondition;
-
     /// Constructor
-    IntraCFGEdge(ICFGNode* s, ICFGNode* d): ICFGEdge(s,d,IntraCF)
+    IntraCFGEdge(ICFGNode* s, ICFGNode* d): ICFGEdge(s,d,IntraCF), conditionVar(nullptr), branchCondVal(0)
     {
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -139,23 +134,31 @@ public:
     }
     //@}
 
-    const BranchCondition& getBranchCondtion() const{
-        return brCondition;
+    const Value* getCondition() const{
+        return conditionVar;
     }
 
-    void setBranchCondtion(const Value* pNode, NodeID branchID){
-        brCondition = std::make_pair(pNode,branchID);
+    const s64_t getSuccessorCondValue() const{
+        assert(getCondition() && "this is not a conditional branch edge");
+        return branchCondVal;
+    }
+
+    void setBranchCondition(const Value* c, s64_t bVal){
+        conditionVar = c;
+        branchCondVal = bVal;
     }
 
     virtual const std::string toString() const;
 
 private:
-    BranchCondition brCondition;
-
+    /// conditionVar is a boolean (for if/else) or numeric condition variable (for switch)
+    /// branchCondVal is the value when this condition should hold to execute this CFGEdge.
+    /// e.g., Inst1: br %cmp label 0, label 1,  Inst2 is label 0 and Inst 3 is label 1;
+    /// for edge between Inst1 and Inst 2, the first element is %cmp and second element is 0
+    const Value* conditionVar;
+    s64_t branchCondVal;
 };
 
-
-
 /*!
  * Call ICFG edge representing parameter passing/return from a caller to a callee
  */
@@ -164,6 +167,7 @@ class CallCFGEdge : public ICFGEdge
 
 private:
 	const Instruction*  cs;
+    std::vector<const CallPE*> callPEs;
 public:
     /// Constructor
     CallCFGEdge(ICFGNode* s, ICFGNode* d, const Instruction*  c):
@@ -175,6 +179,14 @@ public:
     {
         return cs;
     }
+    /// Add call parameter edge to this CallCFGEdge
+    inline void addCallPE(const CallPE* callPE){
+        callPEs.push_back(callPE);
+    }
+    /// Add get parameter edge to this CallCFGEdge
+    inline const std::vector<const CallPE*>& getCallPEs() const{
+        return callPEs;
+    }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const CallCFGEdge *)
@@ -201,10 +213,11 @@ class RetCFGEdge : public ICFGEdge
 
 private:
 	const Instruction*  cs;
+    const RetPE* retPE;
 public:
     /// Constructor
     RetCFGEdge(ICFGNode* s, ICFGNode* d, const Instruction*  c):
-        ICFGEdge(s,d,RetCF),cs(c)
+        ICFGEdge(s,d,RetCF),cs(c),retPE(nullptr)
     {
     }
     /// Return callsite ID
@@ -212,6 +225,15 @@ public:
     {
         return cs;
     }
+    /// Add call parameter edge to this CallCFGEdge
+    inline void addRetPE(const RetPE* ret){
+        assert(retPE==nullptr && "we can only have one retPE for each RetCFGEdge");
+        retPE = ret;
+    }
+    /// Add get parameter edge to this CallCFGEdge
+    inline const RetPE* getRetPE() const{
+        return retPE;
+    }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const RetCFGEdge *)

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

@@ -384,7 +384,7 @@ public:
     }
 
     /// Return callsite
-    inline const RetICFGNode* getRetBlock() const
+    inline const RetICFGNode* getRetICFGNode() const
     {
     	assert(ret && "RetICFGNode not set?");
         return ret;

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

@@ -639,15 +639,6 @@ public:
     {
         return SVFStmt::getDstNode();
     }
-    /// Return the position of this op
-    const u32_t getOpPos(const SVFVar* op) const{
-        for(u32_t i = 0; i < getOpVarNum(); i++){
-            if(getOpVar(i)==op)
-                return i;
-        }
-        assert(false && "this operand not found!");
-        abort();
-    }
 
     NodeID getOpVarID(u32_t pos) const;
     NodeID getResID() const;
@@ -718,8 +709,8 @@ public:
     }
 
     /// Return the corresponding ICFGNode of this operand
-    inline const ICFGNode* getOpICFGNode(const SVFVar* op) const{
-        return opICFGNodes.at(getOpPos(op));
+    inline const ICFGNode* getOpICFGNode(u32_t op_idx) const{
+        return opICFGNodes.at(op_idx);
     }
 
     /// Return true if this is a phi at the function exit 

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

@@ -309,7 +309,9 @@ public:
     inline PhiStmt* addPhiStmt(NodeID res, NodeID opnd, const ICFGNode* pred)
     {
         PhiStmt *edge = pag->addPhiStmt(res,opnd,pred);
-        setCurrentBBAndValueForPAGEdge(edge);
+        /// If we already added this phi node, then skip this adding
+        if(edge)
+            setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add SelectStmt

package/package.json

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