svf-tools 1.0.1036 → 1.0.1038

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1036",
+  "version": "1.0.1038",
   "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": {

package/svf/include/Graphs/IRGraph.h

@@ -71,9 +71,6 @@ public:
 
     /// various maps defined
     //{@
-    /// llvm value to sym id map
-    /// local (%) and global (@) identifiers are pointer types which have a value node id.
-    typedef OrderedMap<const SVFValue*, NodeID> ValueToIDMapTy;
     /// sym id to obj type info map
     typedef OrderedMap<NodeID, ObjTypeInfo*> IDToTypeInfoMapTy;
 
@@ -84,8 +81,6 @@ public:
     //@}
 
 private:
-    ValueToIDMapTy valSymMap;  ///< map a value to its sym id
-    ValueToIDMapTy objSymMap;  ///< map a obj reference to its sym id
     FunToIDMapTy returnSymMap; ///< return map
     FunToIDMapTy varargSymMap; ///< vararg map
     IDToTypeInfoMapTy objTypeInfoMap;       ///< map a memory sym id to its obj
@@ -114,6 +109,8 @@ protected:
     bool fromFile; ///< Whether the SVFIR is built according to user specified data from a txt file
     NodeID nodeNumAfterPAGBuild; ///< initial node number after building SVFIR, excluding later added nodes, e.g., gepobj nodes
     u32_t totalPTAPAGEdge;
+    u32_t valVarNum;
+    u32_t objVarNum;
 
     /// Add a node into the graph
     inline NodeID addNode(SVFVar* node)
@@ -139,7 +136,7 @@ protected:
 
 public:
     IRGraph(bool buildFromFile)
-        : totalSymNum(0), fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0),
+        : totalSymNum(0), fromFile(buildFromFile), nodeNumAfterPAGBuild(0), totalPTAPAGEdge(0), valVarNum(0), objVarNum(0),
           maxStruct(nullptr), maxStSize(0)
     {
     }
@@ -210,16 +207,6 @@ public:
 
     /// Get different kinds of syms maps
     //@{
-    inline ValueToIDMapTy& valSyms()
-    {
-        return valSymMap;
-    }
-
-    inline ValueToIDMapTy& objSyms()
-    {
-        return objSymMap;
-    }
-
     inline IDToTypeInfoMapTy& idToObjTypeInfoMap()
     {
         return objTypeInfoMap;
@@ -242,16 +229,6 @@ public:
 
     //@}
 
-    /// Get SVFIR Node according to LLVM value
-    ///getNode - Return the node corresponding to the specified pointer.
-    NodeID getValueNode(const SVFValue* V);
-
-    bool hasValueNode(const SVFValue* V);
-
-    /// getObject - Return the obj node id refer to the memory object for the
-    /// specified global, heap or alloca instruction according to llvm value.
-    NodeID getObjectNode(const SVFValue* V);
-
     inline ObjTypeInfo* getObjTypeInfo(NodeID id) const
     {
         IDToTypeInfoMapTy::const_iterator iter = objTypeInfoMap.find(id);
@@ -282,14 +259,9 @@ public:
         return nullPtrSymID();
     }
 
-    inline u32_t getValueNodeNum() const
-    {
-        return valSymMap.size();
-    }
-    inline u32_t getObjectNodeNum() const
-    {
-        return objTypeInfoMap.size();
-    }
+    u32_t getValueNodeNum();
+
+    u32_t getObjectNodeNum();
 
     /// Constant reader that won't change the state of the symbol table
     //@{

package/svf/include/SVFIR/SVFIR.h

@@ -39,7 +39,6 @@ class CallGraph;
 /*!
  * SVF Intermediate representation, representing variables and statements as a Program Assignment Graph (PAG)
  * Variables as nodes and statements as edges.
- * SymID and NodeID are equal here (same numbering).
  */
 class SVFIR : public IRGraph
 {
@@ -63,6 +62,7 @@ public:
     typedef Map<const CallICFGNode*,SVFVarList> CSToArgsListMap;
     typedef Map<const RetICFGNode*,const SVFVar*> CSToRetMap;
     typedef Map<const SVFFunction*,const SVFVar*> FunToRetMap;
+    typedef Map<const CallGraphNode*,const FunObjVar *> FunToFunObjVarMap;
     typedef Map<const SVFFunction*,SVFStmtSet> FunToPAGEdgeSetMap;
     typedef Map<const ICFGNode*,SVFStmtList> ICFGNode2SVFStmtsMap;
     typedef Map<NodeID, NodeID> NodeToNodeMap;
@@ -90,6 +90,7 @@ private:
     CSToArgsListMap callSiteArgsListMap;	///< Map a callsite to a list of all its actual parameters
     CSToRetMap callSiteRetMap;	///< Map a callsite to its callsite returns PAGNodes
     FunToRetMap funRetMap;	///< Map a function to its unique function return PAGNodes
+    FunToFunObjVarMap funToFunObjvarMap;    ///< Map a function to its unique function object PAGNodes
     CallSiteToFunPtrMap indCallSiteToFunPtrMap; ///< Map an indirect callsite to its function pointer
     FunPtrToCallSitesMap funPtrToCallSitesMap;	///< Map a function pointer to the callsites where it is used
     /// Valid pointers for pointer analysis resolution connected by SVFIR edges (constraints)
@@ -330,6 +331,12 @@ public:
     }
     //@}
 
+    inline const FunObjVar* getFunObjVar(const CallGraphNode*  node) const
+    {
+        FunToFunObjVarMap::const_iterator it = funToFunObjvarMap.find(node);
+        assert(it != funToFunObjvarMap.end() && "this function doesn't have funobjvar");
+        return it->second;
+    }
     /// Node and edge statistics
     //@{
     inline u32_t getFieldValNodeNum() const
@@ -546,10 +553,10 @@ private:
         return addValNode(node);
     }
 
