svf-lib 1.0.1044 → 1.0.1047

package/SVF-linux/include/MTA/MHP.h

@@ -341,7 +341,7 @@ public:
         NodeID parentTid = tct->getParentThread(tid);
         const CxtThread& parentct = tct->getTCTNode(parentTid)->getCxtThread();
         const Function* parentRoutine = tct->getStartRoutineOfCxtThread(parentct);
-        return &(SVFUtil::getFunExitBB(parentRoutine)->back());
+        return &(LLVMUtil::getFunExitBB(parentRoutine)->back());
     }
 
     /// Get loop for join site

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

@@ -763,7 +763,7 @@ public:
     //@}
 
     /// constructor
-    SelectStmt(SVFVar* s, const OPVars& opnds, const SVFVar* cond) : MultiOpndStmt(s,opnds,SVFStmt::Select), condition(cond)
+    SelectStmt(SVFVar* s, const OPVars& opnds, const SVFVar* cond) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::Select,opnds.at(1))), condition(cond)
     {
         assert(opnds.size()==2 && "SelectStmt can only have two operands!");
     }
@@ -816,8 +816,9 @@ public:
     //@}
 
     /// constructor
-    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre) : MultiOpndStmt(s,opnds,SVFStmt::Cmp), predicate(pre)
+    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::Cmp,opnds.at(1))), predicate(pre)
     {
+        assert(opnds.size()==2 && "CmpStmt can only have two operands!");
     }
 
     u32_t getPredicate() const
@@ -862,8 +863,9 @@ public:
     //@}
 
     /// constructor
-    BinaryOPStmt(SVFVar* s, const OPVars& opnds, u32_t oc) : MultiOpndStmt(s,opnds,SVFStmt::BinaryOp), opcode(oc)
+    BinaryOPStmt(SVFVar* s, const OPVars& opnds, u32_t oc) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::BinaryOp,opnds.at(1))), opcode(oc)
     {
+        assert(opnds.size()==2 && "BinaryOPStmt can only have two operands!");
     }
 
     u32_t getOpcode() const

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

@@ -40,7 +40,7 @@
 namespace SVF
 {
 
-namespace SVFUtil
+namespace LLVMUtil
 {
 
 
@@ -86,9 +86,9 @@ inline const PointerType *getRefTypeOfHeapAllocOrStatic(const CallSite cs)
 {
     const PointerType *refType = nullptr;
     // Case 1: heap object held by *argument, we should get its element type.
-    if (isHeapAllocExtCallViaArg(cs))
+    if (SVFUtil::isHeapAllocExtCallViaArg(cs))
     {
-        int argPos = getHeapAllocHoldingArgPosition(cs);
+        int argPos = SVFUtil::getHeapAllocHoldingArgPosition(cs);
         const Value *arg = cs.getArgument(argPos);
         if (const PointerType *argType = SVFUtil::dyn_cast<PointerType>(arg->getType()))
             refType = SVFUtil::dyn_cast<PointerType>(getPtrElementType(argType));
@@ -96,7 +96,7 @@ inline const PointerType *getRefTypeOfHeapAllocOrStatic(const CallSite cs)
     // Case 2: heap/static object held by return value.
     else
     {
-        assert((isStaticExtCall(cs) || isHeapAllocExtCallViaRet(cs))
+        assert((SVFUtil::isStaticExtCall(cs) || SVFUtil::isHeapAllocExtCallViaRet(cs))
                && "Must be heap alloc via ret, or static allocation site");
         refType = SVFUtil::dyn_cast<PointerType>(cs.getType());
     }
@@ -132,7 +132,7 @@ inline bool ArgInDeadFunction (const Value * val)
 inline bool ArgInProgEntryFunction (const Value * val)
 {
     return SVFUtil::isa<Argument>(val)
-           && isProgEntryFunction(SVFUtil::cast<Argument>(val)->getParent());
+           && SVFUtil::isProgEntryFunction(SVFUtil::cast<Argument>(val)->getParent());
 }
 /// Return true if this is value in a dead function (function without any caller)
 bool isPtrInDeadFunction (const Value * value);
@@ -145,7 +145,7 @@ bool isPtrInDeadFunction (const Value * value);
 /// Return true if the function does not have a caller (either it is a main function or a dead function)
 inline bool isNoCallerFunction (const Function * fun)
 {
-    return isDeadFunction(fun) || isProgEntryFunction(fun);
+    return isDeadFunction(fun) || SVFUtil::isProgEntryFunction(fun);
 }
 
 /// Return true if the argument in a function does not have a caller
@@ -315,7 +315,7 @@ u32_t getTypeSizeInBytes(const StructType *sty, u32_t field_index);
 //@}
 
 
-} // End namespace SVFUtil
+} // End namespace LLVMUtil
 
 } // End namespace SVF
 

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

@@ -763,7 +763,7 @@ public:
     //@}
 
     /// constructor
-    SelectStmt(SVFVar* s, const OPVars& opnds, const SVFVar* cond) : MultiOpndStmt(s,opnds,SVFStmt::Select), condition(cond)
+    SelectStmt(SVFVar* s, const OPVars& opnds, const SVFVar* cond) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::Select,opnds.at(1))), condition(cond)
     {
         assert(opnds.size()==2 && "SelectStmt can only have two operands!");
     }
@@ -816,8 +816,9 @@ public:
     //@}
 
     /// constructor
-    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre) : MultiOpndStmt(s,opnds,SVFStmt::Cmp), predicate(pre)
+    CmpStmt(SVFVar* s, const OPVars& opnds, u32_t pre) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::Cmp,opnds.at(1))), predicate(pre)
     {
+        assert(opnds.size()==2 && "CmpStmt can only have two operands!");
     }
 
     u32_t getPredicate() const
@@ -862,8 +863,9 @@ public:
     //@}
 
     /// constructor
-    BinaryOPStmt(SVFVar* s, const OPVars& opnds, u32_t oc) : MultiOpndStmt(s,opnds,SVFStmt::BinaryOp), opcode(oc)
+    BinaryOPStmt(SVFVar* s, const OPVars& opnds, u32_t oc) : MultiOpndStmt(s,opnds,makeEdgeFlagWithAddionalOpnd(SVFStmt::BinaryOp,opnds.at(1))), opcode(oc)
     {
+        assert(opnds.size()==2 && "BinaryOPStmt can only have two operands!");
     }
 
     u32_t getOpcode() const

package/package.json

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