svf-lib 1.0.809 → 1.0.810

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

@@ -569,7 +569,7 @@ public:
     u32_t getNumSuccessors() const{
         return brstmt->getNumSuccessors();
     }
-    const std::vector<const ICFGNode*>& getSuccessors() const{
+    const BranchStmt::SuccAndCondPairVec& getSuccessors() const{
         return brstmt->getSuccessors();
     }
     const ICFGNode* getSuccessor (u32_t i) const{

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

@@ -637,7 +637,7 @@ private:
     /// Add Unary edge
     UnaryOPStmt* addUnaryOPStmt(NodeID src, NodeID dst, u32_t opcode);
     /// Add BranchStmt
-    BranchStmt* addBranchStmt(NodeID br, NodeID cond, std::vector<const ICFGNode*> succs);
+    BranchStmt* addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs);
     /// Add Load edge
     LoadStmt* addLoadStmt(NodeID src, NodeID dst);
     /// Add Store edge

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

@@ -839,6 +839,8 @@ public:
  */
 class BranchStmt: public SVFStmt
 {
+public:
+    typedef std::vector<std::pair<const ICFGNode*, s64_t> > SuccAndCondPairVec;
 private:
     BranchStmt();                      ///< place holder
     BranchStmt(const BranchStmt &);  ///< place holder
@@ -848,9 +850,10 @@ private:
     NodeID getSrcID();  ///< place holder, use getOpVarID(pos) instead
     NodeID getDstID();    ///< place holder, use getResID() instead
 
-    std::vector<const ICFGNode*> successors;
+    SuccAndCondPairVec successors;
     const SVFVar* cond;
     const SVFVar* brInst;
+
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -869,7 +872,7 @@ public:
     //@}
 
     /// constructor
-    BranchStmt(SVFVar* inst, SVFVar* c, const std::vector<const ICFGNode*>& succs) : SVFStmt(c,inst,SVFStmt::Branch), successors(succs), cond(c), brInst(inst)
+    BranchStmt(SVFVar* inst, SVFVar* c, const SuccAndCondPairVec& succs) : SVFStmt(c,inst,SVFStmt::Branch), successors(succs), cond(c), brInst(inst)
     {
     }
 
@@ -882,18 +885,31 @@ public:
     const SVFVar* getBranchInst() const{
         return brInst;
     }
+    
+    /// For example if(c) {stmt1} else {stmt2}
+    /// successor(0): stmt1, 1
+    /// successor(1): stmt2, 0 
+
+    /// For example switch(c) case 0: {stmt1; break;} case 1: {stmt2; break;} default {stmt3: break}
+    /// successor(0): stmt1, 0
+    /// successor(1): stmt2, 1 
+    /// successor(3): stmt3, -1 
+
     /// Successors of this branch statement
     ///@{
     u32_t getNumSuccessors() const{
         return successors.size();
     }
-    const std::vector<const ICFGNode*>& getSuccessors() const{
+    const SuccAndCondPairVec& getSuccessors() const{
         return successors;
     }
     const ICFGNode* getSuccessor (u32_t i) const{
-        return successors.at(i);
+        return successors.at(i).first;
     }
-    ///@}
+    s64_t getSuccessorCondValue (u32_t i) const{ 
+        return successors.at(i).second;
+    }
+    //@}
     virtual const std::string toString() const override;
 };
 

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

@@ -331,7 +331,7 @@ public:
         return edge;
     }
     /// Add Branch statement 
-    inline BranchStmt* addBranchStmt(NodeID br, NodeID cond, const std::vector<const ICFGNode*> succs){
+    inline BranchStmt* addBranchStmt(NodeID br, NodeID cond, const BranchStmt::SuccAndCondPairVec& succs){
         BranchStmt *edge = pag->addBranchStmt(br, cond, succs);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;

package/package.json

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