svf-tools 1.0.270 → 1.0.274

package/include/Graphs/SVFG.h

@@ -394,43 +394,48 @@ protected:
     }
 
     /// Add memory Function entry chi SVFG node
-    inline void addFormalINSVFGNode(const MemSSA::ENTRYCHI* chi)
+    inline void addFormalINSVFGNode(const FunEntryBlockNode* funEntry,  const MRVer* resVer, const NodeID nodeId)
     {
-        FormalINSVFGNode* sNode = new FormalINSVFGNode(totalVFGNode++,chi);
-        addSVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(chi->getFunction()));
-        setDef(chi->getResVer(),sNode);
-        funToFormalINMap[chi->getFunction()].set(sNode->getId());
+        FormalINSVFGNode* sNode = new FormalINSVFGNode(nodeId, resVer, funEntry);
+        addSVFGNode(sNode, pag->getICFG()->getFunEntryBlockNode(funEntry->getFun()));
+        setDef(resVer,sNode);
+        funToFormalINMap[funEntry->getFun()].set(sNode->getId());
     }
+
     /// Add memory Function return mu SVFG node
-    inline void addFormalOUTSVFGNode(const MemSSA::RETMU* mu)
+    inline void addFormalOUTSVFGNode(const FunExitBlockNode* funExit, const MRVer* ver, const NodeID nodeId)
     {
-        FormalOUTSVFGNode* sNode = new FormalOUTSVFGNode(totalVFGNode++,mu);
-        addSVFGNode(sNode,pag->getICFG()->getFunExitBlockNode(mu->getFunction()));
-        funToFormalOUTMap[mu->getFunction()].set(sNode->getId());
+        FormalOUTSVFGNode* sNode = new FormalOUTSVFGNode(nodeId, ver, funExit);
+        addSVFGNode(sNode,pag->getICFG()->getFunExitBlockNode(funExit->getFun()));
+        funToFormalOUTMap[funExit->getFun()].set(sNode->getId());
     }
+
     /// Add memory callsite mu SVFG node
-    inline void addActualINSVFGNode(const MemSSA::CALLMU* mu)
+    inline void addActualINSVFGNode(const CallBlockNode* callsite, const MRVer* ver, const NodeID nodeId)
     {
-        ActualINSVFGNode* sNode = new ActualINSVFGNode(totalVFGNode++,mu, mu->getCallSite());
-        addSVFGNode(sNode,pag->getICFG()->getCallBlockNode(mu->getCallSite()->getCallSite()));
-        callSiteToActualINMap[mu->getCallSite()].set(sNode->getId());
+        ActualINSVFGNode* sNode = new ActualINSVFGNode(nodeId, callsite, ver);
+        addSVFGNode(sNode,pag->getICFG()->getCallBlockNode(callsite->getCallSite()));
+        callSiteToActualINMap[callsite].set(sNode->getId());
     }
+
     /// Add memory callsite chi SVFG node
-    inline void addActualOUTSVFGNode(const MemSSA::CALLCHI* chi)
+    inline void addActualOUTSVFGNode(const CallBlockNode* callsite, const MRVer* resVer, const NodeID nodeId)
     {
-        ActualOUTSVFGNode* sNode = new ActualOUTSVFGNode(totalVFGNode++,chi,chi->getCallSite());
-        addSVFGNode(sNode, pag->getICFG()->getRetBlockNode(chi->getCallSite()->getCallSite()));
-        setDef(chi->getResVer(),sNode);
-        callSiteToActualOUTMap[chi->getCallSite()].set(sNode->getId());
+        ActualOUTSVFGNode* sNode = new ActualOUTSVFGNode(nodeId, callsite, resVer);
+        addSVFGNode(sNode, pag->getICFG()->getRetBlockNode(callsite->getCallSite()));
+        setDef(resVer,sNode);
+        callSiteToActualOUTMap[callsite].set(sNode->getId());
     }
+
     /// Add memory SSA PHI SVFG node
