svf-tools 1.0.1036 → 1.0.1037

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1036",
+  "version": "1.0.1037",
   "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
@@ -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/SVFVariables.h

@@ -598,7 +598,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/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);

package/svf-llvm/lib/LLVMModule.cpp

@@ -1218,6 +1218,77 @@ void LLVMModuleSet::dumpModulesToFile(const std::string& suffix)
     }
 }
 
+NodeID LLVMModuleSet::getValueNode(const SVFValue *val)
+{
+    if (val->isNullPtr())
+        return svfir->nullPtrSymID();
+    else if (val->isblackHole())
+        return svfir->blkPtrSymID();
+    else
+    {
+        ValueToIDMapTy::const_iterator iter = valSymMap.find(val);
+        assert(iter!=valSymMap.end() &&"value sym not found");
+        return iter->second;
+    }
+}
+bool LLVMModuleSet::hasValueNode(const SVFValue *val)
+{
+    if (val->isNullPtr() || val->isblackHole())
+        return true;
+    else
+        return (valSymMap.find(val) != valSymMap.end());
+}
+
+NodeID LLVMModuleSet::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;
+}
+
+
+void LLVMModuleSet::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 (SVFIR::FunToIDMapTy::iterator iter = svfir->retSyms().begin(); iter != svfir->retSyms().end();
+            ++iter)
+    {
+        const NodeID i = iter->second;
+        SVFValue* val = (SVFValue*) iter->first;
+        idmap[i] = val;
+    }
+    for (SVFIR::FunToIDMapTy::iterator iter = svfir->varargSyms().begin(); iter != svfir->varargSyms().end();
+            ++iter)
+    {
+        const NodeID i = iter->second;
+        SVFValue* val = (SVFValue*) iter->first;
+        idmap[i] = val;
+    }
+    SVFUtil::outs() << "{SymbolTableInfo \n";
+    for (auto iter : idmap)
+    {
+        SVFUtil::outs() << iter.first << " " << iter.second->toString() << "\n";
+    }
+    SVFUtil::outs() << "}\n";
+}
+
 void LLVMModuleSet::addFunctionMap(const Function* func, CallGraphNode* svfFunc)
 {
     LLVMFunc2CallGraphNode[func] = svfFunc;

package/svf-llvm/lib/SVFIRBuilder.cpp

@@ -118,7 +118,7 @@ SVFIR* SVFIRBuilder::build()
                         I != E; ++I)
                 {
                     setCurrentLocation(&*I,&fun.getEntryBlock());
-                    NodeID argValNodeId = pag->getValueNode(llvmModuleSet()->getSVFValue(&*I));
+                    NodeID argValNodeId = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(&*I));
                     // if this is the function does not have caller (e.g. main)
                     // or a dead function, shall we create a black hole address edge for it?
                     // it is (1) too conservative, and (2) make FormalParmVFGNode defined at blackhole address PAGEdge.
@@ -194,8 +194,8 @@ void SVFIRBuilder::initialiseNodes()
     addNullPtrNode();
 
     // Iterate over all value symbols in the symbol table
