svf-tools 1.0.321 → 1.0.325

package/lib/DDA/DDAClient.cpp

@@ -155,8 +155,8 @@ void FunptrDDAClient::performStat(PointerAnalysis* pta)
 OrderedNodeSet& AliasDDAClient::collectCandidateQueries(SVFIR* pag)
 {
     setPAG(pag);
-    PAGEdge::PAGEdgeSetTy& loads = pag->getEdgeSet(PAGEdge::Load);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = loads.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& loads = pag->getSVFStmtSet(PAGEdge::Load);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = loads.begin(), eiter =
                 loads.end(); iter != eiter; ++iter)
     {
         PAGNode* loadsrc = (*iter)->getSrcNode();
@@ -164,16 +164,16 @@ OrderedNodeSet& AliasDDAClient::collectCandidateQueries(SVFIR* pag)
         addCandidate(loadsrc->getId());
     }
 
-    PAGEdge::PAGEdgeSetTy& stores = pag->getEdgeSet(PAGEdge::Store);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = stores.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& stores = pag->getSVFStmtSet(PAGEdge::Store);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = stores.begin(), eiter =
                 stores.end(); iter != eiter; ++iter)
     {
         PAGNode* storedst = (*iter)->getDstNode();
         storeDstNodes.insert(storedst);
         addCandidate(storedst->getId());
     }
