svf-tools 1.0.333 → 1.0.334

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());
     }
 }
 

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

@@ -611,8 +611,8 @@ void SVFIR::print()
                 ngeps.end(); iter != eiter; ++iter)
     {
         NormalGepStmt* gep = SVFUtil::cast<NormalGepStmt>(*iter);
-        outs() << gep->getSrcID() << " -- NormalGep (" << gep->getFieldOffset()
-               << ") --> " << 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/package.json

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