-    inline void addIntraMSSAPHISVFGNode(const MemSSA::PHI* phi)
+    inline void addIntraMSSAPHISVFGNode(ICFGNode* BlockICFGNode, const Map<u32_t,const MRVer*>::const_iterator opVerBegin, 
+    const  Map<u32_t,const MRVer*>::const_iterator opVerEnd, const MRVer* resVer, const NodeID nodeId)
     {
-        IntraMSSAPHISVFGNode* sNode = new IntraMSSAPHISVFGNode(totalVFGNode++,phi);
-        addSVFGNode(sNode, pag->getICFG()->getBlockICFGNode(&(phi->getBasicBlock()->front())));
-        for(MemSSA::PHI::OPVers::const_iterator it = phi->opVerBegin(), eit=phi->opVerEnd(); it!=eit; ++it)
+        IntraMSSAPHISVFGNode* sNode = new IntraMSSAPHISVFGNode(nodeId, resVer);
+        addSVFGNode(sNode, BlockICFGNode);
+        for(MemSSA::PHI::OPVers::const_iterator it = opVerBegin, eit=opVerEnd; it!=eit; ++it)
             sNode->setOpVer(it->first,it->second);
-        setDef(phi->getResVer(),sNode);
+        setDef(resVer,sNode);
     }
 
     /// Has function for EntryCHI/RetMU/CallCHI/CallMU

package/include/Graphs/SVFGNode.h