-    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type, bool isUncalled = false)
+    NodeID addArgValNode(NodeID i, u32_t argNo, const ICFGNode* icfgNode, const CallGraphNode* callGraphNode, const SVFType* type)
     {
         ArgValVar* node =
-            new ArgValVar(i, argNo, icfgNode, callGraphNode, type, isUncalled);
+            new ArgValVar(i, argNo, icfgNode, callGraphNode, type);
         return addValNode(node);
     }
 
@@ -622,6 +629,7 @@ private:
     {
         memToFieldsMap[id].set(id);
         FunObjVar* funObj = new FunObjVar(id, ti, callGraphNode, type, node);
+        funToFunObjvarMap[callGraphNode] = funObj;
         return addObjNode(funObj);
     }
 

package/svf/include/SVFIR/SVFValue.h

@@ -292,6 +292,8 @@ public:
     //@}
 };
 
+class ArgValVar;
+
 class SVFFunction : public SVFValue
 {
     friend class LLVMModuleSet;
@@ -316,7 +318,7 @@ private:
     const SVFFunctionType* funcType; /// FunctionType, which is different from the type (PointerType) of this SVFFunction
     SVFLoopAndDomInfo* loopAndDom;  /// the loop and dominate information
     const SVFFunction* realDefFun;  /// the definition of a function across multiple modules
-    std::vector<const SVFArgument*> allArgs;    /// all formal arguments of this function
+    std::vector<const ArgValVar*> allArgs;    /// all formal arguments of this function
     SVFBasicBlock *exitBlock;             /// a 'single' basic block having no successors and containing return instruction in a function
     const CallGraphNode *callGraphNode;          /// call graph node for this function
     BasicBlockGraph* bbGraph; /// the basic block graph of this function
@@ -327,7 +329,7 @@ protected:
         callGraphNode = cgn;
     }
 
-    inline void addArgument(SVFArgument* arg)
+    inline void addArgument(const ArgValVar* arg)
     {
         allArgs.push_back(arg);
     }
@@ -417,7 +419,7 @@ public:
     }
 
     u32_t arg_size() const;
