svf-tools 1.0.331 → 1.0.335

package/include/MemoryModel/SVFVariables.h

@@ -45,6 +45,9 @@ class SVFVar;
 typedef GenericNode<SVFVar,SVFStmt> GenericPAGNodeTy;
 class SVFVar : public GenericPAGNodeTy
 {
+friend class IRGraph;
+friend class SVFIR;
+friend class VFG;
 
 public:
     /// Nine kinds of SVFIR variables
@@ -162,13 +165,11 @@ public:
     {
         return InEdgeKindToSetMap[kind];
     }
-
     /// Get outgoing SVFIR statements (edges)
     inline SVFStmt::SVFStmtSetTy& getOutgoingEdges(SVFStmt::PEDGEK kind)
     {
         return OutEdgeKindToSetMap[kind];
     }
-
     /// Has incoming SVFIR statements (edges)
     inline bool hasIncomingEdges(SVFStmt::PEDGEK kind) const
     {
@@ -178,18 +179,16 @@ public:
         else
             return false;
     }
-
-    /// Has incoming VariantGepEdges
-    inline bool hasIncomingVariantGepEdge() const
+    /// Has outgoing SVFIR statements (edges)
+    inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
     {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
-        if (it != InEdgeKindToSetMap.end())
-        {
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
+        if (it != OutEdgeKindToSetMap.end())
             return (!it->second.empty());
-        }
-        return false;
+        else
+            return false;
     }
-
+    
     /// Get incoming SVFStmt iterator
     inline SVFStmt::SVFStmtSetTy::iterator getIncomingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
@@ -206,16 +205,6 @@ public:
         return it->second.end();
     }
 
-    /// Has outgoing SVFIR statements (edges)
-    inline bool hasOutgoingEdges(SVFStmt::PEDGEK kind) const
-    {
-        SVFStmt::KindToSVFStmtMapTy::const_iterator it = OutEdgeKindToSetMap.find(kind);
-        if (it != OutEdgeKindToSetMap.end())
-            return (!it->second.empty());
-        else
-            return false;
-    }
-
     /// Get outgoing SVFStmt iterator
     inline SVFStmt::SVFStmtSetTy::iterator getOutgoingEdgesBegin(SVFStmt::PEDGEK kind) const
     {
@@ -233,6 +222,7 @@ public:
     }
     //@}
 
+private:
     ///  add methods of the components
     //@{
     inline void addInEdge(SVFStmt* inEdge)
@@ -248,7 +238,18 @@ public:
         OutEdgeKindToSetMap[kind].insert(outEdge);
         addOutgoingEdge(outEdge);
     }
+    /// Has incoming VariantGepEdges
+    inline bool hasIncomingVariantGepEdge() const
+    {
+        SVFStmt::KindToSVFStmtMapTy::const_iterator it = InEdgeKindToSetMap.find(SVFStmt::VariantGep);
+        if (it != InEdgeKindToSetMap.end())
+        {
+            return (!it->second.empty());
+        }
+        return false;
+    }
 
+public:
     virtual const std::string toString() const;
 
     /// Dump to console for debugging
@@ -417,17 +418,17 @@ public:
     }
 
     /// offset of the base value variable
-    inline u32_t getOffset() const
+    inline u32_t getFieldOffset() const
     {
-        return ls.accumulateConstantOffset();
+        return ls.accumulateConstantFieldIdx();
     }
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::utostr(getOffset());
-        return "offset_" + llvm::utostr(getOffset());
+            return value->getName().str() + "_" + llvm::utostr(getFieldOffset());
+        return "offset_" + llvm::utostr(getFieldOffset());
     }
 
     inline const Type* getType() const
@@ -492,9 +493,9 @@ public:
     }
 
     /// offset of the mem object
-    inline u32_t getOffset() const
+    inline u32_t getFieldOffset() const
     {
-        return ls.accumulateConstantOffset();
+        return ls.accumulateConstantFieldIdx();
     }
 
     /// Set the base object from which this GEP node came from.