-    for (IRGraph::ValueToIDMapTy::iterator iter =
-                pag->valSyms().begin(); iter != pag->valSyms().end();
+    for (LLVMModuleSet::ValueToIDMapTy::iterator iter =
+                llvmModuleSet()->valSyms().begin(); iter != llvmModuleSet()->valSyms().end();
             ++iter)
     {
         // Debug output for adding value node
@@ -266,8 +266,8 @@ void SVFIRBuilder::initialiseNodes()
     }
 
     // Iterate over all object symbols in the symbol table
-    for (IRGraph::ValueToIDMapTy::iterator iter =
-                pag->objSyms().begin(); iter != pag->objSyms().end();
+    for (LLVMModuleSet::ValueToIDMapTy::iterator iter =
+                llvmModuleSet()->objSyms().begin(); iter != llvmModuleSet()->objSyms().end();
             ++iter)
     {
         // Debug output for adding object node
@@ -290,57 +290,57 @@ void SVFIRBuilder::initialiseNodes()
         // Check if the value is a function and add a function object node
         if (const Function* func = SVFUtil::dyn_cast<Function>(llvmValue))
         {
-            SymID id = pag->getObjectNode(llvmModuleSet()->getCallGraphNode(func)->getFunction());
+            NodeID id = llvmModuleSet()->getObjectNode(llvmModuleSet()->getCallGraphNode(func)->getFunction());
             pag->addFunObjNode(iter->second, pag->getObjTypeInfo(id),  llvmModuleSet()->getCallGraphNode(func), iter->first->getType(), icfgNode);
         }
         // Check if the value is a heap object and add a heap object node
         else if (LLVMUtil::isHeapObj(llvmValue))
         {
-            SymID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addHeapObjNode(iter->second, pag->getObjTypeInfo(id), iter->first->getType(), icfgNode);
         }
         // Check if the value is an alloca instruction and add a stack object node
         else if (LLVMUtil::isStackObj(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addStackObjNode(iter->second, pag->getObjTypeInfo(id), iter->first->getType(), icfgNode);
         }
         else if (auto fpValue = SVFUtil::dyn_cast<ConstantFP>(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addConstantFPObjNode(iter->second, pag->getObjTypeInfo(id),  LLVMUtil::getDoubleValue(fpValue), iter->first->getType(), icfgNode);
         }
         else if (auto intValue = SVFUtil::dyn_cast<ConstantInt>(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addConstantIntObjNode(iter->second, pag->getObjTypeInfo(id), LLVMUtil::getIntegerValue(intValue), iter->first->getType(), icfgNode);
         }
         else if (SVFUtil::isa<ConstantPointerNull>(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addConstantNullPtrObjNode(iter->second, pag->getObjTypeInfo(id), iter->first->getType(), icfgNode);
         }
         else if (SVFUtil::isa<GlobalValue>(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addGlobalObjNode(iter->second,
                                   pag->getObjTypeInfo(id),
                                   iter->first->getType(), icfgNode);
         }
         else if (SVFUtil::isa<ConstantData, MetadataAsValue, BlockAddress>(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addConstantDataObjNode(iter->second, pag->getObjTypeInfo(id), iter->first->getType(), icfgNode);
         }
         else if (SVFUtil::isa<ConstantAggregate>(llvmValue))
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addConstantAggObjNode(iter->second, pag->getObjTypeInfo(id), iter->first->getType(), icfgNode);
         }
         // Add a generic object node for other types of values
         else
         {
-            NodeID id = pag->getObjectNode(iter->first);
+            NodeID id = llvmModuleSet()->getObjectNode(iter->first);
             pag->addObjNode(iter->second,
                             pag->getObjTypeInfo(id), iter->first->getType(), icfgNode);
         }
@@ -384,14 +384,14 @@ void SVFIRBuilder::initialiseNodes()
     }
 
     /// add address edges for constant nodes.
-    for (IRGraph::ValueToIDMapTy::iterator iter =
-                pag->objSyms().begin(); iter != pag->objSyms().end(); ++iter)
+    for (LLVMModuleSet::ValueToIDMapTy::iterator iter =
+                llvmModuleSet()->objSyms().begin(); iter != llvmModuleSet()->objSyms().end(); ++iter)
     {
         DBOUT(DPAGBuild, outs() << "add address edges for constant node " << iter->second << "\n");
         const SVFValue* val = iter->first;
         if (isConstantObjSym(val))
         {
-            NodeID ptr = pag->getValueNode(val);
+            NodeID ptr = llvmModuleSet()->getValueNode(val);
             if(ptr!= pag->getBlkPtr() && ptr!= pag->getNullPtr())
             {
                 setCurrentLocation(val, nullptr);
@@ -452,7 +452,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, AccessPath& ap)
         const Value* offsetVal = gi.getOperand();
         const SVFValue* offsetSvfVal = llvmModuleSet()->getSVFValue(offsetVal);
         assert(gepTy != offsetVal->getType() && "iteration and operand have the same type?");
-        ap.addOffsetVarAndGepTypePair(getPAG()->getGNode(getPAG()->getValueNode(offsetSvfVal)), svfGepTy);
+        ap.addOffsetVarAndGepTypePair(getPAG()->getGNode(llvmModuleSet()->getValueNode(offsetSvfVal)), svfGepTy);
 
         //The int value of the current index operand
         const ConstantInt* op = SVFUtil::dyn_cast<ConstantInt>(offsetVal);
@@ -521,7 +521,7 @@ void SVFIRBuilder::processCE(const Value* val)
              * The gep edge created are like constexpr (same edge may appear at multiple callsites)
              * so bb/inst of this edge may be rewritten several times, we treat it as global here.
              */
-            addGepEdge(pag->getValueNode(llvmModuleSet()->getSVFValue(opnd)), pag->getValueNode(llvmModuleSet()->getSVFValue(gepce)), ap, constGep);
+            addGepEdge(llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(opnd)), llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(gepce)), ap, constGep);
             setCurrentLocation(cval, cbb);
         }
         else if (const ConstantExpr* castce = isCastConstantExpr(ref))
@@ -532,7 +532,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFValue* cval = getCurrentValue();
             const SVFBasicBlock* cbb = getCurrentBB();
             setCurrentLocation(castce, nullptr);
-            addCopyEdge(pag->getValueNode(llvmModuleSet()->getSVFValue(opnd)), pag->getValueNode(llvmModuleSet()->getSVFValue(castce)), CopyStmt::BITCAST);
+            addCopyEdge(llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(opnd)), llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(castce)), CopyStmt::BITCAST);
             setCurrentLocation(cval, cbb);
         }
         else if (const ConstantExpr* selectce = isSelectConstantExpr(ref))
@@ -545,10 +545,10 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFValue* cval = getCurrentValue();
             const SVFBasicBlock* cbb = getCurrentBB();
             setCurrentLocation(selectce, nullptr);
-            NodeID cond = pag->getValueNode(llvmModuleSet()->getSVFValue(selectce->getOperand(0)));
-            NodeID nsrc1 = pag->getValueNode(llvmModuleSet()->getSVFValue(src1));
-            NodeID nsrc2 = pag->getValueNode(llvmModuleSet()->getSVFValue(src2));
-            NodeID nres = pag->getValueNode(llvmModuleSet()->getSVFValue(selectce));
+            NodeID cond = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(selectce->getOperand(0)));
+            NodeID nsrc1 = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(src1));
+            NodeID nsrc2 = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(src2));
+            NodeID nres = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(selectce));
             addSelectStmt(nres,nsrc1, nsrc2, cond);
             setCurrentLocation(cval, cbb);
         }