-    PAGEdge::PAGEdgeSetTy& geps = pag->getEdgeSet(PAGEdge::NormalGep);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = geps.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& geps = pag->getSVFStmtSet(PAGEdge::NormalGep);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = geps.begin(), eiter =
                 geps.end(); iter != eiter; ++iter)
     {
         PAGNode* gepsrc = (*iter)->getSrcNode();

package/lib/DDA/DDAStat.cpp

@@ -208,7 +208,7 @@ void DDAStat::performStat()
     for (SVFIR::const_iterator nodeIt = SVFIR::getPAG()->begin(), nodeEit = SVFIR::getPAG()->end(); nodeIt != nodeEit; nodeIt++)
     {
         PAGNode* pagNode = nodeIt->second;
-        if(SVFUtil::isa<ObjPN>(pagNode))
+        if(SVFUtil::isa<ObjVar>(pagNode))
         {
             if(getPTA()->isLocalVarInRecursiveFun(nodeIt->first))
             {
@@ -242,7 +242,7 @@ void DDAStat::performStat()
     PTNumStatMap["PointsToBlkPtr"] = _NumOfBlackholePtr;
     PTNumStatMap["NumOfMustAA"] = _TotalNumOfMustAliases;
     PTNumStatMap["NumOfInfePath"] = _TotalNumOfInfeasiblePath;
-    PTNumStatMap["NumOfStore"] = SVFIR::getPAG()->getPTAEdgeSet(PAGEdge::Store).size();
+    PTNumStatMap["NumOfStore"] = SVFIR::getPAG()->getPTASVFStmtSet(PAGEdge::Store).size();
     PTNumStatMap["MemoryUsageVmrss"] = _vmrssUsageAfter - _vmrssUsageBefore;
     PTNumStatMap["MemoryUsageVmsize"] = _vmsizeUsageAfter - _vmsizeUsageBefore;
 

package/lib/DDA/FlowDDA.cpp

@@ -126,14 +126,14 @@ PointsTo FlowDDA::processGepPts(const GepSVFGNode* gep, const PointsTo& srcPts)
             tmpDstPts.set(ptd);
         else
         {
-            if (SVFUtil::isa<VariantGepPE>(gep->getPAGEdge()))
+            if (SVFUtil::isa<VariantGepStmt>(gep->getPAGEdge()))
             {
                 setObjFieldInsensitive(ptd);
-                tmpDstPts.set(getFIObjNode(ptd));
+                tmpDstPts.set(getFIObjVar(ptd));
             }
-            else if (const NormalGepPE* normalGep = SVFUtil::dyn_cast<NormalGepPE>(gep->getPAGEdge()))
+            else if (const NormalGepStmt* normalGep = SVFUtil::dyn_cast<NormalGepStmt>(gep->getPAGEdge()))
             {
-                NodeID fieldSrcPtdNode = getGepObjNode(ptd,	normalGep->getLocationSet());
+                NodeID fieldSrcPtdNode = getGepObjVar(ptd,	normalGep->getLocationSet());
                 tmpDstPts.set(fieldSrcPtdNode);
             }
             else

package/lib/Graphs/ConsG.cpp

@@ -49,89 +49,89 @@ void ConstraintGraph::buildCG()
     }
 
     // initialize edges
-    PAGEdge::PAGEdgeSetTy& addrs = getPAGEdgeSet(PAGEdge::Addr);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = addrs.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& addrs = getPAGEdgeSet(PAGEdge::Addr);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = addrs.begin(), eiter =
                 addrs.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addAddrCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& copys = getPAGEdgeSet(PAGEdge::Copy);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = copys.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& copys = getPAGEdgeSet(PAGEdge::Copy);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = copys.begin(), eiter =
                 copys.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addCopyCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& phis = getPAGEdgeSet(PAGEdge::Phi);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = phis.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& phis = getPAGEdgeSet(PAGEdge::Phi);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = phis.begin(), eiter =
                 phis.end(); iter != eiter; ++iter)
     {
-        const PhiPE* edge = SVFUtil::cast<PhiPE>(*iter);
+        const PhiStmt* edge = SVFUtil::cast<PhiStmt>(*iter);
         for(const auto opVar : edge->getOpndVars())
             addCopyCGEdge(opVar->getId(),edge->getResID());
     }
 
-    PAGEdge::PAGEdgeSetTy& calls = getPAGEdgeSet(PAGEdge::Call);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = calls.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& calls = getPAGEdgeSet(PAGEdge::Call);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = calls.begin(), eiter =
                 calls.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addCopyCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& rets = getPAGEdgeSet(PAGEdge::Ret);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = rets.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& rets = getPAGEdgeSet(PAGEdge::Ret);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = rets.begin(), eiter =
                 rets.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addCopyCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& tdfks = getPAGEdgeSet(PAGEdge::ThreadFork);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = tdfks.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& tdfks = getPAGEdgeSet(PAGEdge::ThreadFork);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = tdfks.begin(), eiter =
                 tdfks.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addCopyCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& tdjns = getPAGEdgeSet(PAGEdge::ThreadJoin);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = tdjns.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& tdjns = getPAGEdgeSet(PAGEdge::ThreadJoin);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = tdjns.begin(), eiter =
                 tdjns.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addCopyCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& ngeps = getPAGEdgeSet(PAGEdge::NormalGep);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = ngeps.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& ngeps = getPAGEdgeSet(PAGEdge::NormalGep);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = ngeps.begin(), eiter =
                 ngeps.end(); iter != eiter; ++iter)
     {
-        NormalGepPE* edge = SVFUtil::cast<NormalGepPE>(*iter);
+        NormalGepStmt* edge = SVFUtil::cast<NormalGepStmt>(*iter);
         addNormalGepCGEdge(edge->getSrcID(),edge->getDstID(),edge->getLocationSet());
     }
 
-    PAGEdge::PAGEdgeSetTy& vgeps = getPAGEdgeSet(PAGEdge::VariantGep);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = vgeps.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& vgeps = getPAGEdgeSet(PAGEdge::VariantGep);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = vgeps.begin(), eiter =
                 vgeps.end(); iter != eiter; ++iter)
     {
-        VariantGepPE* edge = SVFUtil::cast<VariantGepPE>(*iter);
+        VariantGepStmt* edge = SVFUtil::cast<VariantGepStmt>(*iter);
         addVariantGepCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& stores = getPAGEdgeSet(PAGEdge::Load);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = stores.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& stores = getPAGEdgeSet(PAGEdge::Load);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = stores.begin(), eiter =
                 stores.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
         addLoadCGEdge(edge->getSrcID(),edge->getDstID());
     }
 
-    PAGEdge::PAGEdgeSetTy& loads = getPAGEdgeSet(PAGEdge::Store);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = loads.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& loads = getPAGEdgeSet(PAGEdge::Store);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = loads.begin(), eiter =
                 loads.end(); iter != eiter; ++iter)
     {
         PAGEdge* edge = *iter;
@@ -156,7 +156,7 @@ AddrCGEdge::AddrCGEdge(ConstraintNode* s, ConstraintNode* d, EdgeID id)
     // Retarget addr edges may lead s to be a dummy node
     PAGNode* node = SVFIR::getPAG()->getGNode(s->getId());
     if (!SVFModule::pagReadFromTXT())
-        assert(!SVFUtil::isa<DummyValPN>(node) && "a dummy node??");
+        assert(!SVFUtil::isa<DummyValVar>(node) && "a dummy node??");
 }
 
 /*!
@@ -624,11 +624,12 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
     }
 
 #if LLVM_VERSION_MAJOR >= 12
-    static bool isNodeHidden(NodeType *n, ConstraintGraph*) {
+    static bool isNodeHidden(NodeType *n, ConstraintGraph *){
 #else
     static bool isNodeHidden(NodeType *n) {
 #endif
-	return (n->getInEdges().empty() && n->getOutEdges().empty());
+        if (Options::ShowHiddenNode) return false;
+        else return (n->getInEdges().empty() && n->getOutEdges().empty());
     }
 
     /// Return label of a VFG node with two display mode
@@ -643,7 +644,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
 
         if (briefDisplay)
         {
-            if (SVFUtil::isa<ValPN>(node))
+            if (SVFUtil::isa<ValVar>(node))
             {
                 if (nameDisplay)
                     rawstr << node->getId() << ":" << node->getValueName();
@@ -656,7 +657,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
         else
         {
             // print the whole value
-            if (!SVFUtil::isa<DummyValPN>(node) && !SVFUtil::isa<DummyObjPN>(node))
+            if (!SVFUtil::isa<DummyValVar>(node) && !SVFUtil::isa<DummyObjVar>(node))
                 rawstr << node->getId() << ":" << value2String(node->getValue());
             else
                 rawstr << node->getId() << ":";
@@ -669,22 +670,22 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
     static std::string getNodeAttributes(NodeType *n, ConstraintGraph*)
     {
         PAGNode* node = SVFIR::getPAG()->getGNode(n->getId());
-        if (SVFUtil::isa<ValPN>(node))
+        if (SVFUtil::isa<ValVar>(node))
         {
-            if(SVFUtil::isa<GepValPN>(node))
+            if(SVFUtil::isa<GepValVar>(node))
                 return "shape=hexagon";
-            else if (SVFUtil::isa<DummyValPN>(node))
+            else if (SVFUtil::isa<DummyValVar>(node))
                 return "shape=diamond";
             else
                 return "shape=box";
         }
-        else if (SVFUtil::isa<ObjPN>(node))
+        else if (SVFUtil::isa<ObjVar>(node))
         {
             if(SVFUtil::isa<GepObjPN>(node))
                return "shape=doubleoctagon";
-            else if(SVFUtil::isa<FIObjPN>(node))
+            else if(SVFUtil::isa<FIObjVar>(node))
                 return "shape=box3d";
-            else if (SVFUtil::isa<DummyObjPN>(node))
+            else if (SVFUtil::isa<DummyObjVar>(node))
                 return "shape=tab";
             else
                 return "shape=component";

package/lib/Graphs/ICFG.cpp

@@ -472,11 +472,11 @@ struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>
         if (IntraBlockNode* bNode = SVFUtil::dyn_cast<IntraBlockNode>(node))
         {
             rawstr << "IntraBlockNode ID: " << bNode->getId() << " \t";
-            SVFIR::PAGEdgeList&  edges = SVFIR::getPAG()->getInstPTAPAGEdgeList(bNode);
+            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getPTASVFStmtList(bNode);
             if (edges.empty()) {
                 rawstr << value2String(bNode->getInst()) << " \t";
             } else {
-                for (SVFIR::PAGEdgeList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
+                for (SVFIR::SVFStmtList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
                 {
                     const PAGEdge* edge = *it;
                     rawstr << edge->toString();
@@ -502,8 +502,8 @@ struct DOTGraphTraits<ICFG*> : public DOTGraphTraits<SVFIR*>
         }
         else if (GlobalBlockNode* glob  = SVFUtil::dyn_cast<GlobalBlockNode>(node) )
         {
-            SVFIR::PAGEdgeList&  edges = SVFIR::getPAG()->getInstPTAPAGEdgeList(glob);
-            for (SVFIR::PAGEdgeList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
+            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getPTASVFStmtList(glob);
+            for (SVFIR::SVFStmtList::iterator it = edges.begin(), eit = edges.end(); it != eit; ++it)
             {
                 const PAGEdge* edge = *it;
                 rawstr << edge->toString();

package/lib/Graphs/IRGraph.cpp

@@ -28,6 +28,8 @@
  */
 
 #include "Graphs/IRGraph.h"