@@ -90,18 +90,24 @@ public:
 class FormalINSVFGNode : public MRSVFGNode
 {
 private:
-    const MemSSA::ENTRYCHI* chi;
+    const MRVer* ver;
+    const FunEntryBlockNode* funEntryNode; 
 
 public:
     /// Constructor
-    FormalINSVFGNode(NodeID id, const MemSSA::ENTRYCHI* entry): MRSVFGNode(id, FPIN), chi(entry)
+    FormalINSVFGNode(NodeID id, const MRVer* resVer, const FunEntryBlockNode* funEntry): MRSVFGNode(id, FPIN)
     {
-        cpts = entry->getMR()->getPointsTo();
+        cpts = resVer->getMR()->getPointsTo();
+        ver = resVer;
+        funEntryNode = funEntry; 
     }
-    /// EntryCHI
-    inline const MemSSA::ENTRYCHI* getEntryChi() const
+    inline const MRVer* getMRVer() const
     {
-        return chi;
+        return ver;
+    }
+    inline const FunEntryBlockNode* getFunEntryNode() const
+    {
+        return funEntryNode;
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -129,16 +135,21 @@ public:
 class FormalOUTSVFGNode : public MRSVFGNode
 {
 private:
-    const MemSSA::RETMU* mu;
+    const MRVer* ver;
+    const FunExitBlockNode* funExitNode; 
 
 public:
     /// Constructor
-    FormalOUTSVFGNode(NodeID id, const MemSSA::RETMU* exit);
+    FormalOUTSVFGNode(NodeID id, const MRVer* ver, const FunExitBlockNode* funExitNode);
 
-    /// RetMU
-    inline const MemSSA::RETMU* getRetMU() const
+    inline const FunExitBlockNode* getFunExitNode() const
     {
-        return mu;
+        return funExitNode;
+    }
+
+    inline const MRVer* getMRVer() const
+    {
+        return ver;
     }
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
@@ -166,26 +177,29 @@ public:
 class ActualINSVFGNode : public MRSVFGNode
 {
 private:
-    const MemSSA::CALLMU* mu;
     const CallBlockNode* cs;
+    const MRVer* ver;
 public:
     /// Constructor
-    ActualINSVFGNode(NodeID id, const MemSSA::CALLMU* m, const CallBlockNode* c):
-        MRSVFGNode(id, APIN), mu(m), cs(c)
+    ActualINSVFGNode(NodeID id, const CallBlockNode* c, const MRVer* mrver):
+        MRSVFGNode(id, APIN), cs(c)
     {
-        cpts = m->getMR()->getPointsTo();
+        cpts = mrver->getMR()->getPointsTo();
+        ver = mrver;
     }
     /// Callsite
     inline const CallBlockNode* getCallSite() const
     {
         return cs;
     }
-    /// CallMU
-    inline const MemSSA::CALLMU* getCallMU() const
+
+    /// Ver
+    inline const MRVer* getMRVer() const
     {
-        return mu;
+        return ver;
     }
 
+
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const ActualINSVFGNode *)
@@ -212,27 +226,27 @@ public:
 class ActualOUTSVFGNode : public MRSVFGNode
 {
 private:
-    const MemSSA::CALLCHI* chi;
     const CallBlockNode* cs;
+    const MRVer* ver;
 
 public:
     /// Constructor
-    ActualOUTSVFGNode(NodeID id, const MemSSA::CALLCHI* c, const CallBlockNode* cal):
-        MRSVFGNode(id, APOUT), chi(c), cs(cal)
+    ActualOUTSVFGNode(NodeID id, const CallBlockNode* cal, const MRVer* resVer):
+        MRSVFGNode(id, APOUT), cs(cal)
     {
-        cpts = c->getMR()->getPointsTo();
+        cpts = resVer->getMR()->getPointsTo();
+        ver = resVer;
     }
     /// Callsite
     inline const CallBlockNode* getCallSite() const
     {
         return cs;
     }
-    /// CallCHI
-    inline const MemSSA::CALLCHI* getCallCHI() const
+    /// Ver
+    inline const MRVer* getMRVer() const
     {
-        return chi;
+        return ver;
     }
-
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const ActualOUTSVFGNode *)
@@ -262,14 +276,20 @@ public:
     typedef Map<u32_t,const MRVer*> OPVers;
 
 protected:
-    const MemSSA::MDEF* res;
+    const MRVer* ver; 
     OPVers opVers;
 
 public:
     /// Constructor
-    MSSAPHISVFGNode(NodeID id, const MemSSA::MDEF* def,VFGNodeK k = MPhi): MRSVFGNode(id, k), res(def)
+    MSSAPHISVFGNode(NodeID id, const MRVer* resVer,VFGNodeK k = MPhi): MRSVFGNode(id, k)
+    {
+        cpts = resVer->getMR()->getPointsTo();
+        ver = resVer; 
+    }
+      /// Ver
+    inline const MRVer* getResVer() const
     {
-        cpts = def->getMR()->getPointsTo();
+        return ver;
     }
     /// MSSA phi operands
     //@{
@@ -283,10 +303,6 @@ public:
     {
         opVers[pos] = node;
     }
-    inline const MemSSA::MDEF* getRes() const
-    {
-        return res;
-    }
     inline u32_t getOpVerNum() const
     {
         return opVers.size();
@@ -331,9 +347,26 @@ class IntraMSSAPHISVFGNode : public MSSAPHISVFGNode
 {
 
 public:
+    const MRVer* resVer;
     /// Constructor
-    IntraMSSAPHISVFGNode(NodeID id, const MemSSA::PHI* phi): MSSAPHISVFGNode(id, phi, MIntraPhi)
+    IntraMSSAPHISVFGNode(NodeID id, const MRVer* resVer): MSSAPHISVFGNode(id, resVer, MIntraPhi)
     {
+        resVer = resVer; 
+    }
+
+     inline const MRVer* getMRVer() const
+    {
+        return resVer;
+    }
+
+    inline OPVers::const_iterator opVerBegin() const
+    {
+        return opVers.begin();
+    }
+
+    inline OPVers::const_iterator opVerEnd() const
+    {
+        return opVers.end();
     }
 
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -372,9 +405,9 @@ class InterMSSAPHISVFGNode : public MSSAPHISVFGNode
 
 public:
     /// Constructor interPHI for formal parameter
-    InterMSSAPHISVFGNode(NodeID id, const FormalINSVFGNode* fi) : MSSAPHISVFGNode(id, fi->getEntryChi(), MInterPhi),fun(fi->getFun()),callInst(nullptr) {}
+    InterMSSAPHISVFGNode(NodeID id, const FormalINSVFGNode* fi) : MSSAPHISVFGNode(id, fi->getMRVer(), MInterPhi),fun(fi->getFun()),callInst(nullptr) {}
     /// Constructor interPHI for actual return
-    InterMSSAPHISVFGNode(NodeID id, const ActualOUTSVFGNode* ao) : MSSAPHISVFGNode(id, ao->getCallCHI(), MInterPhi), fun(nullptr),callInst(ao->getCallSite()) {}
+    InterMSSAPHISVFGNode(NodeID id, const ActualOUTSVFGNode* ao) : MSSAPHISVFGNode(id, ao->getMRVer(), MInterPhi), fun(nullptr),callInst(ao->getCallSite()) {}
 
     inline bool isFormalINPHI() const
     {

package/include/Graphs/SVFGOPT.h

@@ -296,11 +296,11 @@ private:
     //@{
     inline bool formalInOfAddressTakenFunc(const FormalINSVFGNode* fi) const
     {
-        return (fi->getEntryChi()->getFunction()->getLLVMFun()->hasAddressTaken());
+        return (fi->getFun()->getLLVMFun()->hasAddressTaken());
     }
     inline bool formalOutOfAddressTakenFunc(const FormalOUTSVFGNode* fo) const
     {
-        return (fo->getRetMU()->getFunction()->getLLVMFun()->hasAddressTaken());
+        return (fo->getFun()->getLLVMFun()->hasAddressTaken());
     }
     //@}
 

package/include/MSSA/MSSAMuChi.h

@@ -76,6 +76,12 @@ public:
     {
         return def;
     }
+
+    /// Get MRVERID
+    inline MRVERID getID() const
+    {
+        return vid;
+    }
 };
 
 
@@ -128,7 +134,7 @@ public:
         ver = v;
     }
     /// Get Ver
-    inline MRVer* getVer() const
+    inline MRVer* getMRVer() const
     {
         assert(ver!=nullptr && "version is nullptr, did not rename?");
         return ver;
@@ -203,7 +209,7 @@ public:
     /// Print MU
     virtual void dump()
     {
-        SVFUtil::outs() << "LDMU(MR_" << this->getMR()->getMRID() << "V_" << this->getVer()->getSSAVersion() << ") \t" <<
+        SVFUtil::outs() << "LDMU(MR_" << this->getMR()->getMRID() << "V_" << this->getMRVer()->getSSAVersion() << ") \t" <<
                         this->getMR()->dumpStr() << "\n";
     }
 };
@@ -258,7 +264,7 @@ public:
     /// Print MU
     virtual void dump()
     {
-        SVFUtil::outs() << "CALMU(MR_" << this->getMR()->getMRID() << "V_" << this->getVer()->getSSAVersion() << ") \t" <<
+        SVFUtil::outs() << "CALMU(MR_" << this->getMR()->getMRID() << "V_" << this->getMRVer()->getSSAVersion() << ") \t" <<
                         this->getMR()->dumpStr() << "\n";
     }
 };
@@ -303,7 +309,7 @@ public:
     /// Print MU
     virtual void dump()
     {
-        SVFUtil::outs() << "RETMU(MR_" << this->getMR()->getMRID() << "V_" << this->getVer()->getSSAVersion() << ") \t" <<
+        SVFUtil::outs() << "RETMU(MR_" << this->getMR()->getMRID() << "V_" << this->getMRVer()->getSSAVersion() << ") \t" <<
                         this->getMR()->dumpStr() << "\n";
     }
 };

package/lib/Graphs/SVFG.cpp

@@ -32,10 +32,14 @@
 #include "Graphs/SVFG.h"
 #include "Graphs/SVFGOPT.h"
 #include "Graphs/SVFGStat.h"
+#include "Graphs/ICFG.h"
+#include <fstream>
+
 
 using namespace SVF;
 using namespace SVFUtil;
 
+
 const std::string MRSVFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
@@ -47,9 +51,9 @@ const std::string FormalINSVFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "FormalINSVFGNode ID: " << getId() << " {fun: " << getFun()->getName() << "}";
-    rawstr << getEntryChi()->getMR()->getMRID() << "V_" << getEntryChi()->getResVer()->getSSAVersion() <<
-            " = ENCHI(MR_" << getEntryChi()->getMR()->getMRID() << "V_" << getEntryChi()->getOpVer()->getSSAVersion() << ")\n";
-    rawstr << getEntryChi()->getMR()->dumpStr() << "\n";
+    rawstr << getMRVer()->getMR()->getMRID() << "V_" << getMRVer()->getSSAVersion() <<
+            " = ENCHI(MR_" << getMRVer()->getMR()->getMRID() << "V_" << getMRVer()->getSSAVersion() << ")\n";
+    rawstr << getMRVer()->getMR()->dumpStr() << "\n";
     return rawstr.str();
 }
 
@@ -57,8 +61,8 @@ const std::string FormalOUTSVFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "FormalOUTSVFGNode ID: " << getId() << " {fun: " << getFun()->getName() << "}";
-    rawstr << "RETMU(" << getRetMU()->getMR()->getMRID() << "V_" << getRetMU()->getVer()->getSSAVersion() << ")\n";
-                rawstr  << getRetMU()->getMR()->dumpStr() << "\n";
+    rawstr << "RETMU(" << getMRVer()->getMR()->getMRID() << "V_" << getMRVer()->getSSAVersion() << ")\n";
+                rawstr  << getMRVer()->getMR()->dumpStr() << "\n";
     return rawstr.str();
 }
 