@@ -512,15 +513,15 @@ public:
     /// Return the type of this gep object
     inline virtual const Type* getType() const
     {
-        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantOffset());
+        return SymbolTableInfo::SymbolInfo()->getOriginalFieldType(mem->getType(), ls.accumulateConstantFieldIdx());
     }
 
     /// Return name of a LLVM value
     inline const std::string getValueName() const
     {
         if (value && value->hasName())
-            return value->getName().str() + "_" + llvm::itostr(ls.accumulateConstantOffset());
-        return "offset_" + llvm::itostr(ls.accumulateConstantOffset());
+            return value->getName().str() + "_" + llvm::itostr(ls.accumulateConstantFieldIdx());
+        return "offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
     }
 
     virtual const std::string toString() const;

package/include/SVF-FE/DCHG.h

@@ -46,18 +46,18 @@ public:
     {
     }
 
-    unsigned int getOffset(void) const
+    u32_t getFieldOffset(void) const
     {
         return offset;
     }
 
-    void setOffset(unsigned int offset)
+    void setOffset(u32_t offset)
     {
         this->offset = offset;
     }
 
 private:
-    unsigned int offset;
+    u32_t offset;
 };
 
 class DCHNode : public GenericNode<DCHNode, DCHEdge>

package/include/SVF-FE/SVFIRBuilder.h

@@ -381,9 +381,9 @@ public:
         return edge;
     }
     /// Add Variant(Gep) edge
-    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst)
+    inline VariantGepStmt* addVariantGepEdge(NodeID src, NodeID dst, const LocationSet& ls)
     {
-        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst);
+        VariantGepStmt *edge = pag->addVariantGepStmt(src, dst, ls);
         setCurrentBBAndValueForPAGEdge(edge);
         return edge;
     }

package/include/Util/IRAnnotator.h