+#include "Util/Options.h"
+
 using namespace SVF;
 using namespace SVFUtil;
 
@@ -57,8 +59,8 @@ bool IRGraph::addEdge(SVFVar* src, SVFVar* dst, SVFStmt* edge)
 SVFStmt* IRGraph::hasNonlabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind)
 {
     SVFStmt edge(src,dst,kind);
-    SVFStmt::PAGEdgeSetTy::iterator it = PAGEdgeKindToSetMap[kind].find(&edge);
-    if (it != PAGEdgeKindToSetMap[kind].end())
+    SVFStmt::SVFStmtSetTy::iterator it = KindToSVFStmtSetMap[kind].find(&edge);
+    if (it != KindToSVFStmtSetMap[kind].end())
     {
         return *it;
     }
@@ -71,8 +73,8 @@ SVFStmt* IRGraph::hasNonlabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK ki
 SVFStmt* IRGraph::hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind, const SVFVar* op2)
 {
     SVFStmt edge(src,op1,SVFStmt::makeEdgeFlagWithAddionalOpnd(kind,op2));
-    SVFStmt::PAGEdgeSetTy::iterator it = PAGEdgeKindToSetMap[kind].find(&edge);
-    if (it != PAGEdgeKindToSetMap[kind].end())
+    SVFStmt::SVFStmtSetTy::iterator it = KindToSVFStmtSetMap[kind].find(&edge);
+    if (it != KindToSVFStmtSetMap[kind].end())
     {
         return *it;
     }
@@ -85,8 +87,8 @@ SVFStmt* IRGraph::hasLabeledEdge(SVFVar* src, SVFVar* op1, SVFStmt::PEDGEK kind,
 SVFStmt* IRGraph::hasLabeledEdge(SVFVar* src, SVFVar* dst, SVFStmt::PEDGEK kind, const ICFGNode* callInst)
 {
     SVFStmt edge(src,dst,SVFStmt::makeEdgeFlagWithCallInst(kind,callInst));
-    SVFStmt::PAGEdgeSetTy::iterator it = PAGEdgeKindToSetMap[kind].find(&edge);
-    if (it != PAGEdgeKindToSetMap[kind].end())
+    SVFStmt::SVFStmtSetTy::iterator it = KindToSVFStmtSetMap[kind].find(&edge);
+    if (it != KindToSVFStmtSetMap[kind].end())
     {
         return *it;
     }
@@ -135,12 +137,13 @@ struct DOTGraphTraits<IRGraph*> : public DefaultDOTGraphTraits
     /// isNodeHidden - If the function returns true, the given node is not
     /// displayed in the graph
 #if LLVM_VERSION_MAJOR >= 12
-	static bool isNodeHidden(SVFVar *node, IRGraph*) {
+    static bool isNodeHidden(SVFVar *node, IRGraph *){
 #else
     static bool isNodeHidden(SVFVar *node) {
 #endif
-		return node->isIsolatedNode();
-	}
+        if (Options::ShowHiddenNode) return false;
+        else return node->isIsolatedNode();
+    }
 
     /// Return label of a VFG node with two display mode
     /// Either you can choose to display the name of the value or the whole instruction
@@ -160,22 +163,22 @@ struct DOTGraphTraits<IRGraph*> : public DefaultDOTGraphTraits
 
     static std::string getNodeAttributes(SVFVar *node, IRGraph*)
     {
-        if (SVFUtil::isa<ValPN>(node))
+        if (SVFUtil::isa<ValVar>(node))
         {
-            if(SVFUtil::isa<GepValPN>(node))
+            if(SVFUtil::isa<GepValVar>(node))
                 return "shape=hexagon";
-            else if (SVFUtil::isa<DummyValPN>(node))
+            else if (SVFUtil::isa<DummyValVar>(node))
                 return "shape=diamond";
             else
                 return "shape=box";
         }
-        else if (SVFUtil::isa<ObjPN>(node))
+        else if (SVFUtil::isa<ObjVar>(node))
         {
             if(SVFUtil::isa<GepObjPN>(node))
                return "shape=doubleoctagon";
-            else if(SVFUtil::isa<FIObjPN>(node))
+            else if(SVFUtil::isa<FIObjVar>(node))
                 return "shape=box3d";
-            else if (SVFUtil::isa<DummyObjPN>(node))
+            else if (SVFUtil::isa<DummyObjVar>(node))
                 return "shape=tab";
             else
                 return "shape=component";
@@ -200,39 +203,39 @@ struct DOTGraphTraits<IRGraph*> : public DefaultDOTGraphTraits
     {
         const SVFStmt* edge = *(EI.getCurrent());
         assert(edge && "No edge found!!");
-        if (SVFUtil::isa<AddrPE>(edge))
+        if (SVFUtil::isa<AddrStmt>(edge))
         {
             return "color=green";
         }
-        else if (SVFUtil::isa<CopyPE>(edge))
+        else if (SVFUtil::isa<CopyStmt>(edge))
         {
             return "color=black";
         }
-        else if (SVFUtil::isa<GepPE>(edge))
+        else if (SVFUtil::isa<GepStmt>(edge))
         {
             return "color=purple";
         }
-        else if (SVFUtil::isa<StorePE>(edge))
+        else if (SVFUtil::isa<StoreStmt>(edge))
         {
             return "color=blue";
         }
-        else if (SVFUtil::isa<LoadPE>(edge))
+        else if (SVFUtil::isa<LoadStmt>(edge))
         {
             return "color=red";
         }
-        else if (SVFUtil::isa<PhiPE>(edge))
+        else if (SVFUtil::isa<PhiStmt>(edge))
         {
             return "color=grey";
         }
-        else if (SVFUtil::isa<CmpPE>(edge))
+        else if (SVFUtil::isa<CmpStmt>(edge))
         {
             return "color=grey";
         }
-        else if (SVFUtil::isa<BinaryOPPE>(edge))
+        else if (SVFUtil::isa<BinaryOPStmt>(edge))
         {
             return "color=grey";
         }
-        else if (SVFUtil::isa<UnaryOPPE>(edge))
+        else if (SVFUtil::isa<UnaryOPStmt>(edge))
         {
             return "color=grey";
         }

package/lib/Graphs/OfflineConsG.cpp

@@ -209,7 +209,7 @@ struct DOTGraphTraits<OfflineConsG*> : public DOTGraphTraits<SVFIR*>
 
             if (briefDisplay)
             {
-                if (SVFUtil::isa<ValPN>(node))
+                if (SVFUtil::isa<ValVar>(node))
                 {
                     if (nameDisplay)
                         rawstr << node->getId() << ":" << node->getValueName();
@@ -222,7 +222,7 @@ struct DOTGraphTraits<OfflineConsG*> : public DOTGraphTraits<SVFIR*>
             else
             {
                 // print the whole value
-                if (!SVFUtil::isa<DummyValPN>(node) && !SVFUtil::isa<DummyObjPN>(node))
+                if (!SVFUtil::isa<DummyValVar>(node) && !SVFUtil::isa<DummyObjVar>(node))
                     rawstr << *node->getValue();
                 else
                     rawstr << "";
@@ -243,22 +243,22 @@ struct DOTGraphTraits<OfflineConsG*> : public DOTGraphTraits<SVFIR*>
         if (SVFIR::getPAG()->getGNode(n->getId()))
         {
             PAGNode *node = SVFIR::getPAG()->getGNode(n->getId());
-            if (SVFUtil::isa<ValPN>(node))
+            if (SVFUtil::isa<ValVar>(node))
             {
-                if(SVFUtil::isa<GepValPN>(node))
+                if(SVFUtil::isa<GepValVar>(node))
                     return "shape=hexagon";
-                else if (SVFUtil::isa<DummyValPN>(node))
+                else if (SVFUtil::isa<DummyValVar>(node))
                     return "shape=diamond";
                 else
                     return "shape=box";
             }
-            else if (SVFUtil::isa<ObjPN>(node))
+            else if (SVFUtil::isa<ObjVar>(node))
             {
                 if(SVFUtil::isa<GepObjPN>(node))
                     return "shape=doubleoctagon";
-                else if(SVFUtil::isa<FIObjPN>(node))
+                else if(SVFUtil::isa<FIObjVar>(node))
                     return "shape=box3d";
-                else if (SVFUtil::isa<DummyObjPN>(node))
+                else if (SVFUtil::isa<DummyObjVar>(node))
                     return "shape=tab";
                 else
                     return "shape=component";

package/lib/Graphs/SVFG.cpp

@@ -33,6 +33,7 @@
 #include "Graphs/SVFGOPT.h"
 #include "Graphs/SVFGStat.h"
 #include "Graphs/ICFG.h"
+#include "Util/Options.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include <fstream>
 
@@ -223,11 +224,11 @@ void SVFG::addSVFGNodesForAddrTakenVars()
 {
 
     // set defs for address-taken vars defined at store statements
-    PAGEdge::PAGEdgeSetTy& stores = getPAGEdgeSet(PAGEdge::Store);
-    for (PAGEdge::PAGEdgeSetTy::iterator iter = stores.begin(), eiter =
+    PAGEdge::SVFStmtSetTy& stores = getPAGEdgeSet(PAGEdge::Store);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = stores.begin(), eiter =
                 stores.end(); iter != eiter; ++iter)
     {
-        StorePE* store = SVFUtil::cast<StorePE>(*iter);
+        StoreStmt* store = SVFUtil::cast<StoreStmt>(*iter);
         const StmtSVFGNode* sNode = getStmtVFGNode(store);
         for(CHISet::iterator pi = mssa->getCHISet(store).begin(), epi = mssa->getCHISet(store).end(); pi!=epi; ++pi)
             setDef((*pi)->getResVer(),sNode);
@@ -297,7 +298,7 @@ void SVFG::connectIndirectSVFGEdges()
         const SVFGNode* node = it->second;
         if(const LoadSVFGNode* loadNode = SVFUtil::dyn_cast<LoadSVFGNode>(node))
         {
-            MUSet& muSet = mssa->getMUSet(SVFUtil::cast<LoadPE>(loadNode->getPAGEdge()));
+            MUSet& muSet = mssa->getMUSet(SVFUtil::cast<LoadStmt>(loadNode->getPAGEdge()));
             for(MUSet::iterator it = muSet.begin(), eit = muSet.end(); it!=eit; ++it)
             {
                 if(LOADMU* mu = SVFUtil::dyn_cast<LOADMU>(*it))
@@ -309,7 +310,7 @@ void SVFG::connectIndirectSVFGEdges()
         }
         else if(const StoreSVFGNode* storeNode = SVFUtil::dyn_cast<StoreSVFGNode>(node))
         {
-            CHISet& chiSet = mssa->getCHISet(SVFUtil::cast<StorePE>(storeNode->getPAGEdge()));
+            CHISet& chiSet = mssa->getCHISet(SVFUtil::cast<StoreStmt>(storeNode->getPAGEdge()));
             for(CHISet::iterator it = chiSet.begin(), eit = chiSet.end(); it!=eit; ++it)
             {
                 if(STORECHI* chi = SVFUtil::dyn_cast<STORECHI>(*it))
@@ -571,10 +572,10 @@ void SVFG::getInterVFEdgesForIndirectCallSite(const CallBlockNode* callBlockNode
     // Find inter direct call edges between actual param and formal param.
     if (pag->hasCallSiteArgsMap(callBlockNode) && pag->hasFunArgsList(callee))
     {
-        const SVFIR::PAGNodeList& csArgList = pag->getCallSiteArgsList(callBlockNode);
-        const SVFIR::PAGNodeList& funArgList = pag->getFunArgsList(callee);
-        SVFIR::PAGNodeList::const_iterator csArgIt = csArgList.begin(), csArgEit = csArgList.end();
-        SVFIR::PAGNodeList::const_iterator funArgIt = funArgList.begin(), funArgEit = funArgList.end();
+        const SVFIR::SVFVarList& csArgList = pag->getCallSiteArgsList(callBlockNode);
+        const SVFIR::SVFVarList& funArgList = pag->getFunArgsList(callee);
+        SVFIR::SVFVarList::const_iterator csArgIt = csArgList.begin(), csArgEit = csArgList.end();
+        SVFIR::SVFVarList::const_iterator funArgIt = funArgList.begin(), funArgEit = funArgList.end();
         for (; funArgIt != funArgEit && csArgIt != csArgEit; funArgIt++, csArgIt++)
         {
             const PAGNode *cs_arg = *csArgIt;
@@ -766,11 +767,12 @@ struct DOTGraphTraits<SVFG*> : public DOTGraphTraits<SVFIR*>
     /// isNodeHidden - If the function returns true, the given node is not
     /// displayed in the graph
 #if LLVM_VERSION_MAJOR >= 12
-    static bool isNodeHidden(SVFGNode *node, SVFG*) {
+    static bool isNodeHidden(SVFGNode *node, SVFG *){
 #else
     static bool isNodeHidden(SVFGNode *node) {
 #endif
-        return node->getInEdges().empty() && node->getOutEdges().empty();
+        if (Options::ShowHiddenNode) return false;
+        else return node->getInEdges().empty() && node->getOutEdges().empty();
     }
 
     std::string getNodeLabel(NodeType *node, SVFG *graph)
@@ -932,11 +934,11 @@ struct DOTGraphTraits<SVFG*> : public DOTGraphTraits<SVFIR*>
         if(StmtSVFGNode* stmtNode = SVFUtil::dyn_cast<StmtSVFGNode>(node))
         {
             const PAGEdge* edge = stmtNode->getPAGEdge();
-            if (SVFUtil::isa<AddrPE>(edge))
+            if (SVFUtil::isa<AddrStmt>(edge))
             {
                 rawstr <<  "color=green";
             }
-            else if (SVFUtil::isa<CopyPE>(edge))
+            else if (SVFUtil::isa<CopyStmt>(edge))
             {
                 rawstr <<  "color=black";
             }
@@ -944,15 +946,15 @@ struct DOTGraphTraits<SVFG*> : public DOTGraphTraits<SVFIR*>
             {
                 rawstr <<  "color=black,style=dotted";
             }
-            else if (SVFUtil::isa<GepPE>(edge))
+            else if (SVFUtil::isa<GepStmt>(edge))
             {
                 rawstr <<  "color=purple";
             }
-            else if (SVFUtil::isa<StorePE>(edge))
+            else if (SVFUtil::isa<StoreStmt>(edge))
             {
                 rawstr <<  "color=blue";
             }
-            else if (SVFUtil::isa<LoadPE>(edge))
+            else if (SVFUtil::isa<LoadStmt>(edge))
             {
                 rawstr <<  "color=red";
             }

package/lib/Graphs/ThreadCallGraph.cpp

@@ -77,7 +77,7 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
             const NodeBS targets = pta->getPts(pag->getValueNode(forkedval)).toNodeBS();
             for (NodeBS::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
             {
-                if(ObjPN* objPN = SVFUtil::dyn_cast<ObjPN>(pag->getGNode(*ii)))
+                if(ObjVar* objPN = SVFUtil::dyn_cast<ObjVar>(pag->getGNode(*ii)))
                 {
                     const MemObj* obj = pag->getObject(objPN);
                     if(obj->isFunction())
@@ -101,7 +101,7 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
             const NodeBS targets = pta->getPts(pag->getValueNode(forkedval)).toNodeBS();
             for (NodeBS::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
             {
-                if(ObjPN* objPN = SVFUtil::dyn_cast<ObjPN>(pag->getGNode(*ii)))
+                if(ObjVar* objPN = SVFUtil::dyn_cast<ObjVar>(pag->getGNode(*ii)))
                 {
                     const MemObj* obj = pag->getObject(objPN);
                     if(obj->isFunction())