@@ -66,8 +70,8 @@ const std::string ActualINSVFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "ActualINSVFGNode ID: " << getId() << " at callsite: " <<  *getCallSite()->getCallSite() << " {fun: " << getFun()->getName() << "}";
-    rawstr << "CSMU(" << getCallMU()->getMR()->getMRID() << "V_" << getCallMU()->getVer()->getSSAVersion() << ")\n";
-                rawstr << getCallMU()->getMR()->dumpStr() << "\n";
+    rawstr << "CSMU(" << getMRVer()->getMR()->getMRID() << "V_" << getMRVer()->getSSAVersion() << ")\n";
+                rawstr << getMRVer()->getMR()->dumpStr() << "\n";
                 rawstr << "CS[" << getSourceLoc(getCallSite()->getCallSite()) << "]";
     return rawstr.str();
 }
@@ -76,9 +80,9 @@ const std::string ActualOUTSVFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "ActualOUTSVFGNode ID: " << getId() << " at callsite: " <<  *getCallSite()->getCallSite() << " {fun: " << getFun()->getName() << "}";
-    rawstr <<  getCallCHI()->getMR()->getMRID() << "V_" << getCallCHI()->getResVer()->getSSAVersion() <<
-           " = CSCHI(MR_" << getCallCHI()->getMR()->getMRID() << "V_" << getCallCHI()->getOpVer()->getSSAVersion() << ")\n";
-    rawstr << getCallCHI()->getMR()->dumpStr() << "\n";
+    rawstr <<  getMRVer()->getMR()->getMRID() << "V_" << getMRVer()->getSSAVersion() <<
+           " = CSCHI(MR_" << getMRVer()->getMR()->getMRID() << "V_" << getMRVer()->getSSAVersion() << ")\n";
+    rawstr << getMRVer()->getMR()->dumpStr() << "\n";
     rawstr << "CS[" << getSourceLoc(getCallSite()->getCallSite()) << "]" ;
     return rawstr.str();
 }
