svf-tools 1.0.1063 → 1.0.1065

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1063",
+  "version": "1.0.1065",
   "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-llvm/include/SVF-LLVM/LLVMModule.h

@@ -72,7 +72,7 @@ public:
     typedef OrderedMap<const Function*, NodeID> FunToIDMapTy;
 
     typedef std::vector<const Function*> FunctionSet;
-    typedef Map<const Function*, const SVFBasicBlock*> FunToExitBBMap;
+    typedef Map<const Function*, const BasicBlock*> FunToExitBBMap;
     typedef Map<const Function*, const Function *> FunToRealDefFunMap;
 
 private:
@@ -173,7 +173,7 @@ public:
 
 public:
 
-    inline const SVFBasicBlock* getFunExitBB(const Function* fun) const
+    inline const BasicBlock* getFunExitBB(const Function* fun) const
     {
         auto it = funToExitBB.find(fun);
         if (it == funToExitBB.end()) return nullptr;
@@ -435,7 +435,7 @@ private:
         funSet.push_back(svfFunc);
     }
 
-    inline void setFunExitBB(const Function* fun, const SVFBasicBlock* bb)
+    inline void setFunExitBB(const Function* fun, const BasicBlock* bb)
     {
         funToExitBB[fun] = bb;
     }

package/svf-llvm/lib/LLVMModule.cpp

@@ -205,6 +205,34 @@ void LLVMModuleSet::createSVFDataStructure()
         addFunctionSet(func);
     }
 
+    // set function exit block
+    for (const auto& func: funSet) {
+        for (Function::const_iterator bit = func->begin(), ebit = func->end(); bit != ebit; ++bit)
+        {
+            const BasicBlock* bb = &*bit;
+            /// set exit block: exit basic block must have no successors and have a return instruction
+            if (succ_size(bb) == 0)
+            {
+                if (LLVMUtil::basicBlockHasRetInst(bb))
+                {
+                    assert((LLVMUtil::functionDoesNotRet(func) ||
+                            SVFUtil::isa<ReturnInst>(bb->back())) &&
+                           "last inst must be return inst");
+                    setFunExitBB(func, bb);
+                }
+            }
+        }
+        // For no return functions, we set the last block as exit BB
+        // This ensures that each function that has definition must have an exit BB
+        if (func->size() != 0 && !getFunExitBB(func))
+        {
+            assert((LLVMUtil::functionDoesNotRet(func) ||
+                    SVFUtil::isa<ReturnInst>(&func->back().back())) &&
+                   "last inst must be return inst");
+            setFunExitBB(func, &func->back());
+        }
+    }
+
     // Store annotations of functions in extapi.bc
     for (const auto& pair : ExtFun2Annotations)
     {

package/svf-llvm/lib/ObjTypeInference.cpp

@@ -626,7 +626,7 @@ Set<const Value *> &ObjTypeInference::bwfindAllocOfVar(const Value *var)
                 {
 
                     LLVMModuleSet* llvmmodule = LLVMModuleSet::getLLVMModuleSet();
-                    const BasicBlock* exitBB = SVFUtil::dyn_cast<BasicBlock>(llvmmodule->getLLVMValue(llvmmodule->getFunExitBB(callee)));
+                    const BasicBlock* exitBB = llvmmodule->getFunExitBB(callee);
                     assert (exitBB && "exit bb is not a basic block?");
                     const Value *pValue = &exitBB->back();
                     const auto *retInst = SVFUtil::dyn_cast<ReturnInst>(pValue);
@@ -934,7 +934,7 @@ Set<const Value *> &ObjTypeInference::bwFindAllocOrClsNameSources(const Value *s
                 if (!callee->isDeclaration())
                 {
                     LLVMModuleSet* llvmmodule = LLVMModuleSet::getLLVMModuleSet();
-                    const BasicBlock* exitBB = SVFUtil::dyn_cast<BasicBlock>(llvmmodule->getLLVMValue(llvmmodule->getFunExitBB(callee)));
+                    const BasicBlock* exitBB = llvmmodule->getFunExitBB(callee);
                     assert (exitBB && "exit bb is not a basic block?");
                     const Value *pValue = &exitBB->back();
                     const auto *retInst = SVFUtil::dyn_cast<ReturnInst>(pValue);

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -242,7 +242,6 @@ void SVFIRBuilder::initSVFBasicBlock(const Function* func)
                         SVFUtil::isa<ReturnInst>(bb->back())) &&
                        "last inst must be return inst");
                 svfFun->setExitBlock(svfbb);
-                llvmModuleSet()->setFunExitBB(func, svfbb);
             }
         }
     }
@@ -255,7 +254,6 @@ void SVFIRBuilder::initSVFBasicBlock(const Function* func)
                 SVFUtil::isa<ReturnInst>(&func->back().back())) &&
                "last inst must be return inst");
         svfFun->setExitBlock(retBB);
-        llvmModuleSet()->setFunExitBB(func, retBB);
     }
 }