svf-tools 1.0.321 → 1.0.322

package/lib/MemoryModel/SVFVariables.cpp

@@ -48,7 +48,7 @@ SVFVar::SVFVar(const Value* val, NodeID i, PNODEK k) :
     case ValNode:
     case GepValNode:
     {
-        assert(val != nullptr && "value is nullptr for ValPN or GepValNode");
+        assert(val != nullptr && "value is nullptr for ValVar or GepValNode");
         isTLPointer = val->getType()->isPointerTy();
         isATPointer = false;
         break;
@@ -108,10 +108,10 @@ void SVFVar::dump() const {
     outs() << this->toString() << "\n";
 }
 
-const std::string ValPN::toString() const {
+const std::string ValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "ValPN ID: " << getId();
+    rawstr << "ValVar ID: " << getId();
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -119,10 +119,10 @@ const std::string ValPN::toString() const {
     return rawstr.str();
 }
 
-const std::string ObjPN::toString() const {
+const std::string ObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "ObjPN ID: " << getId();
+    rawstr << "ObjVar ID: " << getId();
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -130,10 +130,10 @@ const std::string ObjPN::toString() const {
     return rawstr.str();
 }
 
-const std::string GepValPN::toString() const {
+const std::string GepValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepValPN ID: " << getId() << " with offset_" + llvm::utostr(getOffset());
+    rawstr << "GepValVar ID: " << getId() << " with offset_" + llvm::utostr(getOffset());
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -152,10 +152,10 @@ const std::string GepObjPN::toString() const {
     return rawstr.str();
 }
 
-const std::string FIObjPN::toString() const {
+const std::string FIObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "FIObjPN ID: " << getId() << " (base object)";
+    rawstr << "FIObjVar ID: " << getId() << " (base object)";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -177,38 +177,38 @@ const std::string VarArgPN::toString() const {
     return rawstr.str();
 }
 
-const std::string DummyValPN::toString() const {
+const std::string DummyValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "DummyValPN ID: " << getId();
+    rawstr << "DummyValVar ID: " << getId();
     return rawstr.str();
 }
 
-const std::string DummyObjPN::toString() const {
+const std::string DummyObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "DummyObjPN ID: " << getId();
+    rawstr << "DummyObjVar ID: " << getId();
     return rawstr.str();
 }
 
-const std::string CloneDummyObjPN::toString() const {
+const std::string CloneDummyObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CloneDummyObjPN ID: " << getId();
+    rawstr << "CloneDummyObjVar ID: " << getId();
     return rawstr.str();
 }
 
-const std::string CloneGepObjPN::toString() const {
+const std::string CloneGepObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CloneGepObjPN ID: " << getId();
+    rawstr << "CloneGepObjVar ID: " << getId();
     return rawstr.str();
 }
 
-const std::string CloneFIObjPN::toString() const {
+const std::string CloneFIObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CloneFIObjPN ID: " << getId();
+    rawstr << "CloneFIObjVar ID: " << getId();
     return rawstr.str();
 }
 

package/lib/SABER/SaberSVFGBuilder.cpp

@@ -70,11 +70,11 @@ void SaberSVFGBuilder::collectGlobals(BVDataPTAImpl* pta)
     for(SVFIR::iterator it = pag->begin(), eit = pag->end(); it!=eit; it++)
     {
         PAGNode* pagNode = it->second;
-        if(SVFUtil::isa<DummyValPN>(pagNode) || SVFUtil::isa<DummyObjPN>(pagNode))
+        if(SVFUtil::isa<DummyValVar>(pagNode) || SVFUtil::isa<DummyObjVar>(pagNode))
             continue;
 
         if(GepObjPN* gepobj = SVFUtil::dyn_cast<GepObjPN>(pagNode)) {
-            if(SVFUtil::isa<DummyObjPN>(pag->getGNode(gepobj->getBaseNode())))
+            if(SVFUtil::isa<DummyObjVar>(pag->getGNode(gepobj->getBaseNode())))
                 continue;
         }
         if(const Value* val = pagNode->getValue())

package/lib/SVF-FE/Graph2Json.cpp

@@ -52,7 +52,7 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
                 edge_obj["dstValueName"] = edge->getDstNode()->getValueName();
                 if(edge->getEdgeKind()==PAGEdge::NormalGep)
                 {
-                    const NormalGepPE* gepEdge = SVFUtil::cast<NormalGepPE>(edge);
+                    const NormalGepStmt* gepEdge = SVFUtil::cast<NormalGepStmt>(edge);
                     edge_obj["offset"] = gepEdge->getOffset();
                 }
                 llvm::json::Value edge_value = llvm::json::Object{edge_obj};

package/lib/SVF-FE/SVFIRBuilder.cpp

@@ -617,7 +617,7 @@ void SVFIRBuilder::visitBinaryOperator(BinaryOperator &inst)
     Value* op2 = inst.getOperand(1);
     NodeID op2Node = getValueNode(op2);
     u32_t opcode = inst.getOpcode();
-    const BinaryOPPE* binayPE = addBinaryOPEdge(op1Node, op2Node, dst, opcode);
+    const BinaryOPStmt* binayPE = addBinaryOPEdge(op1Node, op2Node, dst, opcode);
 }
 
 /*!
@@ -630,7 +630,7 @@ void SVFIRBuilder::visitUnaryOperator(UnaryOperator &inst)
     Value* opnd = inst.getOperand(0);
     NodeID src = getValueNode(opnd);
     u32_t opcode = inst.getOpcode();
-    const UnaryOPPE* unaryPE = addUnaryOPEdge(src, dst, opcode);
+    const UnaryOPStmt* unaryPE = addUnaryOPEdge(src, dst, opcode);
 }
 
 /*!
@@ -645,7 +645,7 @@ void SVFIRBuilder::visitCmpInst(CmpInst &inst)
     Value* op2 = inst.getOperand(1);
     NodeID op2Node = getValueNode(op2);
     u32_t opcode = inst.getOpcode();
-    const CmpPE* cmpPE = addCmpEdge(op1Node, op2Node, dst, opcode);
+    const CmpStmt* cmpPE = addCmpEdge(op1Node, op2Node, dst, opcode);
 }
 
 
@@ -1468,8 +1468,8 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
             assert(dstFun==curInst->getFunction() && "DstNode of the PAGEdge not in the same function?");
         }
 
-        /// We assume every GepValPN and its GepPE are unique across whole program
-        if (!(SVFUtil::isa<GepPE>(edge) && SVFUtil::isa<GepValPN>(edge->getDstNode())))
+        /// We assume every GepValVar and its GepStmt are unique across whole program
+        if (!(SVFUtil::isa<GepStmt>(edge) && SVFUtil::isa<GepValVar>(edge->getDstNode())))
             assert(curBB && "instruction does not have a basic block??");
 
         /// We will have one unique function exit ICFGNode for all returns

package/lib/Util/PTAStat.cpp

@@ -151,7 +151,7 @@ void PTAStat::performStat()
     for(SVFIR::iterator it = pag->begin(), eit = pag->end(); it!=eit; ++it)
     {
         PAGNode* node = it->second;
-        if(ObjPN* obj = SVFUtil::dyn_cast<ObjPN>(node))
+        if(ObjVar* obj = SVFUtil::dyn_cast<ObjVar>(node))
         {
             const MemObj* mem = obj->getMemObj();
             if (memObjSet.insert(mem->getId()).second == false)

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))
@@ -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/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!!");

package/lib/WPA/AndersenStat.cpp

@@ -74,7 +74,7 @@ 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);
                 clone.reset(nodeId);
@@ -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();
@@ -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

@@ -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)
         {
@@ -486,7 +486,7 @@ bool FlowSensitive::processGep(const GepSVFGNode* edge)
             tmpDstPts.set(getFIObjNode(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)
         {

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();
@@ -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)));
     }
@@ -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);
 

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.");

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.321",
+  "version": "1.0.322",
   "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": {