@@ -64,7 +64,7 @@ private:
     void writePAGgepNode(SVF::NodeID nodeId, GepObjVar* gepNode)
     {
         auto baseNodeId = gepNode->getBaseNode();
-        auto locationSetOffset = gepNode->getOffset();
+        auto locationSetOffset = gepNode->getFieldOffset();
 
         LLVMContext &context = mainModule->getContext();
         llvm::SmallVector<llvm::Metadata *, 32> operands;

package/lib/Graphs/ConsG.cpp

@@ -53,16 +53,16 @@ void ConstraintGraph::buildCG()
     for (PAGEdge::SVFStmtSetTy::iterator iter = addrs.begin(), eiter =
                 addrs.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addAddrCGEdge(edge->getSrcID(),edge->getDstID());
+        const AddrStmt* edge = SVFUtil::cast<AddrStmt>(*iter);
+        addAddrCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
     PAGEdge::SVFStmtSetTy& copys = getPAGEdgeSet(PAGEdge::Copy);
     for (PAGEdge::SVFStmtSetTy::iterator iter = copys.begin(), eiter =
                 copys.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addCopyCGEdge(edge->getSrcID(),edge->getDstID());
+        const CopyStmt* edge = SVFUtil::cast<CopyStmt>(*iter);
+        addCopyCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
     PAGEdge::SVFStmtSetTy& phis = getPAGEdgeSet(PAGEdge::Phi);
@@ -78,32 +78,32 @@ void ConstraintGraph::buildCG()
     for (PAGEdge::SVFStmtSetTy::iterator iter = calls.begin(), eiter =
                 calls.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addCopyCGEdge(edge->getSrcID(),edge->getDstID());
+        const CallPE* edge = SVFUtil::cast<CallPE>(*iter);
+        addCopyCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
     PAGEdge::SVFStmtSetTy& rets = getPAGEdgeSet(PAGEdge::Ret);
     for (PAGEdge::SVFStmtSetTy::iterator iter = rets.begin(), eiter =
                 rets.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addCopyCGEdge(edge->getSrcID(),edge->getDstID());
+        const RetPE* edge = SVFUtil::cast<RetPE>(*iter);
+        addCopyCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
     PAGEdge::SVFStmtSetTy& tdfks = getPAGEdgeSet(PAGEdge::ThreadFork);
     for (PAGEdge::SVFStmtSetTy::iterator iter = tdfks.begin(), eiter =
                 tdfks.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addCopyCGEdge(edge->getSrcID(),edge->getDstID());
+        const TDForkPE* edge = SVFUtil::cast<TDForkPE>(*iter);
+        addCopyCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
     PAGEdge::SVFStmtSetTy& tdjns = getPAGEdgeSet(PAGEdge::ThreadJoin);
     for (PAGEdge::SVFStmtSetTy::iterator iter = tdjns.begin(), eiter =
                 tdjns.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addCopyCGEdge(edge->getSrcID(),edge->getDstID());
+        const TDJoinPE* edge = SVFUtil::cast<TDJoinPE>(*iter);
+        addCopyCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
     PAGEdge::SVFStmtSetTy& ngeps = getPAGEdgeSet(PAGEdge::NormalGep);
@@ -111,7 +111,7 @@ void ConstraintGraph::buildCG()
                 ngeps.end(); iter != eiter; ++iter)
     {
         NormalGepStmt* edge = SVFUtil::cast<NormalGepStmt>(*iter);
-        addNormalGepCGEdge(edge->getSrcID(),edge->getDstID(),edge->getLocationSet());
+        addNormalGepCGEdge(edge->getRHSVarID(),edge->getLHSVarID(),edge->getLocationSet());
     }
 
     PAGEdge::SVFStmtSetTy& vgeps = getPAGEdgeSet(PAGEdge::VariantGep);
@@ -119,23 +119,23 @@ void ConstraintGraph::buildCG()
                 vgeps.end(); iter != eiter; ++iter)
     {
         VariantGepStmt* edge = SVFUtil::cast<VariantGepStmt>(*iter);
-        addVariantGepCGEdge(edge->getSrcID(),edge->getDstID());
+        addVariantGepCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
-    PAGEdge::SVFStmtSetTy& stores = getPAGEdgeSet(PAGEdge::Load);
-    for (PAGEdge::SVFStmtSetTy::iterator iter = stores.begin(), eiter =
-                stores.end(); iter != eiter; ++iter)
+    PAGEdge::SVFStmtSetTy& loads = getPAGEdgeSet(PAGEdge::Load);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = loads.begin(), eiter =
+                loads.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addLoadCGEdge(edge->getSrcID(),edge->getDstID());
+        LoadStmt* edge = SVFUtil::cast<LoadStmt>(*iter);
+        addLoadCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 
-    PAGEdge::SVFStmtSetTy& loads = getPAGEdgeSet(PAGEdge::Store);
-    for (PAGEdge::SVFStmtSetTy::iterator iter = loads.begin(), eiter =
-                loads.end(); iter != eiter; ++iter)
+    PAGEdge::SVFStmtSetTy& stores = getPAGEdgeSet(PAGEdge::Store);
+    for (PAGEdge::SVFStmtSetTy::iterator iter = stores.begin(), eiter =
+                stores.end(); iter != eiter; ++iter)
     {
-        PAGEdge* edge = *iter;
-        addStoreCGEdge(edge->getSrcID(),edge->getDstID());
+        StoreStmt* edge = SVFUtil::cast<StoreStmt>(*iter);
+        addStoreCGEdge(edge->getRHSVarID(),edge->getLHSVarID());
     }
 }
 
@@ -562,7 +562,7 @@ void ConstraintGraph::print()
         }
         else if (NormalGepCGEdge* ngep = SVFUtil::dyn_cast<NormalGepCGEdge>(*iter))
         {
-            outs() << ngep->getSrcID() << " -- NormalGep (" << ngep->getOffset()
+            outs() << ngep->getSrcID() << " -- NormalGep (" << ngep->getFieldOffset()
                    << ") --> " << ngep->getDstID() << "\n";
         }
         else if (VariantGepCGEdge* vgep = SVFUtil::dyn_cast<VariantGepCGEdge>(*iter))

package/lib/Graphs/VFG.cpp

@@ -389,7 +389,7 @@ void VFG::addVFGNodes()
                 forks.end(); iter != eiter; ++iter)
     {
         TDForkPE* forkedge = SVFUtil::cast<TDForkPE>(*iter);
-        addActualParmVFGNode(forkedge->getSrcNode(),forkedge->getCallSite());
+        addActualParmVFGNode(forkedge->getRHSVar(),forkedge->getCallSite());
     }
 
     // initialize actual parameter nodes
@@ -435,7 +435,7 @@ void VFG::addVFGNodes()
                             param->getIncomingEdgesEnd(PAGEdge::Call); cit != ecit; ++cit)
                 {
                     CallPE* callPE = SVFUtil::cast<CallPE>(*cit);
-                    if (isInterestedPAGNode(callPE->getSrcNode()))
+                    if (isInterestedPAGNode(callPE->getRHSVar()))
                         callPEs.insert(callPE);
                 }
             }
@@ -455,7 +455,7 @@ void VFG::addVFGNodes()
                         ecit = varParam->getIncomingEdgesEnd(PAGEdge::Call); cit!=ecit; ++cit)
                 {
                     CallPE* callPE = SVFUtil::cast<CallPE>(*cit);
-                    if(isInterestedPAGNode(callPE->getSrcNode()))
+                    if(isInterestedPAGNode(callPE->getRHSVar()))
                         callPEs.insert(callPE);
                 }
             }
