svf-tools 1.0.798 → 1.0.800

package/SVF-doxygen/html/svf-ex_8cpp_source.html

@@ -358,7 +358,7 @@ $(function() {
 <div class="ttc" id="aclassSVF_1_1PointerAnalysis_html_a4dfb43679e9fa794ebad99b6584c32ec"><div class="ttname"><a href="classSVF_1_1PointerAnalysis.html#a4dfb43679e9fa794ebad99b6584c32ec">SVF::PointerAnalysis::getPts</a></div><div class="ttdeci">virtual const PointsTo &amp; getPts(NodeID ptr)=0</div><div class="ttdoc">Get points-to targets of a pointer. It needs to be implemented in child class.</div></div>
 <div class="ttc" id="aclassSVF_1_1SVFIRBuilder_html"><div class="ttname"><a href="classSVF_1_1SVFIRBuilder.html">SVF::SVFIRBuilder</a></div><div class="ttdef"><b>Definition:</b> <a href="SVFIRBuilder_8h_source.html#l00046">SVFIRBuilder.h:46</a></div></div>
 <div class="ttc" id="aclassSVF_1_1SVFIR2ItvExeState_html_aed2e41879bae8389c49e69356b7aaac5"><div class="ttname"><a href="classSVF_1_1SVFIR2ItvExeState.html#aed2e41879bae8389c49e69356b7aaac5">SVF::SVFIR2ItvExeState::translateStore</a></div><div class="ttdeci">void translateStore(const StoreStmt *store)</div><div class="ttdef"><b>Definition:</b> <a href="SVFIR2ItvExeState_8cpp_source.html#l00800">SVFIR2ItvExeState.cpp:800</a></div></div>
-<div class="ttc" id="anamespaceSVF_html_a61c01e2e687ab3a001fb806737583943"><div class="ttname"><a href="namespaceSVF.html#a61c01e2e687ab3a001fb806737583943">SVF::AliasResult</a></div><div class="ttdeci">AliasResult</div><div class="ttdef"><b>Definition:</b> <a href="SVFType_8h_source.html#l00604">SVFType.h:604</a></div></div>
+<div class="ttc" id="anamespaceSVF_html_a61c01e2e687ab3a001fb806737583943"><div class="ttname"><a href="namespaceSVF.html#a61c01e2e687ab3a001fb806737583943">SVF::AliasResult</a></div><div class="ttdeci">AliasResult</div><div class="ttdef"><b>Definition:</b> <a href="SVFType_8h_source.html#l00611">SVFType.h:611</a></div></div>
 <div class="ttc" id="aclassSVF_1_1SVFStmt_html"><div class="ttname"><a href="classSVF_1_1SVFStmt.html">SVF::SVFStmt</a></div><div class="ttdef"><b>Definition:</b> <a href="SVFStatements_8h_source.html#l00051">SVFStatements.h:51</a></div></div>
 <div class="ttc" id="aclassSVF_1_1VFGNode_html"><div class="ttname"><a href="classSVF_1_1VFGNode.html">SVF::VFGNode</a></div><div class="ttdef"><b>Definition:</b> <a href="VFGNode_8h_source.html#l00046">VFGNode.h:46</a></div></div>
 <div class="ttc" id="asvf-ex_8cpp_html_a985b6c880c7922538046c6a1fa987829"><div class="ttname"><a href="svf-ex_8cpp.html#a985b6c880c7922538046c6a1fa987829">printPts</a></div><div class="ttdeci">std::string printPts(PointerAnalysis *pta, SVFValue *val)</div><div class="ttdef"><b>Definition:</b> <a href="svf-ex_8cpp_source.html#l00051">svf-ex.cpp:51</a></div></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.798",
+  "version": "1.0.800",
   "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

@@ -350,19 +350,26 @@ private:
     const SVFType* ptrElementType;
 
 public:
-    SVFPointerType(const SVFType* pty)
-        : SVFType(true, SVFPointerTy), ptrElementType(pty)
+    SVFPointerType()
+        : SVFType(true, SVFPointerTy), ptrElementType(nullptr)
     {
     }
+
     static inline bool classof(const SVFType* node)
     {
         return node->getKind() == SVFPointerTy;
     }
     inline const SVFType* getPtrElementType() const
     {
+        assert(ptrElementType && "ptrElementType is nullptr");
         return ptrElementType;
     }
 
+    inline void setPtrElementType(SVFType* _ptrElementType)
+    {
+        ptrElementType = _ptrElementType;
+    }
+
     void print(std::ostream& os) const override;
 };
 

package/svf/lib/MemoryModel/AccessPath.cpp

@@ -129,12 +129,13 @@ APOffset AccessPath::computeConstantByteOffset() const
         if (const SVFStructType* structType = SVFUtil::dyn_cast<SVFStructType>(type))
         {
             /// for (1) structType: %struct.DEST
-            ///   structField = 0, type2: int
-            ///   structField = 1, type2: char[10]
-            ///   structField = 2, type2: int[5]
+            ///   structField = 0, flattenIdx = 0, type2: int
+            ///   structField = 1, flattenIdx = 1, type2: char[10]
+            ///   structField = 2, flattenIdx = 11, type2: int[5]
             for (u32_t structField = 0; structField < (u32_t)op->getSExtValue(); ++structField)
             {
-                type2 = structType->getTypeInfo()->getOriginalElemType(structField);
+                u32_t flattenIdx = structType->getTypeInfo()->getFlattenedFieldIdxVec()[structField];
+                type2 = structType->getTypeInfo()->getOriginalElemType(flattenIdx);
                 totalConstOffset += type2->getLLVMByteSize();
             }
         }

package/svf/lib/SVFIR/SVFFileSystem.cpp

@@ -24,7 +24,7 @@ SVFType* createSVFType(SVFType::GNodeK kind, bool isSingleValTy)
         ABORT_MSG("Creation of RAW SVFType isn't allowed");
     case SVFType::SVFPointerTy:
         ABORT_IFNOT(isSingleValTy, "Pointer type must be single-valued");
-        return new SVFPointerType(nullptr);
+        return new SVFPointerType();
     case SVFType::SVFIntegerTy:
         ABORT_IFNOT(isSingleValTy, "Integer type must be single-valued");
         return new SVFIntegerType();

package/svf-llvm/include/SVF-LLVM/LLVMUtil.h

@@ -119,7 +119,7 @@ inline bool isNullPtrSym(const Value* val)
 static inline Type* getPtrElementType(const PointerType* pty)
 {
 #if (LLVM_VERSION_MAJOR < 14)
-    return pty->getElementType();
+    return pty->getPointerElementType();
 #else
     assert(!pty->isOpaque() && "Opaque Pointer is used, please recompile the source adding '-Xclang -no-opaque-pointers'");
     return pty->getNonOpaquePointerElementType();
@@ -384,11 +384,14 @@ void removeUnusedFuncsAndAnnotationsAndGlobalVariables(std::vector<Function*> re
 inline u32_t SVFType2ByteSize(const SVFType* type)
 {
     const llvm::Type* llvm_rhs = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(type);
-    u32_t llvm_rhs_size = LLVMUtil::getTypeSizeInBytes(llvm_rhs->getPointerElementType());
+    const llvm::PointerType* llvm_rhs_ptr = SVFUtil::dyn_cast<PointerType>(llvm_rhs);
+    assert(llvm_rhs_ptr && "not a pointer type?");
+    const Type *ptrElementType = getPtrElementType(llvm_rhs_ptr);
+    u32_t llvm_rhs_size = LLVMUtil::getTypeSizeInBytes(ptrElementType);
     u32_t llvm_elem_size = -1;
-    if (llvm_rhs->getPointerElementType()->isArrayTy() && llvm_rhs_size > 0)
+    if (ptrElementType->isArrayTy() && llvm_rhs_size > 0)
     {
-        size_t array_len = llvm_rhs->getPointerElementType()->getArrayNumElements();
+        size_t array_len = ptrElementType->getArrayNumElements();
         llvm_elem_size = llvm_rhs_size / array_len;
     }
     else

package/svf-llvm/lib/LLVMModule.cpp

@@ -1253,8 +1253,10 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
            "SVFType has been added before");
 
     SVFType* svftype;
-    if (const PointerType* pt = SVFUtil::dyn_cast<PointerType>(T))
-        svftype = new SVFPointerType(getSVFType(LLVMUtil::getPtrElementType(pt)));
+    if (SVFUtil::isa<PointerType>(T))
+    {
+        svftype = new SVFPointerType();
+    }
     else if (const IntegerType* intT = SVFUtil::dyn_cast<IntegerType>(T))
     {
         auto svfIntT = new SVFIntegerType();
@@ -1290,6 +1292,13 @@ SVFType* LLVMModuleSet::addSVFTypeInfo(const Type* T)
 
     symInfo->addTypeInfo(svftype);
     LLVMType2SVFType[T] = svftype;
+    if (const PointerType* pt = SVFUtil::dyn_cast<PointerType>(T))
+    {
+        //cast svftype to SVFPointerType
+        SVFPointerType* svfPtrType = SVFUtil::dyn_cast<SVFPointerType>(svftype);
+        assert(svfPtrType && "this is not SVFPointerType");
+        svfPtrType->setPtrElementType(getSVFType(LLVMUtil::getPtrElementType(pt)));
+    }
     return svftype;
 }