-    const SVFArgument* getArg(u32_t idx) const;
+    const ArgValVar* getArg(u32_t idx) const;
     bool isVarArg() const;
 
     inline bool hasBasicBlock() const

package/svf/include/SVFIR/SVFVariables.h

@@ -368,7 +368,6 @@ class ArgValVar: public ValVar
 private:
     const CallGraphNode* cgNode;
     u32_t argNo;
-    bool uncalled;
 
 protected:
     /// Constructor to create function argument (for SVFIRReader/deserialization)
@@ -401,7 +400,7 @@ public:
 
     /// Constructor
     ArgValVar(NodeID i, u32_t argNo, const ICFGNode* icn, const CallGraphNode* callGraphNode,
-              const SVFType* svfType, bool isUncalled = false);
+              const SVFType* svfType);
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
@@ -422,7 +421,7 @@ public:
 
     inline bool isArgOfUncalledFunction() const
     {
-        return uncalled;
+        return getFunction()->isUncalledFunction();
     }
 
     virtual bool isPointer() const;
@@ -598,7 +597,7 @@ public:
     virtual const std::string toString() const;
 
     /// Get the memory object id
-    inline SymID getId() const
+    inline NodeID getId() const
     {
         return id;
     }

package/svf/include/Util/GeneralType.h

@@ -54,7 +54,6 @@ typedef signed short s16_t;
 
 typedef u32_t NodeID;
 typedef u32_t EdgeID;
-typedef unsigned SymID;
 typedef unsigned CallSiteID;
 typedef unsigned ThreadID;
 typedef s64_t APOffset;

package/svf/include/Util/SVFUtil.h

@@ -167,7 +167,6 @@ typedef OrderedSet<PointsTo, equalPointsTo> PointsToList;
 void dumpPointsToList(const PointsToList& ptl);
 
 /// Return true if it is an llvm intrinsic instruction
-bool isIntrinsicInst(const SVFInstruction* inst);
 bool isIntrinsicInst(const ICFGNode* inst);
 //@}
 

package/svf/lib/DDA/ContextDDA.cpp

@@ -195,7 +195,7 @@ bool ContextDDA::testIndCallReachability(CxtLocDPItem& dpm, const SVFFunction* c
         CxtVar funptrVar(dpm.getCondVar().get_cond(), id);
         CxtLocDPItem funptrDpm = getDPIm(funptrVar,getDefSVFGNode(node));
         PointsTo pts = getBVPointsTo(findPT(funptrDpm));
-        if(pts.test(getPAG()->getObjectNode(callee)))
+        if(pts.test(getPAG()->getFunObjVar(callee->getCallGraphNode())->getId()))
             return true;
         else
             return false;

package/svf/lib/Graphs/IRGraph.cpp

@@ -56,38 +56,6 @@ IRGraph::~IRGraph()
     destorySymTable();
 }
 
-NodeID IRGraph::getValueNode(const SVFValue* val)
-{
-    if(val->isNullPtr())
-        return nullPtrSymID();
-    else if (val->isblackHole())
-        return blkPtrSymID();
-    else
-    {
-        ValueToIDMapTy::const_iterator iter =  valSymMap.find(val);
-        assert(iter!=valSymMap.end() &&"value sym not found");
-        return iter->second;
-    }
-}
-
-bool IRGraph::hasValueNode(const SVFValue *val)
-{
-    if (val->isNullPtr() || val->isblackHole())
-        return true;
-    else
-        return (valSymMap.find(val) != valSymMap.end());
-}
-
-NodeID IRGraph::getObjectNode(const SVFValue *val)
-{
-    const SVFValue* svfVal = val;
-    if(const SVFGlobalValue* g = SVFUtil::dyn_cast<SVFGlobalValue>(val))
-        svfVal = g->getDefGlobalForMultipleModule();
-    ValueToIDMapTy::const_iterator iter = objSymMap.find(svfVal);
-    assert(iter!=objSymMap.end() && "obj sym not found");
-    return iter->second;
-}
-
 NodeID IRGraph::getReturnNode(const SVFFunction *func) const
 {
     FunToIDMapTy::const_iterator iter =  returnSymMap.find(func);
@@ -102,45 +70,6 @@ NodeID IRGraph::getVarargNode(const SVFFunction *func) const
     return iter->second;
 }
 