@@ -478,7 +478,7 @@ void VFG::addVFGNodes()
                     cit != ecit; ++cit)
             {
                 const RetPE* retPE = SVFUtil::cast<RetPE>(*cit);
-                if (isInterestedPAGNode(retPE->getDstNode()))
+                if (isInterestedPAGNode(retPE->getLHSVar()))
                     retPEs.insert(retPE);
             }
         }
@@ -667,7 +667,7 @@ void VFG::connectDirectVFGEdges()
                     it!=eit; ++it)
             {
                 const CallBlockNode* cs = (*it)->getCallSite();
-                ActualParmVFGNode* acutalParm = getActualParmVFGNode((*it)->getSrcNode(),cs);
+                ActualParmVFGNode* acutalParm = getActualParmVFGNode((*it)->getRHSVar(),cs);
                 addInterEdgeFromAPToFP(acutalParm,formalParm,getCallSiteID(cs, formalParm->getFun()));
             }
         }
@@ -679,7 +679,7 @@ void VFG::connectDirectVFGEdges()
             /// connect formal ret to actual ret
             for(RetPESet::const_iterator it = calleeRet->retPEBegin(), eit = calleeRet->retPEEnd(); it!=eit; ++it)
             {
-                ActualRetVFGNode* callsiteRev = getActualRetVFGNode((*it)->getDstNode());
+                ActualRetVFGNode* callsiteRev = getActualRetVFGNode((*it)->getLHSVar());
                 const CallBlockNode* retBlockNode = (*it)->getCallSite();
                 CallBlockNode* callBlockNode = pag->getICFG()->getCallBlockNode(retBlockNode->getCallSite());
                 addInterEdgeFromFRToAR(calleeRet,callsiteRev, getCallSiteID(callBlockNode, calleeRet->getFun()));
@@ -697,8 +697,8 @@ void VFG::connectDirectVFGEdges()
                 forks.end(); iter != eiter; ++iter)
         {
             TDForkPE* forkedge = SVFUtil::cast<TDForkPE>(*iter);
-            ActualParmVFGNode* acutalParm = getActualParmVFGNode(forkedge->getSrcNode(),forkedge->getCallSite());
-            FormalParmVFGNode* formalParm = getFormalParmVFGNode(forkedge->getDstNode());
+            ActualParmVFGNode* acutalParm = getActualParmVFGNode(forkedge->getRHSVar(),forkedge->getCallSite());
+            FormalParmVFGNode* formalParm = getFormalParmVFGNode(forkedge->getLHSVar());
             addInterEdgeFromAPToFP(acutalParm,formalParm,getCallSiteID(forkedge->getCallSite(), formalParm->getFun()));
         }
         /// add join edge
