svf-lib 1.0.951 → 1.0.954

package/SVF-linux/include/DDA/DDAVFSolver.h

@@ -448,10 +448,10 @@ protected:
         assert(obj && "object not found!!");
         if(obj->isStack())
         {
-            if(const AllocaInst* local = SVFUtil::dyn_cast<AllocaInst>(obj->getValue()))
+            if(const Function* fun = _pag->getGNode(id)->getFunction())
             {
-                const SVFFunction* fun = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(local->getFunction());
-                return _callGraphSCC->isInCycle(_callGraph->getCallGraphNode(fun)->getId());
+                const SVFFunction* svffun = LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(fun);
+                return _callGraphSCC->isInCycle(_callGraph->getCallGraphNode(svffun)->getId());
             }
         }
         return false;

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

@@ -431,6 +431,9 @@ public:
     /// Get the number of elements of this object 
     u32_t getNumOfElements() const;
 
+    /// Set the number of elements of this object
+    void setNumOfElements(u32_t num);
+
     /// Get max field offset limit
     u32_t getMaxFieldOffsetLimit() const;
 

package/SVF-linux/include/SABER/PathCondAllocator.h

@@ -202,6 +202,10 @@ public:
         return condMgr->isEquivalentBranchCond(lhs, rhs);
     }
 
+    inline ICFG* getICFG() const {
+        return PAG::getPAG()->getICFG();
+    }
+
 private:
 
     /// Allocate path condition for every basic block
@@ -223,9 +227,9 @@ private:
     /// Evaluate loop exit branch
     Condition* evaluateLoopExitBranch(const BasicBlock * bb, const BasicBlock *succ);
     /// Return branch condition after evaluating test null like expression
-    Condition* evaluateTestNullLikeExpr(const BranchInst* brInst, const BasicBlock *succ);
+    Condition* evaluateTestNullLikeExpr(const BranchStmt* branchStmt, const BasicBlock *succ);
     /// Return condition when there is a branch calls program exit
-    Condition* evaluateProgExit(const BranchInst* brInst, const BasicBlock *succ);
+    Condition* evaluateProgExit(const BranchStmt* branchStmt, const BasicBlock *succ);
     /// Collect basic block contains program exit function call
     void collectBBCallingProgExit(const BasicBlock& bb);
     bool isBBCallsProgExit(const BasicBlock* bb);
@@ -269,6 +273,8 @@ private:
     }
     //@}
 
+
+
     /// Release memory
     void destroy(){
 

package/SVF-linux/include/SABER/SaberAnnotator.h

@@ -30,7 +30,7 @@
 #ifndef SABERANNOTATOR_H_
 #define SABERANNOTATOR_H_
 
-#include "Util/BasicTypes.h"
+#include <MemoryModel/SVFStatements.h>
 #include "Util/Annotator.h"
 
 namespace SVF
@@ -60,10 +60,10 @@ public:
     //@{
     void annotateSource();
     void annotateSinks();
-    void annotateFeasibleBranch(const BranchInst *brInst, u32_t succPos);
-    void annotateInfeasibleBranch(const BranchInst *brInst, u32_t succPos);
+    void annotateFeasibleBranch(const BranchStmt *branchStmt, u32_t succPos);
+    void annotateInfeasibleBranch(const BranchStmt *branchStmt, u32_t succPos);
 
-    void annotateSwitch(SwitchInst *brInst, u32_t succPos);
+    void annotateSwitch(const BranchStmt *swithStmt, u32_t succPos);
     //@}
 };
 

package/SVF-osx/include/SABER/PathCondAllocator.h

@@ -202,6 +202,10 @@ public:
         return condMgr->isEquivalentBranchCond(lhs, rhs);
     }
 
+    inline ICFG* getICFG() const {
+        return PAG::getPAG()->getICFG();
+    }
+
 private:
 
     /// Allocate path condition for every basic block
@@ -223,9 +227,9 @@ private:
     /// Evaluate loop exit branch
     Condition* evaluateLoopExitBranch(const BasicBlock * bb, const BasicBlock *succ);
     /// Return branch condition after evaluating test null like expression
-    Condition* evaluateTestNullLikeExpr(const BranchInst* brInst, const BasicBlock *succ);
+    Condition* evaluateTestNullLikeExpr(const BranchStmt* branchStmt, const BasicBlock *succ);
     /// Return condition when there is a branch calls program exit
-    Condition* evaluateProgExit(const BranchInst* brInst, const BasicBlock *succ);
+    Condition* evaluateProgExit(const BranchStmt* branchStmt, const BasicBlock *succ);
     /// Collect basic block contains program exit function call
     void collectBBCallingProgExit(const BasicBlock& bb);
     bool isBBCallsProgExit(const BasicBlock* bb);
@@ -269,6 +273,8 @@ private:
     }
     //@}
 
+
+
     /// Release memory
     void destroy(){
 

package/SVF-osx/include/SABER/SaberAnnotator.h

@@ -30,7 +30,7 @@
 #ifndef SABERANNOTATOR_H_
 #define SABERANNOTATOR_H_
 
-#include "Util/BasicTypes.h"
+#include <MemoryModel/SVFStatements.h>
 #include "Util/Annotator.h"
 
 namespace SVF
@@ -60,10 +60,10 @@ public:
     //@{
     void annotateSource();
     void annotateSinks();
-    void annotateFeasibleBranch(const BranchInst *brInst, u32_t succPos);
-    void annotateInfeasibleBranch(const BranchInst *brInst, u32_t succPos);
+    void annotateFeasibleBranch(const BranchStmt *branchStmt, u32_t succPos);
+    void annotateInfeasibleBranch(const BranchStmt *branchStmt, u32_t succPos);
 
-    void annotateSwitch(SwitchInst *brInst, u32_t succPos);
+    void annotateSwitch(const BranchStmt *swithStmt, u32_t succPos);
     //@}
 };
 

package/package.json

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