@@ -560,7 +560,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFBasicBlock* cbb = getCurrentBB();
             const SVFValue* cval = getCurrentValue();
             setCurrentLocation(int2Ptrce, nullptr);
-            addCopyEdge(pag->getValueNode(llvmModuleSet()->getSVFValue(opnd)), pag->getValueNode(llvmModuleSet()->getSVFValue(int2Ptrce)), CopyStmt::INTTOPTR);
+            addCopyEdge(llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(opnd)), llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(int2Ptrce)), CopyStmt::INTTOPTR);
             setCurrentLocation(cval, cbb);
         }
         else if (const ConstantExpr* ptr2Intce = isPtr2IntConstantExpr(ref))
@@ -570,7 +570,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFBasicBlock* cbb = getCurrentBB();
             const SVFValue* cval = getCurrentValue();
             setCurrentLocation(ptr2Intce, nullptr);
-            addCopyEdge(pag->getValueNode(llvmModuleSet()->getSVFValue(opnd)), pag->getValueNode(llvmModuleSet()->getSVFValue(ptr2Intce)), CopyStmt::PTRTOINT);
+            addCopyEdge(llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(opnd)), llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(ptr2Intce)), CopyStmt::PTRTOINT);
             setCurrentLocation(cval, cbb);
         }
         else if(isTruncConstantExpr(ref) || isCmpConstantExpr(ref))
@@ -579,7 +579,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFValue* cval = getCurrentValue();
             const SVFBasicBlock* cbb = getCurrentBB();
             setCurrentLocation(ref, nullptr);
-            NodeID dst = pag->getValueNode(llvmModuleSet()->getSVFValue(ref));
+            NodeID dst = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(ref));
             addBlackHoleAddrEdge(dst);
             setCurrentLocation(cval, cbb);
         }
@@ -589,7 +589,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFValue* cval = getCurrentValue();
             const SVFBasicBlock* cbb = getCurrentBB();
             setCurrentLocation(ref, nullptr);
-            NodeID dst = pag->getValueNode(llvmModuleSet()->getSVFValue(ref));
+            NodeID dst = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(ref));
             addBlackHoleAddrEdge(dst);
             setCurrentLocation(cval, cbb);
         }
@@ -599,7 +599,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFValue* cval = getCurrentValue();
             const SVFBasicBlock* cbb = getCurrentBB();
             setCurrentLocation(ref, nullptr);