@@ -707,8 +707,8 @@ void VFG::connectDirectVFGEdges()
                 joins.end(); iter != eiter; ++iter)
         {
             TDJoinPE* joinedge = SVFUtil::cast<TDJoinPE>(*iter);
-            NodeID callsiteRev = getDef(joinedge->getDstNode());
-            FormalRetVFGNode* calleeRet = getFormalRetVFGNode(joinedge->getSrcNode());
+            NodeID callsiteRev = getDef(joinedge->getLHSVar());
+            FormalRetVFGNode* calleeRet = getFormalRetVFGNode(joinedge->getRHSVar());
             addRetEdge(calleeRet->getId(),callsiteRev, getCallSiteID(joinedge->getCallSite(), calleeRet->getFun()));
         }
     }

package/lib/MSSA/MemRegion.cpp

@@ -198,7 +198,7 @@ void MRGenerator::collectModRefForLoadStore()
                     pagEdgeToFunMap[inst] = &fun;
                     if (const StoreStmt *st = SVFUtil::dyn_cast<StoreStmt>(inst))
                     {
-                        NodeBS cpts(pta->getPts(st->getDstID()).toNodeBS());
+                        NodeBS cpts(pta->getPts(st->getLHSVarID()).toNodeBS());
                         // TODO: change this assertion check later when we have conditional points-to set
                         if (cpts.empty())
                             continue;
@@ -208,7 +208,7 @@ void MRGenerator::collectModRefForLoadStore()
 
                     else if (const LoadStmt *ld = SVFUtil::dyn_cast<LoadStmt>(inst))
                     {
-                        NodeBS cpts(pta->getPts(ld->getSrcID()).toNodeBS());
+                        NodeBS cpts(pta->getPts(ld->getRHSVarID()).toNodeBS());
                         // TODO: change this assertion check later when we have conditional points-to set
                         if (cpts.empty())
                             continue;
@@ -611,7 +611,7 @@ bool MRGenerator::handleCallsiteModRef(NodeBS& mod, NodeBS& ref, const CallBlock
         {
             const PAGEdge* edge = *bit;
             if (const AddrStmt* addr = SVFUtil::dyn_cast<AddrStmt>(edge))
-                mod.set(addr->getSrcID());
+                mod.set(addr->getRHSVarID());
         }
     }
     /// otherwise, we find the mod/ref sets from the callee function, who has definition and been processed
@@ -678,7 +678,7 @@ NodeBS MRGenerator::getModInfoForCall(const CallBlockNode* cs)
         {
             const PAGEdge* edge = *bit;
             if (const StoreStmt* st = SVFUtil::dyn_cast<StoreStmt>(edge))
-                mods |= pta->getPts(st->getDstID()).toNodeBS();
+                mods |= pta->getPts(st->getLHSVarID()).toNodeBS();
         }
         return mods;
     }
@@ -702,7 +702,7 @@ NodeBS MRGenerator::getRefInfoForCall(const CallBlockNode* cs)
         {
             const PAGEdge* edge = *bit;
             if (const LoadStmt* ld = SVFUtil::dyn_cast<LoadStmt>(edge))
-                refs |= pta->getPts(ld->getSrcID()).toNodeBS();
+                refs |= pta->getPts(ld->getRHSVarID()).toNodeBS();
         }
         return refs;
     }

package/lib/MemoryModel/LocationSet.cpp

@@ -65,7 +65,7 @@ bool LocationSet::isConstantOffset() const
 NodeBS LocationSet::computeAllLocations() const
 {
     NodeBS result;
-    result.set(accumulateConstantOffset());
+    result.set(accumulateConstantFieldIdx());
     return result;
 }
 
@@ -96,7 +96,7 @@ std::string LocationSet::dump() const
     std::string str;
     raw_string_ostream rawstr(str);
 
-    rawstr << "LocationSet\tField_Index: " << accumulateConstantOffset();
+    rawstr << "LocationSet\tField_Index: " << accumulateConstantFieldIdx();
     rawstr << ",\tNum-Stride: {";
     const OffsetValueVec& vec = getOffsetValueVec();
     OffsetValueVec::const_iterator it = vec.begin();

