remove all fields in CallGraphBuilder

SVF-tools · Oct 11, 2024 · ff5b75d · ff5b75d
1 parent 45579ac
commit ff5b75d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/svf-llvm/lib/LLVMModule.cpp b/svf-llvm/lib/LLVMModule.cpp
@@ -172,8 +172,8 @@ void LLVMModuleSet::build()
     ICFGBuilder icfgbuilder;
     icfg = icfgbuilder.build();
 
-    CallGraphBuilder callGraphBuilder(&(svfModule->getFunctionSet()), icfg);
-    callgraph = callGraphBuilder.buildSVFIRCallGraph();
+    CallGraphBuilder callGraphBuilder;
+    callgraph = callGraphBuilder.buildSVFIRCallGraph(svfModule);
 }
 
 void LLVMModuleSet::createSVFDataStructure()

diff --git a/svf/include/Util/CallGraphBuilder.h b/svf/include/Util/CallGraphBuilder.h
@@ -43,22 +43,10 @@ class SVFModule;
 class CallGraphBuilder
 {
 public:
-    typedef SVFModule::FunctionSetType FunctionSetType;
-
-protected:
-    const FunctionSetType* svfFunctionSet;
-    ICFG* icfg;
-
-public:
-
-    CallGraphBuilder(FunctionSetType* fs, ICFG* i): svfFunctionSet(fs),icfg(i)
-    {
-    }
-
-    CallGraphBuilder();
+    CallGraphBuilder()=default;
 
     /// Buidl SVFIR callgraoh
-    CallGraph* buildSVFIRCallGraph();
+    CallGraph* buildSVFIRCallGraph(SVFModule* svfModule);
 
     /// Build thread-aware callgraph
     ThreadCallGraph* buildThreadCallGraph();

diff --git a/svf/lib/Util/CallGraphBuilder.cpp b/svf/lib/Util/CallGraphBuilder.cpp
@@ -36,10 +36,10 @@
 using namespace SVF;
 using namespace SVFUtil;
 
-CallGraph* CallGraphBuilder::buildSVFIRCallGraph()
+CallGraph* CallGraphBuilder::buildSVFIRCallGraph(SVFModule* svfModule)
 {
     CallGraph* callgraph = new CallGraph();
-    for (const SVFFunction* svfFunc: *svfFunctionSet){
+    for (const SVFFunction* svfFunc: svfModule->getFunctionSet()){
         callgraph->addCallGraphNode(svfFunc);
     }
 
@@ -111,7 +111,3 @@ ThreadCallGraph* CallGraphBuilder::buildThreadCallGraph()
 
     return cg;
 }
-CallGraphBuilder::CallGraphBuilder() {
-    icfg = PAG::getPAG()->getICFG();
-    svfFunctionSet = nullptr;
-}