refactor icfg builder

SVF-tools · Oct 9, 2024 · f98501e · f98501e
1 parent 2af9828
commit f98501e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/svf-llvm/include/SVF-LLVM/ICFGBuilder.h b/svf-llvm/include/SVF-LLVM/ICFGBuilder.h
@@ -58,11 +58,11 @@ class ICFGBuilder
 public:
     typedef FIFOWorkList<const Instruction*> WorkList;
 
-    ICFGBuilder(ICFG* i): icfg(i)
+    ICFGBuilder(): icfg(new ICFG())
     {
 
     }
-    void build();
+    ICFG* build();
 
 private:
 

diff --git a/svf-llvm/lib/ICFGBuilder.cpp b/svf-llvm/lib/ICFGBuilder.cpp
@@ -40,7 +40,7 @@ using namespace SVFUtil;
 /*!
  * Create ICFG nodes and edges
  */
-void ICFGBuilder::build()
+ICFG* ICFGBuilder::build()
 {
     DBOUT(DGENERAL, outs() << pasMsg("\t Building ICFG ...\n"));
     // Add the unique global ICFGNode at the entry of a program (before the main method).
@@ -78,6 +78,7 @@ void ICFGBuilder::build()
 
     }
     connectGlobalToProgEntry();
+    return icfg;
 }
 
 void ICFGBuilder::checkICFGNodesVisited(const Function* fun)

diff --git a/svf-llvm/lib/LLVMModule.cpp b/svf-llvm/lib/LLVMModule.cpp
@@ -167,9 +167,8 @@ void LLVMModuleSet::build()
 
     createSVFDataStructure();
     initSVFFunction();
-    icfg = new ICFG();
-    ICFGBuilder icfgbuilder(icfg);
-    icfgbuilder.build();
+    ICFGBuilder icfgbuilder;
+    icfg = icfgbuilder.build();
 }
 
 void LLVMModuleSet::createSVFDataStructure()