@@ -87,14 +91,14 @@ const std::string MSSAPHISVFGNode::toString() const {
     std::string str;
     raw_string_ostream rawstr(str);
     rawstr << "MSSAPHISVFGNode ID: " << getId() << " {fun: " << getFun()->getName() << "}";
-    rawstr << "MR_" << getRes()->getMR()->getMRID()
-           << "V_" << getRes()->getResVer()->getSSAVersion() << " = PHI(";
+    rawstr << "MR_" << getResVer()->getMR()->getMRID()
+           << "V_" << getResVer()->getSSAVersion() << " = PHI(";
     for (MemSSA::PHI::OPVers::const_iterator it = opVerBegin(), eit = opVerEnd();
             it != eit; it++)
         rawstr << "MR_" << it->second->getMR()->getMRID() << "V_" << it->second->getSSAVersion() << ", ";
     rawstr << ")\n";
 
-    rawstr << getRes()->getMR()->dumpStr();
+    rawstr << getResVer()->getMR()->dumpStr();
     rawstr << getSourceLoc(&getICFGNode()->getBB()->back());
     return rawstr.str();
 }
@@ -177,9 +181,11 @@ const Value* ArgumentVFGNode::getValue() const {
 }
 
 
-FormalOUTSVFGNode::FormalOUTSVFGNode(NodeID id, const MemSSA::RETMU* exit): MRSVFGNode(id, FPOUT), mu(exit)
+FormalOUTSVFGNode::FormalOUTSVFGNode(NodeID id, const MRVer* mrVer, const FunExitBlockNode* funExit): MRSVFGNode(id, FPOUT)
 {
-    cpts = exit->getMR()->getPointsTo();
+    cpts = mrVer->getMR()->getPointsTo();
+    ver = mrVer;
+    funExitNode = funExit; 
 }
 
 /*!
@@ -226,7 +232,7 @@ void SVFG::buildSVFG()
     stat->indVFEdgeStart();
     connectIndirectSVFGEdges();
     stat->indVFEdgeEnd();
-
+    
 }
 
 /*
@@ -252,38 +258,49 @@ void SVFG::addSVFGNodesForAddrTakenVars()
     for(MemSSA::BBToPhiSetMap::iterator it = mssa->getBBToPhiSetMap().begin(),
             eit = mssa->getBBToPhiSetMap().end(); it!=eit; ++it)
     {
-        for(PHISet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi)
-            addIntraMSSAPHISVFGNode(*pi);
+        for(PHISet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi){
+            MemSSA::PHI* phi =  *pi;
+            addIntraMSSAPHISVFGNode(pag->getICFG()->getBlockICFGNode(&(phi->getBasicBlock()->front())), phi->opVerBegin(), phi->opVerEnd(),phi->getResVer(), totalVFGNode++);
+        }
     }
     /// initialize memory SSA entry chi nodes
     for(MemSSA::FunToEntryChiSetMap::iterator it = mssa->getFunToEntryChiSetMap().begin(),
             eit = mssa->getFunToEntryChiSetMap().end(); it!=eit; ++it)
     {
-        for(CHISet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi)
-            addFormalINSVFGNode(SVFUtil::cast<ENTRYCHI>(*pi));
+        for(CHISet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi){
+            const MemSSA::ENTRYCHI* chi = SVFUtil::cast<ENTRYCHI>(*pi);
+            addFormalINSVFGNode(pag->getICFG()->getFunEntryBlockNode(chi->getFunction()), chi->getResVer(), totalVFGNode++);
+        }
     }
     /// initialize memory SSA return mu nodes
     for(MemSSA::FunToReturnMuSetMap::iterator it = mssa->getFunToRetMuSetMap().begin(),
             eit = mssa->getFunToRetMuSetMap().end(); it!=eit; ++it)
     {
-        for(MUSet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi)
-            addFormalOUTSVFGNode(SVFUtil::cast<RETMU>(*pi));
+        for(MUSet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi){
+              const MemSSA::RETMU* mu = SVFUtil::cast<RETMU>(*pi);
+              addFormalOUTSVFGNode(pag->getICFG()->getFunExitBlockNode(mu->getFunction()), mu->getMRVer(), totalVFGNode++);
+        }
     }
     /// initialize memory SSA callsite mu nodes
     for(MemSSA::CallSiteToMUSetMap::iterator it = mssa->getCallSiteToMuSetMap().begin(),
             eit = mssa->getCallSiteToMuSetMap().end();
             it!=eit; ++it)
     {
-        for(MUSet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi)
-            addActualINSVFGNode(SVFUtil::cast<CALLMU>(*pi));
+        for(MUSet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi){
+            const MemSSA::CALLMU* mu = SVFUtil::cast<CALLMU>(*pi);
+            addActualINSVFGNode(mu->getCallSite(), mu->getMRVer(), totalVFGNode++);
+        }
     }
     /// initialize memory SSA callsite chi nodes
     for(MemSSA::CallSiteToCHISetMap::iterator it = mssa->getCallSiteToChiSetMap().begin(),
             eit = mssa->getCallSiteToChiSetMap().end();
             it!=eit; ++it)
     {
-        for(CHISet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi)
-            addActualOUTSVFGNode(SVFUtil::cast<CALLCHI>(*pi));
+        for(CHISet::iterator pi = it->second.begin(), epi = it->second.end(); pi!=epi; ++pi){
+            const MemSSA::CALLCHI* chi = SVFUtil::cast<CALLCHI>(*pi);
+            addActualOUTSVFGNode(chi->getCallSite(), chi->getResVer(), totalVFGNode++);
+        }
+
     }
 }
 
@@ -304,8 +321,8 @@ void SVFG::connectIndirectSVFGEdges()
             {
                 if(LOADMU* mu = SVFUtil::dyn_cast<LOADMU>(*it))
                 {
-                    NodeID def = getDef(mu->getVer());
-                    addIntraIndirectVFEdge(def,nodeId, mu->getVer()->getMR()->getPointsTo());
+                    NodeID def = getDef(mu->getMRVer());
+                    addIntraIndirectVFEdge(def,nodeId, mu->getMRVer()->getMR()->getPointsTo());
                 }
             }
         }
@@ -324,7 +341,7 @@ void SVFG::connectIndirectSVFGEdges()
         else if(const FormalINSVFGNode* formalIn = SVFUtil::dyn_cast<FormalINSVFGNode>(node))
         {
             PTACallGraphEdge::CallInstSet callInstSet;
-            mssa->getPTA()->getPTACallGraph()->getDirCallSitesInvokingCallee(formalIn->getEntryChi()->getFunction(),callInstSet);
+            mssa->getPTA()->getPTACallGraph()->getDirCallSitesInvokingCallee(formalIn->getFun(),callInstSet);
             for(PTACallGraphEdge::CallInstSet::iterator it = callInstSet.begin(), eit = callInstSet.end(); it!=eit; ++it)
             {
                 const CallBlockNode* cs = *it;
@@ -341,8 +358,8 @@ void SVFG::connectIndirectSVFGEdges()
         else if(const FormalOUTSVFGNode* formalOut = SVFUtil::dyn_cast<FormalOUTSVFGNode>(node))
         {
             PTACallGraphEdge::CallInstSet callInstSet;
-            const MemSSA::RETMU* retMu = formalOut->getRetMU();
-            mssa->getPTA()->getPTACallGraph()->getDirCallSitesInvokingCallee(retMu->getFunction(),callInstSet);
+            // const MemSSA::RETMU* retMu = formalOut->getRetMU();
+            mssa->getPTA()->getPTACallGraph()->getDirCallSitesInvokingCallee(formalOut->getFun(),callInstSet);
             for(PTACallGraphEdge::CallInstSet::iterator it = callInstSet.begin(), eit = callInstSet.end(); it!=eit; ++it)
             {
                 const CallBlockNode* cs = *it;
@@ -355,12 +372,12 @@ void SVFG::connectIndirectSVFGEdges()
                     addInterIndirectVFRetEdge(formalOut,actualOut,getCallSiteID(cs, formalOut->getFun()));
                 }
             }
-            NodeID def = getDef(retMu->getVer());
-            addIntraIndirectVFEdge(def,nodeId, retMu->getVer()->getMR()->getPointsTo());
+            NodeID def = getDef(formalOut->getMRVer());
+            addIntraIndirectVFEdge(def,nodeId, formalOut->getMRVer()->getMR()->getPointsTo());
         }
         else if(const ActualINSVFGNode* actualIn = SVFUtil::dyn_cast<ActualINSVFGNode>(node))
         {
-            const MRVer* ver = actualIn->getCallMU()->getVer();
+            const MRVer* ver = actualIn->getMRVer();
             NodeID def = getDef(ver);
             addIntraIndirectVFEdge(def,nodeId, ver->getMR()->getPointsTo());
         }
@@ -706,7 +723,7 @@ const SVFFunction* SVFG::isFunEntrySVFGNode(const SVFGNode* node) const
     else if(const InterMSSAPHISVFGNode* mphi = SVFUtil::dyn_cast<InterMSSAPHISVFGNode>(node))
     {
         if(mphi->isFormalINPHI())
-            return mphi->getFun();
+            return phi->getFun();
     }
     return nullptr;
 }

package/package.json

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