-            NodeID dst = pag->getValueNode(llvmModuleSet()->getSVFValue(ref));
+            NodeID dst = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(ref));
             addBlackHoleAddrEdge(dst);
             setCurrentLocation(cval, cbb);
         }
@@ -614,7 +614,7 @@ void SVFIRBuilder::processCE(const Value* val)
             const SVFValue* cval = getCurrentValue();
             const SVFBasicBlock* cbb = getCurrentBB();
             setCurrentLocation(ref, nullptr);
-            NodeID dst = pag->getValueNode(llvmModuleSet()->getSVFValue(ref));
+            NodeID dst = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(ref));
             addAddrEdge(pag->getConstantNode(), dst);
             setCurrentLocation(cval, cbb);
         }
@@ -775,8 +775,8 @@ void SVFIRBuilder::visitGlobal(SVFModule* svfModule)
         for (Module::alias_iterator I = M.alias_begin(), E = M.alias_end(); I != E; I++)
         {
             const GlobalAlias* alias = &*I;
-            NodeID dst = pag->getValueNode(llvmModuleSet()->getSVFValue(alias));
-            NodeID src = pag->getValueNode(llvmModuleSet()->getSVFValue(alias->getAliasee()));
+            NodeID dst = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(alias));
+            NodeID src = llvmModuleSet()->getValueNode(llvmModuleSet()->getSVFValue(alias->getAliasee()));
             processCE(alias->getAliasee());
             setCurrentLocation(alias, nullptr);
             addCopyEdge(src, dst, CopyStmt::COPYVAL);
@@ -1317,7 +1317,7 @@ void SVFIRBuilder::handleIndCall(CallBase* cs)
     const SVFValue* svfcalledval = llvmModuleSet()->getSVFValue(cs->getCalledOperand());
 
     const CallICFGNode* cbn = llvmModuleSet()->getCallICFGNode(cs);
-    pag->addIndirectCallsites(cbn,pag->getValueNode(svfcalledval));
+    pag->addIndirectCallsites(cbn,llvmModuleSet()->getValueNode(svfcalledval));
 }
 
 void SVFIRBuilder::updateCallGraph(PTACallGraph* callgraph)
