svf-tools 1.0.320 → 1.0.324

package/lib/MemoryModel/SVFStatements.cpp

@@ -65,10 +65,10 @@ const std::string SVFStmt::toString() const {
     return rawstr.str();
 }
 
-const std::string AddrPE::toString() const{
+const std::string AddrStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "AddrPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "AddrStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -76,10 +76,10 @@ const std::string AddrPE::toString() const{
     return rawstr.str();
 }
 
-const std::string CopyPE::toString() const{
+const std::string CopyStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CopyPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "CopyStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -87,10 +87,10 @@ const std::string CopyPE::toString() const{
     return rawstr.str();
 }
 
-const std::string PhiPE::toString() const{
+const std::string PhiStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "PhiPE: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
+    rawstr << "PhiStmt: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -98,10 +98,10 @@ const std::string PhiPE::toString() const{
     return rawstr.str();
 }
 
-const std::string CmpPE::toString() const{
+const std::string CmpStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CmpPE: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
+    rawstr << "CmpStmt: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -109,10 +109,10 @@ const std::string CmpPE::toString() const{
     return rawstr.str();
 }
 
-const std::string BinaryOPPE::toString() const{
+const std::string BinaryOPStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "BinaryOPPE: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
+    rawstr << "BinaryOPStmt: [" << getResID() << "<--(" << getOpVarID(0) << "," << getOpVarID(1) << ")]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -120,10 +120,10 @@ const std::string BinaryOPPE::toString() const{
     return rawstr.str();
 }
 
-const std::string UnaryOPPE::toString() const{
+const std::string UnaryOPStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "UnaryOPPE: [" << getResID() << "<--" << getOpVarID() << "]\t";
+    rawstr << "UnaryOPStmt: [" << getResID() << "<--" << getOpVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -146,10 +146,10 @@ const std::string BranchStmt::toString() const {
 }
 
 
-const std::string LoadPE::toString() const{
+const std::string LoadStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "LoadPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "LoadStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -157,10 +157,10 @@ const std::string LoadPE::toString() const{
     return rawstr.str();
 }
 
-const std::string StorePE::toString() const{
+const std::string StoreStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "StorePE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "StoreStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -168,10 +168,10 @@ const std::string StorePE::toString() const{
     return rawstr.str();
 }
 
-const std::string GepPE::toString() const{
+const std::string GepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "GepStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -179,10 +179,10 @@ const std::string GepPE::toString() const{
     return rawstr.str();
 }
 
-const std::string NormalGepPE::toString() const{
+const std::string NormalGepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "NormalGepPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "NormalGepStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -190,10 +190,10 @@ const std::string NormalGepPE::toString() const{
     return rawstr.str();
 }
 
-const std::string VariantGepPE::toString() const{
+const std::string VariantGepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "VariantGepPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "VariantGepStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -256,10 +256,10 @@ NodeID MultiOpndStmt::getResID() const
     return getRes()->getId();
 }
 
-NodeID UnaryOPPE::getOpVarID() const{
+NodeID UnaryOPStmt::getOpVarID() const{
     return getOpVar()->getId();
 }
-NodeID UnaryOPPE::getResID() const{
+NodeID UnaryOPStmt::getResID() const{
     return getRes()->getId();
 }
 

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/LeakChecker.cpp

@@ -119,10 +119,10 @@ void LeakChecker::initSnks()
         {
             const SVFFunction* fun = *cit;
 			if (isSinkLikeFun(fun)) {
-				SVFIR::PAGNodeList &arglist = it->second;
+				SVFIR::SVFVarList &arglist = it->second;
 				assert(!arglist.empty()	&& "no actual parameter at deallocation site?");
 				/// we only choose pointer parameters among all the actual parameters
-				for (SVFIR::PAGNodeList::const_iterator ait = arglist.begin(),
+				for (SVFIR::SVFVarList::const_iterator ait = arglist.begin(),
 						aeit = arglist.end(); ait != aeit; ++ait) {
 					const PAGNode *pagNode = *ait;
 					if (pagNode->isPointer()) {

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())
@@ -102,7 +102,7 @@ PointsTo& SaberSVFGBuilder::CollectPtsChain(BVDataPTAImpl* pta,NodeID id, NodeTo
 {
     SVFIR* pag = svfg->getPAG();
 
-    NodeID baseId = pag->getBaseObjNode(id);
+    NodeID baseId = pag->getBaseObjVar(id);
     NodeToPTSSMap::iterator it = cachedPtsMap.find(baseId);
     if(it!=cachedPtsMap.end())
         return it->second;
@@ -265,8 +265,8 @@ void SaberSVFGBuilder::AddExtActualParmSVFGNodes(PTACallGraph* callgraph)
             if (SaberCheckerAPI::getCheckerAPI()->isMemDealloc(fun)
                     || SaberCheckerAPI::getCheckerAPI()->isFClose(fun))
             {
-                SVFIR::PAGNodeList& arglist = it->second;
-                for(SVFIR::PAGNodeList::const_iterator ait = arglist.begin(), aeit = arglist.end(); ait!=aeit; ++ait){
+                SVFIR::SVFVarList& arglist = it->second;
+                for(SVFIR::SVFVarList::const_iterator ait = arglist.begin(), aeit = arglist.end(); ait!=aeit; ++ait){
 					const PAGNode *pagNode = *ait;
 					if (pagNode->isPointer()) {
 						addActualParmVFGNode(pagNode, it->first);

package/lib/SVF-FE/Graph2Json.cpp

@@ -34,11 +34,11 @@ void ICFGPrinter::printICFGToJson(const std::string& filename)
         if(IntraBlockNode* bNode = SVFUtil::dyn_cast<IntraBlockNode>(node))
         {
             ICFGNode_Obj["Source Location"] = getSourceLoc(bNode->getInst());
-            SVFIR::PAGEdgeList&  edges = SVFIR::getPAG()->getInstPTAPAGEdgeList(bNode);
+            SVFIR::SVFStmtList&  edges = SVFIR::getPAG()->getPTASVFStmtList(bNode);
             llvm::json::Array PAGEdge_array;
 
             //dump pag edges
-            for (SVFIR::PAGEdgeList::iterator it = edges.begin(),
+            for (SVFIR::SVFStmtList::iterator it = edges.begin(),
                     eit = edges.end(); it != eit; ++it)
             {
                 const PAGEdge* edge = *it;
@@ -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

@@ -260,8 +260,8 @@ void SVFIRBuilder::processCE(const Value *val)
             NodeID nsrc1 = pag->getValueNode(src1);
             NodeID nsrc2 = pag->getValueNode(src2);
             NodeID nres = pag->getValueNode(selectce);
-            addPhiNode(nres,nsrc1);
-            addPhiNode(nres,nsrc2);
+            addPhiStmt(nres,nsrc1);
+            addPhiStmt(nres,nsrc2);
             setCurrentLocation(cval, cbb);
         }
         // if we meet a int2ptr, then it points-to black hole
@@ -351,7 +351,7 @@ NodeID SVFIRBuilder::getGlobalVarField(const GlobalVariable *gvar, u32_t offset)
         const Type *gvartype = gvar->getType();
         while (const PointerType *ptype = SVFUtil::dyn_cast<PointerType>(gvartype))
             gvartype = ptype->getElementType();
-        return getGepValNode(gvar, LocationSet(offset), gvartype, offset);
+        return getGepValVar(gvar, LocationSet(offset), gvartype, offset);
     }
 }
 
@@ -519,7 +519,7 @@ void SVFIRBuilder::visitPHINode(PHINode &inst)
         assert((incomingInst==nullptr) || (incomingInst->getFunction() == inst.getFunction()));
 
         NodeID src = getValueNode(val);
-        addPhiNode(dst,src);
+        addPhiStmt(dst,src);
     }
 }
 
@@ -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);
 }
 
 /*!
@@ -644,8 +644,8 @@ void SVFIRBuilder::visitCmpInst(CmpInst &inst)
     NodeID op1Node = getValueNode(op1);
     Value* op2 = inst.getOperand(1);
     NodeID op2Node = getValueNode(op2);
-    u32_t opcode = inst.getOpcode();
-    const CmpPE* cmpPE = addCmpEdge(op1Node, op2Node, dst, opcode);
+    u32_t predicate = inst.getPredicate();
+    const CmpStmt* cmpPE = addCmpEdge(op1Node, op2Node, dst, predicate);
 }
 
 
@@ -662,8 +662,8 @@ void SVFIRBuilder::visitSelectInst(SelectInst &inst)
     NodeID src2 = getValueNode(inst.getFalseValue());
 
     /// Two operands have same incoming basic block, both are the current BB
-    addPhiNode(dst,src1);
-    addPhiNode(dst,src2);
+    addPhiStmt(dst,src1);
+    addPhiStmt(dst,src2);
 }
 
 /*
@@ -730,7 +730,7 @@ void SVFIRBuilder::visitReturnInst(ReturnInst &inst)
         NodeID rnF = getReturnNode(F);
         NodeID vnS = getValueNode(src);
         //vnS may be null if src is a null ptr
-        addPhiNode(rnF,vnS);
+        addPhiStmt(rnF,vnS);
     }
 }
 
@@ -938,8 +938,8 @@ void SVFIRBuilder::addComplexConsForExt(Value *D, Value *S, u32_t sz)
     //For each field (i), add (Ti = *S + i) and (*D + i = Ti).
     for (u32_t index = 0; index < sz; index++)
     {
-        NodeID dField = getGepValNode(D,fields[index],dtype,index);
-        NodeID sField = getGepValNode(S,fields[index],stype,index);
+        NodeID dField = getGepValVar(D,fields[index],dtype,index);
+        NodeID sField = getGepValVar(S,fields[index],stype,index);
         NodeID dummy = pag->addDummyValNode();
         addLoadEdge(sField,dummy);
         addStoreEdge(dummy,dField);
@@ -1193,7 +1193,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 // Note that arg0 is aligned with "offset".
                 for (int i = offset + 1; i <= offset + 3; ++i)
                 {
-                    NodeID vnD = getGepValNode(vArg3, fields[i], type, i);
+                    NodeID vnD = getGepValVar(vArg3, fields[i], type, i);
                     NodeID vnS = getValueNode(vArg1);
                     if(vnD && vnS)
                         addStoreEdge(vnS,vnD);
@@ -1217,7 +1217,7 @@ void SVFIRBuilder::handleExtCall(CallSite cs, const SVFFunction *callee)
                 // Note that arg0 is aligned with "offset".
                 for (int i = offset + 1; i <= offset + 3; ++i)
                 {
-                    NodeID vnS = getGepValNode(vArg, fields[i], type, i);
+                    NodeID vnS = getGepValVar(vArg, fields[i], type, i);
                     if(vnD && vnS)
                         addStoreEdge(vnS,vnD);
                 }
@@ -1399,15 +1399,15 @@ void SVFIRBuilder::sanityCheck()
  * Add a temp field value node according to base value and offset
  * this node is after the initial node method, it is out of scope of symInfo table
  */
-NodeID SVFIRBuilder::getGepValNode(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx)
+NodeID SVFIRBuilder::getGepValVar(const Value* val, const LocationSet& ls, const Type *baseType, u32_t fieldidx)
 {
-    NodeID base = pag->getBaseValNode(getValueNode(val));
-    NodeID gepval = pag->getGepValNode(curVal, base, ls);
+    NodeID base = pag->getBaseValVar(getValueNode(val));
+    NodeID gepval = pag->getGepValVar(curVal, base, ls);
     if (gepval==UINT_MAX)
     {
         assert(((int) UINT_MAX)==-1 && "maximum limit of unsigned int is not -1?");
         /*
-         * getGepValNode can only be called from two places:
+         * getGepValVar can only be called from two places:
          * 1. SVFIRBuilder::addComplexConsForExt to handle external calls
          * 2. SVFIRBuilder::getGlobalVarField to initialize global variable
          * so curVal can only be
@@ -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
@@ -1505,7 +1505,7 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
         assert(false && "what else value can we have?");
     }
 
-    pag->addToInstPAGEdgeList(icfgNode,edge);
+    pag->addToSVFStmtList(icfgNode,edge);
     icfgNode->addPAGEdge(edge);
 }
 

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)
@@ -202,13 +202,13 @@ void PTAStat::performStat()
     generalNumMap[NumberOfFieldInsensitiveObj] = fiObjNumber;
     generalNumMap[NumberOfFieldSensitiveObj] = fsObjNumber;
 
-    generalNumMap[NumOfAddrs] = pag->getEdgeSet(PAGEdge::Addr).size();
-    generalNumMap[NumOfLoads] = pag->getEdgeSet(PAGEdge::Load).size();
-    generalNumMap[NumOfStores] = pag->getEdgeSet(PAGEdge::Store).size();
-    generalNumMap[NumOfCopys] =  pag->getEdgeSet(PAGEdge::Copy).size();
-    generalNumMap[NumOfGeps] =  pag->getEdgeSet(PAGEdge::NormalGep).size() + pag->getEdgeSet(PAGEdge::VariantGep).size();
-    generalNumMap[NumOfCalls] = pag->getEdgeSet(PAGEdge::Call).size();
-    generalNumMap[NumOfReturns] = pag->getEdgeSet(PAGEdge::Ret).size();
+    generalNumMap[NumOfAddrs] = pag->getSVFStmtSet(PAGEdge::Addr).size();
+    generalNumMap[NumOfLoads] = pag->getSVFStmtSet(PAGEdge::Load).size();
+    generalNumMap[NumOfStores] = pag->getSVFStmtSet(PAGEdge::Store).size();
+    generalNumMap[NumOfCopys] =  pag->getSVFStmtSet(PAGEdge::Copy).size();
+    generalNumMap[NumOfGeps] =  pag->getSVFStmtSet(PAGEdge::NormalGep).size() + pag->getSVFStmtSet(PAGEdge::VariantGep).size();
+    generalNumMap[NumOfCalls] = pag->getSVFStmtSet(PAGEdge::Call).size();
+    generalNumMap[NumOfReturns] = pag->getSVFStmtSet(PAGEdge::Ret).size();
 
     generalNumMap[NumOfFunctionObjs] = numOfFunction;
     generalNumMap[NumOfGlobalObjs] = numOfGlobal;