small change

SVF-tools · Oct 11, 2024 · 68c933c · 68c933c
1 parent 7c8cd2a
commit 68c933c
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 27 deletions.
diff --git a/svf/include/Util/CallGraphBuilder.h b/svf/include/Util/CallGraphBuilder.h
@@ -42,12 +42,15 @@ class SVFModule;
 
 class CallGraphBuilder
 {
+public:
+    typedef SVFModule::FunctionSetType FunctionSetType;
+
 protected:
-    const SVFModule::FunctionSetType* svfFunctionSet;
+    const FunctionSetType* svfFunctionSet;
     ICFG* icfg;
-//    CallGraph* callgraph;
 
 public:
+
     CallGraphBuilder(const SVFModule::FunctionSetType* fs, ICFG* i): svfFunctionSet(fs),icfg(i)
     {
     }
@@ -58,7 +61,7 @@ class CallGraphBuilder
     CallGraph* buildSVFIRCallGraph();
 
     /// Build thread-aware callgraph
-    CallGraph* buildThreadCallGraph();
+    ThreadCallGraph* buildThreadCallGraph();
 };
 
 } // End namespace SVF

diff --git a/svf/include/Util/SVFUtil.h b/svf/include/Util/SVFUtil.h
@@ -327,11 +327,11 @@ inline bool isProgEntryFunction(const SVFFunction* fun)
     return fun && fun->getName() == "main";
 }
 
-/// Get program entry function from module.
-const SVFFunction* getProgFunction(SVFModule* svfModule, const std::string& funName);
+/// Get program entry function from function name.
+const SVFFunction* getProgFunction(const std::string& funName);
 
-/// Get program entry function from module.
-const SVFFunction* getProgEntryFunction(SVFModule* svfModule);
+/// Get program entry function.
+const SVFFunction* getProgEntryFunction();
 
 /// Return true if this is a program exit function call
 //@{

