svf-tools 1.0.1022 → 1.0.1023

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1022",
+  "version": "1.0.1023",
   "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/ICFGBuilder.h

@@ -75,7 +75,7 @@ private:
     ///@{
     void processFunEntry(const Function*  fun, WorkList& worklist);
 
-    void processNoPrecessorBasicBlocks(const Function*  fun, WorkList& worklist);
+    void processUnreachableFromEntry(const Function*  fun, WorkList& worklist);
 
     void processFunBody(WorkList& worklist);
 

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

@@ -109,6 +109,8 @@ private:
     FunToFunExitNodeMapTy FunToFunExitNodeMap; ///< map a function to its FunEntryICFGNode
     CallGraph* callgraph;
 
+    Map<const Function*, DominatorTree> FunToDominatorTree;
+
     /// Constructor
     LLVMModuleSet();
 
@@ -397,6 +399,8 @@ public:
         return icfg;
     }
 
+    DominatorTree& getDomTree(const Function* fun);
+
 private:
     /// Create SVFTypes
     SVFType* addSVFTypeInfo(const Type* t);

package/svf-llvm/lib/ICFGBuilder.cpp

@@ -70,7 +70,7 @@ ICFG* ICFGBuilder::build()
                 continue;
             WorkList worklist;
             processFunEntry(fun,worklist);
-            processNoPrecessorBasicBlocks(fun, worklist);
+            processUnreachableFromEntry(fun, worklist);
             processFunBody(worklist);
             processFunExit(fun);
 
@@ -122,21 +122,20 @@ void ICFGBuilder::processFunEntry(const Function*  fun, WorkList& worklist)
 }
 
 /*!
- * bbs with no predecessors
+ * bbs unreachable from function entry
  */
-void ICFGBuilder::processNoPrecessorBasicBlocks(const Function* fun, WorkList& worklist)
+void ICFGBuilder::processUnreachableFromEntry(const Function* fun, WorkList& worklist)
 {
-    for (const auto& bb: *fun)
+    SVFLoopAndDomInfo* pInfo =
+        llvmModuleSet()->getSVFFunction(fun)->getLoopAndDomInfo();
+    for (const auto& bb : *fun)
     {
-        for (const auto& inst: bb)
+        if (pInfo->isUnreachable(llvmModuleSet()->getSVFBasicBlock(&bb)) &&
+                !visited.count(&bb.front()))
         {
-            if (LLVMUtil::isNoPrecessorBasicBlock(inst.getParent()) &&
-                    !visited.count(&inst))
-            {
-                visited.insert(&inst);
-                (void)addBlockICFGNode(&inst);
-                worklist.push(&inst);
-            }
+            visited.insert(&bb.front());
+            (void)addBlockICFGNode(&bb.front());
+            worklist.push(&bb.front());
         }
     }
 }

package/svf-llvm/lib/LLVMLoopAnalysis.cpp

@@ -48,7 +48,6 @@ using namespace SVFUtil;
  */
 void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, ICFG* icfg)
 {
-    llvm::DominatorTree DT = llvm::DominatorTree();
     std::vector<const Loop *> loop_stack;
     for (Module& M : LLVMModuleSet::getLLVMModuleSet()->getLLVMModules())
     {
@@ -59,7 +58,7 @@ void LLVMLoopAnalysis::buildLLVMLoops(SVFModule *mod, ICFG* icfg)
             if (func->isDeclaration()) continue;
             // do not analyze external call
             if (SVFUtil::isExtCall(svffun)) continue;
-            DT.recalculate(const_cast<Function&>(*func));
+            llvm::DominatorTree& DT = LLVMModuleSet::getLLVMModuleSet()->getDomTree(func);
             llvm::LoopInfoBase<llvm::BasicBlock, llvm::Loop> loopInfo;
             std::vector<const Loop*> llvmLoops;
             loopInfo.analyze(DT);

package/svf-llvm/lib/LLVMModule.cpp

@@ -99,6 +99,15 @@ ObjTypeInference* LLVMModuleSet::getTypeInference()
     return typeInference;
 }
 
+DominatorTree& LLVMModuleSet::getDomTree(const SVF::Function* fun)
+{
+    auto it = FunToDominatorTree.find(fun);
+    if(it != FunToDominatorTree.end()) return it->second;
+    DominatorTree& dt = FunToDominatorTree[fun];
+    dt.recalculate(const_cast<Function&>(*fun));
+    return dt;
+}
+
 SVFModule* LLVMModuleSet::buildSVFModule(Module &mod)
 {
     LLVMModuleSet* mset = getLLVMModuleSet();
@@ -407,9 +416,8 @@ void LLVMModuleSet::initDomTree(SVFFunction* svffun, const Function* fun)
     if (fun->isDeclaration())
         return;
     //process and stored dt & df
-    DominatorTree dt;
     DominanceFrontier df;
-    dt.recalculate(const_cast<Function&>(*fun));
+    DominatorTree& dt = getDomTree(fun);
     df.analyze(dt);
     LoopInfo loopInfo = LoopInfo(dt);
     PostDominatorTree pdt = PostDominatorTree(const_cast<Function&>(*fun));

package/svf-llvm/lib/LLVMUtil.cpp

@@ -75,8 +75,7 @@ void LLVMUtil::getFunReachableBBs (const Function* fun, std::vector<const SVFBas
 {
     assert(!SVFUtil::isExtCall(LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(fun)) && "The calling function cannot be an external function.");
     //initial DominatorTree
-    DominatorTree dt;
-    dt.recalculate(const_cast<Function&>(*fun));
+    DominatorTree& dt = LLVMModuleSet::getLLVMModuleSet()->getDomTree(fun);
 
     Set<const BasicBlock*> visited;
     std::vector<const BasicBlock*> bbVec;