add process unreachable bbs (#1619) to resolve issue #1618

* add process unreachable bbs * add process unreachable bbs * add process unreachable bbs * cache fun2domtree
SVF-tools · Dec 25, 2024 · efa1583 · efa1583
1 parent 3470c8e
commit efa1583
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 19 deletions.
diff --git a/svf-llvm/include/SVF-LLVM/ICFGBuilder.h b/svf-llvm/include/SVF-LLVM/ICFGBuilder.h
@@ -75,7 +75,7 @@ class ICFGBuilder
     ///@{
     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);
 

diff --git a/svf-llvm/include/SVF-LLVM/LLVMModule.h b/svf-llvm/include/SVF-LLVM/LLVMModule.h
@@ -109,6 +109,8 @@ class LLVMModuleSet
     FunToFunExitNodeMapTy FunToFunExitNodeMap; ///< map a function to its FunEntryICFGNode
     CallGraph* callgraph;
 
+    Map<const Function*, DominatorTree> FunToDominatorTree;
+
     /// Constructor
     LLVMModuleSet();
 
@@ -397,6 +399,8 @@ class LLVMModuleSet
         return icfg;
     }
 
+    DominatorTree& getDomTree(const Function* fun);
+
 private:
     /// Create SVFTypes
     SVFType* addSVFTypeInfo(const Type* t);

diff --git a/svf-llvm/lib/ICFGBuilder.cpp b/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());
         }
     }
 }

diff --git a/svf-llvm/lib/LLVMLoopAnalysis.cpp b/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);

diff --git a/svf-llvm/lib/LLVMModule.cpp b/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));

diff --git a/svf-llvm/lib/LLVMUtil.cpp b/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;