svf-lib 1.0.816 → 1.0.820

package/SVF-linux/include/Graphs/ICFG.h

@@ -163,19 +163,19 @@ public:
     /// Get a basic block ICFGNode
     /// TODO:: need to fix the assertions
     //@{
-    ICFGNode* getBlockICFGNode(const Instruction* inst);
+    ICFGNode* getICFGNode(const Instruction* inst);
 
-    CallICFGNode* getCallBlockNode(const Instruction* inst);
+    CallICFGNode* getCallICFGNode(const Instruction* inst);
 
-    RetICFGNode* getRetBlockNode(const Instruction* inst);
+    RetICFGNode* getRetICFGNode(const Instruction* inst);
 
-    IntraICFGNode* getIntraBlockNode(const Instruction* inst);
+    IntraICFGNode* getIntraICFGNode(const Instruction* inst);
 
-    FunEntryICFGNode* getFunEntryBlockNode(const SVFFunction*  fun);
+    FunEntryICFGNode* getFunEntryICFGNode(const SVFFunction*  fun);
 
-    FunExitICFGNode* getFunExitBlockNode(const SVFFunction*  fun);
+    FunExitICFGNode* getFunExitICFGNode(const SVFFunction*  fun);
 
-    inline GlobalICFGNode* getGlobalBlockNode() const
+    inline GlobalICFGNode* getGlobalICFGNode() const
     {
         return globalBlockNode;
     }
@@ -184,14 +184,14 @@ public:
 private:
 	
     /// Get/Add IntraBlock ICFGNode
