svf-tools 1.0.660 → 1.0.662

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.660",
+  "version": "1.0.662",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {

package/svf/include/Util/ExtAPI.json

@@ -4974,35 +4974,35 @@
         "arguments":  "(i8*, i8, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["0", "1", "2"]
+        "memset_like": ["Arg0", "Arg1", "Arg2"]
     },
     "llvm.memset.p0i8.i32": {
         "return":  "void",
         "arguments":  "(i8*, i8, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["0", "1", "2"]
+        "memset_like": ["Arg0", "Arg1", "Arg2"]
     },
     "llvm.memset.p0i8.i64": {
         "return":  "void",
         "arguments":  "(i8*, i8, i64, i32, i1)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["0", "1", "2"]
+        "memset_like": ["Arg0", "Arg1", "Arg2"]
     },
     "__memset_chk": {
         "return":  "void *",
         "arguments":  "(void *, int, size_t, size_t)",
         "type": "EFT_L_A0__A0R_A1",
         "overwrite_app_function": 0,
-        "memset_like": ["0", "1", "2"]
+        "memset_like": ["Arg0", "Arg1", "Arg2"]
     },
     "llvm.memcpy":  {
         "return":  "void",
         "arguments":  "(i8*, i8*, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5013,7 +5013,7 @@
         "arguments":  "(i8*, i8*, i32, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5024,7 +5024,7 @@
         "arguments":  "(i8*, *i8, i64, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5035,7 +5035,7 @@
         "arguments":  "(i8*, i8*, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5046,7 +5046,7 @@
         "arguments":  "(i8*, i8*, i32, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5057,7 +5057,7 @@
         "arguments":  "(i8*, i8*, i64, i1)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5068,7 +5068,7 @@
         "arguments":  "(void *restrict, const void *restrict, int, size_t)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5079,7 +5079,7 @@
         "arguments":  "(void *, const void *, size_t)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5090,7 +5090,7 @@
         "arguments":  "(void *, const void *, size_t)",
         "type": "EFT_L_A0__A0R_A1R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5108,14 +5108,14 @@
         "arguments":  "(const void *, void *, size_t)",
         "type": "EFT_A1R_A0R",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["1", "0", "2"]
+        "memcpy_like":  ["Arg1", "Arg0", "Arg2"]
     },
     "iconv":    {
         "return":  "size_t",
         "arguments":  "(iconv_t, char **restrict, size_t *restrict, char **restrict, size_t *restrict)",
         "type": "EFT_A3R_A1R_NS",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["3", "1"]
+        "memcpy_like":  ["Arg3", "Arg1"]
     },
     "strtod":   {
         "return":  "double",
@@ -5192,7 +5192,7 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5203,7 +5203,7 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5214,7 +5214,7 @@
         "arguments":  "(char *restrict, const char *restrict)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1"],
+        "memcpy_like":  ["Arg0", "Arg1"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5225,7 +5225,7 @@
         "arguments":  "(char *, char *)", 
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1"],
+        "memcpy_like":  ["Arg0", "Arg1"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5236,7 +5236,7 @@
         "arguments":  "(char *, const char *)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1"],
+        "memcpy_like":  ["Arg0", "Arg1"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5247,7 +5247,7 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5258,7 +5258,7 @@
         "arguments":  "(char *, const char *, size_t)",
         "type": "EFT_L_A0__A1_A0",
         "overwrite_app_function": 0,
-        "memcpy_like":  ["0", "1", "2"],
+        "memcpy_like":  ["Arg0", "Arg1", "Arg2"],
         "CopyStmt": {
 			"src": "Arg0",
 			"dst": "Ret"
@@ -5703,5 +5703,19 @@
             "dst": "Ret",
             "offset": "0"
         }
+    },
+    "my_multi_free":{
+        "return":  "void",
+        "arguments":  "(int id, void** ptr)",
+        "type": "EFT_FREE_MULTILEVEL",
+        "overwrite_app_function": 1,
+        "LoadStmt": {
+            "src": "Arg1",
+            "dst": "Dummy"
+        },
+        "StoreStmt": {
+            "src": "NullPtr",
+            "dst": "Dummy"
+        }
     }
 }

package/svf/lib/SVFIR/SVFIR.cpp