-void IRGraph::dumpSymTable()
-{
-    OrderedMap<NodeID, SVFValue*> idmap;
-    for (ValueToIDMapTy::iterator iter = valSymMap.begin(); iter != valSymMap.end();
-            ++iter)
-    {
-        const NodeID i = iter->second;
-        SVFValue* val = (SVFValue*) iter->first;
-        idmap[i] = val;
-    }
-    for (ValueToIDMapTy::iterator iter = objSymMap.begin(); iter != objSymMap.end();
-            ++iter)
-    {
-        const NodeID i = iter->second;
-        SVFValue* val = (SVFValue*) iter->first;
-        idmap[i] = val;
-    }
-    for (FunToIDMapTy::iterator iter = returnSymMap.begin(); iter != returnSymMap.end();
-            ++iter)
-    {
-        const NodeID i = iter->second;
-        SVFValue* val = (SVFValue*) iter->first;
-        idmap[i] = val;
-    }
-    for (FunToIDMapTy::iterator iter = varargSymMap.begin(); iter != varargSymMap.end();
-            ++iter)
-    {
-        const NodeID i = iter->second;
-        SVFValue* val = (SVFValue*) iter->first;
-        idmap[i] = val;
-    }
-    outs() << "{SymbolTableInfo \n";
-    for (auto iter : idmap)
-    {
-        outs() << iter.first << " " << iter.second->toString() << "\n";
-    }
-    outs() << "}\n";
-}
-
 void IRGraph::printFlattenFields(const SVFType *type)
 {
     if (const SVFArrayType* at = SVFUtil::dyn_cast<SVFArrayType>(type))
@@ -392,6 +321,33 @@ void IRGraph::view()
 }
 
 