-    inline IntraICFGNode* getIntraBlockICFGNode(const Instruction* inst)
+    inline IntraICFGNode* getIntraBlock(const Instruction* inst)
     {
         InstToBlockNodeMapTy::const_iterator it = InstToBlockNodeMap.find(inst);
         if (it == InstToBlockNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline IntraICFGNode* addIntraBlockICFGNode(const Instruction* inst)
+    inline IntraICFGNode* addIntraBlock(const Instruction* inst)
     {
         IntraICFGNode* sNode = new IntraICFGNode(totalICFGNode++,inst);
         addICFGNode(sNode);
@@ -200,14 +200,14 @@ private:
     }
 
     /// Get/Add a function entry node
-    inline FunEntryICFGNode* getFunEntryICFGNode(const SVFFunction* fun)
+    inline FunEntryICFGNode* getFunEntryBlock(const SVFFunction* fun)
     {
         FunToFunEntryNodeMapTy::const_iterator it = FunToFunEntryNodeMap.find(fun);
         if (it == FunToFunEntryNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline FunEntryICFGNode* addFunEntryICFGNode(const SVFFunction* fun)
+    inline FunEntryICFGNode* addFunEntryBlock(const SVFFunction* fun)
     {
         FunEntryICFGNode* sNode = new FunEntryICFGNode(totalICFGNode++,fun);
         addICFGNode(sNode);
@@ -216,14 +216,14 @@ private:
     }
 
     /// Get/Add a function exit node
-    inline FunExitICFGNode* getFunExitICFGNode(const SVFFunction* fun)
+    inline FunExitICFGNode* getFunExitBlock(const SVFFunction* fun)
     {
         FunToFunExitNodeMapTy::const_iterator it = FunToFunExitNodeMap.find(fun);
         if (it == FunToFunExitNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline FunExitICFGNode* addFunExitICFGNode(const SVFFunction* fun)
+    inline FunExitICFGNode* addFunExitBlock(const SVFFunction* fun)
     {
         FunExitICFGNode* sNode = new FunExitICFGNode(totalICFGNode++, fun);
         addICFGNode(sNode);
@@ -232,14 +232,14 @@ private:
     }
 
     /// Get/Add a call node
-    inline CallICFGNode* addCallICFGNode(const Instruction* cs)
+    inline CallICFGNode* addCallBlock(const Instruction* cs)
     {
         CallICFGNode* sNode = new CallICFGNode(totalICFGNode++, cs);
         addICFGNode(sNode);
         CSToCallNodeMap[cs] = sNode;
         return sNode;
     }
-    inline CallICFGNode* getCallICFGNode(const Instruction* cs)
+    inline CallICFGNode* getCallBlock(const Instruction* cs)
     {
         CSToCallNodeMapTy::const_iterator it = CSToCallNodeMap.find(cs);
         if (it == CSToCallNodeMap.end())
@@ -248,16 +248,16 @@ private:
     }
 
     /// Get/Add a return node
-    inline RetICFGNode* getRetICFGNode(const Instruction* cs)
+    inline RetICFGNode* getRetBlock(const Instruction* cs)
     {
         CSToRetNodeMapTy::const_iterator it = CSToRetNodeMap.find(cs);
         if (it == CSToRetNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline RetICFGNode* addRetICFGNode(const Instruction* cs)
+    inline RetICFGNode* addRetBlock(const Instruction* cs)
     {
-        CallICFGNode* callBlockNode = getCallBlockNode(cs);
+        CallICFGNode* callBlockNode = getCallICFGNode(cs);
         RetICFGNode* sNode = new RetICFGNode(totalICFGNode++, cs, callBlockNode);
         callBlockNode->setRetICFGNode(sNode);
         addICFGNode(sNode);

package/SVF-linux/include/Graphs/ICFGNode.h

@@ -384,7 +384,7 @@ public:
     }
 
     /// Return callsite
-    inline const RetICFGNode* getRetICFGNode() const
+    inline const RetICFGNode* getRetBlock() const
     {
     	assert(ret && "RetICFGNode not set?");
         return ret;
@@ -477,7 +477,7 @@ public:
         return cs;
     }
 
-    inline const CallICFGNode* getCallBlockNode() const
+    inline const CallICFGNode* getCallICFGNode() const
     {
         return callBlockNode;
     }

package/SVF-linux/include/Graphs/SVFG.h

@@ -397,7 +397,7 @@ protected:
     inline void addFormalINSVFGNode(const FunEntryICFGNode* funEntry,  const MRVer* resVer, const NodeID nodeId)
     {
         FormalINSVFGNode* sNode = new FormalINSVFGNode(nodeId, resVer, funEntry);
-        addSVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(funEntry->getFun()));
+        addSVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(funEntry->getFun()));
         setDef(resVer,sNode);
         funToFormalINMap[funEntry->getFun()].set(sNode->getId());
     }
@@ -406,7 +406,7 @@ protected:
     inline void addFormalOUTSVFGNode(const FunExitICFGNode* funExit, const MRVer* ver, const NodeID nodeId)
     {
         FormalOUTSVFGNode* sNode = new FormalOUTSVFGNode(nodeId, ver, funExit);
-        addSVFGNode(sNode,pag->getICFG()->getFunExitBlockNode(funExit->getFun()));
+        addSVFGNode(sNode,pag->getICFG()->getFunExitICFGNode(funExit->getFun()));
         funToFormalOUTMap[funExit->getFun()].set(sNode->getId());
     }
 
@@ -414,7 +414,7 @@ protected:
     inline void addActualINSVFGNode(const CallICFGNode* callsite, const MRVer* ver, const NodeID nodeId)
     {
         ActualINSVFGNode* sNode = new ActualINSVFGNode(nodeId, callsite, ver);
-        addSVFGNode(sNode,pag->getICFG()->getCallBlockNode(callsite->getCallSite()));
+        addSVFGNode(sNode,pag->getICFG()->getCallICFGNode(callsite->getCallSite()));
         callSiteToActualINMap[callsite].set(sNode->getId());
     }
 
@@ -422,7 +422,7 @@ protected:
     inline void addActualOUTSVFGNode(const CallICFGNode* callsite, const MRVer* resVer, const NodeID nodeId)
     {
         ActualOUTSVFGNode* sNode = new ActualOUTSVFGNode(nodeId, callsite, resVer);
-        addSVFGNode(sNode, pag->getICFG()->getRetBlockNode(callsite->getCallSite()));
+        addSVFGNode(sNode, pag->getICFG()->getRetICFGNode(callsite->getCallSite()));
         setDef(resVer,sNode);
         callSiteToActualOUTMap[callsite].set(sNode->getId());
     }

package/SVF-linux/include/Graphs/SVFGOPT.h

@@ -244,7 +244,7 @@ private:
     inline InterPHISVFGNode* addInterPHIForFP(const FormalParmSVFGNode* fp)
     {
         InterPHISVFGNode* sNode = new InterPHISVFGNode(totalVFGNode++,fp);
-        addSVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(fp->getFun()));
+        addSVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(fp->getFun()));
         resetDef(fp->getParam(),sNode);
         return sNode;
     }
@@ -252,7 +252,7 @@ private:
     inline InterPHISVFGNode* addInterPHIForAR(const ActualRetSVFGNode* ar)
     {
         InterPHISVFGNode* sNode = new InterPHISVFGNode(totalVFGNode++,ar);
-        addSVFGNode(sNode, pag->getICFG()->getRetBlockNode(ar->getCallSite()->getCallSite()));
+        addSVFGNode(sNode, pag->getICFG()->getRetICFGNode(ar->getCallSite()->getCallSite()));
         resetDef(ar->getRev(),sNode);
         return sNode;
     }

package/SVF-linux/include/Graphs/VFG.h

@@ -479,7 +479,7 @@ protected:
     inline void addNullPtrVFGNode(const PAGNode* pagNode)
     {
         NullPtrVFGNode* sNode = new NullPtrVFGNode(totalVFGNode++,pagNode);
-        addVFGNode(sNode, pag->getICFG()->getGlobalBlockNode());
+        addVFGNode(sNode, pag->getICFG()->getGlobalICFGNode());
         setDef(pagNode,sNode);
     }
     /// Add an Address VFG node
@@ -524,7 +524,7 @@ protected:
     inline void addActualParmVFGNode(const PAGNode* aparm, const CallICFGNode* cs)
     {
         ActualParmVFGNode* sNode = new ActualParmVFGNode(totalVFGNode++,aparm,cs);
-        addVFGNode(sNode, pag->getICFG()->getCallBlockNode(cs->getCallSite()));
+        addVFGNode(sNode, pag->getICFG()->getCallICFGNode(cs->getCallSite()));
         PAGNodeToActualParmMap[std::make_pair(aparm->getId(),cs)] = sNode;
         /// do not set def here, this node is not a variable definition
     }
@@ -532,7 +532,7 @@ protected:
     inline void addFormalParmVFGNode(const PAGNode* fparm, const SVFFunction* fun, CallPESet& callPEs)
     {
         FormalParmVFGNode* sNode = new FormalParmVFGNode(totalVFGNode++,fparm,fun);
-        addVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(fun));
+        addVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(fun));
         for(CallPESet::const_iterator it = callPEs.begin(), eit=callPEs.end();
                 it!=eit; ++it)
             sNode->addCallPE(*it);
@@ -546,7 +546,7 @@ protected:
     inline void addFormalRetVFGNode(const PAGNode* uniqueFunRet, const SVFFunction* fun, RetPESet& retPEs)
     {
 		FormalRetVFGNode *sNode = new FormalRetVFGNode(totalVFGNode++, uniqueFunRet, fun);
-		addVFGNode(sNode, pag->getICFG()->getFunExitBlockNode(fun));
+		addVFGNode(sNode, pag->getICFG()->getFunExitICFGNode(fun));
 		for (RetPESet::const_iterator it = retPEs.begin(), eit = retPEs.end(); it != eit; ++it)
 			sNode->addRetPE(*it);
 
@@ -564,7 +564,7 @@ protected:
     inline void addActualRetVFGNode(const PAGNode* ret,const CallICFGNode* cs)
     {
         ActualRetVFGNode* sNode = new ActualRetVFGNode(totalVFGNode++,ret,cs);
-        addVFGNode(sNode, pag->getICFG()->getRetBlockNode(cs->getCallSite()));
+        addVFGNode(sNode, pag->getICFG()->getRetICFGNode(cs->getCallSite()));
         setDef(ret,sNode);
         PAGNodeToActualRetMap[ret] = sNode;
     }

package/SVF-linux/include/MTA/LockResultValidator.h

@@ -35,7 +35,7 @@ public:
 private:
 	// Get CallICFGNode
 	inline CallICFGNode* getCBN(const Instruction* inst) {
-		return _la->getTCT()->getCallBlockNode(inst);
+		return _la->getTCT()->getCallICFGNode(inst);
 	}
 	const Instruction *getPreviousMemoryAccessInst( const Instruction *I) {
         I = I->getPrevNode();

package/SVF-linux/include/MTA/MHP.h

@@ -63,7 +63,7 @@ public:
 	
 	// Get CallICFGNode
 	inline CallICFGNode* getCBN(const Instruction* inst) {
-		return tct->getCallBlockNode(inst);
+		return tct->getCallICFGNode(inst);
 	}
 
     /// Whether the function is connected from main function in thread call graph
@@ -381,7 +381,7 @@ private:
     }
     // Get CallICFGNode
 	inline CallICFGNode* getCBN(const Instruction* inst) {
-		return tct->getCallBlockNode(inst);
+		return tct->getCallICFGNode(inst);
 	}
     /// Mark thread flags for cxtStmt
     //@{

package/SVF-linux/include/MTA/PCG.h

@@ -123,8 +123,8 @@ public:
     {
     }
 	
-	CallICFGNode* getCallBlockNode(const Instruction* inst) {
-		return pta->getICFG()->getCallBlockNode(inst);
+	CallICFGNode* getCallICFGNode(const Instruction* inst) {
+		return pta->getICFG()->getCallICFGNode(inst);
 	}
 	const SVFFunction* getSVFFun(const Function* fun) const {
 		return LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(fun);

package/SVF-linux/include/MTA/TCT.h

@@ -148,8 +148,8 @@ public:
         destroy();
     }
     /// Get CallICFGNode given inst
-    CallICFGNode* getCallBlockNode(const Instruction* inst) {
-		return pta->getICFG()->getCallBlockNode(inst);
+    CallICFGNode* getCallICFGNode(const Instruction* inst) {
+		return pta->getICFG()->getCallICFGNode(inst);
 	}
 	/// Get SVFFuntion given Function 
 	const SVFFunction* getSVFFun(const Function* fun) const {

package/SVF-linux/include/MemoryModel/SVFIR.h

@@ -493,14 +493,14 @@ private:
     /// Add function arguments
     inline void addFunArgs(const SVFFunction* fun, const SVFVar* arg)
     {
-        FunEntryICFGNode* funEntryBlockNode = icfg->getFunEntryBlockNode(fun);
+        FunEntryICFGNode* funEntryBlockNode = icfg->getFunEntryICFGNode(fun);
         funEntryBlockNode->addFormalParms(arg);
         funArgsListMap[fun].push_back(arg);
     }
     /// Add function returns
     inline void addFunRet(const SVFFunction* fun, const SVFVar* ret)
     {
-        FunExitICFGNode* funExitBlockNode = icfg->getFunExitBlockNode(fun);
+        FunExitICFGNode* funExitBlockNode = icfg->getFunExitICFGNode(fun);
         funExitBlockNode->addFormalRet(ret);
         funRetMap[fun] = ret;
     }

package/SVF-linux/include/SVF-FE/ICFGBuilder.h

@@ -84,20 +84,20 @@ private:
     void addICFGInterEdges(const Instruction*  cs, const SVFFunction*  callee);
 
     /// Add a call node
-    inline CallICFGNode* getOrAddCallICFGNode(const Instruction*  cs)
+    inline CallICFGNode* getCallICFGNode(const Instruction*  cs)
     {
-        return icfg->getCallBlockNode(cs);
+        return icfg->getCallICFGNode(cs);
     }
     /// Add a return node
-    inline RetICFGNode* getOrAddRetICFGNode(const Instruction*  cs)
+    inline RetICFGNode* getRetICFGNode(const Instruction*  cs)
     {
-        return icfg->getRetBlockNode(cs);
+        return icfg->getRetICFGNode(cs);
     }
 
     /// Add and get IntraBlock ICFGNode
     IntraICFGNode* getOrAddIntraBlockICFGNode(const Instruction* inst)
     {
-        return icfg->getIntraBlockNode(inst);
+        return icfg->getIntraICFGNode(inst);
     }
 };
 

package/SVF-linux/include/SVF-FE/SVFIRBuilder.h

@@ -348,7 +348,7 @@ public:
     {
         IntraICFGNode* node;
         if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(curVal))
-            node = pag->getICFG()->getIntraBlockNode(inst);
+            node = pag->getICFG()->getIntraICFGNode(inst);
         else
             node = nullptr;
         StoreStmt *edge = pag->addStoreStmt(src, dst, node);

package/SVF-osx/include/Graphs/ICFG.h

@@ -163,19 +163,19 @@ public:
     /// Get a basic block ICFGNode
     /// TODO:: need to fix the assertions
     //@{
-    ICFGNode* getBlockICFGNode(const Instruction* inst);
+    ICFGNode* getICFGNode(const Instruction* inst);
 
-    CallICFGNode* getCallBlockNode(const Instruction* inst);
+    CallICFGNode* getCallICFGNode(const Instruction* inst);
 
-    RetICFGNode* getRetBlockNode(const Instruction* inst);
+    RetICFGNode* getRetICFGNode(const Instruction* inst);
 
-    IntraICFGNode* getIntraBlockNode(const Instruction* inst);
+    IntraICFGNode* getIntraICFGNode(const Instruction* inst);
 
-    FunEntryICFGNode* getFunEntryBlockNode(const SVFFunction*  fun);
+    FunEntryICFGNode* getFunEntryICFGNode(const SVFFunction*  fun);
 
-    FunExitICFGNode* getFunExitBlockNode(const SVFFunction*  fun);
+    FunExitICFGNode* getFunExitICFGNode(const SVFFunction*  fun);
 
-    inline GlobalICFGNode* getGlobalBlockNode() const
+    inline GlobalICFGNode* getGlobalICFGNode() const
     {
         return globalBlockNode;
     }
@@ -184,14 +184,14 @@ public:
 private:
 	
     /// Get/Add IntraBlock ICFGNode
-    inline IntraICFGNode* getIntraBlockICFGNode(const Instruction* inst)
+    inline IntraICFGNode* getIntraBlock(const Instruction* inst)
     {
         InstToBlockNodeMapTy::const_iterator it = InstToBlockNodeMap.find(inst);
         if (it == InstToBlockNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline IntraICFGNode* addIntraBlockICFGNode(const Instruction* inst)
+    inline IntraICFGNode* addIntraBlock(const Instruction* inst)
     {
         IntraICFGNode* sNode = new IntraICFGNode(totalICFGNode++,inst);
         addICFGNode(sNode);
@@ -200,14 +200,14 @@ private:
     }
 
     /// Get/Add a function entry node
-    inline FunEntryICFGNode* getFunEntryICFGNode(const SVFFunction* fun)
+    inline FunEntryICFGNode* getFunEntryBlock(const SVFFunction* fun)
     {
         FunToFunEntryNodeMapTy::const_iterator it = FunToFunEntryNodeMap.find(fun);
         if (it == FunToFunEntryNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline FunEntryICFGNode* addFunEntryICFGNode(const SVFFunction* fun)
+    inline FunEntryICFGNode* addFunEntryBlock(const SVFFunction* fun)
     {
         FunEntryICFGNode* sNode = new FunEntryICFGNode(totalICFGNode++,fun);
         addICFGNode(sNode);
@@ -216,14 +216,14 @@ private:
     }
 
     /// Get/Add a function exit node
-    inline FunExitICFGNode* getFunExitICFGNode(const SVFFunction* fun)
+    inline FunExitICFGNode* getFunExitBlock(const SVFFunction* fun)
     {
         FunToFunExitNodeMapTy::const_iterator it = FunToFunExitNodeMap.find(fun);
         if (it == FunToFunExitNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline FunExitICFGNode* addFunExitICFGNode(const SVFFunction* fun)
+    inline FunExitICFGNode* addFunExitBlock(const SVFFunction* fun)
     {
         FunExitICFGNode* sNode = new FunExitICFGNode(totalICFGNode++, fun);
         addICFGNode(sNode);
@@ -232,14 +232,14 @@ private:
     }
 
     /// Get/Add a call node
-    inline CallICFGNode* addCallICFGNode(const Instruction* cs)
+    inline CallICFGNode* addCallBlock(const Instruction* cs)
     {
         CallICFGNode* sNode = new CallICFGNode(totalICFGNode++, cs);
         addICFGNode(sNode);
         CSToCallNodeMap[cs] = sNode;
         return sNode;
     }
-    inline CallICFGNode* getCallICFGNode(const Instruction* cs)
+    inline CallICFGNode* getCallBlock(const Instruction* cs)
     {
         CSToCallNodeMapTy::const_iterator it = CSToCallNodeMap.find(cs);
         if (it == CSToCallNodeMap.end())
@@ -248,16 +248,16 @@ private:
     }
 
     /// Get/Add a return node
-    inline RetICFGNode* getRetICFGNode(const Instruction* cs)
+    inline RetICFGNode* getRetBlock(const Instruction* cs)
     {
         CSToRetNodeMapTy::const_iterator it = CSToRetNodeMap.find(cs);
         if (it == CSToRetNodeMap.end())
             return nullptr;
         return it->second;
     }
-    inline RetICFGNode* addRetICFGNode(const Instruction* cs)
+    inline RetICFGNode* addRetBlock(const Instruction* cs)
     {
-        CallICFGNode* callBlockNode = getCallBlockNode(cs);
+        CallICFGNode* callBlockNode = getCallICFGNode(cs);
         RetICFGNode* sNode = new RetICFGNode(totalICFGNode++, cs, callBlockNode);
         callBlockNode->setRetICFGNode(sNode);
         addICFGNode(sNode);

package/SVF-osx/include/Graphs/ICFGNode.h

@@ -384,7 +384,7 @@ public:
     }
 
     /// Return callsite
-    inline const RetICFGNode* getRetICFGNode() const
+    inline const RetICFGNode* getRetBlock() const
     {
     	assert(ret && "RetICFGNode not set?");
         return ret;
@@ -477,7 +477,7 @@ public:
         return cs;
     }
 
-    inline const CallICFGNode* getCallBlockNode() const
+    inline const CallICFGNode* getCallICFGNode() const
     {
         return callBlockNode;
     }

package/SVF-osx/include/Graphs/SVFG.h

@@ -397,7 +397,7 @@ protected:
     inline void addFormalINSVFGNode(const FunEntryICFGNode* funEntry,  const MRVer* resVer, const NodeID nodeId)
     {
         FormalINSVFGNode* sNode = new FormalINSVFGNode(nodeId, resVer, funEntry);
-        addSVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(funEntry->getFun()));
+        addSVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(funEntry->getFun()));
         setDef(resVer,sNode);
         funToFormalINMap[funEntry->getFun()].set(sNode->getId());
     }
@@ -406,7 +406,7 @@ protected:
     inline void addFormalOUTSVFGNode(const FunExitICFGNode* funExit, const MRVer* ver, const NodeID nodeId)
     {
         FormalOUTSVFGNode* sNode = new FormalOUTSVFGNode(nodeId, ver, funExit);
-        addSVFGNode(sNode,pag->getICFG()->getFunExitBlockNode(funExit->getFun()));
+        addSVFGNode(sNode,pag->getICFG()->getFunExitICFGNode(funExit->getFun()));
         funToFormalOUTMap[funExit->getFun()].set(sNode->getId());
     }
 
@@ -414,7 +414,7 @@ protected:
     inline void addActualINSVFGNode(const CallICFGNode* callsite, const MRVer* ver, const NodeID nodeId)
     {
         ActualINSVFGNode* sNode = new ActualINSVFGNode(nodeId, callsite, ver);
-        addSVFGNode(sNode,pag->getICFG()->getCallBlockNode(callsite->getCallSite()));
+        addSVFGNode(sNode,pag->getICFG()->getCallICFGNode(callsite->getCallSite()));
         callSiteToActualINMap[callsite].set(sNode->getId());
     }
 
@@ -422,7 +422,7 @@ protected:
     inline void addActualOUTSVFGNode(const CallICFGNode* callsite, const MRVer* resVer, const NodeID nodeId)
     {
         ActualOUTSVFGNode* sNode = new ActualOUTSVFGNode(nodeId, callsite, resVer);
-        addSVFGNode(sNode, pag->getICFG()->getRetBlockNode(callsite->getCallSite()));
+        addSVFGNode(sNode, pag->getICFG()->getRetICFGNode(callsite->getCallSite()));
         setDef(resVer,sNode);
         callSiteToActualOUTMap[callsite].set(sNode->getId());
     }

package/SVF-osx/include/Graphs/SVFGOPT.h

@@ -244,7 +244,7 @@ private:
     inline InterPHISVFGNode* addInterPHIForFP(const FormalParmSVFGNode* fp)
     {
         InterPHISVFGNode* sNode = new InterPHISVFGNode(totalVFGNode++,fp);
-        addSVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(fp->getFun()));
+        addSVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(fp->getFun()));
         resetDef(fp->getParam(),sNode);
         return sNode;
     }
@@ -252,7 +252,7 @@ private:
     inline InterPHISVFGNode* addInterPHIForAR(const ActualRetSVFGNode* ar)
     {
         InterPHISVFGNode* sNode = new InterPHISVFGNode(totalVFGNode++,ar);
-        addSVFGNode(sNode, pag->getICFG()->getRetBlockNode(ar->getCallSite()->getCallSite()));
+        addSVFGNode(sNode, pag->getICFG()->getRetICFGNode(ar->getCallSite()->getCallSite()));
         resetDef(ar->getRev(),sNode);
         return sNode;
     }

package/SVF-osx/include/Graphs/VFG.h

@@ -479,7 +479,7 @@ protected:
     inline void addNullPtrVFGNode(const PAGNode* pagNode)
     {
         NullPtrVFGNode* sNode = new NullPtrVFGNode(totalVFGNode++,pagNode);
-        addVFGNode(sNode, pag->getICFG()->getGlobalBlockNode());
+        addVFGNode(sNode, pag->getICFG()->getGlobalICFGNode());
         setDef(pagNode,sNode);
     }
     /// Add an Address VFG node
@@ -524,7 +524,7 @@ protected:
     inline void addActualParmVFGNode(const PAGNode* aparm, const CallICFGNode* cs)
     {
         ActualParmVFGNode* sNode = new ActualParmVFGNode(totalVFGNode++,aparm,cs);
-        addVFGNode(sNode, pag->getICFG()->getCallBlockNode(cs->getCallSite()));
+        addVFGNode(sNode, pag->getICFG()->getCallICFGNode(cs->getCallSite()));
         PAGNodeToActualParmMap[std::make_pair(aparm->getId(),cs)] = sNode;
         /// do not set def here, this node is not a variable definition
     }
@@ -532,7 +532,7 @@ protected:
     inline void addFormalParmVFGNode(const PAGNode* fparm, const SVFFunction* fun, CallPESet& callPEs)
     {
         FormalParmVFGNode* sNode = new FormalParmVFGNode(totalVFGNode++,fparm,fun);
-        addVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(fun));
+        addVFGNode(sNode, pag->getICFG()->getFunEntryICFGNode(fun));
         for(CallPESet::const_iterator it = callPEs.begin(), eit=callPEs.end();
                 it!=eit; ++it)
             sNode->addCallPE(*it);
@@ -546,7 +546,7 @@ protected:
     inline void addFormalRetVFGNode(const PAGNode* uniqueFunRet, const SVFFunction* fun, RetPESet& retPEs)
     {
 		FormalRetVFGNode *sNode = new FormalRetVFGNode(totalVFGNode++, uniqueFunRet, fun);
-		addVFGNode(sNode, pag->getICFG()->getFunExitBlockNode(fun));
+		addVFGNode(sNode, pag->getICFG()->getFunExitICFGNode(fun));
 		for (RetPESet::const_iterator it = retPEs.begin(), eit = retPEs.end(); it != eit; ++it)
 			sNode->addRetPE(*it);
 
@@ -564,7 +564,7 @@ protected:
     inline void addActualRetVFGNode(const PAGNode* ret,const CallICFGNode* cs)
     {
         ActualRetVFGNode* sNode = new ActualRetVFGNode(totalVFGNode++,ret,cs);
-        addVFGNode(sNode, pag->getICFG()->getRetBlockNode(cs->getCallSite()));
+        addVFGNode(sNode, pag->getICFG()->getRetICFGNode(cs->getCallSite()));
         setDef(ret,sNode);
         PAGNodeToActualRetMap[ret] = sNode;
     }

package/SVF-osx/include/MTA/LockResultValidator.h

@@ -35,7 +35,7 @@ public:
 private:
 	// Get CallICFGNode
 	inline CallICFGNode* getCBN(const Instruction* inst) {
-		return _la->getTCT()->getCallBlockNode(inst);
+		return _la->getTCT()->getCallICFGNode(inst);
 	}
 	const Instruction *getPreviousMemoryAccessInst( const Instruction *I) {
         I = I->getPrevNode();

package/SVF-osx/include/MTA/MHP.h

@@ -63,7 +63,7 @@ public:
 	
 	// Get CallICFGNode
 	inline CallICFGNode* getCBN(const Instruction* inst) {
-		return tct->getCallBlockNode(inst);
+		return tct->getCallICFGNode(inst);
 	}
 
     /// Whether the function is connected from main function in thread call graph
@@ -381,7 +381,7 @@ private:
     }
     // Get CallICFGNode
 	inline CallICFGNode* getCBN(const Instruction* inst) {
-		return tct->getCallBlockNode(inst);
+		return tct->getCallICFGNode(inst);
 	}
     /// Mark thread flags for cxtStmt
     //@{

package/SVF-osx/include/MTA/PCG.h

@@ -123,8 +123,8 @@ public:
     {
     }
 	
-	CallICFGNode* getCallBlockNode(const Instruction* inst) {
-		return pta->getICFG()->getCallBlockNode(inst);
+	CallICFGNode* getCallICFGNode(const Instruction* inst) {
+		return pta->getICFG()->getCallICFGNode(inst);
 	}
 	const SVFFunction* getSVFFun(const Function* fun) const {
 		return LLVMModuleSet::getLLVMModuleSet()->getSVFFunction(fun);

package/SVF-osx/include/MTA/TCT.h

@@ -148,8 +148,8 @@ public:
         destroy();
     }
     /// Get CallICFGNode given inst
-    CallICFGNode* getCallBlockNode(const Instruction* inst) {
-		return pta->getICFG()->getCallBlockNode(inst);
+    CallICFGNode* getCallICFGNode(const Instruction* inst) {
+		return pta->getICFG()->getCallICFGNode(inst);
 	}
 	/// Get SVFFuntion given Function 
 	const SVFFunction* getSVFFun(const Function* fun) const {

package/SVF-osx/include/MemoryModel/SVFIR.h

@@ -493,14 +493,14 @@ private:
     /// Add function arguments
     inline void addFunArgs(const SVFFunction* fun, const SVFVar* arg)
     {
-        FunEntryICFGNode* funEntryBlockNode = icfg->getFunEntryBlockNode(fun);
+        FunEntryICFGNode* funEntryBlockNode = icfg->getFunEntryICFGNode(fun);
         funEntryBlockNode->addFormalParms(arg);
         funArgsListMap[fun].push_back(arg);
     }
     /// Add function returns
     inline void addFunRet(const SVFFunction* fun, const SVFVar* ret)
     {
-        FunExitICFGNode* funExitBlockNode = icfg->getFunExitBlockNode(fun);
+        FunExitICFGNode* funExitBlockNode = icfg->getFunExitICFGNode(fun);
         funExitBlockNode->addFormalRet(ret);
         funRetMap[fun] = ret;
     }

package/SVF-osx/include/MemoryModel/SVFStatements.h

@@ -437,12 +437,20 @@ public:
         assert(isVariantFieldGep()==false && "Can't retrieve the LocationSet if using a variable field index (pointer arithmetic) for struct field access ");
         return ls;
     }
-
+    inline const LocationSet::OffsetValueVec& getOffsetValueVec() const
+    {
+        return getLocationSet().getOffsetValueVec();
+    }
+    /// Return TRUE if this is a constant location set.
+    inline bool isConstantOffset() const{
+        return getLocationSet().isConstantOffset();
+    }
+    /// Return accumulated constant offset (when accessing array or struct) if this offset is a constant.
     inline s64_t accumulateConstantOffset() const
     {
-        return ls.accumulateConstantOffset();
+        return getLocationSet().accumulateConstantOffset();
     }
-    /// offset of the gep statement
+    /// Field index of the gep statement if it access the field of a struct
     inline s64_t getConstantFieldIdx() const
     {
         return getLocationSet().accumulateConstantFieldIdx();

package/SVF-osx/include/MemoryModel/SymbolTableInfo.h

@@ -344,18 +344,7 @@ public:
     /// Get struct info
     //@{
     ///Get an iterator for StructInfo, designed as internal methods
-    TypeToFieldInfoMap::iterator getStructInfoIter(const Type *T)
-    {
-        assert(T);
-        TypeToFieldInfoMap::iterator it = typeToFieldInfo.find(T);
-        if (it != typeToFieldInfo.end())
-            return it;
-        else
-        {
-            collectTypeInfo(T);
-            return typeToFieldInfo.find(T);
-        }
-    }
+    TypeToFieldInfoMap::iterator getStructInfoIter(const Type *T);
 
     ///Get a reference to StructInfo.
     inline StInfo* getStructInfo(const Type *T)
@@ -364,8 +353,12 @@ public:
     }
 
     ///Get a reference to the components of struct_info.
-    /// Flatterned full offset information of a struct including its array fields 
-    const std::vector<u32_t>& getFlattenedOffsetVec(const StructType *T);
+    /// Number of flattenned elements of an array or struct
+    const u32_t getNumOfFlattenElements(const Type *T);
+    /// Number of flattenned fields of a struct
+    const u32_t getNumOfFlattenFields(const StructType *T);
+    /// Flatterned element idx of an array or struct by considering stride
+    const std::vector<u32_t>& getFlattenedElemIdxVec(const Type *T);
     /// Flatterned field index information of a struct ignoring any array field
     const std::vector<u32_t>& getFlattenedFieldIdxVec(const StructType *T);
 
@@ -513,14 +506,18 @@ class StInfo
 private:
     /// flattened field indices of a struct (ignoring arrays)
     std::vector<u32_t> fldIdxVec;
-    /// flattened full offset (including array strides)
-    std::vector<u32_t> fullOffsetVec;
+    /// flattened element indices including structs and arrays by considering strides
+    std::vector<u32_t> elemIdxVec;
     /// Types of all fields of a struct
     Map<u32_t, const Type*> fldIdx2TypeMap;
     /// All field infos after flattening a struct
     std::vector<FlattenedFieldInfo> finfo;
     /// stride represents the number of repetitive elements if this StInfo represent an ArrayType. stride is 1 by default.
     u32_t stride; 
+    /// number of elements after flattenning (including array elements)
+    u32_t numOfFlattenElements; 
+    /// number of fields after flattenning (ignoring array elements)
+    u32_t numOfFlattenFields; 
     /// Max field limit
     static u32_t maxFieldLimit;
 
@@ -530,7 +527,7 @@ private:
 
 public:
     /// Constructor
-    StInfo(u32_t s) : stride(s)
+    StInfo(u32_t s) : stride(s), numOfFlattenElements(s), numOfFlattenFields(s)
     {
     }
     /// Destructor
@@ -552,28 +549,16 @@ public:
     ///  OriginalFieldType of b with field_idx 1 : Struct A
     ///  FlatternedFieldType of b with field_idx 1 : int
     //{@
-    inline const Type* getOriginalFieldType(u32_t fldIdx)
-    {
-        Map<u32_t, const Type*>::const_iterator it = fldIdx2TypeMap.find(fldIdx);
-        if(it!=fldIdx2TypeMap.end())
-            return it->second;
-        return nullptr;
-    }
-    inline const Type* getFlatternedFieldType(u32_t fldIdx)
-    {
-        for(FlattenedFieldInfo& fallenedFld : finfo){
-            if(fallenedFld.getFlattenFldIdx() == fldIdx)
-                return fallenedFld.getFlattenElemTy();
-        }
-        return nullptr;
-    }
+    const Type* getOriginalFieldType(u32_t fldIdx);
+    const Type* getFlatternedFieldType(u32_t fldIdx);
+
     inline std::vector<u32_t>& getFlattenedFieldIdxVec()
     {
         return fldIdxVec;
     }
-    inline std::vector<u32_t>& getFlattenedOffsetVec()
+    inline std::vector<u32_t>& getFlattenedElemIdxVec()
     {
-        return fullOffsetVec;
+        return elemIdxVec;
     }
     inline std::vector<FlattenedFieldInfo>& getFlattenedFieldInfoVec()
     {
@@ -581,16 +566,27 @@ public:
     }
     //@}
 
-    /// Add field (index and offset) with its corresponding type
-    inline void addFldWithType(u32_t fldIdx, const Type* type, u32_t fullOffset)
+    /// Add field index and element index and their corresponding type
+    void addFldWithType(u32_t fldIdx, const Type* type, u32_t elemIdx);
+
+    /// Set number of fields and elements of an aggrate
+    inline void setNumOfFieldsAndElems(u32_t nf, u32_t ne)
     {
-        fldIdxVec.push_back(fldIdx);
-        fullOffsetVec.push_back(fullOffset);
-        fldIdx2TypeMap[fldIdx] = type;
+        numOfFlattenFields = nf;
+        numOfFlattenElements = ne;
     }
 
-    /// Array Type can have 
-    inline u32_t getStride() const {
+    /// Return number of elements after flattenning (including array elements)
+    inline u32_t getNumOfFlattenElements() const {
+        return numOfFlattenElements;
+    }
+
+    /// Return the number of fields after flattenning (ignoring array elements)
+    inline u32_t getNumOfFlattenFields() const {
+        return numOfFlattenFields;
+    }
+    /// Return the stride
+    inline u32_t getStride() const{
         return stride;
     }
 };

package/SVF-osx/include/SVF-FE/ICFGBuilder.h

@@ -84,20 +84,20 @@ private:
     void addICFGInterEdges(const Instruction*  cs, const SVFFunction*  callee);
 
     /// Add a call node
-    inline CallICFGNode* getOrAddCallICFGNode(const Instruction*  cs)
+    inline CallICFGNode* getCallICFGNode(const Instruction*  cs)
     {
-        return icfg->getCallBlockNode(cs);
+        return icfg->getCallICFGNode(cs);
     }
     /// Add a return node
-    inline RetICFGNode* getOrAddRetICFGNode(const Instruction*  cs)
+    inline RetICFGNode* getRetICFGNode(const Instruction*  cs)
     {
-        return icfg->getRetBlockNode(cs);
+        return icfg->getRetICFGNode(cs);
     }
 
     /// Add and get IntraBlock ICFGNode
     IntraICFGNode* getOrAddIntraBlockICFGNode(const Instruction* inst)
     {
-        return icfg->getIntraBlockNode(inst);
+        return icfg->getIntraICFGNode(inst);
     }
 };
 

package/SVF-osx/include/SVF-FE/SVFIRBuilder.h

@@ -348,7 +348,7 @@ public:
     {
         IntraICFGNode* node;
         if(const Instruction* inst = SVFUtil::dyn_cast<Instruction>(curVal))
-            node = pag->getICFG()->getIntraBlockNode(inst);
+            node = pag->getICFG()->getIntraICFGNode(inst);
         else
             node = nullptr;
         StoreStmt *edge = pag->addStoreStmt(src, dst, node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.816",
+  "version": "1.0.820",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {