svf-tools 1.0.320 → 1.0.324

package/lib/Util/TypeBasedHeapCloning.cpp

@@ -36,7 +36,7 @@ void TypeBasedHeapCloning::setPAG(SVFIR *pag)
 bool TypeBasedHeapCloning::isBlkObjOrConstantObj(NodeID o) const
 {
     if (isClone(o)) o = cloneToOriginalObj.at(o);
-    return SVFUtil::isa<ObjPN>(ppag->getGNode(o)) && ppag->isBlkObjOrConstantObj(o);
+    return SVFUtil::isa<ObjVar>(ppag->getGNode(o)) && ppag->isBlkObjOrConstantObj(o);
 }
 
 bool TypeBasedHeapCloning::isBase(const DIType *a, const DIType *b) const
@@ -120,7 +120,7 @@ void TypeBasedHeapCloning::addGepToObj(NodeID gep, NodeID base, unsigned offset)
     objToGeps[base].set(gep);
     const PAGNode *baseNode = ppag->getGNode(base);
     assert(baseNode && "TBHC: given bad base node?");
-    const ObjPN *baseObj = SVFUtil::dyn_cast<ObjPN>(baseNode);
+    const ObjVar *baseObj = SVFUtil::dyn_cast<ObjVar>(baseNode);
     assert(baseObj && "TBHC: non-object given for base?");
     // We can use the base or the gep mem. obj.; should be identical.
     const MemObj *baseMemObj = baseObj->getMemObj();
@@ -147,7 +147,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
 
     PAGNode *node = ppag->getGNode(base);
     assert(node && "TBHC: base object node does not exist.");
-    ObjPN *baseNode = SVFUtil::dyn_cast<ObjPN>(node);
+    ObjVar *baseNode = SVFUtil::dyn_cast<ObjVar>(node);
     assert(baseNode && "TBHC: base \"object\" node is not an object.");
 
     // totalOffset is the offset from the real base (i.e. base of base),
@@ -184,7 +184,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
     {
         PAGNode *node = ppag->getGNode(gep);
         assert(node && "TBHC: expected gep node doesn't exist.");
-        assert((SVFUtil::isa<GepObjPN>(node) || SVFUtil::isa<FIObjPN>(node))
+        assert((SVFUtil::isa<GepObjPN>(node) || SVFUtil::isa<FIObjVar>(node))
                && "TBHC: expected a GEP or FI object.");
 
         if (GepObjPN *gepNode = SVFUtil::dyn_cast<GepObjPN>(node))
@@ -216,13 +216,13 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
 
         if (isClone(base))
         {
-            // Don't use ppag->getGepObjNode because base and it's original object
+            // Don't use ppag->getGepObjVar because base and it's original object
             // have the same memory object which is the key SVFIR uses.
             newGep = addCloneGepObjNode(baseNode->getMemObj(), newLS);
         }
         else
         {
-            newGep = ppag->getGepObjNode(base, newLS);
+            newGep = ppag->getGepObjVar(base, newLS);
         }
 
         if (GepObjPN *gep = SVFUtil::dyn_cast<GepObjPN>(ppag->getGNode(newGep)))
@@ -259,7 +259,7 @@ const NodeBS TypeBasedHeapCloning::getGepObjClones(NodeID base, unsigned offset)
 
         setType(newGep, newGepType);
         // We call the object created in the non-TBHC analysis the original object.
-        setOriginalObj(newGep, ppag->getGepObjNode(baseNode->getMemObj(), offset));
+        setOriginalObj(newGep, ppag->getGepObjVar(baseNode->getMemObj(), offset));
         setAllocationSite(newGep, 0);
 
         geps.set(newGep);
@@ -292,7 +292,7 @@ bool TypeBasedHeapCloning::init(NodeID loc, NodeID p, const DIType *tildet, bool
         // type if that object is field-insensitive.
         bool fieldInsensitive = false;
         std::vector<const DIType *> fieldTypes;
-        if (ObjPN *obj = SVFUtil::dyn_cast<ObjPN>(ppag->getGNode(o)))
+        if (ObjVar *obj = SVFUtil::dyn_cast<ObjVar>(ppag->getGNode(o)))
         {
             fieldInsensitive = obj->getMemObj()->isFieldInsensitive();
             if (tp != nullptr && (tp->getTag() == dwarf::DW_TAG_structure_type
@@ -314,14 +314,14 @@ bool TypeBasedHeapCloning::init(NodeID loc, NodeID p, const DIType *tildet, bool
             assert(!isGep(obj) && "TBHC: GEP object is untyped!");
             prop = cloneObject(o, tildet, false);
             ++numInit;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGInit;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGInit;
         }
         else if (fieldInsensitive && tp && dchg->isFieldOf(tildet, tp))
         {
             // Field-insensitive object but the instruction is operating on a field.
             prop = o;
             ++numTBWU;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGTBWU;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGTBWU;
         }
         else if (gep && aggs.find(tildet) != aggs.end())
         {
@@ -334,7 +334,7 @@ bool TypeBasedHeapCloning::init(NodeID loc, NodeID p, const DIType *tildet, bool
             // 'Struct S', not 'Array of S'.
             prop = cloneObject(o, tildet, false);
             ++numAgg;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGAgg;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGAgg;
         }
         else if (isBase(tp, tildet) && tp != tildet
                  && (reuse || dchg->isFirstField(tp, tildet) || (!reuse && pta->isHeapMemObj(o))))
@@ -349,21 +349,21 @@ bool TypeBasedHeapCloning::init(NodeID loc, NodeID p, const DIType *tildet, bool
             //  - reuse: because it can happen to stack/heap objects.
             prop = cloneObject(o, tildet, reuse);
             ++numTBSSU;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGTBSSU;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGTBSSU;
         }
         else if (isBase(tildet, tp))
         {
             // Upcast.
             prop = o;
             ++numTBWU;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGTBWU;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGTBWU;
         }
         else if (tildet != tp && reuse)
         {
             // Reuse.
             prop = cloneObject(o, tildet, true);
             ++numReuse;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGReuse;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGReuse;
         }
         else
         {
@@ -371,7 +371,7 @@ bool TypeBasedHeapCloning::init(NodeID loc, NodeID p, const DIType *tildet, bool
             filter = true;
             prop = o;
             ++numTBSU;
-            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjPN>(obj)) ++numSGTBSU;
+            if (!pta->isHeapMemObj(o) && !SVFUtil::isa<DummyObjVar>(obj)) ++numSGTBSU;
         }
 
         if (prop != o)
@@ -435,10 +435,10 @@ NodeID TypeBasedHeapCloning::cloneObject(NodeID o, const DIType *type, bool)
         // IN sets and gepToSVFGRetriever in FSTBHC, so we don't care that clone comes
         // from o (we can get that by checking the base and offset).
         setOriginalObj(clone, getOriginalObj(o));
-        CloneGepObjPN *cloneGepObj = SVFUtil::dyn_cast<CloneGepObjPN>(ppag->getGNode(clone));
+        CloneGepObjVar *cloneGepObj = SVFUtil::dyn_cast<CloneGepObjVar>(ppag->getGNode(clone));
         cloneGepObj->setBaseNode(gepObj->getBaseNode());
     }
-    else if (SVFUtil::isa<FIObjPN>(obj) || SVFUtil::isa<DummyObjPN>(obj))
+    else if (SVFUtil::isa<FIObjVar>(obj) || SVFUtil::isa<DummyObjVar>(obj))
     {
         o = getOriginalObj(o);
         // Check there isn't an appropriate clone already.
@@ -451,13 +451,13 @@ NodeID TypeBasedHeapCloning::cloneObject(NodeID o, const DIType *type, bool)
             }
         }
 
-        if (const FIObjPN *fiObj = SVFUtil::dyn_cast<FIObjPN>(obj))
+        if (const FIObjVar *fiObj = SVFUtil::dyn_cast<FIObjVar>(obj))
         {
             clone = addCloneFIObjNode(fiObj->getMemObj());
         }
         else
         {
-            const DummyObjPN *dummyObj = SVFUtil::dyn_cast<DummyObjPN>(obj);
+            const DummyObjVar *dummyObj = SVFUtil::dyn_cast<DummyObjVar>(obj);
             clone = addCloneDummyObjNode(dummyObj->getMemObj());
         }
         // We checked above that it's an FIObj or a DummyObj.
@@ -501,19 +501,19 @@ const MDNode *TypeBasedHeapCloning::getRawCTirMetadata(const Value *v)
 NodeID TypeBasedHeapCloning::addCloneDummyObjNode(const MemObj *mem)
 {
     NodeID id = NodeIDAllocator::get()->allocateObjectId();
-    return ppag->addObjNode(nullptr, new CloneDummyObjPN(id, mem), id);
+    return ppag->addObjNode(nullptr, new CloneDummyObjVar(id, mem), id);
 }
 
 NodeID TypeBasedHeapCloning::addCloneGepObjNode(const MemObj *mem, const LocationSet &l)
 {
     NodeID id = NodeIDAllocator::get()->allocateObjectId();
-    return ppag->addObjNode(mem->getValue(), new CloneGepObjPN(mem, id, l), id);
+    return ppag->addObjNode(mem->getValue(), new CloneGepObjVar(mem, id, l), id);
 }
 
 NodeID TypeBasedHeapCloning::addCloneFIObjNode(const MemObj *mem)
 {
     NodeID id = NodeIDAllocator::get()->allocateObjectId();
-    return ppag->addObjNode(mem->getValue(), new CloneFIObjPN(mem->getValue(), id, mem), id);
+    return ppag->addObjNode(mem->getValue(), new CloneFIObjVar(mem->getValue(), id, mem), id);
 }
 
 const DIType *TypeBasedHeapCloning::getTypeFromCTirMetadata(const Value *v)

package/lib/WPA/Andersen.cpp

@@ -164,16 +164,16 @@ void AndersenBase::cleanConsCG(NodeID id) {
 void AndersenBase::normalizePointsTo()
 {
     SVFIR::MemObjToFieldsMap &memToFieldsMap = pag->getMemToFieldsMap();
-    SVFIR::NodeLocationSetMap &GepObjNodeMap = pag->getGepObjNodeMap();
+    SVFIR::NodeLocationSetMap &GepObjVarMap = pag->getGepObjNodeMap();
 
-    // clear GepObjNodeMap/memToFieldsMap/nodeToSubsMap/nodeToRepMap
+    // clear GepObjVarMap/memToFieldsMap/nodeToSubsMap/nodeToRepMap
     // for redundant gepnodes and remove those nodes from pag
     for (NodeID n: redundantGepNodes) {
-        NodeID base = pag->getBaseObjNode(n);
+        NodeID base = pag->getBaseObjVar(n);
         GepObjPN *gepNode = SVFUtil::dyn_cast<GepObjPN>(pag->getGNode(n));
         assert(gepNode && "Not a gep node in redundantGepNodes set");
         const LocationSet ls = gepNode->getLocationSet();
-        GepObjNodeMap.erase(std::make_pair(base, ls));
+        GepObjVarMap.erase(std::make_pair(base, ls));
         memToFieldsMap[base].reset(n);
         cleanConsCG(n);
 
@@ -411,11 +411,11 @@ bool Andersen::processGepPts(const PointsTo& pts, const GepCGEdge* edge)
             if (!isFieldInsensitive(o))
             {
                 setObjFieldInsensitive(o);
-                consCG->addNodeToBeCollapsed(consCG->getBaseObjNode(o));
+                consCG->addNodeToBeCollapsed(consCG->getBaseObjVar(o));
             }
 
             // Add the field-insensitive node into pts.
-            NodeID baseId = consCG->getFIObjNode(o);
+            NodeID baseId = consCG->getFIObjVar(o);
             tmpDstPts.set(baseId);
         }
     }
@@ -434,7 +434,7 @@ bool Andersen::processGepPts(const PointsTo& pts, const GepCGEdge* edge)
 
             if (!matchType(edge->getSrcID(), o, normalGepEdge)) continue;
 
-            NodeID fieldSrcPtdNode = consCG->getGepObjNode(o, normalGepEdge->getLocationSet());
+            NodeID fieldSrcPtdNode = consCG->getGepObjVar(o, normalGepEdge->getLocationSet());
             tmpDstPts.set(fieldSrcPtdNode);
             addTypeForGepObjNode(fieldSrcPtdNode, normalGepEdge);
         }
@@ -561,9 +561,9 @@ bool Andersen::collapseField(NodeID nodeId)
     setObjFieldInsensitive(nodeId);
 
     // replace all occurrences of each field with the field-insensitive node
-    NodeID baseId = consCG->getFIObjNode(nodeId);
+    NodeID baseId = consCG->getFIObjVar(nodeId);
     NodeID baseRepNodeId = consCG->sccRepNode(baseId);
-    NodeBS & allFields = consCG->getAllFieldsObjNode(baseId);
+    NodeBS & allFields = consCG->getAllFieldsObjVars(baseId);
     for (NodeBS::iterator fieldIt = allFields.begin(), fieldEit = allFields.end(); fieldIt != fieldEit; fieldIt++)
     {
         NodeID fieldId = *fieldIt;
@@ -722,12 +722,12 @@ void Andersen::connectCaller2CalleeParams(CallSite cs, const SVFFunction* F, Nod
     {
 
         // connect actual and formal param
-        const SVFIR::PAGNodeList& csArgList = pag->getCallSiteArgsList(callBlockNode);
-        const SVFIR::PAGNodeList& funArgList = pag->getFunArgsList(F);
+        const SVFIR::SVFVarList& csArgList = pag->getCallSiteArgsList(callBlockNode);
+        const SVFIR::SVFVarList& funArgList = pag->getFunArgsList(F);
         //Go through the fixed parameters.
         DBOUT(DPAGBuild, outs() << "      args:");
-        SVFIR::PAGNodeList::const_iterator funArgIt = funArgList.begin(), funArgEit = funArgList.end();
-        SVFIR::PAGNodeList::const_iterator csArgIt  = csArgList.begin(), csArgEit = csArgList.end();
+        SVFIR::SVFVarList::const_iterator funArgIt = funArgList.begin(), funArgEit = funArgList.end();
+        SVFIR::SVFVarList::const_iterator csArgIt  = csArgList.begin(), csArgEit = csArgList.end();
         for (; funArgIt != funArgEit; ++csArgIt, ++funArgIt)
         {
             //Some programs (e.g. Linux kernel) leave unneeded parameters empty.

package/lib/WPA/AndersenSFR.cpp

@@ -135,7 +135,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides,
             Size_t initOffset;
             if (GepObjPN *gepNode = SVFUtil::dyn_cast<GepObjPN>(initPN))
                 initOffset = gepNode->getLocationSet().getOffset();
-            else if (SVFUtil::isa<FIObjPN>(initPN) || SVFUtil::isa<DummyObjPN>(initPN))
+            else if (SVFUtil::isa<FIObjVar>(initPN) || SVFUtil::isa<DummyObjVar>(initPN))
                 initOffset = 0;
             else
                 assert(false && "Not an object node!!");
@@ -161,7 +161,7 @@ void AndersenSFR::fieldExpand(NodeSet& initials, Size_t offset, NodeBS& strides,
             // get gep objs
             for (Size_t _f : offsets)
             {
-                NodeID gepId = consCG->getGepObjNode(init, LocationSet(_f));
+                NodeID gepId = consCG->getGepObjVar(init, LocationSet(_f));
                 initials.erase(gepId);  // gep id in initials should be removed to avoid redundant derivation
                 expandPts.set(gepId);
             }

package/lib/WPA/AndersenStat.cpp

@@ -74,9 +74,9 @@ void AndersenStat::collectCycleInfo(ConstraintGraph* consCG)
         {
             NodeID nodeId = *it;
             PAGNode* pagNode = pta->getPAG()->getGNode(nodeId);
-            if (SVFUtil::isa<ObjPN>(pagNode) && pta->isFieldInsensitive(nodeId))
+            if (SVFUtil::isa<ObjVar>(pagNode) && pta->isFieldInsensitive(nodeId))
             {
-                NodeID baseId = consCG->getBaseObjNode(nodeId);
+                NodeID baseId = consCG->getBaseObjVar(nodeId);
                 clone.reset(nodeId);
                 clone.set(baseId);
             }
@@ -145,7 +145,7 @@ void AndersenStat::constraintGraphStat()
         if(nodeIt->second->getInEdges().empty() && nodeIt->second->getOutEdges().empty())
             continue;
         cgNodeNumber++;
-        if(SVFUtil::isa<ObjPN>(pta->getPAG()->getGNode(nodeIt->first)))
+        if(SVFUtil::isa<ObjVar>(pta->getPAG()->getGNode(nodeIt->first)))
             objNodeNumber++;
 
         u32_t nCopyIn = nodeIt->second->getDirectInEdges().size();
@@ -228,8 +228,8 @@ void AndersenStat::statNullPtr()
         PAGNode* pagNode = iter->second;
         if (pagNode->isTopLevelPtr() == false)
             continue;
-        PAGEdge::PAGEdgeSetTy& inComingStore = pagNode->getIncomingEdges(PAGEdge::Store);
-        PAGEdge::PAGEdgeSetTy& outGoingLoad = pagNode->getOutgoingEdges(PAGEdge::Load);
+        PAGEdge::SVFStmtSetTy& inComingStore = pagNode->getIncomingEdges(PAGEdge::Store);
+        PAGEdge::SVFStmtSetTy& outGoingLoad = pagNode->getOutgoingEdges(PAGEdge::Load);
         if (inComingStore.empty()==false || outGoingLoad.empty()==false)
         {
             ///TODO: change the condition here to fetch the points-to set
@@ -244,7 +244,7 @@ void AndersenStat::statNullPtr()
             {
                 std::string str;
                 raw_string_ostream rawstr(str);
-                if (!SVFUtil::isa<DummyValPN>(pagNode) && !SVFUtil::isa<DummyObjPN>(pagNode) )
+                if (!SVFUtil::isa<DummyValVar>(pagNode) && !SVFUtil::isa<DummyObjVar>(pagNode) )
                 {
                     // if a pointer is in dead function, we do not care
                     if(isPtrInDeadFunction(pagNode->getValue()) == false)

package/lib/WPA/FlowSensitive.cpp

@@ -378,7 +378,7 @@ bool FlowSensitive::propAlongIndirectEdge(const IndirectSVFGEdge* edge)
         if (isFieldInsensitive(ptd))
         {
             /// If this is a field-insensitive obj, propagate all field node's pts
-            const NodeBS& allFields = getAllFieldsObjNode(ptd);
+            const NodeBS& allFields = getAllFieldsObjVars(ptd);
             for (NodeBS::iterator fieldIt = allFields.begin(), fieldEit = allFields.end();
                     fieldIt != fieldEit; ++fieldIt)
             {
@@ -422,7 +422,7 @@ bool FlowSensitive::processAddr(const AddrSVFGNode* addr)
     /// TODO: If this object has been set as field-insensitive, just
     ///       add the insensitive object node into dst pointer's pts.
     if (isFieldInsensitive(srcID))
-        srcID = getFIObjNode(srcID);
+        srcID = getFIObjVar(srcID);
     bool changed = addPts(addr->getPAGDstNodeID(), srcID);
     double end = stat->getClk();
     addrTime += (end - start) / TIMEINTERVAL;
@@ -472,7 +472,7 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
     const PointsTo& srcPts = getPts(edge->getPAGSrcNodeID());
 
     PointsTo tmpDstPts;
-    if (SVFUtil::isa<VariantGepPE>(edge->getPAGEdge()))
+    if (SVFUtil::isa<VariantGepStmt>(edge->getPAGEdge()))
     {
         for (NodeID o : srcPts)
         {
@@ -483,10 +483,10 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
             }
 
             setObjFieldInsensitive(o);
-            tmpDstPts.set(getFIObjNode(o));
+            tmpDstPts.set(getFIObjVar(o));
         }
     }
-    else if (const NormalGepPE* normalGep = SVFUtil::dyn_cast<NormalGepPE>(edge->getPAGEdge()))
+    else if (const NormalGepStmt* normalGep = SVFUtil::dyn_cast<NormalGepStmt>(edge->getPAGEdge()))
     {
         for (NodeID o : srcPts)
         {
@@ -496,7 +496,7 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
                 continue;
             }
 
-            NodeID fieldSrcPtdNode = getGepObjNode(o, normalGep->getLocationSet());
+            NodeID fieldSrcPtdNode = getGepObjVar(o, normalGep->getLocationSet());
             tmpDstPts.set(fieldSrcPtdNode);
         }
     }
@@ -542,7 +542,7 @@ bool FlowSensitive::processLoad(const LoadSVFGNode* load)
         {
             /// If the ptd is a field-insensitive node, we should also get all field nodes'
             /// points-to sets and pass them to pagDst.
-            const NodeBS& allFields = getAllFieldsObjNode(ptd);
+            const NodeBS& allFields = getAllFieldsObjVars(ptd);
             for (NodeBS::iterator fieldIt = allFields.begin(), fieldEit = allFields.end();
                     fieldIt != fieldEit; ++fieldIt)
             {
@@ -755,7 +755,7 @@ void FlowSensitive::updateConnectedNodes(const SVFGEdgeSetTy& edges)
                 if (isFieldInsensitive(ptd))
                 {
                     /// If this is a field-insensitive obj, propagate all field node's pts
-                    const NodeBS& allFields = getAllFieldsObjNode(ptd);
+                    const NodeBS& allFields = getAllFieldsObjVars(ptd);
                     for (NodeBS::iterator fieldIt = allFields.begin(), fieldEit = allFields.end();
                             fieldIt != fieldEit; ++fieldIt)
                     {

package/lib/WPA/FlowSensitiveStat.cpp

@@ -107,7 +107,7 @@ void FlowSensitiveStat::performStat()
     {
         NodeID nodeId = nodeIt->first;
         PAGNode* pagNode = nodeIt->second;
-        if(SVFUtil::isa<ObjPN>(pagNode))
+        if(SVFUtil::isa<ObjVar>(pagNode))
         {
             const MemObj * memObj = pag->getBaseObj(nodeId);
             SymID baseId = memObj->getId();
@@ -276,8 +276,8 @@ void FlowSensitiveStat::statNullPtr()
     {
         NodeID pagNodeId = iter->first;
         PAGNode* pagNode = iter->second;
-        PAGEdge::PAGEdgeSetTy& inComingStore = pagNode->getIncomingEdges(PAGEdge::Store);
-        PAGEdge::PAGEdgeSetTy& outGoingLoad = pagNode->getOutgoingEdges(PAGEdge::Load);
+        PAGEdge::SVFStmtSetTy& inComingStore = pagNode->getIncomingEdges(PAGEdge::Store);
+        PAGEdge::SVFStmtSetTy& outGoingLoad = pagNode->getOutgoingEdges(PAGEdge::Load);
         if (inComingStore.empty()==false || outGoingLoad.empty()==false)
         {
             ///TODO: change the condition here to fetch the points-to set
@@ -294,7 +294,7 @@ void FlowSensitiveStat::statNullPtr()
             {
                 std::string str;
                 raw_string_ostream rawstr(str);
-                if (!SVFUtil::isa<DummyValPN>(pagNode) && !SVFUtil::isa<DummyObjPN>(pagNode))
+                if (!SVFUtil::isa<DummyValVar>(pagNode) && !SVFUtil::isa<DummyObjVar>(pagNode))
                 {
                     // if a pointer is in dead function, we do not care
                     if(isPtrInDeadFunction(pagNode->getValue()) == false)

package/lib/WPA/FlowSensitiveTBHC.cpp

@@ -69,7 +69,7 @@ void FlowSensitiveTBHC::backPropagate(NodeID clone)
     assert(cloneObj && "FSTBHC: original object does not exist in SVFIR?");
     // Check the original object too because when reuse of a gep occurs, the new object
     // is an FI object.
-    if (SVFUtil::isa<CloneGepObjPN>(cloneObj) || SVFUtil::isa<GepObjPN>(originalObj))
+    if (SVFUtil::isa<CloneGepObjVar>(cloneObj) || SVFUtil::isa<GepObjPN>(originalObj))
     {
         // Since getGepObjClones is updated, some GEP nodes need to be redone.
         const NodeBS &retrievers = gepToSVFGRetrievers[getOriginalObj(clone)];
@@ -78,7 +78,7 @@ void FlowSensitiveTBHC::backPropagate(NodeID clone)
             pushIntoWorklist(r);
         }
     }
-    else if (SVFUtil::isa<CloneFIObjPN>(cloneObj) || SVFUtil::isa<CloneDummyObjPN>(cloneObj))
+    else if (SVFUtil::isa<CloneFIObjVar>(cloneObj) || SVFUtil::isa<CloneDummyObjVar>(cloneObj))
     {
         pushIntoWorklist(getAllocationSite(getOriginalObj(clone)));
     }
@@ -169,7 +169,7 @@ bool FlowSensitiveTBHC::propAlongIndirectEdge(const IndirectSVFGEdge* edge)
         if (isFIObjNode(o))
         {
             /// If this is a field-insensitive obj, propagate all field node's pts
-            const NodeBS &allFields = getAllFieldsObjNode(o);
+            const NodeBS &allFields = getAllFieldsObjVars(o);
             for (NodeID f : allFields)
             {
                 if (propVarPtsFromSrcToDst(f, src, dst))
@@ -299,7 +299,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
         }
         else
         {
-            if (SVFUtil::isa<VariantGepPE>(gep->getPAGEdge()))
+            if (SVFUtil::isa<VariantGepStmt>(gep->getPAGEdge()))
             {
                 setObjFieldInsensitive(oq);
                 tmpDstPts.set(oq);
@@ -314,7 +314,7 @@ bool FlowSensitiveTBHC::processGep(const GepSVFGNode* gep)
                     }
                 }
             }
-            else if (const NormalGepPE* normalGep = SVFUtil::dyn_cast<NormalGepPE>(gep->getPAGEdge()))
+            else if (const NormalGepStmt* normalGep = SVFUtil::dyn_cast<NormalGepStmt>(gep->getPAGEdge()))
             {
                 const DIType *baseType = getType(oq);
 
@@ -405,7 +405,7 @@ bool FlowSensitiveTBHC::processLoad(const LoadSVFGNode* load)
         {
             /// If the ptd is a field-insensitive node, we should also get all field nodes'
             /// points-to sets and pass them to pagDst.
-            const NodeBS &allFields = getAllFieldsObjNode(ptd);
+            const NodeBS &allFields = getAllFieldsObjVars(ptd);
             for (NodeID f : allFields)
             {
                 if (unionPtsFromIn(load, f, dstVar))
@@ -529,7 +529,7 @@ bool FlowSensitiveTBHC::processCopy(const CopySVFGNode* copy)
     return FlowSensitive::processCopy(copy) || changed;
 }
 
-const NodeBS& FlowSensitiveTBHC::getAllFieldsObjNode(NodeID id)
+const NodeBS& FlowSensitiveTBHC::getAllFieldsObjVars(NodeID id)
 {
     return getGepObjs(id);
 }
@@ -647,10 +647,10 @@ void FlowSensitiveTBHC::expandFIObjs(const PointsTo& pts, PointsTo& expandedPts)
     expandedPts = pts;
     for (NodeID o : pts)
     {
-        expandedPts |= getAllFieldsObjNode(o);
+        expandedPts |= getAllFieldsObjVars(o);
         while (const GepObjPN *gepObj = SVFUtil::dyn_cast<GepObjPN>(pag->getGNode(o)))
         {
-            expandedPts |= getAllFieldsObjNode(o);
+            expandedPts |= getAllFieldsObjVars(o);
             o = gepObj->getBaseNode();
         }
     }

package/lib/WPA/VersionedFlowSensitive.cpp

@@ -36,7 +36,7 @@ VersionedFlowSensitive::VersionedFlowSensitive(SVFIR *_pag, PTATY type)
 
     for (SVFIR::const_iterator it = pag->begin(); it != pag->end(); ++it)
     {
-        if (SVFUtil::isa<ObjPN>(it->second)) equivalentObject[it->first] = it->first;
+        if (SVFUtil::isa<ObjVar>(it->second)) equivalentObject[it->first] = it->first;
     }
 
     assert(!Options::OPTSVFG && "VFS: -opt-svfg not currently supported with VFS.");
@@ -641,7 +641,7 @@ bool VersionedFlowSensitive::processLoad(const LoadSVFGNode* load)
         {
             /// If o is a field-insensitive object, we should also get all field nodes'
             /// points-to sets and pass them to p.
-            const NodeBS& fields = getAllFieldsObjNode(o);
+            const NodeBS& fields = getAllFieldsObjVars(o);
             for (NodeID of : fields)
             {
                 const Version c = getConsume(l, of);

package/lib/WPA/VersionedFlowSensitiveStat.cpp

@@ -53,7 +53,7 @@ void VersionedFlowSensitiveStat::performStat()
     {
         NodeID nodeId = it->first;
         PAGNode* pagNode = it->second;
-        if (SVFUtil::isa<ObjPN>(pagNode))
+        if (SVFUtil::isa<ObjVar>(pagNode))
         {
             const MemObj *memObj = pag->getBaseObj(nodeId);
             SymID baseId = memObj->getId();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.320",
+  "version": "1.0.324",
   "description": "* <b>[TypeClone](https://github.com/SVF-tools/SVF/wiki/TypeClone) published in our [ECOOP paper](https://yuleisui.github.io/publications/ecoop20.pdf) is now available in SVF </b> * <b>SVF now uses a single script for its build. Just type [`source ./build.sh`](https://github.com/SVF-tools/SVF/blob/master/build.sh) in your terminal, that's it!</b> * <b>SVF now supports LLVM-10.0.0! </b> * <b>We thank [bsauce](https://github.com/bsauce) for writing a user manual of SVF ([link1](https://www.jianshu.com/p/068a08ec749c) and [link2](https://www.jianshu.com/p/777c30d4240e)) in Chinese </b> * <b>SVF now supports LLVM-9.0.0 (Thank [Byoungyoung Lee](https://github.com/SVF-tools/SVF/issues/142) for his help!). </b> * <b>SVF now supports a set of [field-sensitive pointer analyses](https://yuleisui.github.io/publications/sas2019a.pdf). </b> * <b>[Use SVF as an external lib](https://github.com/SVF-tools/SVF/wiki/Using-SVF-as-a-lib-in-your-own-tool) for your own project (Contributed by [Hongxu Chen](https://github.com/HongxuChen)). </b> * <b>SVF now supports LLVM-7.0.0. </b> * <b>SVF now supports Docker. [Try SVF in Docker](https://github.com/SVF-tools/SVF/wiki/Try-SVF-in-Docker)! </b> * <b>SVF now supports [LLVM-6.0.0](https://github.com/svf-tools/SVF/pull/38) (Contributed by [Jack Anthony](https://github.com/jackanth)). </b> * <b>SVF now supports [LLVM-4.0.0](https://github.com/svf-tools/SVF/pull/23) (Contributed by Jared Carlson. Thank [Jared](https://github.com/jcarlson23) and [Will](https://github.com/dtzWill) for their in-depth [discussions](https://github.com/svf-tools/SVF/pull/18) about updating SVF!) </b> * <b>SVF now supports analysis for C++ programs.</b> <br />",
   "main": "index.js",
   "scripts": {