svf-tools 1.0.321 → 1.0.322

package/include/SVF-FE/SVFIRBuilder.h

@@ -281,44 +281,44 @@ public:
     }
 
     /// Add Address edge
-    inline AddrPE* addAddrEdge(NodeID src, NodeID dst)
+    inline AddrStmt* addAddrEdge(NodeID src, NodeID dst)
     {
-        AddrPE *edge = pag->addAddrPE(src, dst);
+        AddrStmt *edge = pag->addAddrPE(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
-    inline CopyPE* addCopyEdge(NodeID src, NodeID dst)
+    inline CopyStmt* addCopyEdge(NodeID src, NodeID dst)
     {
-        CopyPE *edge = pag->addCopyPE(src, dst);
+        CopyStmt *edge = pag->addCopyPE(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
-    inline PhiPE* addPhiNode(NodeID res, NodeID opnd)
+    inline PhiStmt* addPhiNode(NodeID res, NodeID opnd)
     {
-        PhiPE *edge = pag->addPhiNode(res,opnd);
+        PhiStmt *edge = pag->addPhiNode(res,opnd);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
-    inline CmpPE* addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
+    inline CmpStmt* addCmpEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
     {
-        CmpPE *edge = pag->addCmpPE(op1, op2, dst, opcode);
+        CmpStmt *edge = pag->addCmpPE(op1, op2, dst, opcode);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Copy edge
-    inline BinaryOPPE* addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
+    inline BinaryOPStmt* addBinaryOPEdge(NodeID op1, NodeID op2, NodeID dst, u32_t opcode)
     {
-        BinaryOPPE *edge = pag->addBinaryOPPE(op1, op2, dst, opcode);
+        BinaryOPStmt *edge = pag->addBinaryOPPE(op1, op2, dst, opcode);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Unary edge
-    inline UnaryOPPE* addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
+    inline UnaryOPStmt* addUnaryOPEdge(NodeID src, NodeID dst, u32_t opcode)
     {
-        UnaryOPPE *edge = pag->addUnaryOPPE(src, dst, opcode);
+        UnaryOPStmt *edge = pag->addUnaryOPPE(src, dst, opcode);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -329,21 +329,21 @@ public:
         return edge;
     }
     /// Add Load edge
-    inline LoadPE* addLoadEdge(NodeID src, NodeID dst)
+    inline LoadStmt* addLoadEdge(NodeID src, NodeID dst)
     {
-        LoadPE *edge = pag->addLoadPE(src, dst);
+        LoadStmt *edge = pag->addLoadPE(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Store edge
-    inline StorePE* addStoreEdge(NodeID src, NodeID dst)
+    inline StoreStmt* addStoreEdge(NodeID src, NodeID dst)
     {
         IntraBlockNode* node;
         if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(curVal))
             node = pag->getICFG()->getIntraBlockNode(inst);
         else
             node = nullptr;
-        StorePE *edge = pag->addStorePE(src, dst, node);
+        StoreStmt *edge = pag->addStorePE(src, dst, node);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
@@ -362,23 +362,23 @@ public:
         return edge;
     }
     /// Add Gep edge
-    inline GepPE* addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
+    inline GepStmt* addGepEdge(NodeID src, NodeID dst, const LocationSet& ls, bool constGep)
     {
-        GepPE *edge = pag->addGepPE(src, dst, ls, constGep);
+        GepStmt *edge = pag->addGepPE(src, dst, ls, constGep);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Offset(Gep) edge
-    inline NormalGepPE* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
+    inline NormalGepStmt* addNormalGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        NormalGepPE *edge = pag->addNormalGepPE(src, dst, ls);
+        NormalGepStmt *edge = pag->addNormalGepPE(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }
     /// Add Variant(Gep) edge
-    inline VariantGepPE* addVariantGepEdge(NodeID src, NodeID dst)
+    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst)
     {
-        VariantGepPE *edge = pag->addVariantGepPE(src, dst);
+        VariantGepStmt *edge = pag->addVariantGepPE(src, dst);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

package/lib/DDA/ContextDDA.cpp

@@ -140,13 +140,13 @@ CxtPtSet ContextDDA::processGepPts(const GepSVFGNode* gep, const CxtPtSet& srcPt
             tmpDstPts.set(ptd);
         else
         {
-            if (SVFUtil::isa<VariantGepPE>(gep->getPAGEdge()))
+            if (SVFUtil::isa<VariantGepStmt>(gep->getPAGEdge()))
             {
                 setObjFieldInsensitive(ptd.get_id());
                 CxtVar var(ptd.get_cond(),getFIObjNode(ptd.get_id()));
                 tmpDstPts.set(var);
             }
-            else if (const NormalGepPE* normalGep = SVFUtil::dyn_cast<NormalGepPE>(gep->getPAGEdge()))
+            else if (const NormalGepStmt* normalGep = SVFUtil::dyn_cast<NormalGepStmt>(gep->getPAGEdge()))
             {
                 CxtVar var(ptd.get_cond(),getGepObjNode(ptd.get_id(),normalGep->getLocationSet()));
                 tmpDstPts.set(var);
@@ -319,10 +319,10 @@ bool ContextDDA::isHeapCondMemObj(const CxtVar& var, const StoreSVFGNode*)
         if (!mem->getValue()) {
             PAGNode *pnode = _pag->getGNode(getPtrNodeID(var));
             if(GepObjPN* gepobj = SVFUtil::dyn_cast<GepObjPN>(pnode)){
-                assert(SVFUtil::isa<DummyObjPN>(_pag->getGNode(gepobj->getBaseNode())) && "emtpy refVal in a gep object whose base is a non-dummy object");
+                assert(SVFUtil::isa<DummyObjVar>(_pag->getGNode(gepobj->getBaseNode())) && "emtpy refVal in a gep object whose base is a non-dummy object");
             }
             else{
-                assert((SVFUtil::isa<DummyObjPN>(pnode) || SVFUtil::isa<DummyValPN>(pnode)) && "empty refVal in non-dummy object");
+                assert((SVFUtil::isa<DummyObjVar>(pnode) || SVFUtil::isa<DummyValVar>(pnode)) && "empty refVal in non-dummy object");
             }
             return true;
         }

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))
             {

package/lib/DDA/FlowDDA.cpp

@@ -126,12 +126,12 @@ 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));
             }
-            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());
                 tmpDstPts.set(fieldSrcPtdNode);

package/lib/Graphs/ConsG.cpp

@@ -69,7 +69,7 @@ void ConstraintGraph::buildCG()
     for (PAGEdge::PAGEdgeSetTy::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());
     }
@@ -110,7 +110,7 @@ void ConstraintGraph::buildCG()
     for (PAGEdge::PAGEdgeSetTy::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());
     }
 
@@ -118,7 +118,7 @@ void ConstraintGraph::buildCG()
     for (PAGEdge::PAGEdgeSetTy::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());
     }
 
@@ -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??");
 }
 
 /*!
@@ -643,7 +643,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 +656,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 +669,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/IRGraph.cpp

@@ -160,22 +160,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 +200,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

@@ -227,7 +227,7 @@ void SVFG::addSVFGNodesForAddrTakenVars()
     for (PAGEdge::PAGEdgeSetTy::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 +297,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 +309,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))
@@ -932,11 +932,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 +944,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())

package/lib/Graphs/VFG.cpp

@@ -340,7 +340,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = addrs.begin(), eiter =
                 addrs.end(); iter != eiter; ++iter)
     {
-        addAddrVFGNode(SVFUtil::cast<AddrPE>(*iter));
+        addAddrVFGNode(SVFUtil::cast<AddrStmt>(*iter));
     }
 
     // initialize copy nodes
@@ -348,7 +348,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = copys.begin(), eiter =
                 copys.end(); iter != eiter; ++iter)
     {
-        const CopyPE* edge = SVFUtil::cast<CopyPE>(*iter);
+        const CopyStmt* edge = SVFUtil::cast<CopyStmt>(*iter);
         assert(!isPhiCopyEdge(edge) && "Copy edges can not be a PhiNode (or from PhiNode)");
         addCopyVFGNode(edge);
     }
@@ -358,14 +358,14 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = ngeps.begin(), eiter =
                 ngeps.end(); iter != eiter; ++iter)
     {
-        addGepVFGNode(SVFUtil::cast<NormalGepPE>(*iter));
+        addGepVFGNode(SVFUtil::cast<NormalGepStmt>(*iter));
     }
 
     PAGEdge::PAGEdgeSetTy& vgeps = getPAGEdgeSet(PAGEdge::VariantGep);
     for (PAGEdge::PAGEdgeSetTy::iterator iter = vgeps.begin(), eiter =
                 vgeps.end(); iter != eiter; ++iter)
     {
-        addGepVFGNode(SVFUtil::cast<VariantGepPE>(*iter));
+        addGepVFGNode(SVFUtil::cast<VariantGepStmt>(*iter));
     }
 
     // initialize load nodes
@@ -373,7 +373,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = loads.begin(), eiter =
                 loads.end(); iter != eiter; ++iter)
     {
-        addLoadVFGNode(SVFUtil::cast<LoadPE>(*iter));
+        addLoadVFGNode(SVFUtil::cast<LoadStmt>(*iter));
     }
 
     // initialize store nodes
@@ -381,7 +381,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = stores.begin(), eiter =
                 stores.end(); iter != eiter; ++iter)
     {
-        addStoreVFGNode(SVFUtil::cast<StorePE>(*iter));
+        addStoreVFGNode(SVFUtil::cast<StoreStmt>(*iter));
     }
 
     PAGEdge::PAGEdgeSetTy& forks = getPAGEdgeSet(PAGEdge::ThreadFork);
@@ -492,7 +492,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = phis.begin(), eiter =
                 phis.end(); iter != eiter; ++iter)
     {
-        const PhiPE* edge = SVFUtil::cast<PhiPE>(*iter);
+        const PhiStmt* edge = SVFUtil::cast<PhiStmt>(*iter);
         if(isInterestedPAGNode(edge->getRes()))
             addIntraPHIVFGNode(edge);
     }
@@ -501,7 +501,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = binaryops.begin(), eiter =
                 binaryops.end(); iter != eiter; ++iter)
     {
-        const BinaryOPPE* edge = SVFUtil::cast<BinaryOPPE>(*iter);
+        const BinaryOPStmt* edge = SVFUtil::cast<BinaryOPStmt>(*iter);
         if(isInterestedPAGNode(edge->getRes()))
             addBinaryOPVFGNode(edge);
     }
@@ -510,7 +510,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = unaryops.begin(), eiter =
                 unaryops.end(); iter != eiter; ++iter)
     {
-        const UnaryOPPE* edge = SVFUtil::cast<UnaryOPPE>(*iter);
+        const UnaryOPStmt* edge = SVFUtil::cast<UnaryOPStmt>(*iter);
         if(isInterestedPAGNode(edge->getRes()))
             addUnaryOPVFGNode(edge);
     }
@@ -528,7 +528,7 @@ void VFG::addVFGNodes()
     for (PAGEdge::PAGEdgeSetTy::iterator iter = cmps.begin(), eiter =
                 cmps.end(); iter != eiter; ++iter)
     {
-        const CmpPE* edge = SVFUtil::cast<CmpPE>(*iter);
+        const CmpStmt* edge = SVFUtil::cast<CmpStmt>(*iter);
         if(isInterestedPAGNode(edge->getRes()))
             addCmpVFGNode(edge);
     }
@@ -1081,11 +1081,11 @@ struct DOTGraphTraits<VFG*> : public DOTGraphTraits<SVFIR*>
         if(StmtVFGNode* stmtNode = SVFUtil::dyn_cast<StmtVFGNode>(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";
             }
@@ -1093,15 +1093,15 @@ struct DOTGraphTraits<VFG*> : 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/MSSA/MemRegion.cpp

@@ -107,7 +107,7 @@ void MRGenerator::collectGlobals()
     SVFIR* pag = pta->getPAG();
     for (SVFIR::iterator nIter = pag->begin(); nIter != pag->end(); ++nIter)
     {
-        if(ObjPN* obj = SVFUtil::dyn_cast<ObjPN>(nIter->second))
+        if(ObjVar* obj = SVFUtil::dyn_cast<ObjVar>(nIter->second))
         {
             if (obj->getMemObj()->isGlobalObj())
             {
@@ -196,7 +196,7 @@ void MRGenerator::collectModRefForLoadStore()
                 {
                     const PAGEdge* inst = *bit;
                     pagEdgeToFunMap[inst] = &fun;
-                    if (const StorePE *st = SVFUtil::dyn_cast<StorePE>(inst))
+                    if (const StoreStmt *st = SVFUtil::dyn_cast<StoreStmt>(inst))
                     {
                         NodeBS cpts(pta->getPts(st->getDstID()).toNodeBS());
                         // TODO: change this assertion check later when we have conditional points-to set
@@ -206,7 +206,7 @@ void MRGenerator::collectModRefForLoadStore()
                         addCPtsToStore(cpts, st, &fun);
                     }
 
-                    else if (const LoadPE *ld = SVFUtil::dyn_cast<LoadPE>(inst))
+                    else if (const LoadStmt *ld = SVFUtil::dyn_cast<LoadStmt>(inst))
                     {
                         NodeBS cpts(pta->getPts(ld->getSrcID()).toNodeBS());
                         // TODO: change this assertion check later when we have conditional points-to set
@@ -610,7 +610,7 @@ bool MRGenerator::handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallBlock
                 ebit = pagEdgeList.end(); bit != ebit; ++bit)
         {
             const PAGEdge* edge = *bit;
-            if (const AddrPE* addr = SVFUtil::dyn_cast<AddrPE>(edge))
+            if (const AddrStmt* addr = SVFUtil::dyn_cast<AddrStmt>(edge))
                 mod.set(addr->getSrcID());
         }
     }
@@ -677,7 +677,7 @@ NodeBS MRGenerator::getModInfoForCall(const CallBlockNode* cs)
                     pagEdgeList.end(); bit != ebit; ++bit)
         {
             const PAGEdge* edge = *bit;
-            if (const StorePE* st = SVFUtil::dyn_cast<StorePE>(edge))
+            if (const StoreStmt* st = SVFUtil::dyn_cast<StoreStmt>(edge))
                 mods |= pta->getPts(st->getDstID()).toNodeBS();
         }
         return mods;
@@ -701,7 +701,7 @@ NodeBS MRGenerator::getRefInfoForCall(const CallBlockNode* cs)
                     pagEdgeList.end(); bit != ebit; ++bit)
         {
             const PAGEdge* edge = *bit;
-            if (const LoadPE* ld = SVFUtil::dyn_cast<LoadPE>(edge))
+            if (const LoadStmt* ld = SVFUtil::dyn_cast<LoadStmt>(edge))
                 refs |= pta->getPts(ld->getSrcID()).toNodeBS();
         }
         return refs;