diff --git a/svf/lib/Graphs/SVFG.cpp b/svf/lib/Graphs/SVFG.cpp
@@ -427,9 +427,7 @@ void SVFG::connectIndirectSVFGEdges()
  */
 void SVFG::connectFromGlobalToProgEntry()
 {
-    SVFModule* svfModule = mssa->getPTA()->getModule();
-    const SVFFunction* mainFunc =
-        SVFUtil::getProgEntryFunction(svfModule);
+    const SVFFunction* mainFunc = SVFUtil::getProgEntryFunction();
     FormalINSVFGNodeSet& formalIns = getFormalINSVFGNodes(mainFunc);
     if (formalIns.empty())
         return;

diff --git a/svf/lib/MSSA/MemRegion.cpp b/svf/lib/MSSA/MemRegion.cpp
@@ -173,7 +173,8 @@ SVFIR::SVFStmtList& MRGenerator::getPAGEdgesFromInst(const ICFGNode* node)
 void MRGenerator::collectModRefForLoadStore()
 {
 
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const SVFFunction& fun = *item.second->getFunction();
 

diff --git a/svf/lib/MSSA/MemSSA.cpp b/svf/lib/MSSA/MemSSA.cpp
@@ -575,7 +575,8 @@ u32_t MemSSA::getBBPhiNum() const
 void MemSSA::dumpMSSA(OutStream& Out)
 {
 
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const SVFFunction* fun = item.second->getFunction();
         if(Options::MSSAFun()!="" && Options::MSSAFun()!=fun->getName())

diff --git a/svf/lib/MSSA/SVFGBuilder.cpp b/svf/lib/MSSA/SVFGBuilder.cpp
@@ -101,7 +101,8 @@ std::unique_ptr<MemSSA> SVFGBuilder::buildMSSA(BVDataPTAImpl* pta, bool ptrOnlyM
 
     auto mssa = std::make_unique<MemSSA>(pta, ptrOnlyMSSA);
 
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
 
         const SVFFunction *fun = item.second->getFunction();

diff --git a/svf/lib/MTA/TCT.cpp b/svf/lib/MTA/TCT.cpp
@@ -185,7 +185,8 @@ void TCT::markRelProcs(const SVFFunction* svffun)
  */
 void TCT::collectEntryFunInCallGraph()
 {
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const SVFFunction* fun = item.second->getFunction();
         if (SVFUtil::isExtCall(fun))

diff --git a/svf/lib/SABER/SaberCondAllocator.cpp b/svf/lib/SABER/SaberCondAllocator.cpp
@@ -59,7 +59,8 @@ void SaberCondAllocator::allocate(const SVFModule *M)
 {
     DBOUT(DGENERAL, outs() << pasMsg("path condition allocation starts\n"));
 
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const SVFFunction *func = (item.second)->getFunction();
         if (!SVFUtil::isExtCall(func))

diff --git a/svf/lib/Util/CDGBuilder.cpp b/svf/lib/Util/CDGBuilder.cpp
@@ -123,7 +123,8 @@ s64_t CDGBuilder::getBBSuccessorBranchID(const SVFBasicBlock *BB, const SVFBasic
  */
 void CDGBuilder::buildControlDependence(const SVFModule *svfgModule)
 {
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const SVFFunction *svfFun = (item.second)->getFunction();
         if (SVFUtil::isExtCall(svfFun)) continue;

diff --git a/svf/lib/Util/CallGraphBuilder.cpp b/svf/lib/Util/CallGraphBuilder.cpp
@@ -63,14 +63,14 @@ CallGraph* CallGraphBuilder::buildSVFIRCallGraph()
     return callgraph;
 }
 
-CallGraph* CallGraphBuilder::buildThreadCallGraph()
+ThreadCallGraph* CallGraphBuilder::buildThreadCallGraph()
 {
-    CallGraph* callgraph = new ThreadCallGraph(*(PAG::getPAG()->getCallGraph()));
-    ThreadCallGraph* cg = dyn_cast<ThreadCallGraph>(callgraph);
+    ThreadCallGraph* cg = new ThreadCallGraph(*(PAG::getPAG()->getCallGraph()));
     assert(cg && "not a thread callgraph?");
 
     ThreadAPI* tdAPI = ThreadAPI::getThreadAPI();
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         for (const SVFBasicBlock* svfbb : (item.second)->getFunction()->getBasicBlockList())
         {
@@ -95,7 +95,7 @@ CallGraph* CallGraphBuilder::buildThreadCallGraph()
         }
     }
     // record join sites
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    for (const auto& item: *svfirCallGraph)
     {
         for (const SVFBasicBlock* svfbb : (item.second)->getFunction()->getBasicBlockList())
         {

diff --git a/svf/lib/Util/SVFStat.cpp b/svf/lib/Util/SVFStat.cpp
@@ -216,7 +216,8 @@ void SVFStat::branchStat()
 {
     u32_t numOfBB_2Succ = 0;
     u32_t numOfBB_3Succ = 0;
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const SVFFunction* func = item.second->getFunction();
         for (SVFFunction::const_iterator bbIt = func->begin(), bbEit = func->end();

diff --git a/svf/lib/Util/SVFUtil.cpp b/svf/lib/Util/SVFUtil.cpp
@@ -399,9 +399,10 @@ bool SVFUtil::isProgExitCall(const CallICFGNode* cs)
 }
 
 /// Get program entry function from module.
-const SVFFunction* SVFUtil::getProgFunction(SVFModule* svfModule, const std::string& funName)
+const SVFFunction* SVFUtil::getProgFunction(const std::string& funName)
 {
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const CallGraphNode*fun = item.second;
         if (fun->getName()==funName)
@@ -411,9 +412,10 @@ const SVFFunction* SVFUtil::getProgFunction(SVFModule* svfModule, const std::str
 }
 
 /// Get program entry function from module.
-const SVFFunction* SVFUtil::getProgEntryFunction(SVFModule* svfModule)
+const SVFFunction* SVFUtil::getProgEntryFunction()
 {
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         const CallGraphNode*fun = item.second;
         if (isProgEntryFunction(fun->getFunction()))

diff --git a/svf/lib/Util/ThreadAPI.cpp b/svf/lib/Util/ThreadAPI.cpp
@@ -270,7 +270,8 @@ void ThreadAPI::performAPIStat(SVFModule* module)
 
     statInit(tdAPIStatMap);
 
-    for (const auto& item: *PAG::getPAG()->getCallGraph())
+    CallGraph* svfirCallGraph = PAG::getPAG()->getCallGraph();
+    for (const auto& item: *svfirCallGraph)
     {
         for (SVFFunction::const_iterator bit = (item.second)->getFunction()->begin(), ebit = (item.second)->getFunction()->end(); bit != ebit; ++bit)
         {