svf-tools 1.0.977 → 1.0.978

package/svf/lib/Graphs/ThreadCallGraph.cpp

@@ -38,7 +38,7 @@ using namespace SVFUtil;
  * Constructor
  */
 ThreadCallGraph::ThreadCallGraph() :
-    PTACallGraph(ThdCallGraph), tdAPI(ThreadAPI::getThreadAPI())
+    CallGraph(ThdCallGraph), tdAPI(ThreadAPI::getThreadAPI())
 {
     DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("Building ThreadCallGraph\n"));
 }
@@ -58,8 +58,8 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
     for (; iter != eiter; iter++)
     {
         const CallICFGNode* cs = iter->first;
-        const PTACallGraph::FunctionSet &functions = iter->second;
-        for (PTACallGraph::FunctionSet::const_iterator func_iter =
+        const CallGraph::FunctionSet &functions = iter->second;
+        for (CallGraph::FunctionSet::const_iterator func_iter =
                     functions.begin(); func_iter != functions.end(); func_iter++)
         {
             const SVFFunction* callee = *func_iter;
@@ -89,29 +89,6 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
             }
         }
     }
-
-    // parallel_for sites
-    for (CallSiteSet::const_iterator it = parForSitesBegin(), eit = parForSitesEnd(); it != eit; ++it)
-    {
-        const SVFValue* forkedval = tdAPI->getTaskFuncAtHareParForSite((*it)->getCallSite());
-        if(SVFUtil::dyn_cast<SVFFunction>(forkedval)==nullptr)
-        {
-            SVFIR* pag = pta->getPAG();
-            const NodeBS targets = pta->getPts(pag->getValueNode(forkedval)).toNodeBS();
-            for (NodeBS::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
-            {
-                if(ObjVar* objPN = SVFUtil::dyn_cast<ObjVar>(pag->getGNode(*ii)))
-                {
-                    const MemObj* obj = pag->getObject(objPN);
-                    if(obj->isFunction())
-                    {
-                        const SVFFunction* svfCallee = SVFUtil::cast<SVFFunction>(obj->getValue());
-                        this->addIndirectForkEdge(*it, svfCallee);
-                    }
-                }
-            }
-        }
-    }
 }
 
 
