svf-tools 1.0.1095 → 1.0.1097

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1095",
+  "version": "1.0.1097",
   "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/SVFIR/SVFType.h

@@ -197,15 +197,15 @@ private:
     StInfo* typeinfo;   ///< SVF's TypeInfo
     bool isSingleValTy; ///< The type represents a single value, not struct or
     u32_t byteSize; ///< LLVM Byte Size
+    u32_t id;
     ///< array
 
 protected:
-    SVFType(bool svt, SVFTyKind k, u32_t Sz = 1)
+    SVFType(bool svt, SVFTyKind k, u32_t i = 0, u32_t Sz = 1)
         : kind(k), typeinfo(nullptr),
-          isSingleValTy(svt), byteSize(Sz)
+          isSingleValTy(svt), byteSize(Sz), id(i)
     {
     }
-
 public:
     SVFType(void) = delete;
     virtual ~SVFType() {}
@@ -222,6 +222,11 @@ public:
     virtual void print(std::ostream& os) const = 0;
 
 
+    u32_t getId() const
+    {
+        return id;
+    }
+
     inline void setTypeInfo(StInfo* ti)
     {
         typeinfo = ti;
@@ -275,8 +280,8 @@ class SVFPointerType : public SVFType
     friend class SVFIRReader;
 
 public:
-    SVFPointerType(u32_t byteSize = 1)
-        : SVFType(true, SVFPointerTy, byteSize)
+    SVFPointerType(u32_t i, u32_t byteSize = 1)
+        : SVFType(true, SVFPointerTy, i, byteSize)
     {
     }
 
@@ -297,7 +302,7 @@ private:
     short signAndWidth; ///< For printing
 
 public:
-    SVFIntegerType(u32_t byteSize = 1) : SVFType(true, SVFIntegerTy, byteSize) {}
+    SVFIntegerType(u32_t i, u32_t byteSize = 1) : SVFType(true, SVFIntegerTy, i, byteSize) {}
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFIntegerTy;
@@ -327,8 +332,8 @@ private:
     bool varArg;
 
 public:
-    SVFFunctionType(const SVFType* rt, const std::vector<const SVFType*>& p, bool isvararg)
-        : SVFType(false, SVFFunctionTy, 1), retTy(rt), params(p), varArg(isvararg)
+    SVFFunctionType(u32_t i, const SVFType* rt, const std::vector<const SVFType*>& p, bool isvararg)
+        : SVFType(false, SVFFunctionTy,  i, 1), retTy(rt), params(p), varArg(isvararg)
     {
     }
 
@@ -363,9 +368,13 @@ class SVFStructType : public SVFType
 private:
     /// @brief Field for printing & debugging
     std::string name;
+    std::vector<const SVFType*> fields;
 
 public:
-    SVFStructType(u32_t byteSize = 1) : SVFType(false, SVFStructTy, byteSize) {}
+    SVFStructType(u32_t i, std::vector<const SVFType *> &f, u32_t byteSize = 1) :
+        SVFType(false, SVFStructTy, i, byteSize), fields(f)
+    {
+    }
 
     static inline bool classof(const SVFType* node)
     {
@@ -386,6 +395,11 @@ public:
     {
         name = std::move(structName);
     }
+
+    const std::vector<const SVFType*>& getFieldTypes() const
+    {
+        return fields;
+    }
 };
 
 class SVFArrayType : public SVFType
@@ -398,8 +412,8 @@ private:
     const SVFType* typeOfElement; /// For printing & debugging
 
 public:
-    SVFArrayType(u32_t byteSize = 1)
-        : SVFType(false, SVFArrayTy, byteSize), numOfElement(0), typeOfElement(nullptr)
+    SVFArrayType(u32_t i, u32_t byteSize = 1)
+        : SVFType(false, SVFArrayTy, i, byteSize), numOfElement(0), typeOfElement(nullptr)
     {
     }
 
@@ -437,7 +451,7 @@ private:
     std::string repr; /// Field representation for printing
 
 public:
-    SVFOtherType(bool isSingleValueTy, u32_t byteSize = 1) : SVFType(isSingleValueTy, SVFOtherTy, byteSize) {}
+    SVFOtherType(u32_t i, bool isSingleValueTy, u32_t byteSize = 1) : SVFType(isSingleValueTy, SVFOtherTy, i, byteSize) {}
 
     static inline bool classof(const SVFType* node)
     {

package/svf/lib/AE/Svfexe/AbsExtAPI.cpp

@@ -83,7 +83,7 @@ void AbsExtAPI::initExtFunMap()
         }
         else
         {
-            SVFUtil::errs() <<"svf_assert Fail. " << callNode->toString() << "\n";
+            SVFUtil::errs() << SVFUtil::errMsg("Assertion failure, this svf_assert cannot be verified!!\n") << callNode->toString() << "\n";
             assert(false);
         }
         return;

package/svf/lib/SVFIR/SVFType.cpp

@@ -36,12 +36,47 @@ void SVFIntegerType::print(std::ostream& os) const
 
 void SVFFunctionType::print(std::ostream& os) const
 {
-    os << *getReturnType() << "()";
+    os << *getReturnType() << "(";
+
+    // Print parameters
+    for (size_t i = 0; i < params.size(); ++i)
+    {
+        os << *params[i];
+        // Add comma after all params except the last one
+        if (i != params.size() - 1)
+        {
+            os << ", ";
+        }
+    }
+
+    // Add varargs indicator if needed
+    if (isVarArg())
+    {
+        if (!params.empty())
+        {
+            os << ", ";
+        }
+        os << "...";
+    }
+
+    os << ")";
 }
 
 void SVFStructType::print(std::ostream& os) const
 {
-    os << "S." << name;
+    os << "S." << name << " {";
+
+    // Print fields
+    for (size_t i = 0; i < fields.size(); ++i)
+    {
+        os << *fields[i];
+        // Add comma after all fields except the last one
+        if (i != fields.size() - 1)
+        {
+            os << ", ";
+        }
+    }
+    os << "}";
 }
 
 void SVFArrayType::print(std::ostream& os) const

package/svf-llvm/lib/LLVMModule.cpp

@@ -1276,13 +1276,15 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
     }
 
     SVFType* svftype;
