svf-tools 1.0.975 → 1.0.976

package/svf/lib/Util/PTAStat.cpp

@@ -28,7 +28,7 @@
  */
 
 #include <iomanip>
-#include "Graphs/PTACallGraph.h"
+#include "Graphs/CallGraph.h"
 #include "Util/PTAStat.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "SVFIR/SVFIR.h"
@@ -81,7 +81,7 @@ void PTAStat::performStat()
 void PTAStat::callgraphStat()
 {
 
-    PTACallGraph* graph = pta->getPTACallGraph();
+    CallGraph* graph = pta->getCallGraph();
     PointerAnalysis::CallGraphSCC* callgraphSCC = new PointerAnalysis::CallGraphSCC(graph);
     callgraphSCC->find();
 
@@ -93,8 +93,8 @@ void PTAStat::callgraphStat()
     unsigned edgeInCycle = 0;
 
     NodeSet sccRepNodeSet;
-    PTACallGraph::iterator it = graph->begin();
-    PTACallGraph::iterator eit = graph->end();
+    CallGraph::iterator it = graph->begin();
+    CallGraph::iterator eit = graph->end();
     for (; it != eit; ++it)
     {
         totalNode++;
@@ -107,11 +107,11 @@ void PTAStat::callgraphStat()
                 maxNodeInCycle = subNodes.count();
         }
 
-        PTACallGraphNode::const_iterator edgeIt = it->second->InEdgeBegin();
-        PTACallGraphNode::const_iterator edgeEit = it->second->InEdgeEnd();
+        CallGraphNode::const_iterator edgeIt = it->second->InEdgeBegin();
+        CallGraphNode::const_iterator edgeEit = it->second->InEdgeEnd();
         for (; edgeIt != edgeEit; ++edgeIt)
         {
-            PTACallGraphEdge *edge = *edgeIt;
+            CallGraphEdge *edge = *edgeIt;
             totalEdge+= edge->getDirectCalls().size() + edge->getIndirectCalls().size();
             if(callgraphSCC->repNode(edge->getSrcID()) == callgraphSCC->repNode(edge->getDstID()))
             {

package/svf/lib/WPA/VersionedFlowSensitive.cpp

@@ -483,9 +483,9 @@ void VersionedFlowSensitive::buildDeltaMaps(void)
         bool isDelta = false;
         if (const SVFFunction *fn = svfg->isFunEntrySVFGNode(s))
         {
-            PTACallGraphEdge::CallInstSet callsites;
+            CallGraphEdge::CallInstSet callsites;
             /// use pre-analysis call graph to approximate all potential callsites
-            ander->getPTACallGraph()->getIndCallSitesInvokingCallee(fn, callsites);
+            ander->getCallGraph()->getIndCallSitesInvokingCallee(fn, callsites);
             isDelta = !callsites.empty();
 
             if (isDelta)

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

@@ -201,7 +201,7 @@ public:
     //}@
 
     /// connect PAG edges based on callgraph
-    void updateCallGraph(PTACallGraph* callgraph);
+    void updateCallGraph(CallGraph* callgraph);
 
 protected:
     /// Handle globals including (global variable and functions)

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -1146,17 +1146,17 @@ void SVFIRBuilder::handleIndCall(CallBase* cs)
     pag->addIndirectCallsites(cbn,pag->getValueNode(svfcalledval));
 }
 
-void SVFIRBuilder::updateCallGraph(PTACallGraph* callgraph)
+void SVFIRBuilder::updateCallGraph(CallGraph* callgraph)
 {
-    PTACallGraph::CallEdgeMap::const_iterator iter = callgraph->getIndCallMap().begin();
-    PTACallGraph::CallEdgeMap::const_iterator eiter = callgraph->getIndCallMap().end();
+    CallGraph::CallEdgeMap::const_iterator iter = callgraph->getIndCallMap().begin();
+    CallGraph::CallEdgeMap::const_iterator eiter = callgraph->getIndCallMap().end();
     for (; iter != eiter; iter++)
     {
         const CallICFGNode* callBlock = iter->first;
         const CallBase* callbase = SVFUtil::cast<CallBase>(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(callBlock->getCallSite()));
         assert(callBlock->isIndirectCall() && "this is not an indirect call?");
-        const PTACallGraph::FunctionSet& functions = iter->second;
-        for (PTACallGraph::FunctionSet::const_iterator func_iter = functions.begin(); func_iter != functions.end(); func_iter++)
+        const CallGraph::FunctionSet& functions = iter->second;
+        for (CallGraph::FunctionSet::const_iterator func_iter = functions.begin(); func_iter != functions.end(); func_iter++)
         {
             const Function* callee = SVFUtil::cast<Function>(LLVMModuleSet::getLLVMModuleSet()->getLLVMValue(*func_iter));
 

package/svf-llvm/tools/AE/ae.cpp

@@ -880,7 +880,7 @@ int main(int argc, char** argv)
     SVFIRBuilder builder(svfModule);
     SVFIR* pag = builder.build();
     AndersenWaveDiff* ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
-    PTACallGraph* callgraph = ander->getPTACallGraph();
+    CallGraph* callgraph = ander->getCallGraph();
     builder.updateCallGraph(callgraph);
     pag->getICFG()->updateCallGraph(callgraph);
     if (Options::ICFGMergeAdjacentNodes())

package/svf-llvm/tools/Example/svf-ex.cpp

@@ -168,7 +168,7 @@ int main(int argc, char ** argv)
 
 
     /// Call Graph
-    PTACallGraph* callgraph = ander->getPTACallGraph();
+    CallGraph* callgraph = ander->getCallGraph();
 
     /// ICFG
     ICFG* icfg = pag->getICFG();

package/svf-llvm/tools/MTA/LockResultValidator.cpp

@@ -224,11 +224,11 @@ const Instruction* LockResultValidator::getPreviousMemoryAccessInst( const Instr
 
         if(LLVMUtil::isCallSite(I))
         {
-            PTACallGraph::FunctionSet callees;
+            CallGraph::FunctionSet callees;
             const SVFInstruction* svfInst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(I);
             _la->getTCT()->getThreadCallGraph()->getCallees(getCBN(svfInst), callees);
 
-            for(PTACallGraph::FunctionSet::const_iterator cit = callees.begin(),
+            for(CallGraph::FunctionSet::const_iterator cit = callees.begin(),
                     ecit = callees.end(); cit!=ecit; cit++)
             {
                 if(*cit != nullptr)