@@ -1385,7 +1385,7 @@ void SVFIRBuilder::sanityCheck()
 NodeID SVFIRBuilder::getGepValVar(const Value* val, const AccessPath& ap, const SVFType* elementType)
 {
     NodeID base = getValueNode(val);
-    NodeID gepval = pag->getGepValVar(pag->getValueNode(curVal), base, ap);
+    NodeID gepval = pag->getGepValVar(llvmModuleSet()->getValueNode(curVal), base, ap);
     if (gepval==UINT_MAX)
     {
         assert(((int) UINT_MAX)==-1 && "maximum limit of unsigned int is not -1?");
@@ -1411,7 +1411,7 @@ NodeID SVFIRBuilder::getGepValVar(const Value* val, const AccessPath& ap, const
             {
                 node = llvmmodule->getICFGNode(inst);
             }
-        NodeID gepNode = pag->addGepValNode(pag->getValueNode(curVal), cast<ValVar>(pag->getGNode(getValueNode(val))), ap,
+        NodeID gepNode = pag->addGepValNode(llvmModuleSet()->getValueNode(curVal), cast<ValVar>(pag->getGNode(getValueNode(val))), ap,
                                             NodeIDAllocator::get()->allocateValueId(),
                                             llvmmodule->getSVFType(PointerType::getUnqual(llvmmodule->getContext())), node);
         addGepEdge(base, gepNode, ap, true);
@@ -1443,7 +1443,7 @@ void SVFIRBuilder::setCurrentBBAndValueForPAGEdge(PAGEdge* edge)
 
     assert(curVal && "current Val is nullptr?");
     edge->setBB(curBB!=nullptr ? curBB : nullptr);
-    edge->setValue(pag->getGNode(pag->getValueNode(curVal)));
+    edge->setValue(pag->getGNode(llvmModuleSet()->getValueNode(curVal)));
     ICFGNode* icfgNode = pag->getICFG()->getGlobalICFGNode();
     LLVMModuleSet* llvmMS = llvmModuleSet();
     if (const SVFInstruction* curInst = SVFUtil::dyn_cast<SVFInstruction>(curVal))

package/svf-llvm/lib/SVFIRExtAPI.cpp

@@ -61,16 +61,16 @@ const Type* SVFIRBuilder::getBaseTypeAndFlattenedFields(const Value* V, std::vec
         // make a ConstantInt and create char for the content type due to byte-wise copy
         const ConstantInt* offset = ConstantInt::get(context, llvm::APInt(32, ei));
         const SVFValue* svfOffset = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(offset);
-        if (!pag->hasValueNode(svfOffset))
+        if (!llvmModuleSet()->hasValueNode(svfOffset))
         {
             SymbolTableBuilder builder(pag);
             builder.collectSym(offset);
-            SymID id = pag->getValueNode(svfOffset);
+            NodeID id = llvmModuleSet()->getValueNode(svfOffset);
             pag->addConstantIntValNode(id, LLVMUtil::getIntegerValue(offset), nullptr, svfOffset->getType());
             llvmModuleSet()->addToSVFVar2LLVMValueMap(offset,
                     pag->getGNode(id));
         }
-        ls.addOffsetVarAndGepTypePair(getPAG()->getGNode(getPAG()->getValueNode(svfOffset)), nullptr);
+        ls.addOffsetVarAndGepTypePair(getPAG()->getGNode(llvmModuleSet()->getValueNode(svfOffset)), nullptr);
         fields.push_back(ls);
     }
     return objType;
@@ -134,8 +134,8 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
 
     if (isHeapAllocExtCallViaRet(callICFGNode))
     {
-        NodeID val = pag->getValueNode(svfInst);
-        NodeID obj = pag->getObjectNode(svfInst);
+        NodeID val = llvmModuleSet()->getValueNode(svfInst);
+        NodeID obj = llvmModuleSet()->getObjectNode(svfInst);
         addAddrWithHeapSz(obj, val, cs);
     }
     else if (isHeapAllocExtCallViaArg(callICFGNode))
@@ -144,7 +144,7 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
         const SVFValue* arg = svfCall->getArgOperand(arg_pos);
         if (arg->getType()->isPointerTy())
         {
-            NodeID vnArg = pag->getValueNode(arg);
+            NodeID vnArg = llvmModuleSet()->getValueNode(arg);
             NodeID dummy = pag->addDummyValNode();
             NodeID obj = pag->addDummyObjNode(arg->getType());
             if (vnArg && dummy && obj)
@@ -237,7 +237,7 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
 
         // We have vArg3 points to the entry of _Rb_tree_node_base { color; parent; left; right; }.
         // Now we calculate the offset from base to vArg3
-        NodeID vnArg3 = pag->getValueNode(svfCall->getArgOperand(3));
+        NodeID vnArg3 = llvmModuleSet()->getValueNode(svfCall->getArgOperand(3));
         APOffset offset =
             getAccessPathFromBaseNode(vnArg3).getConstantStructFldIdx();
 
@@ -253,7 +253,7 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
             const SVFType* elementType = pag->getFlatternedElemType(pag->getTypeLocSetsMap(vnArg3).first,
                                          fields[i].getConstantStructFldIdx());
             NodeID vnD = getGepValVar(cs->getArgOperand(3), fields[i], elementType);
-            NodeID vnS = pag->getValueNode(svfCall->getArgOperand(1));
+            NodeID vnS = llvmModuleSet()->getValueNode(svfCall->getArgOperand(1));
             if(vnD && vnS)
                 addStoreEdge(vnS,vnD);
         }
@@ -277,7 +277,7 @@ void SVFIRBuilder::handleExtCall(const CallBase* cs, const SVFFunction* svfCalle
                 if (actualParm->isPointer() && formalParm->getType()->isPointerTy())
                 {
                     FunEntryICFGNode *entry = pag->getICFG()->getFunEntryICFGNode(forkedFun);
-                    addThreadForkEdge(actualParm->getId(), pag->getValueNode(formalParm), callICFGNode, entry);
+                    addThreadForkEdge(actualParm->getId(), llvmModuleSet()->getValueNode(formalParm), callICFGNode, entry);
                 }
             }
         }

package/svf-llvm/lib/SymbolTableBuilder.cpp

@@ -44,10 +44,10 @@ using namespace SVF;
 using namespace SVFUtil;
 using namespace LLVMUtil;
 
-ObjTypeInfo* SymbolTableBuilder::createBlkObjTypeInfo(SymID symId)
+ObjTypeInfo* SymbolTableBuilder::createBlkObjTypeInfo(NodeID symId)
 {
     assert(svfir->isBlkObj(symId));
-    LLVMModuleSet* llvmset = LLVMModuleSet::getLLVMModuleSet();
+    LLVMModuleSet* llvmset = llvmModuleSet();
     if (svfir->objTypeInfoMap.find(symId)==svfir->objTypeInfoMap.end())
     {
         ObjTypeInfo* ti =svfir->createObjTypeInfo(llvmset->getSVFType(
@@ -58,10 +58,10 @@ ObjTypeInfo* SymbolTableBuilder::createBlkObjTypeInfo(SymID symId)
     return ti;
 }
 
-ObjTypeInfo* SymbolTableBuilder::createConstantObjTypeInfo(SymID symId)
+ObjTypeInfo* SymbolTableBuilder::createConstantObjTypeInfo(NodeID symId)
 {
     assert(IRGraph::isConstantSym(symId));
-    LLVMModuleSet* llvmset = LLVMModuleSet::getLLVMModuleSet();
+    LLVMModuleSet* llvmset = llvmModuleSet();
     if (svfir->objTypeInfoMap.find(symId)==svfir->objTypeInfoMap.end())
     {
         ObjTypeInfo* ti = svfir->createObjTypeInfo(
@@ -94,7 +94,7 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
     assert(svfir->totalSymNum++ == IRGraph::ConstantObj && "Something changed!");
     createConstantObjTypeInfo(IRGraph::ConstantObj);
 
-    for (Module &M : LLVMModuleSet::getLLVMModuleSet()->getLLVMModules())
+    for (Module &M : llvmModuleSet()->getLLVMModules())
     {
         // Add symbols for all the globals .
         for (const GlobalVariable& gv : M.globals())
@@ -235,7 +235,7 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
     svfir->totalSymNum = NodeIDAllocator::get()->endSymbolAllocation();
     if (Options::SymTabPrint())
     {
-        svfir->dumpSymTable();
+        llvmModuleSet()->dumpSymTable();
     }
 }
 
@@ -267,7 +267,7 @@ void SymbolTableBuilder::collectSym(const Value* val)
     DBOUT(DMemModel,
           outs()
           << "collect sym from ##"
-          << LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val)->toString()
+          << llvmModuleSet()->getSVFValue(val)->toString()
           << " \n");
     //TODO handle constant expression value here??
     handleCE(val);
@@ -295,14 +295,14 @@ void SymbolTableBuilder::collectVal(const Value* val)
     {
         return;
     }
-    IRGraph::ValueToIDMapTy::iterator iter = svfir->valSymMap.find(
-                LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val));
-    if (iter == svfir->valSymMap.end())
+    LLVMModuleSet::ValueToIDMapTy::iterator iter = llvmModuleSet()->valSymMap.find(
+                llvmModuleSet()->getSVFValue(val));
+    if (iter == llvmModuleSet()->valSymMap.end())
     {
         // create val sym and sym type
-        SVFValue* svfVal = LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val);
-        SymID id = NodeIDAllocator::get()->allocateValueId();
-        svfir->valSymMap.insert(std::make_pair(svfVal, id));
+        SVFValue* svfVal = llvmModuleSet()->getSVFValue(val);
+        NodeID id = NodeIDAllocator::get()->allocateValueId();
+        llvmModuleSet()->valSymMap.insert(std::make_pair(svfVal, id));
         DBOUT(DMemModel,
               outs() << "create a new value sym " << id << "\n");
         ///  handle global constant expression here
@@ -320,23 +320,22 @@ void SymbolTableBuilder::collectVal(const Value* val)
 void SymbolTableBuilder::collectObj(const Value* val)
 {
     val = LLVMUtil::getGlobalRep(val);
-    LLVMModuleSet* llvmModuleSet = LLVMModuleSet::getLLVMModuleSet();
-    IRGraph::ValueToIDMapTy::iterator iter = svfir->objSymMap.find(llvmModuleSet->getSVFValue(val));
-    if (iter == svfir->objSymMap.end())
+    LLVMModuleSet::ValueToIDMapTy::iterator iter = llvmModuleSet()->objSymMap.find(llvmModuleSet()->getSVFValue(val));
+    if (iter == llvmModuleSet()->objSymMap.end())
     {
-        SVFValue* svfVal = llvmModuleSet->getSVFValue(val);
+        SVFValue* svfVal = llvmModuleSet()->getSVFValue(val);
         // if the object pointed by the pointer is a constant data (e.g., i32 0) or a global constant object (e.g. string)
         // then we treat them as one ConstantObj
         if (isConstantObjSym(val) && !Options::ModelConsts())
         {
-            svfir->objSymMap.insert(std::make_pair(svfVal, svfir->constantSymID()));
+            llvmModuleSet()->objSymMap.insert(std::make_pair(svfVal, svfir->constantSymID()));
         }
         // otherwise, we will create an object for each abstract memory location
         else
         {
             // create obj sym and sym type
-            SymID id = NodeIDAllocator::get()->allocateObjectId();
-            svfir->objSymMap.insert(std::make_pair(svfVal, id));
+            NodeID id = NodeIDAllocator::get()->allocateObjectId();
+            llvmModuleSet()->objSymMap.insert(std::make_pair(svfVal, id));
             DBOUT(DMemModel,
                   outs() << "create a new obj sym " << id << "\n");
 
@@ -354,12 +353,12 @@ void SymbolTableBuilder::collectObj(const Value* val)
 void SymbolTableBuilder::collectRet(const Function* val)
 {
     const SVFFunction* svffun =
-        LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(val);
+        llvmModuleSet()->getSVFFunction(val);
     IRGraph::FunToIDMapTy::iterator iter =
         svfir->returnSymMap.find(svffun);
     if (iter == svfir->returnSymMap.end())
     {
-        SymID id = NodeIDAllocator::get()->allocateValueId();
+        NodeID id = NodeIDAllocator::get()->allocateValueId();
         svfir->returnSymMap.insert(std::make_pair(svffun, id));
         DBOUT(DMemModel, outs() << "create a return sym " << id << "\n");
     }
@@ -371,12 +370,12 @@ void SymbolTableBuilder::collectRet(const Function* val)
 void SymbolTableBuilder::collectVararg(const Function* val)
 {
     const SVFFunction* svffun =
-        LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(val);
+        llvmModuleSet()->getSVFFunction(val);
     IRGraph::FunToIDMapTy::iterator iter =
         svfir->varargSymMap.find(svffun);
     if (iter == svfir->varargSymMap.end())
     {
-        SymID id = NodeIDAllocator::get()->allocateValueId();
+        NodeID id = NodeIDAllocator::get()->allocateValueId();
         svfir->varargSymMap.insert(std::make_pair(svffun, id));
         DBOUT(DMemModel, outs() << "create a vararg sym " << id << "\n");
     }
@@ -392,7 +391,7 @@ void SymbolTableBuilder::handleCE(const Value* val)
         if (const ConstantExpr* ce = isGepConstantExpr(ref))
         {
             DBOUT(DMemModelCE, outs() << "handle constant expression "
-                  << LLVMModuleSet::getLLVMModuleSet()
+                  << llvmModuleSet()
                   ->getSVFValue(ref)
                   ->toString()
                   << "\n");
@@ -409,7 +408,7 @@ void SymbolTableBuilder::handleCE(const Value* val)
         else if (const ConstantExpr* ce = isCastConstantExpr(ref))
         {
             DBOUT(DMemModelCE, outs() << "handle constant expression "
-                  << LLVMModuleSet::getLLVMModuleSet()
+                  << llvmModuleSet()
                   ->getSVFValue(ref)
                   ->toString()
                   << "\n");
@@ -422,7 +421,7 @@ void SymbolTableBuilder::handleCE(const Value* val)
         else if (const ConstantExpr* ce = isSelectConstantExpr(ref))
         {
             DBOUT(DMemModelCE, outs() << "handle constant expression "
-                  << LLVMModuleSet::getLLVMModuleSet()
+                  << llvmModuleSet()
                   ->getSVFValue(ref)
                   ->toString()
                   << "\n");
@@ -575,7 +574,7 @@ void SymbolTableBuilder::handleGlobalInitializerCE(const Constant* C)
 
 ObjTypeInference *SymbolTableBuilder::getTypeInference()
 {
-    return LLVMModuleSet::getLLVMModuleSet()->getTypeInference();
+    return llvmModuleSet()->getTypeInference();
 }
 
 
@@ -593,7 +592,7 @@ const Type* SymbolTableBuilder::inferTypeOfHeapObjOrStaticObj(const Instruction
     const PointerType *originalPType = SVFUtil::dyn_cast<PointerType>(inst->getType());
     const Type* inferedType = nullptr;
     assert(originalPType && "empty type?");
-    const SVFInstruction* svfinst = LLVMModuleSet::getLLVMModuleSet()->getSVFInstruction(inst);
+    const SVFInstruction* svfinst = llvmModuleSet()->getSVFInstruction(inst);
     if(LLVMUtil::isHeapAllocExtCallViaRet(inst))
     {
         if(const Value* v = getFirstUseViaCastInst(inst))
@@ -666,7 +665,7 @@ ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value* val)
     {
         (void) getOrAddSVFTypeInfo(objTy);
         ObjTypeInfo* typeInfo = new ObjTypeInfo(
-            LLVMModuleSet::getLLVMModuleSet()->getSVFType(objTy),
+            llvmModuleSet()->getSVFType(objTy),
             Options::MaxFieldLimit());
         initTypeInfo(typeInfo,val, objTy);
         return typeInfo;
@@ -675,11 +674,11 @@ ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value* val)
     {
         writeWrnMsg("try to create an object with a non-pointer type.");
         writeWrnMsg(val->getName().str());
-        writeWrnMsg("(" + LLVMModuleSet::getLLVMModuleSet()->getSVFValue(val)->getSourceLoc() + ")");
+        writeWrnMsg("(" + llvmModuleSet()->getSVFValue(val)->getSourceLoc() + ")");
         if (isConstantObjSym(val))
         {
             ObjTypeInfo* typeInfo = new ObjTypeInfo(
-                LLVMModuleSet::getLLVMModuleSet()->getSVFType(val->getType()),
+                llvmModuleSet()->getSVFType(val->getType()),
                 0);
             initTypeInfo(typeInfo,val, val->getType());
             return typeInfo;
@@ -697,7 +696,7 @@ ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value* val)
  */
 void SymbolTableBuilder::analyzeObjType(ObjTypeInfo* typeinfo, const Value* val)
 {
-    const Type *elemTy = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(typeinfo->getType());
+    const Type *elemTy = llvmModuleSet()->getLLVMType(typeinfo->getType());
     // Find the inter nested array element
     while (const ArrayType* AT = SVFUtil::dyn_cast<ArrayType>(elemTy))
     {
@@ -744,7 +743,7 @@ u32_t SymbolTableBuilder::analyzeHeapAllocByteSize(const Value* val)
                     callInst->getCalledFunction())
         {
             const SVFFunction* svfFunction =
-                LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(
+                llvmModuleSet()->getSVFFunction(
                     calledFunction);
             std::vector<const Value*> args;
             // Heap alloc functions have annoation like "AllocSize:Arg1"
@@ -810,7 +809,7 @@ u32_t SymbolTableBuilder::analyzeHeapObjType(ObjTypeInfo* typeinfo, const Value*
 {
     typeinfo->setFlag(ObjTypeInfo::HEAP_OBJ);
     analyzeObjType(typeinfo, val);
-    const Type* objTy = LLVMModuleSet::getLLVMModuleSet()->getLLVMType(typeinfo->getType());
+    const Type* objTy = llvmModuleSet()->getLLVMType(typeinfo->getType());
     if(SVFUtil::isa<ArrayType>(objTy))
         return getNumOfElements(objTy);
     else if(const StructType* st = SVFUtil::dyn_cast<StructType>(objTy))
@@ -818,8 +817,8 @@ u32_t SymbolTableBuilder::analyzeHeapObjType(ObjTypeInfo* typeinfo, const Value*
         /// For an C++ class, it can have variant elements depending on the vtable size,
         /// Hence we only handle non-cpp-class object, the type of the cpp class is treated as default PointerType
         if(cppUtil::classTyHasVTable(st))
-            typeinfo->resetTypeForHeapStaticObj(LLVMModuleSet::getLLVMModuleSet()->getSVFType(
-                                                    LLVMModuleSet::getLLVMModuleSet()->getTypeInference()->ptrType()));
+            typeinfo->resetTypeForHeapStaticObj(llvmModuleSet()->getSVFType(
+                                                    llvmModuleSet()->getTypeInference()->ptrType()));
         else
             return getNumOfElements(objTy);
     }
@@ -959,5 +958,5 @@ u32_t SymbolTableBuilder::getNumOfFlattenElements(const Type* T)
 
 StInfo* SymbolTableBuilder::getOrAddSVFTypeInfo(const Type* T)
 {
-    return LLVMModuleSet::getLLVMModuleSet()->getSVFType(T)->getTypeInfo();
+    return llvmModuleSet()->getSVFType(T)->getTypeInfo();
 }