+u32_t IRGraph::getValueNodeNum()
+{
+    if (valVarNum != 0) return valVarNum;
+    u32_t num = 0;
+    for (const auto& item: *this)
+    {
+        if (SVFUtil::isa<ValVar>(item.second))
+            num++;
+    }
+    return valVarNum = num;
+}
+
+
+u32_t IRGraph::getObjectNodeNum()
+{
+    if (objVarNum != 0) return objVarNum;
+    u32_t num = 0;
+    for (const auto& item: *this)
+    {
+        if (SVFUtil::isa<ObjVar>(item.second))
+            num++;
+    }
+    return objVarNum = num;
+}
+
+
+
 namespace SVF
 {
 /*!

package/svf/lib/SVFIR/SVFValue.cpp

@@ -160,8 +160,6 @@ SVFFunction::SVFFunction(const SVFType* ty, const SVFFunctionType* ft,
 
 SVFFunction::~SVFFunction()
 {
-    for(const SVFArgument* arg : allArgs)
-        delete arg;
     delete loopAndDom;
     delete bbGraph;
 }
@@ -171,7 +169,7 @@ u32_t SVFFunction::arg_size() const
     return allArgs.size();
 }
 
-const SVFArgument* SVFFunction::getArg(u32_t idx) const
+const ArgValVar* SVFFunction::getArg(u32_t idx) const
 {
     assert (idx < allArgs.size() && "getArg() out of range!");
     return allArgs[idx];

package/svf/lib/SVFIR/SVFVariables.cpp

@@ -102,9 +102,9 @@ const std::string ObjVar::toString() const
 }
 
 ArgValVar::ArgValVar(NodeID i, u32_t argNo, const ICFGNode* icn,
-                     const SVF::CallGraphNode* callGraphNode, const SVFType* svfType, bool isUncalled)
+                     const SVF::CallGraphNode* callGraphNode, const SVFType* svfType)
     : ValVar(i, svfType, icn, ArgValNode),
-      cgNode(callGraphNode), argNo(argNo), uncalled(isUncalled)
+      cgNode(callGraphNode), argNo(argNo)
 {
 
 }

package/svf/lib/Util/SVFStat.cpp

@@ -127,7 +127,7 @@ void SVFStat::performStat()
     u32_t numOfConstant = 0;
     u32_t fiObjNumber = 0;
     u32_t fsObjNumber = 0;
-    Set<SymID> memObjSet;
+    Set<NodeID> memObjSet;
     for(SVFIR::iterator it = pag->begin(), eit = pag->end(); it!=eit; ++it)
     {
         PAGNode* node = it->second;
@@ -174,7 +174,7 @@ void SVFStat::performStat()
 
 
 
-    generalNumMap["TotalPointers"] = pag->getValueNodeNum() + pag->getFieldValNodeNum();
+    generalNumMap["TotalPointers"] = pag->getValueNodeNum();
     generalNumMap["TotalObjects"] = pag->getObjectNodeNum();
     generalNumMap["TotalFieldObjects"] = pag->getFieldObjNodeNum();
     generalNumMap["MaxStructSize"] = pag->getMaxStructSize();

package/svf/lib/Util/SVFUtil.cpp

@@ -242,21 +242,7 @@ void SVFUtil::increaseStackSize()
     }
 }
 
-/*!
- * Return true if it is an llvm intrinsic instruction
-*/
-bool SVFUtil::isIntrinsicInst(const SVFInstruction* inst)
-{
-    if (const SVFCallInst* call = SVFUtil::dyn_cast<SVFCallInst>(inst))
-    {
-        const SVFFunction* func = call->getCalledFunction();
-        if (func && func->isIntrinsic())
-        {
-            return true;
-        }
-    }
-    return false;
-}
+
 
 std::string SVFUtil::hclustMethodToString(hclust_fast_methods method)
 {

package/svf/lib/WPA/AndersenStat.cpp

@@ -313,8 +313,8 @@ void AndersenStat::performStat()
     timeStatMap["CopyGepTime"] =  Andersen::timeOfProcessCopyGep;
     timeStatMap["UpdateCGTime"] =  Andersen::timeOfUpdateCallGraph;
 
-    PTNumStatMap["TotalPointers"] = pag->getValueNodeNum() + pag->getFieldValNodeNum();
-    PTNumStatMap["TotalObjects"] = pag->getObjectNodeNum() + pag->getFieldObjNodeNum();
+    PTNumStatMap["TotalPointers"] = pag->getValueNodeNum();
+    PTNumStatMap["TotalObjects"] = pag->getObjectNodeNum();
 
 
     PTNumStatMap["AddrProcessed"] = Andersen::numOfProcessedAddr;

package/svf/lib/WPA/FlowSensitiveStat.cpp

@@ -101,7 +101,7 @@ void FlowSensitiveStat::performStat()
 
     u32_t fiObjNumber = 0;
     u32_t fsObjNumber = 0;
-    Set<SymID> nodeSet;
+    Set<NodeID> nodeSet;
     for (SVFIR::const_iterator nodeIt = pag->begin(), nodeEit = pag->end(); nodeIt != nodeEit; nodeIt++)
     {
         NodeID nodeId = nodeIt->first;
@@ -109,7 +109,7 @@ void FlowSensitiveStat::performStat()
         if(SVFUtil::isa<ObjVar>(pagNode))
         {
             const BaseObjVar* baseObj = pag->getBaseObject(nodeId);
-            SymID baseId = baseObj->getId();
+            NodeID baseId = baseObj->getId();
             if (nodeSet.insert(baseId).second)
             {
                 if (baseObj->isFieldInsensitive())
@@ -154,8 +154,8 @@ void FlowSensitiveStat::performStat()
     timeStatMap["UpdateCGTime"] = fspta->updateCallGraphTime;
     timeStatMap["PhiTime"] = fspta->phiTime;
 
-    PTNumStatMap["TotalPointers"] = pag->getValueNodeNum() + pag->getFieldValNodeNum();
-    PTNumStatMap["TotalObjects"] = pag->getObjectNodeNum() + pag->getFieldObjNodeNum();
+    PTNumStatMap["TotalPointers"] = pag->getValueNodeNum();
+    PTNumStatMap["TotalObjects"] = pag->getObjectNodeNum();
 
     PTNumStatMap["Pointers"] = pag->getValueNodeNum();
     PTNumStatMap["MemObjects"] = pag->getObjectNodeNum();

package/svf/lib/WPA/VersionedFlowSensitiveStat.cpp

@@ -48,7 +48,7 @@ void VersionedFlowSensitiveStat::performStat()
 
     u32_t fiObjNumber = 0;
     u32_t fsObjNumber = 0;
-    Set<SymID> nodeSet;
+    Set<NodeID> nodeSet;
     for (SVFIR::const_iterator it = pag->begin(); it != pag->end(); ++it)
     {
         NodeID nodeId = it->first;
@@ -56,7 +56,7 @@ void VersionedFlowSensitiveStat::performStat()
         if (SVFUtil::isa<ObjVar>(pagNode))
         {
             const BaseObjVar* baseObj = pag->getBaseObject(nodeId);
-            SymID baseId = baseObj->getId();
+            NodeID baseId = baseObj->getId();
             if (nodeSet.insert(baseId).second)
             {
                 if (baseObj->isFieldInsensitive()) fiObjNumber++;
@@ -98,8 +98,8 @@ void VersionedFlowSensitiveStat::performStat()
     timeStatMap["PrelabelingTime"]    = vfspta->prelabelingTime;
     timeStatMap["VersionPropTime"]    = vfspta->versionPropTime;
 
-    PTNumStatMap["TotalPointers"]  = pag->getValueNodeNum() + pag->getFieldValNodeNum();
-    PTNumStatMap["TotalObjects"]   = pag->getObjectNodeNum() + pag->getFieldObjNodeNum();
+    PTNumStatMap["TotalPointers"]  = pag->getValueNodeNum();
+    PTNumStatMap["TotalObjects"]   = pag->getObjectNodeNum();
 
     PTNumStatMap["Pointers"]         = pag->getValueNodeNum();
     PTNumStatMap["MemObjects"]       = pag->getObjectNodeNum();

package/svf-llvm/include/SVF-LLVM/LLVMModule.h

@@ -39,13 +39,13 @@
 namespace SVF
 {
 
-class SymbolTableInfo;
 class ObjTypeInference;
 
 class LLVMModuleSet
 {
     friend class SVFIRBuilder;
     friend class ICFGBuilder;
+    friend class SymbolTableBuilder;
 
 public:
 
@@ -73,6 +73,10 @@ public:
     typedef Map<const Function*, FunEntryICFGNode *> FunToFunEntryNodeMapTy;
     typedef Map<const Function*, FunExitICFGNode *> FunToFunExitNodeMapTy;
 
+    /// llvm value to sym id map
+    /// local (%) and global (@) identifiers are pointer types which have a value node id.
+    typedef OrderedMap<const SVFValue*, NodeID> ValueToIDMapTy;
+
 private:
     static LLVMModuleSet* llvmModuleSet;
     static bool preProcessed;
@@ -112,6 +116,9 @@ private:
 
     Map<const Function*, DominatorTree> FunToDominatorTree;
 
+    ValueToIDMapTy valSymMap;  ///< map a value to its sym id
+    ValueToIDMapTy objSymMap;  ///< map a obj reference to its sym id
+
     /// Constructor
     LLVMModuleSet();
 
@@ -170,6 +177,41 @@ public:
     // Dump modules to files
     void dumpModulesToFile(const std::string& suffix);
 
+public:
+
+    inline u32_t getValueNodeNum() const
+    {
+        return valSymMap.size();
+    }
+
+    inline u32_t getObjNodeNum() const
+    {
+        return objSymMap.size();
+    }
+
+    inline ValueToIDMapTy& valSyms()
+    {
+        return valSymMap;
+    }
+
+    inline ValueToIDMapTy& objSyms()
+    {
+        return objSymMap;
+    }
+
+    /// Get SVFIR Node according to LLVM value
+    ///getNode - Return the node corresponding to the specified pointer.
+    NodeID getValueNode(const SVFValue* V);
+
+    bool hasValueNode(const SVFValue* V);
+
+    /// getObject - Return the obj node id refer to the memory object for the
+    /// specified global, heap or alloca instruction according to llvm value.
+    NodeID getObjectNode(const SVFValue* V);
+
+    void dumpSymTable();
+
+public:
     inline void addFunctionMap(const Function* func, SVFFunction* svfFunc)
     {
         LLVMFunc2SVFFunc[func] = svfFunc;

package/svf-llvm/include/SVF-LLVM/SVFIRBuilder.h

@@ -91,14 +91,14 @@ public:
 
         // strip off the constant cast and return the value node
         SVFValue* svfVal = llvmModuleSet()->getSVFValue(V);
-        return pag->getValueNode(svfVal);
+        return llvmModuleSet()->getValueNode(svfVal);
     }
 
     /// GetObject - Return the object node (stack/global/heap/function) according to a LLVM Value
     inline NodeID getObjectNode(const Value* V)
     {
         SVFValue* svfVal = llvmModuleSet()->getSVFValue(V);
-        return pag->getObjectNode(svfVal);
+        return llvmModuleSet()->getObjectNode(svfVal);
     }
 
     /// getReturnNode - Return the node representing the unique return value of a function.

package/svf-llvm/include/SVF-LLVM/SymbolTableBuilder.h

@@ -84,6 +84,10 @@ protected:
     void handleCE(const Value* val);
     // @}
 
+    inline LLVMModuleSet* llvmModuleSet()
+    {
+        return LLVMModuleSet::getLLVMModuleSet();
+    }
 
     ObjTypeInference* getTypeInference();
 
@@ -118,9 +122,9 @@ protected:
     ///Get a reference to StructInfo.
     StInfo* getOrAddSVFTypeInfo(const Type* T);
 
-    ObjTypeInfo* createBlkObjTypeInfo(SymID symId);
+    ObjTypeInfo* createBlkObjTypeInfo(NodeID symId);
 
-    ObjTypeInfo* createConstantObjTypeInfo(SymID symId);
+    ObjTypeInfo* createConstantObjTypeInfo(NodeID symId);
 };
 
 } // End namespace SVF

package/svf-llvm/lib/CHGBuilder.cpp

@@ -377,7 +377,7 @@ void CHGBuilder::analyzeVTables(const Module &M)
             string vtblClassName = getClassNameFromVtblObj(globalvalue->getName().str());
             CHNode *node = chg->getNode(vtblClassName);
             assert(node && "node not found?");
-            SymID i = PAG::getPAG()->getObjectNode(llvmModuleSet()->getSVFGlobalValue(globalvalue));
+            NodeID i = llvmModuleSet()->getObjectNode(llvmModuleSet()->getSVFGlobalValue(globalvalue));
             SVFVar* pVar = PAG::getPAG()->getGNode(i);
             GlobalObjVar* globalObjVar = SVFUtil::cast<GlobalObjVar>(pVar);
             globalObjVar->setName(vtblClassName);

package/svf-llvm/lib/DCHG.cpp

@@ -178,7 +178,7 @@ void DCHGraph::buildVTables(const SVFModule &module)
                 assert(type && "DCHG::buildVTables: bad metadata for ctir.vt");
                 DCHNode *node = getOrCreateNode(type);
                 const SVFGlobalValue* svfgv = LLVMModuleSet::getLLVMModuleSet()->getSVFGlobalValue(gv);
-                SymID i = PAG::getPAG()->getObjectNode(svfgv);
+                NodeID i = LLVMModuleSet::getLLVMModuleSet()->getObjectNode(svfgv);
                 GlobalObjVar* globalObjVar =
                     SVFUtil::cast<GlobalObjVar>(PAG::getPAG()->getGNode(i));
                 node->setVTable(globalObjVar);