+
+    u32_t id = svfir->getSVFTypes().size();
     if (SVFUtil::isa<PointerType>(T))
     {
-        svftype = new SVFPointerType(byteSize);
+        svftype = new SVFPointerType(id, byteSize);
     }
     else if (const IntegerType* intT = SVFUtil::dyn_cast<IntegerType>(T))
     {
-        auto svfIntT = new SVFIntegerType(byteSize);
+        auto svfIntT = new SVFIntegerType(id, byteSize);
         unsigned signWidth = intT->getBitWidth();
         assert(signWidth < INT16_MAX && "Integer width too big");
         svfIntT->setSignAndWidth(intT->getSignBit() ? -signWidth : signWidth);
@@ -1295,18 +1297,24 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
         {
             paramTypes.push_back(getSVFType(t));
         }
-        svftype = new SVFFunctionType(getSVFType(ft->getReturnType()), paramTypes, ft->isVarArg());
+        svftype = new SVFFunctionType(id, getSVFType(ft->getReturnType()), paramTypes, ft->isVarArg());
     }
     else if (const StructType* st = SVFUtil::dyn_cast<StructType>(T))
     {
-        auto svfst = new SVFStructType(byteSize);
+        std::vector<const SVFType*> fieldTypes;
+
+        for (const auto& t: st->elements())
+        {
+            fieldTypes.push_back(getSVFType(t));
+        }
+        auto svfst = new SVFStructType(id, fieldTypes, byteSize);
         if (st->hasName())
             svfst->setName(st->getName().str());
         svftype = svfst;
     }
     else if (const auto at = SVFUtil::dyn_cast<ArrayType>(T))
     {
-        auto svfat = new SVFArrayType(byteSize);
+        auto svfat = new SVFArrayType(id, byteSize);
         svfat->setNumOfElement(at->getNumElements());
         svfat->setTypeOfElement(getSVFType(at->getElementType()));
         svftype = svfat;
@@ -1314,7 +1322,7 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
     else
     {
         std::string buffer;
-        auto ot = new SVFOtherType(T->isSingleValueType(), byteSize);
+        auto ot = new SVFOtherType(id, T->isSingleValueType(), byteSize);
         llvm::raw_string_ostream(buffer) << *T;
         ot->setRepr(std::move(buffer));
         svftype = ot;