package/lib/MemoryModel/PAGBuilderFromFile.cpp

@@ -171,7 +171,7 @@ void PAGBuilderFromFile::addEdge(NodeID srcID, NodeID dstID,
     else if (edge == "gep")
         pag->addNormalGepStmt(srcID, dstID, LocationSet(offsetOrCSId));
     else if (edge == "variant-gep")
-        pag->addVariantGepStmt(srcID, dstID);
+        pag->addVariantGepStmt(srcID, dstID, LocationSet(offsetOrCSId));
     else if (edge == "call")
         pag->addEdge(srcNode, dstNode, new CallPE(srcNode, dstNode, nullptr));
     else if (edge == "ret")

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -154,7 +154,7 @@ void BVDataPTAImpl::writeToFile(const string& filename)
         {
             F.os() << it->first << " ";
             F.os() << pag->getBaseObjVar(it->first) << " ";
-            F.os() << gepObjPN->getOffset() << "\n";
+            F.os() << gepObjPN->getFieldOffset() << "\n";
         }
     }
 

package/lib/MemoryModel/SVFIR.cpp

@@ -313,7 +313,7 @@ GepStmt* SVFIR::addGepStmt(NodeID src, NodeID dst, const LocationSet& ls, bool c
     {
         /// Since the offset from base to src is variant,
         /// the new gep edge being created is also a VariantGepStmt edge.
-        return addVariantGepStmt(src, dst);
+        return addVariantGepStmt(src, dst, ls);
     }
     else
     {
@@ -333,7 +333,7 @@ NormalGepStmt* SVFIR::addNormalGepStmt(NodeID src, NodeID dst, const LocationSet
         return SVFUtil::cast<NormalGepStmt>(edge);
     else
     {
-        NormalGepStmt* gepPE = new NormalGepStmt(baseNode, dstNode, ls+baseLS);
+        NormalGepStmt* gepPE = new NormalGepStmt(baseNode, dstNode, baseLS+ls);
         addToStmt2TypeMap(gepPE);
         addEdge(baseNode, dstNode, gepPE);
         return gepPE;
@@ -344,16 +344,16 @@ NormalGepStmt* SVFIR::addNormalGepStmt(NodeID src, NodeID dst, const LocationSet
  * Add variant(Gep) edge
  * Find the base node id of src and connect base node to dst node
  */
-VariantGepStmt* SVFIR::addVariantGepStmt(NodeID src, NodeID dst)
+VariantGepStmt* SVFIR::addVariantGepStmt(NodeID src, NodeID dst, const LocationSet& ls)
 {
-
+    const LocationSet& baseLS = getLocationSetFromBaseNode(src);
     SVFVar* baseNode = getGNode(getBaseValVar(src));
     SVFVar* dstNode = getGNode(dst);
     if(SVFStmt* edge = hasNonlabeledEdge(baseNode, dstNode, SVFStmt::VariantGep))
         return SVFUtil::cast<VariantGepStmt>(edge);
     else
     {
-        VariantGepStmt* gepPE = new VariantGepStmt(baseNode, dstNode);
+        VariantGepStmt* gepPE = new VariantGepStmt(baseNode, dstNode,baseLS+ls);
         addToStmt2TypeMap(gepPE);
         addEdge(baseNode, dstNode, gepPE);
         return gepPE;
@@ -413,7 +413,7 @@ NodeID SVFIR::getGepObjVar(const MemObj* obj, const LocationSet& ls)
     LocationSet newLS = SymbolTableInfo::SymbolInfo()->getModulusOffset(obj,ls);
 
     // Base and first field are the same memory location.
-    if (Options::FirstFieldEqBase && newLS.accumulateConstantOffset() == 0) return base;
+    if (Options::FirstFieldEqBase && newLS.accumulateConstantFieldIdx() == 0) return base;
 
     NodeLocationSetMap::iterator iter = GepObjVarMap.find(std::make_pair(base, newLS));
     if (iter == GepObjVarMap.end())
@@ -433,7 +433,7 @@ NodeID SVFIR::addGepObjNode(const MemObj* obj, const LocationSet& ls)
     assert(0==GepObjVarMap.count(std::make_pair(base, ls))
            && "this node should not be created before");
 
-    NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, ls.accumulateConstantOffset(), StInfo::getMaxFieldLimit());
+    NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, ls.accumulateConstantFieldIdx(), StInfo::getMaxFieldLimit());
     GepObjVarMap[std::make_pair(base, ls)] = gepId;
     GepObjVar *node = new GepObjVar(obj, gepId, ls);
     memToFieldsMap[base].set(gepId);
@@ -611,8 +611,8 @@ void SVFIR::print()
                 ngeps.end(); iter != eiter; ++iter)
     {
         NormalGepStmt* gep = SVFUtil::cast<NormalGepStmt>(*iter);
-        outs() << gep->getSrcID() << " -- NormalGep (" << gep->getOffset()
-               << ") --> " << gep->getDstID() << "\n";
+        outs() << gep->getRHSVarID() << " -- NormalGep (" << gep->getFieldOffset()
+               << ") --> " << gep->getLHSVarID() << "\n";
     }
 
     SVFStmt::SVFStmtSetTy& vgeps = pag->getSVFStmtSet(SVFStmt::VariantGep);

package/lib/MemoryModel/SVFStatements.cpp

@@ -68,7 +68,7 @@ const std::string SVFStmt::toString() const {
 const std::string AddrStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "AddrStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "AddrStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -79,7 +79,7 @@ const std::string AddrStmt::toString() const{
 const std::string CopyStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CopyStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "CopyStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -149,7 +149,7 @@ const std::string BranchStmt::toString() const {
 const std::string LoadStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "LoadStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "LoadStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -160,7 +160,7 @@ const std::string LoadStmt::toString() const{
 const std::string StoreStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "StoreStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "StoreStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -171,7 +171,7 @@ const std::string StoreStmt::toString() const{
 const std::string GepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "GepStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -182,7 +182,7 @@ const std::string GepStmt::toString() const{
 const std::string NormalGepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "NormalGepStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "NormalGepStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -193,7 +193,7 @@ const std::string NormalGepStmt::toString() const{
 const std::string VariantGepStmt::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "VariantGepStmt: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "VariantGepStmt: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -204,7 +204,7 @@ const std::string VariantGepStmt::toString() const{
 const std::string CallPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "CallPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "CallPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -215,7 +215,7 @@ const std::string CallPE::toString() const{
 const std::string RetPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "RetPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "RetPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -226,7 +226,7 @@ const std::string RetPE::toString() const{
 const std::string TDForkPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "TDForkPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "TDForkPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -237,7 +237,7 @@ const std::string TDForkPE::toString() const{
 const std::string TDJoinPE::toString() const{
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "TDJoinPE: [" << getDstID() << "<--" << getSrcID() << "]\t";
+    rawstr << "TDJoinPE: [" << getLHSVarID() << "<--" << getRHSVarID() << "]\t";
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }

package/lib/MemoryModel/SVFVariables.cpp

@@ -133,7 +133,7 @@ const std::string ObjVar::toString() const {
 const std::string GepValVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepValVar ID: " << getId() << " with offset_" + llvm::utostr(getOffset());
+    rawstr << "GepValVar ID: " << getId() << " with offset_" + llvm::utostr(getFieldOffset());
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }
@@ -144,7 +144,7 @@ const std::string GepValVar::toString() const {
 const std::string GepObjVar::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
-    rawstr << "GepObjVar ID: " << getId() << " with offset_" + llvm::itostr(ls.accumulateConstantOffset());
+    rawstr << "GepObjVar ID: " << getId() << " with offset_" + llvm::itostr(ls.accumulateConstantFieldIdx());
     if (Options::PAGDotGraphShorter) {
         rawstr << "\n";
     }