@@ -690,11 +690,22 @@ bool SVFIR::isNonPointerObj(NodeID id) const
     }
 }
 /*
- * If this is a dummy node or node does not have incoming edges we assume it is not a pointer here
+ * If this is a dummy node or node does not have incoming edges and outcoming edges we assume it is not a pointer here.
+ * However, if it is a pointer and it is an argument of a function definition, we assume it is a pointer here.
  */
 bool SVFIR::isValidPointer(NodeID nodeId) const
 {
     SVFVar* node = pag->getGNode(nodeId);
+
+    if (node->hasValue() && node->isPointer())
+    {
+        if(const SVFArgument* arg = SVFUtil::dyn_cast<SVFArgument>(node->getValue()))
+        {
+            if (!(arg->getParent()->isDeclaration()))
+                return true;
+        }
+    }
+
     if ((node->getInEdges().empty() && node->getOutEdges().empty()))
         return false;
     return node->isPointer();

package/svf/lib/Util/ExtAPI.cpp

@@ -244,8 +244,9 @@ u32_t ExtAPI::getArgPos(const std::string& s)
 // return value = -1 is an inst node
 // return value = -2 is a Dummy node
 // return value = -3 is an object node
-// return value = -4 is an offset
-// return value = -5 is an illegal operand format
+// return value = -4 is a nullptr node
+// return value = -5 is an offset
+// return value = -6 is an illegal operand format
 s32_t ExtAPI::getNodeIDType(const std::string& s)
 {
     u32_t argPos = -1;
@@ -271,6 +272,7 @@ s32_t ExtAPI::getNodeIDType(const std::string& s)
         {"Ret", -1},
         {"Dummy", -2},
         {"Obj", -3},
+        {"NullPtr", -4},
         {"Add", BinaryOPStmt::Add},
         {"Sub", BinaryOPStmt::Sub},
         {"Mul", BinaryOPStmt::Mul},
@@ -302,9 +304,9 @@ s32_t ExtAPI::getNodeIDType(const std::string& s)
     while (i < s.size() && isdigit(s[i]))
         i++;
     if (i == s.size())
-        return -4;
+        return -5;
     // illegal operand format
-    return -5;
+    return -6;
 }
 
 // Get external function name, e.g "memcpy"

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1198,6 +1198,11 @@ void SVFIRBuilder::parseOperations(std::vector<ExtAPI::Operation>  &operations,
                 {
                     if( cs->arg_size() <= (u32_t) nodeIDType)
                         assert(false && "Argument out of bounds!");
+                    else if (operation.getOperator() == "memcpy_like" || operation.getOperator() == "memset_like")
+                    {
+                        operands.push_back(nodeIDType);
+                        nodeIDMap[s] = nodeIDType;
+                    }
                     else
                     {
                         operands.push_back(getValueNode(cs->getArgOperand(nodeIDType)));
@@ -1223,6 +1228,11 @@ void SVFIRBuilder::parseOperations(std::vector<ExtAPI::Operation>  &operations,
                     }
                 }
                 else if (nodeIDType == -4)
+                {
+                    operands.push_back(pag->getNullPtr());
+                    nodeIDMap[s] = operands[operands.size() - 1];
+                }
+                else if (nodeIDType == -5)
                 {
                     for (char const &c : s)
                     {
@@ -1361,17 +1371,17 @@ void SVFIRBuilder::handleExtCall(CallBase* cs, const Function *callee)
                         // this is for memset(void *str, int c, size_t n)
                         // which copies the character c (an unsigned char) to the first n characters of the string pointed to, by the argument str
                         std::vector<LocationSet> dstFields;
-                        const Type* dtype = getBaseTypeAndFlattenedFields(cs->getArgOperand(0), dstFields, cs->getArgOperand(2));
+                        const Type* dtype = getBaseTypeAndFlattenedFields(cs->getArgOperand(op.getOperands()[0]), dstFields, cs->getArgOperand(op.getOperands()[2]));
                         u32_t sz = dstFields.size();
                         //For each field (i), add store edge *(arg0 + i) = arg1
                         for (u32_t index = 0; index < sz; index++)
                         {
                             const SVFType* dElementType = pag->getSymbolInfo()->getFlatternedElemType(LLVMModuleSet::getLLVMModuleSet()->getSVFType(dtype), dstFields[index].accumulateConstantFieldIdx());
-                            NodeID dField = getGepValVar(cs->getArgOperand(0), dstFields[index], dElementType);
-                            addStoreEdge(getValueNode(cs->getArgOperand(1)),dField);
+                            NodeID dField = getGepValVar(cs->getArgOperand(op.getOperands()[0]), dstFields[index], dElementType);
+                            addStoreEdge(getValueNode(cs->getArgOperand(op.getOperands()[1])),dField);
                         }
                         if(SVFUtil::isa<PointerType>(cs->getType()))
-                            addCopyEdge(getValueNode(cs->getArgOperand(0)), getValueNode(cs));
+                            addCopyEdge(getValueNode(cs->getArgOperand(op.getOperands()[0])), getValueNode(cs));
                     }
                     else if (op.getOperator() == "memcpy_like")
                     {