svf-tools 1.0.281 → 1.0.285

package/lib/MSSA/MemPartition.cpp

@@ -41,15 +41,15 @@ using namespace SVF;
  */
 void DistinctMRG::partitionMRs()
 {
-    for(FunToPointsToMap::iterator it = getFunToPointsToList().begin(), eit = getFunToPointsToList().end();
+    for(FunToPointsTosMap::iterator it = getFunToPointsToList().begin(), eit = getFunToPointsToList().end();
             it!=eit; ++it)
     {
         const SVFFunction* fun = it->first;
         /// Collect all points-to target in a function scope.
-        PointsTo mergePts;
+        NodeBS mergePts;
         for(PointsToList::iterator cit = it->second.begin(), ecit = it->second.end(); cit!=ecit; ++cit)
         {
-            const PointsTo& pts = *cit;
+            const NodeBS& pts = *cit;
             mergePts |= pts;
         }
         createDistinctMR(fun, mergePts);
@@ -61,17 +61,17 @@ void DistinctMRG::partitionMRs()
  * 1. collect all points-to targets in a function scope.
  * 2. create memory region for each point-to target.
  */
-void DistinctMRG::createDistinctMR(const SVFFunction* func, const PointsTo& pts)
+void DistinctMRG::createDistinctMR(const SVFFunction* func, const NodeBS& pts)
 {
     /// Create memory regions for each points-to target.
 
-    PointsTo::iterator ptsIt = pts.begin();
-    PointsTo::iterator ptsEit = pts.end();
+    NodeBS::iterator ptsIt = pts.begin();
+    NodeBS::iterator ptsEit = pts.end();
     for (; ptsIt != ptsEit; ++ptsIt)
     {
         NodeID id = *ptsIt;
         // create new conditional points-to set with this single element.
-        PointsTo newPts;
+        NodeBS newPts;
         newPts.set(id);
 
         // set the rep cpts as itself.
@@ -88,17 +88,17 @@ void DistinctMRG::createDistinctMR(const SVFFunction* func, const PointsTo& pts)
  * @param fun The function being analyzed.
  * @param mrs Memory region set contains all possible target memory regions.
  */
-void DistinctMRG::getMRsForLoad(MRSet& mrs, const PointsTo& pts, const SVFFunction*)
+void DistinctMRG::getMRsForLoad(MRSet& mrs, const NodeBS& pts, const SVFFunction*)
 {
     /// Get memory regions for each points-to element in cpts.
 
-    PointsTo::iterator ptsIt = pts.begin();
-    PointsTo::iterator ptsEit = pts.end();
+    NodeBS::iterator ptsIt = pts.begin();
+    NodeBS::iterator ptsEit = pts.end();
     for (; ptsIt != ptsEit; ++ptsIt)
     {
         NodeID id = *ptsIt;
         // create new conditional points-to set with this single element.
-        PointsTo newPts;
+        NodeBS newPts;
         newPts.set(id);
 
         MemRegion mr(newPts);
@@ -112,7 +112,7 @@ void DistinctMRG::getMRsForLoad(MRSet& mrs, const PointsTo& pts, const SVFFuncti
  * Get memory regions to be inserted at a load statement.
  * Just process as getMRsForLoad().
  */
-void DistinctMRG::getMRsForCallSiteRef(MRSet& aliasMRs, const PointsTo& cpts, const SVFFunction* fun)
+void DistinctMRG::getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction* fun)
 {
     getMRsForLoad(aliasMRs, cpts, fun);
 }
@@ -121,7 +121,7 @@ void DistinctMRG::getMRsForCallSiteRef(MRSet& aliasMRs, const PointsTo& cpts, co
 
 void IntraDisjointMRG::partitionMRs()
 {
-    for(FunToPointsToMap::iterator it = getFunToPointsToList().begin(),
+    for(FunToPointsTosMap::iterator it = getFunToPointsToList().begin(),
             eit = getFunToPointsToList().end(); it!=eit; ++it)
     {
         const SVFFunction* fun = it->first;
@@ -129,7 +129,7 @@ void IntraDisjointMRG::partitionMRs()
         for(PointsToList::iterator cit = it->second.begin(), ecit = it->second.end();
                 cit!=ecit; ++cit)
         {
-            const PointsTo& cpts = *cit;
+            const NodeBS& cpts = *cit;
 
             PointsToList& inters = getIntersList(fun);
             computeIntersections(cpts, inters);
@@ -140,7 +140,7 @@ void IntraDisjointMRG::partitionMRs()
         for (PointsToList::const_iterator interIt = inters.begin(), interEit = inters.end();
                 interIt != interEit; ++interIt)
         {
-            const PointsTo& inter = *interIt;
+            const NodeBS& inter = *interIt;
             createDisjointMR(fun, inter);
         }
     }
@@ -149,7 +149,7 @@ void IntraDisjointMRG::partitionMRs()
 /**
  * Compute intersections between cpts and computed cpts intersections before.
  */
-void IntraDisjointMRG::computeIntersections(const PointsTo& cpts, PointsToList& inters)
+void IntraDisjointMRG::computeIntersections(const NodeBS& cpts, PointsToList& inters)
 {
     if (inters.find(cpts) != inters.end())
     {
@@ -168,18 +168,18 @@ void IntraDisjointMRG::computeIntersections(const PointsTo& cpts, PointsToList&
         PointsToList toBeDeleted;
         PointsToList newInters;
 
-        PointsTo cpts_copy = cpts;	// make a copy since cpts may be changed.
+        NodeBS cpts_copy = cpts;	// make a copy since cpts may be changed.
 
         // check intersections with existing cpts in subSetMap
         for (PointsToList::const_iterator interIt = inters.begin(), interEit = inters.end();
                 interIt != interEit; ++interIt)
         {
-            const PointsTo& inter = *interIt;
+            const NodeBS& inter = *interIt;
 
             if (cpts_copy.intersects(inter))
             {
                 // compute intersection between cpts and inter
-                PointsTo new_inter = inter;
+                NodeBS new_inter = inter;
                 new_inter &= cpts_copy;
 
                 // remove old intersection and add new one if possible
@@ -189,7 +189,7 @@ void IntraDisjointMRG::computeIntersections(const PointsTo& cpts, PointsToList&
                     newInters.insert(new_inter);
 
                     // compute complement after intersection
-                    PointsTo complement = inter;
+                    NodeBS complement = inter;
                     complement.intersectWithComplement(new_inter);
                     if (complement.empty() == false)
                     {
@@ -208,7 +208,7 @@ void IntraDisjointMRG::computeIntersections(const PointsTo& cpts, PointsToList&
         for (PointsToList::const_iterator it = toBeDeleted.begin(), eit = toBeDeleted.end();
                 it != eit; ++it)
         {
-            const PointsTo& temp_cpts = *it;
+            const NodeBS& temp_cpts = *it;
             inters.erase(temp_cpts);
         }
 
@@ -216,7 +216,7 @@ void IntraDisjointMRG::computeIntersections(const PointsTo& cpts, PointsToList&
         for (PointsToList::const_iterator it = newInters.begin(), eit = newInters.end();
                 it != eit; ++it)
         {
-            const PointsTo& temp_cpts = *it;
+            const NodeBS& temp_cpts = *it;
             inters.insert(temp_cpts);
         }
 
@@ -229,7 +229,7 @@ void IntraDisjointMRG::computeIntersections(const PointsTo& cpts, PointsToList&
 /**
  * Create memory regions for each points-to target.
  */
-void IntraDisjointMRG::createDisjointMR(const SVFFunction* func, const PointsTo& cpts)
+void IntraDisjointMRG::createDisjointMR(const SVFFunction* func, const NodeBS& cpts)
 {
     // set the rep cpts as itself.
     cptsToRepCPtsMap[cpts] = cpts;
@@ -238,13 +238,13 @@ void IntraDisjointMRG::createDisjointMR(const SVFFunction* func, const PointsTo&
     createMR(func, cpts);
 }
 
-void IntraDisjointMRG::getMRsForLoadFromInterList(MRSet& mrs, const PointsTo& cpts, const PointsToList& inters)
+void IntraDisjointMRG::getMRsForLoadFromInterList(MRSet& mrs, const NodeBS& cpts, const PointsToList& inters)
 {
     PointsToList::const_iterator it = inters.begin();
     PointsToList::const_iterator eit = inters.end();
     for (; it != eit; ++it)
     {
-        const PointsTo& inter = *it;
+        const NodeBS& inter = *it;
         if (cpts.contains(inter))
         {
             MemRegion mr(inter);
@@ -259,7 +259,7 @@ void IntraDisjointMRG::getMRsForLoadFromInterList(MRSet& mrs, const PointsTo& cp
  * Get memory regions to be inserted at a load statement.
  * Just process as getMRsForLoad().
  */
-void IntraDisjointMRG::getMRsForCallSiteRef(MRSet& aliasMRs, const PointsTo& cpts, const SVFFunction* fun)
+void IntraDisjointMRG::getMRsForCallSiteRef(MRSet& aliasMRs, const NodeBS& cpts, const SVFFunction* fun)
 {
     getMRsForLoad(aliasMRs, cpts, fun);
 }
@@ -269,20 +269,20 @@ void IntraDisjointMRG::getMRsForCallSiteRef(MRSet& aliasMRs, const PointsTo& cpt
 void InterDisjointMRG::partitionMRs()
 {
     /// Generate disjoint cpts.
-    for(FunToPointsToMap::iterator it = getFunToPointsToList().begin(),
+    for(FunToPointsTosMap::iterator it = getFunToPointsToList().begin(),
             eit = getFunToPointsToList().end(); it!=eit; ++it)
     {
         for(PointsToList::iterator cit = it->second.begin(), ecit = it->second.end();
                 cit!=ecit; ++cit)
         {
-            const PointsTo& cpts = *cit;
+            const NodeBS& cpts = *cit;
 
             computeIntersections(cpts, inters);
         }
     }
 
     /// Create memory regions.
-    for(FunToPointsToMap::iterator it = getFunToPointsToList().begin(),
+    for(FunToPointsTosMap::iterator it = getFunToPointsToList().begin(),
             eit = getFunToPointsToList().end(); it!=eit; ++it)
     {
         const SVFFunction* fun = it->first;
@@ -290,12 +290,12 @@ void InterDisjointMRG::partitionMRs()
         for(PointsToList::iterator cit = it->second.begin(), ecit = it->second.end();
                 cit!=ecit; ++cit)
         {
-            const PointsTo& cpts = *cit;
+            const NodeBS& cpts = *cit;
 
             for (PointsToList::const_iterator interIt = inters.begin(), interEit = inters.end();
                     interIt != interEit; ++interIt)
             {
-                const PointsTo& inter = *interIt;
+                const NodeBS& inter = *interIt;
                 if (cpts.contains(inter))
                     createDisjointMR(fun, inter);
             }

package/lib/MSSA/MemRegion.cpp

@@ -39,6 +39,12 @@ using namespace SVFUtil;
 Size_t MemRegion::totalMRNum = 0;
 Size_t MRVer::totalVERNum = 0;
 
+MRGenerator::MRGenerator(BVDataPTAImpl* p, bool ptrOnly) :
+    pta(p), ptrOnlyMSSA(ptrOnly)
+{
+    callGraph = pta->getPTACallGraph();
+    callGraphSCC = new SCC(callGraph);
+}
 
 /*!
  * Clean up memory
@@ -61,9 +67,9 @@ void MRGenerator::destroy()
 /*!
  * Generate a memory region and put in into functions which use it
  */
-void MRGenerator::createMR(const SVFFunction* fun, const PointsTo& cpts)
+void MRGenerator::createMR(const SVFFunction* fun, const NodeBS& cpts)
 {
-    const PointsTo& repCPts = getRepPointsTo(cpts);
+    const NodeBS& repCPts = getRepPointsTo(cpts);
     MemRegion mr(repCPts);
     MRSet::const_iterator mit = memRegSet.find(&mr);
     if(mit!=memRegSet.end())
@@ -84,7 +90,7 @@ void MRGenerator::createMR(const SVFFunction* fun, const PointsTo& cpts)
 /*!
  * Generate a memory region and put in into functions which use it
  */
-const MemRegion* MRGenerator::getMR(const PointsTo& cpts) const
+const MemRegion* MRGenerator::getMR(const NodeBS& cpts) const
 {
     MemRegion mr(getRepPointsTo(cpts));
     MRSet::iterator mit = memRegSet.find(&mr);
@@ -142,6 +148,24 @@ void MRGenerator::generateMRs()
     updateAliasMRs();
 }
 
+bool MRGenerator::hasPAGEdgeList(const Instruction* inst)
+{
+    PAG* pag = pta->getPAG();
+    if (ptrOnlyMSSA)
+        return pag->hasPTAPAGEdgeList(pag->getICFG()->getBlockICFGNode(inst));
+    else
+        return pag->hasPAGEdgeList(pag->getICFG()->getBlockICFGNode(inst));
+}
+
+PAG::PAGEdgeList& MRGenerator::getPAGEdgesFromInst(const Instruction* inst)
+{
+    PAG* pag = pta->getPAG();
+    if (ptrOnlyMSSA)
+        return pag->getInstPTAPAGEdgeList(pag->getICFG()->getBlockICFGNode(inst));
+    else
+        return pag->getInstPAGEdgeList(pag->getICFG()->getBlockICFGNode(inst));
+}
+
 /*!
  * Generate memory regions for loads/stores
  */
@@ -174,7 +198,7 @@ void MRGenerator::collectModRefForLoadStore()
                     pagEdgeToFunMap[inst] = &fun;
                     if (const StorePE *st = SVFUtil::dyn_cast<StorePE>(inst))
                     {
-                        PointsTo cpts(pta->getPts(st->getDstID()));
+                        NodeBS cpts(pta->getPts(st->getDstID()));
                         // TODO: change this assertion check later when we have conditional points-to set
                         if (cpts.empty())
                             continue;
@@ -184,7 +208,7 @@ void MRGenerator::collectModRefForLoadStore()
 
                     else if (const LoadPE *ld = SVFUtil::dyn_cast<LoadPE>(inst))
                     {
-                        PointsTo cpts(pta->getPts(ld->getSrcID()));
+                        NodeBS cpts(pta->getPts(ld->getSrcID()));
                         // TODO: change this assertion check later when we have conditional points-to set
                         if (cpts.empty())
                             continue;
@@ -257,18 +281,18 @@ void MRGenerator::collectModRefForCall()
  * 1) map cpts to its superset(rep) which exists in the map, otherwise its superset is itself
  * 2) adjust existing items in the map if their supersets are cpts
  */
-void MRGenerator::sortPointsTo(const PointsTo& cpts)
+void MRGenerator::sortPointsTo(const NodeBS& cpts)
 {
 
     if(cptsToRepCPtsMap.find(cpts)!=cptsToRepCPtsMap.end())
         return;
 
     PointsToList subSetList;
-    PointsTo repCPts = cpts;
+    NodeBS repCPts = cpts;
     for(PtsToRepPtsSetMap::iterator it = cptsToRepCPtsMap.begin(),
             eit = cptsToRepCPtsMap.end(); it!=eit; ++it)
     {
-        PointsTo& existCPts = it->second;
+        NodeBS& existCPts = it->second;
         if(cpts.contains(existCPts))
         {
             subSetList.insert(it->first);
@@ -297,7 +321,7 @@ void MRGenerator::partitionMRs()
     /// TODO: we may need some refined region partitioning algorithm here
     /// For now, we just collapse all refs/mods objects at callsites into one region
     /// Consider modularly partition memory regions to speed up analysis (only partition regions within function scope)
-    for(FunToPointsToMap::iterator it = getFunToPointsToList().begin(), eit = getFunToPointsToList().end();
+    for(FunToPointsTosMap::iterator it = getFunToPointsToList().begin(), eit = getFunToPointsToList().end();
             it!=eit; ++it)
     {
         for(PointsToList::iterator cit = it->second.begin(), ecit = it->second.end(); cit!=ecit; ++cit)
@@ -306,7 +330,7 @@ void MRGenerator::partitionMRs()
         }
     }
     /// Generate memory regions according to condition pts after computing superset
-    for(FunToPointsToMap::iterator it = getFunToPointsToList().begin(), eit = getFunToPointsToList().end();
+    for(FunToPointsTosMap::iterator it = getFunToPointsToList().begin(), eit = getFunToPointsToList().end();
             it!=eit; ++it)
     {
         const SVFFunction* fun = it->first;
@@ -329,7 +353,7 @@ void MRGenerator::updateAliasMRs()
     {
         MRSet aliasMRs;
         const SVFFunction* fun = getFunction(it->first);
-        const PointsTo& storeCPts = it->second;
+        const NodeBS& storeCPts = it->second;
         getAliasMemRegions(aliasMRs,storeCPts,fun);
         for(MRSet::iterator ait = aliasMRs.begin(), eait = aliasMRs.end(); ait!=eait; ++ait)
         {
@@ -341,7 +365,7 @@ void MRGenerator::updateAliasMRs()
     {
         MRSet aliasMRs;
         const SVFFunction* fun = getFunction(it->first);
-        const PointsTo& loadCPts = it->second;
+        const NodeBS& loadCPts = it->second;
         getMRsForLoad(aliasMRs, loadCPts, fun);
         for(MRSet::iterator ait = aliasMRs.begin(), eait = aliasMRs.end(); ait!=eait; ++ait)
         {
@@ -355,7 +379,7 @@ void MRGenerator::updateAliasMRs()
     {
         const SVFFunction* fun = it->first->getCaller();
         MRSet aliasMRs;
-        const PointsTo& callsiteModCPts = it->second;
+        const NodeBS& callsiteModCPts = it->second;
         getAliasMemRegions(aliasMRs,callsiteModCPts,fun);
         for(MRSet::iterator ait = aliasMRs.begin(), eait = aliasMRs.end(); ait!=eait; ++ait)
         {
@@ -367,7 +391,7 @@ void MRGenerator::updateAliasMRs()
     {
         const SVFFunction* fun = it->first->getCaller();
         MRSet aliasMRs;
-        const PointsTo& callsiteRefCPts = it->second;
+        const NodeBS& callsiteRefCPts = it->second;
         getMRsForCallSiteRef(aliasMRs, callsiteRefCPts, fun);
         for(MRSet::iterator ait = aliasMRs.begin(), eait = aliasMRs.end(); ait!=eait; ++ait)
         {
@@ -475,8 +499,8 @@ void MRGenerator::collectCallSitePts(const CallBlockNode* cs)
     while(!worklist.empty())
     {
         NodeID nodeId = worklist.pop();
-        const PointsTo& tmp = pta->getPts(nodeId);
-        for(PointsTo::iterator it = tmp.begin(), eit = tmp.end(); it!=eit; ++it)
+        const NodeBS& tmp = pta->getPts(nodeId);
+        for(NodeBS::iterator it = tmp.begin(), eit = tmp.end(); it!=eit; ++it)
             argsPts |= CollectPtsChain(*it);
     }
 
@@ -488,8 +512,8 @@ void MRGenerator::collectCallSitePts(const CallBlockNode* cs)
         const PAGNode* node = pta->getPAG()->getCallSiteRet(retBlockNode);
         if(node->isPointer())
         {
-            const PointsTo& tmp = pta->getPts(node->getId());
-            for(PointsTo::iterator it = tmp.begin(), eit = tmp.end(); it!=eit; ++it)
+            const NodeBS& tmp = pta->getPts(node->getId());
+            for(NodeBS::iterator it = tmp.begin(), eit = tmp.end(); it!=eit; ++it)
                 retPts |= CollectPtsChain(*it);
         }
     }
@@ -508,18 +532,18 @@ NodeBS& MRGenerator::CollectPtsChain(NodeID id)
         return it->second;
     else
     {
-        PointsTo& pts = cachedPtsChainMap[baseId];
+        NodeBS& pts = cachedPtsChainMap[baseId];
         pts |= pta->getPAG()->getFieldsAfterCollapse(baseId);
 
         WorkList worklist;
-        for(PointsTo::iterator it = pts.begin(), eit = pts.end(); it!=eit; ++it)
+        for(NodeBS::iterator it = pts.begin(), eit = pts.end(); it!=eit; ++it)
             worklist.push(*it);
 
         while(!worklist.empty())
         {
             NodeID nodeId = worklist.pop();
-            const PointsTo& tmp = pta->getPts(nodeId);
-            for(PointsTo::iterator it = tmp.begin(), eit = tmp.end(); it!=eit; ++it)
+            const NodeBS& tmp = pta->getPts(nodeId);
+            for(NodeBS::iterator it = tmp.begin(), eit = tmp.end(); it!=eit; ++it)
             {
                 pts |= CollectPtsChain(*it);
             }
@@ -643,12 +667,12 @@ void MRGenerator::modRefAnalysis(PTACallGraphNode* callGraphNode, WorkList& work
 /*!
  * Obtain the mod sets for a call, used for external ModRefInfo queries
  */
-PointsTo MRGenerator::getModInfoForCall(const CallBlockNode* cs)
+NodeBS MRGenerator::getModInfoForCall(const CallBlockNode* cs)
 {
     if (isExtCall(cs->getCallSite()) && !isHeapAllocExtCall(cs->getCallSite()))
     {
         PAGEdgeList& pagEdgeList = getPAGEdgesFromInst(cs->getCallSite());
-        PointsTo mods;
+        NodeBS mods;
         for (PAGEdgeList::const_iterator bit = pagEdgeList.begin(), ebit =
                     pagEdgeList.end(); bit != ebit; ++bit)
         {
@@ -667,12 +691,12 @@ PointsTo MRGenerator::getModInfoForCall(const CallBlockNode* cs)
 /*!
  * Obtain the ref sets for a call, used for external ModRefInfo queries
  */
-PointsTo MRGenerator::getRefInfoForCall(const CallBlockNode* cs)
+NodeBS MRGenerator::getRefInfoForCall(const CallBlockNode* cs)
 {
     if (isExtCall(cs->getCallSite()) && !isHeapAllocExtCall(cs->getCallSite()))
     {
         PAGEdgeList& pagEdgeList = getPAGEdgesFromInst(cs->getCallSite());
-        PointsTo refs;
+        NodeBS refs;
         for (PAGEdgeList::const_iterator bit = pagEdgeList.begin(), ebit =
                     pagEdgeList.end(); bit != ebit; ++bit)
         {
@@ -718,10 +742,10 @@ ModRefInfo MRGenerator::getModRefInfo(const CallBlockNode* cs, const Value* V)
 
     if (pta->getPAG()->hasValueNode(V))
     {
-        const PointsTo pts(pta->getPts(pta->getPAG()->getValueNode(V)));
-        const PointsTo csRef = getRefInfoForCall(cs);
-        const PointsTo csMod = getModInfoForCall(cs);
-        PointsTo ptsExpanded, csRefExpanded, csModExpanded;
+        const NodeBS pts(pta->getPts(pta->getPAG()->getValueNode(V)));
+        const NodeBS csRef = getRefInfoForCall(cs);
+        const NodeBS csMod = getModInfoForCall(cs);
+        NodeBS ptsExpanded, csRefExpanded, csModExpanded;
         pta->expandFIObjs(pts, ptsExpanded);
         pta->expandFIObjs(csRef, csRefExpanded);
         pta->expandFIObjs(csMod, csModExpanded);
@@ -754,11 +778,11 @@ ModRefInfo MRGenerator::getModRefInfo(const CallBlockNode* cs1, const CallBlockN
     if (getModRefInfo(cs1) == ModRefInfo::NoModRef || getModRefInfo(cs2) == ModRefInfo::NoModRef)
         return ModRefInfo::NoModRef;
 
-    const PointsTo cs1Ref = getRefInfoForCall(cs1);
-    const PointsTo cs1Mod = getModInfoForCall(cs1);
-    const PointsTo cs2Ref = getRefInfoForCall(cs2);
-    const PointsTo cs2Mod = getModInfoForCall(cs2);
-    PointsTo cs1RefExpanded, cs1ModExpanded, cs2RefExpanded, cs2ModExpanded;
+    const NodeBS cs1Ref = getRefInfoForCall(cs1);
+    const NodeBS cs1Mod = getModInfoForCall(cs1);
+    const NodeBS cs2Ref = getRefInfoForCall(cs2);
+    const NodeBS cs2Mod = getModInfoForCall(cs2);
+    NodeBS cs1RefExpanded, cs1ModExpanded, cs2RefExpanded, cs2ModExpanded;
     pta->expandFIObjs(cs1Ref, cs1RefExpanded);
     pta->expandFIObjs(cs1Mod, cs1ModExpanded);
     pta->expandFIObjs(cs2Ref, cs2RefExpanded);

package/lib/MSSA/MemSSA.cpp

@@ -70,6 +70,11 @@ MemSSA::MemSSA(BVDataPTAImpl* p, bool ptrOnlyMSSA) : df(nullptr),dt(nullptr)
     timeOfGeneratingMemRegions += (mrEnd - mrStart)/TIMEINTERVAL;
 }
 
+PAG* MemSSA::getPAG()
+{
+    return pta->getPAG();
+}
+
 /*!
  * Set DF/DT
  */

package/lib/MemoryModel/LocationSet.cpp

@@ -113,10 +113,10 @@ bool LocationSet::increaseIfNotReachUpperBound(std::vector<NodeID>& indices,
 /*!
  * Compute all possible locations according to offset and number-stride pairs.
  */
-PointsTo LocationSet::computeAllLocations() const
+NodeBS LocationSet::computeAllLocations() const
 {
 
-    PointsTo result;
+    NodeBS result;
     result.set(getOffset());
 
     if (isConstantOffset() == false)

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -6,7 +6,6 @@
  */
 
 
-#include "Util/Options.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "SVF-FE/CPPUtil.h"
 #include "SVF-FE/DCHG.h"
@@ -20,13 +19,11 @@ using namespace SVFUtil;
 using namespace cppUtil;
 using namespace std;
 
-PersistentPointsToCache<PointsTo> BVDataPTAImpl::ptCache = PersistentPointsToCache<PointsTo>(PointsTo());
-
 /*!
  * Constructor
  */
 BVDataPTAImpl::BVDataPTAImpl(PAG* p, PointerAnalysis::PTATY type, bool alias_check) :
-    PointerAnalysis(p, type, alias_check)
+    PointerAnalysis(p, type, alias_check), ptCache()
 {
     if (type == Andersen_BASE || type == Andersen_WPA || type == AndersenWaveDiff_WPA || type == AndersenHCD_WPA || type == AndersenHLCD_WPA
             || type == AndersenLCD_WPA || type == TypeCPP_WPA || type == FlowS_DDA || type == AndersenWaveDiffWithType_WPA

package/lib/Util/Options.cpp

@@ -7,12 +7,12 @@ namespace SVF
 {
     const llvm::cl::opt<bool> Options::MarkedClocksOnly(
         "marked-clocks-only",
-        llvm::cl::init(false),
+        llvm::cl::init(true),
         llvm::cl::desc("Only measure times where explicitly marked"));
 
     const llvm::cl::opt<NodeIDAllocator::Strategy> Options::NodeAllocStrat(
         "node-alloc-strat",
-        llvm::cl::init(NodeIDAllocator::Strategy::DEBUG),
+        llvm::cl::init(NodeIDAllocator::Strategy::SEQ),
         llvm::cl::desc("Method of allocating (LLVM) values and memory objects as node IDs"),
         llvm::cl::values(
             clEnumValN(NodeIDAllocator::Strategy::DENSE, "dense", "allocate objects together and values together, separately"),
@@ -26,7 +26,7 @@ namespace SVF
 
     const llvm::cl::opt<BVDataPTAImpl::PTBackingType> Options::ptDataBacking(
         "ptd",
-        llvm::cl::init(BVDataPTAImpl::PTBackingType::Mutable),
+        llvm::cl::init(BVDataPTAImpl::PTBackingType::Persistent),
         llvm::cl::desc("Overarching points-to data structure"),
         llvm::cl::values(
             clEnumValN(BVDataPTAImpl::PTBackingType::Mutable, "mutable", "points-to set per pointer"),

package/lib/Util/SVFUtil.cpp

@@ -31,6 +31,8 @@
 #include "Util/SVFUtil.h"
 #include "SVF-FE/LLVMUtil.h"
 
+#include "Util/Conditions.h"
+
 #include <sys/resource.h>		/// increase stack size
 
 using namespace SVF;
@@ -125,7 +127,7 @@ void SVFUtil::dumpPointsToList(const PointsToList& ptl)
          ii != ie; ii++)
     {
         auto bs = *ii;
-        dumpSparseSet(bs);
+        dumpSet(bs);
     }
     outs() << "}\n";
 }
@@ -351,7 +353,6 @@ std::string SVFUtil::getSourceLoc(const Value* val)
     return rawstr.str();
 }
 
-
 /*!
  * return string of an LLVM Value
  */

package/lib/WPA/FlowSensitive.cpp

@@ -615,6 +615,40 @@ bool FlowSensitive::updateCallGraph(const CallSiteToFunPtrMap& callsites)
     CallEdgeMap newEdges;
     onTheFlyCallGraphSolve(callsites, newEdges);
 
+    // Bound the new edges by the Andersen's call graph.
+    // TODO: we want this to be an assertion eventually.
+    const CallEdgeMap &andersCallEdgeMap = ander->getIndCallMap();
+    for (typename CallEdgeMap::value_type &csfs : newEdges)
+    {
+        const CallBlockNode *potentialCallSite = csfs.first;
+        FunctionSet &potentialFunctionSet = csfs.second;
+
+        // Check this callsite even calls anything per Andersen's.
+        typename CallEdgeMap::const_iterator andersFunctionSetIt
+            = andersCallEdgeMap.find(potentialCallSite);
+        if (andersFunctionSetIt == andersCallEdgeMap.end())
+        {
+            potentialFunctionSet.clear();
+        }
+
+        const FunctionSet &andersFunctionSet = andersFunctionSetIt->second;
+        for (FunctionSet::iterator potentialFunctionIt = potentialFunctionSet.begin();
+             potentialFunctionIt != potentialFunctionSet.end(); )
+        {
+            const SVFFunction *potentialFunction = *potentialFunctionIt;
+            if (andersFunctionSet.find(potentialFunction) == andersFunctionSet.end())
+            {
+                // potentialFunction is not in the Andersen's call graph -- remove it.
+                potentialFunctionIt = potentialFunctionSet.erase(potentialFunctionIt);
+            }
+            else
+            {
+                // potentialFunction is in the Andersen's call graph -- keep it..
+                ++potentialFunctionIt;
+            }
+        }
+    }
+
     SVFGEdgeSetTy svfgEdges;
     connectCallerAndCallee(newEdges, svfgEdges);
 

package/package.json

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