@@ -123,7 +100,7 @@ void ThreadCallGraph::updateJoinEdge(PointerAnalysis* pta)
 
     for (CallSiteSet::const_iterator it = joinsitesBegin(), eit = joinsitesEnd(); it != eit; ++it)
     {
-        const SVFValue* jointhread = tdAPI->getJoinedThread((*it)->getCallSite());
+        const SVFValue* jointhread = tdAPI->getJoinedThread(*it);
         // find its corresponding fork sites first
         CallSiteSet forkset;
         for (CallSiteSet::const_iterator it = forksitesBegin(), eit = forksitesEnd(); it != eit; ++it)
@@ -145,13 +122,13 @@ void ThreadCallGraph::updateJoinEdge(PointerAnalysis* pta)
 void ThreadCallGraph::addDirectForkEdge(const CallICFGNode* cs)
 {
 
-    PTACallGraphNode* caller = getCallGraphNode(cs->getCaller());
+    CallGraphNode* caller = getCallGraphNode(cs->getCaller());
     const SVFFunction* forkee = SVFUtil::dyn_cast<SVFFunction>(tdAPI->getForkedFun(cs->getCallSite()));
     assert(forkee && "callee does not exist");
-    PTACallGraphNode* callee = getCallGraphNode(forkee->getDefFunForMultipleModule());
+    CallGraphNode* callee = getCallGraphNode(forkee->getDefFunForMultipleModule());
     CallSiteID csId = addCallSite(cs, callee->getFunction());
 
-    if (!hasGraphEdge(caller, callee, PTACallGraphEdge::TDForkEdge, csId))
+    if (!hasGraphEdge(caller, callee, CallGraphEdge::TDForkEdge, csId))
     {
         assert(cs->getCaller() == caller->getFunction() && "callee instruction not inside caller??");
 
@@ -168,12 +145,12 @@ void ThreadCallGraph::addDirectForkEdge(const CallICFGNode* cs)
  */
 void ThreadCallGraph::addIndirectForkEdge(const CallICFGNode* cs, const SVFFunction* calleefun)
 {
-    PTACallGraphNode* caller = getCallGraphNode(cs->getCaller());
-    PTACallGraphNode* callee = getCallGraphNode(calleefun);
+    CallGraphNode* caller = getCallGraphNode(cs->getCaller());
+    CallGraphNode* callee = getCallGraphNode(calleefun);
 
     CallSiteID csId = addCallSite(cs, callee->getFunction());
 
-    if (!hasGraphEdge(caller, callee, PTACallGraphEdge::TDForkEdge, csId))
+    if (!hasGraphEdge(caller, callee, CallGraphEdge::TDForkEdge, csId))
     {
         assert(cs->getCaller() == caller->getFunction() && "callee instruction not inside caller??");
 
@@ -194,14 +171,14 @@ void ThreadCallGraph::addIndirectForkEdge(const CallICFGNode* cs, const SVFFunct
 void ThreadCallGraph::addDirectJoinEdge(const CallICFGNode* cs,const CallSiteSet& forkset)
 {
 
-    PTACallGraphNode* joinFunNode = getCallGraphNode(cs->getCaller());
+    CallGraphNode* joinFunNode = getCallGraphNode(cs->getCaller());
 
     for (CallSiteSet::const_iterator it = forkset.begin(), eit = forkset.end(); it != eit; ++it)
     {
 
         const SVFFunction* threadRoutineFun = SVFUtil::dyn_cast<SVFFunction>(tdAPI->getForkedFun((*it)->getCallSite()));
         assert(threadRoutineFun && "thread routine function does not exist");
-        PTACallGraphNode* threadRoutineFunNode = getCallGraphNode(threadRoutineFun);
+        CallGraphNode* threadRoutineFunNode = getCallGraphNode(threadRoutineFun);
         CallSiteID csId = addCallSite(cs, threadRoutineFun);
 
         if (!hasThreadJoinEdge(cs,joinFunNode,threadRoutineFunNode, csId))
@@ -214,52 +191,3 @@ void ThreadCallGraph::addDirectJoinEdge(const CallICFGNode* cs,const CallSiteSet
         }
     }
 }
-
-/*!
- * Add a direct ParFor edges
- */
-void ThreadCallGraph::addDirectParForEdge(const CallICFGNode* cs)
-{
-
-    PTACallGraphNode* caller = getCallGraphNode(cs->getCaller());
-    const SVFFunction* taskFunc = SVFUtil::dyn_cast<SVFFunction>(tdAPI->getTaskFuncAtHareParForSite(cs->getCallSite()));
-    assert(taskFunc && "callee does not exist");
-
-    PTACallGraphNode* callee = getCallGraphNode(taskFunc);
-
-    CallSiteID csId = addCallSite(cs, callee->getFunction());
-
-    if (!hasGraphEdge(caller, callee, PTACallGraphEdge::TDForkEdge, csId))
-    {
-        assert(cs->getCaller() == caller->getFunction() && "callee instruction not inside caller??");
-
-        HareParForEdge* edge = new HareParForEdge(caller, callee, csId);
-        edge->addDirectCallSite(cs);
-
-        addEdge(edge);
-        addHareParForEdgeSetMap(cs, edge);
-    }
-}
-
-/*!
- * Add an indirect ParFor edge to update call graph
- */
-void ThreadCallGraph::addIndirectParForEdge(const CallICFGNode* cs, const SVFFunction* calleefun)
-{
-
-    PTACallGraphNode* caller = getCallGraphNode(cs->getCaller());
-    PTACallGraphNode* callee = getCallGraphNode(calleefun);
-
-    CallSiteID csId = addCallSite(cs, callee->getFunction());
-
-    if (!hasGraphEdge(caller, callee, PTACallGraphEdge::HareParForEdge,csId))
-    {
-        assert(cs->getCaller() == caller->getFunction() && "callee instruction not inside caller??");
-
-        HareParForEdge* edge = new HareParForEdge(caller, callee, csId);
-        edge->addInDirectCallSite(cs);
-
-        addEdge(edge);
-        addHareParForEdgeSetMap(cs, edge);
-    }
-}

package/svf/lib/Graphs/VFG.cpp

@@ -438,7 +438,7 @@ PHIVFGNode::PHIVFGNode(NodeID id, const PAGNode* r,VFGNodeK k): VFGNode(id, k),
  * 2) connect VFG edges
  *    between two statements (PAGEdges)
  */
-VFG::VFG(PTACallGraph* cg, VFGK k): totalVFGNode(0), callgraph(cg), pag(SVFIR::getPAG()), kind(k)
+VFG::VFG(CallGraph* cg, VFGK k): totalVFGNode(0), callgraph(cg), pag(SVFIR::getPAG()), kind(k)
 {
 
     DBOUT(DGENERAL, outs() << pasMsg("\tCreate VFG Top Level Node\n"));

package/svf/lib/MSSA/MemRegion.cpp

@@ -41,7 +41,7 @@ u32_t MRVer::totalVERNum = 0;
 MRGenerator::MRGenerator(BVDataPTAImpl* p, bool ptrOnly) :
     pta(p), ptrOnlyMSSA(ptrOnly)
 {
-    callGraph = pta->getPTACallGraph();
+    callGraph = pta->getCallGraph();
     callGraphSCC = new SCC(callGraph);
 }
 
@@ -248,7 +248,7 @@ void MRGenerator::collectModRefForCall()
         const NodeBS& subNodes = callGraphSCC->subNodes(callGraphNodeID);
         for(NodeBS::iterator it = subNodes.begin(), eit = subNodes.end(); it!=eit; ++it)
         {
-            PTACallGraphNode* subCallGraphNode = callGraph->getCallGraphNode(*it);
+            CallGraphNode* subCallGraphNode = callGraph->getCallGraphNode(*it);
             /// Get mod-ref of all callsites calling callGraphNode
             modRefAnalysis(subCallGraphNode,worklist);
         }
@@ -630,17 +630,17 @@ bool MRGenerator::handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallICFGN
  * Call site mod-ref analysis
  * Compute mod-ref of all callsites invoking this call graph node
  */
-void MRGenerator::modRefAnalysis(PTACallGraphNode* callGraphNode, WorkList& worklist)
+void MRGenerator::modRefAnalysis(CallGraphNode* callGraphNode, WorkList& worklist)
 {
 
     /// add ref/mod set of callee to its invocation callsites at caller
-    for(PTACallGraphNode::iterator it = callGraphNode->InEdgeBegin(), eit = callGraphNode->InEdgeEnd();
+    for(CallGraphNode::iterator it = callGraphNode->InEdgeBegin(), eit = callGraphNode->InEdgeEnd();
             it!=eit; ++it)
     {
-        PTACallGraphEdge* edge = *it;
+        CallGraphEdge* edge = *it;
 
         /// handle direct callsites
-        for(PTACallGraphEdge::CallInstSet::iterator cit = edge->getDirectCalls().begin(),
+        for(CallGraphEdge::CallInstSet::iterator cit = edge->getDirectCalls().begin(),
                 ecit = edge->getDirectCalls().end(); cit!=ecit; ++cit)
         {
             NodeBS mod, ref;
@@ -650,7 +650,7 @@ void MRGenerator::modRefAnalysis(PTACallGraphNode* callGraphNode, WorkList& work
                 worklist.push(edge->getSrcID());
         }
         /// handle indirect callsites
-        for(PTACallGraphEdge::CallInstSet::iterator cit = edge->getIndirectCalls().begin(),
+        for(CallGraphEdge::CallInstSet::iterator cit = edge->getIndirectCalls().begin(),
                 ecit = edge->getIndirectCalls().end(); cit!=ecit; ++cit)
         {
             NodeBS mod, ref;