svf-lib 1.0.1810 → 1.0.1812

package/SVF-linux/svf/include/AbstractExecution/IntervalExeState.h

@@ -289,7 +289,7 @@ public:
         }
     }
 
-    inline virtual IntervalValue& getLocToVal(u32_t id)
+    inline virtual IntervalValue& getLocVal(u32_t id)
     {
         auto it = _locToItvVal.find(id);
         if(it != _locToItvVal.end())
@@ -578,7 +578,7 @@ public:
         }
     }
 
-    inline IntervalValue& getLocToVal(u32_t id) override
+    inline IntervalValue& getLocVal(u32_t id) override
     {
         auto it = _locToItvVal.find(id);
         if(it != _locToItvVal.end())

package/SVF-osx/svf/include/SVFIR/SVFStatements.h

@@ -320,6 +320,8 @@ private:
     AddrStmt(const AddrStmt&);       ///< place holder
     void operator=(const AddrStmt&); ///< place holder
 
+    std::vector<SVFValue*> arrSize;	///< Array size of the allocated memory
+
 public:
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -342,6 +344,17 @@ public:
 
     virtual const std::string toString() const override;
 
+    inline void addArrSize(SVFValue* size)   //TODO:addSizeVar
+    {
+        arrSize.push_back(size);
+    }
+
+    ///< get array size of the allocated memory
+    inline const std::vector<SVFValue*>& getArrSize() const   //TODO:getSizeVars
+    {
+        return arrSize;
+    }
+
 };
 
 /*!

package/SVF-osx/svf-llvm/include/SVF-LLVM/SVFIRBuilder.h

@@ -297,6 +297,66 @@ protected:
         }
         return nullptr;
     }
+
+    /// Add Address edge from allocinst with arraysize like "%4 = alloca i8, i64 3"
+    inline AddrStmt* addAddrWithStackArraySz(NodeID src, NodeID dst, llvm::AllocaInst& inst)
+    {
+        AddrStmt* edge = addAddrEdge(src, dst);
+        if (inst.getArraySize())
+        {
+            SVFValue* arrSz = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(inst.getArraySize());
+            edge->addArrSize(arrSz);
+        }
+        return edge;
+    }
+
+    /// Add Address edge from ext call with args like "%5 = call i8* @malloc(i64 noundef 5)"
+    inline AddrStmt* addAddrWithHeapSz(NodeID src, NodeID dst, const CallBase* cs)
+    {
+        // get name of called function
+        AddrStmt* edge = addAddrEdge(src, dst);
+
+        llvm::Function* calledFunc = cs->getCalledFunction();
+        std::string functionName;
+        if (calledFunc)
+        {
+            functionName = calledFunc->getName().str();
+        }
+        else
+        {
+            SVFUtil::wrnMsg("not support indirect call to add AddrStmt.\n");
+        }
+        if (functionName == "malloc")
+        {
+            if (cs->arg_size() > 0)
+            {
+                const llvm::Value* val = cs->getArgOperand(0);
+                SVFValue* svfval = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val);
+                edge->addArrSize(svfval);
+            }
+        }
+        // Check if the function called is 'calloc' and process its arguments.
+        // e.g. "%5 = call i8* @calloc(1, 8)", edge should add two SVFValue (1 and 8)
+        else if (functionName == "calloc")
+        {
+            if (cs->arg_size() > 1)
+            {
+                edge->addArrSize(LLVMModuleSet::getLLVMModuleSet()->getSVFValue(cs->getArgOperand(0)));
+                edge->addArrSize(LLVMModuleSet::getLLVMModuleSet()->getSVFValue(cs->getArgOperand(1)));
+            }
+        }
+        else
+        {
+            if (cs->arg_size() > 0)
+            {
+                const llvm::Value* val = cs->getArgOperand(0);
+                SVFValue* svfval = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val);
+                edge->addArrSize(svfval);
+            }
+        }
+        return edge;
+    }
+
     /// Add Copy edge
     inline CopyStmt* addCopyEdge(NodeID src, NodeID dst)
     {

package/package.json

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