svf-tools 1.0.283 → 1.0.287

package/lib/MTA/FSMPTA.cpp

@@ -141,12 +141,12 @@ void MTASVFGBuilder::performRemovingMHPEdges()
             if (edge->isIndirectVFGEdge() && (edge->getDstNode()==n2))
             {
                 IndirectSVFGEdge* e = SVFUtil::cast<IndirectSVFGEdge>(edge);
-                const PointsTo& pts = e->getPointsTo();
-                for (NodeBS::iterator o = remove_pts.begin(), eo = remove_pts.end(); o != eo; ++o)
+                const NodeBS& pts = e->getPointsTo();
+                for (PointsTo::iterator o = remove_pts.begin(), eo = remove_pts.end(); o != eo; ++o)
                 {
-                    if (const_cast<PointsTo&>(pts).test(*o))
+                    if (const_cast<NodeBS&>(pts).test(*o))
                     {
-                        const_cast<PointsTo&>(pts).reset(*o);
+                        const_cast<NodeBS&>(pts).reset(*o);
                         MTASVFGBuilder::numOfRemovedPTS ++;
                     }
                 }
@@ -406,7 +406,7 @@ MTASVFGBuilder::SVFGNodeIDSet MTASVFGBuilder::getSuccNodes(const StmtSVFGNode* n
         if (edge->isIndirectVFGEdge())
         {
             IndirectSVFGEdge* e = SVFUtil::cast<IndirectSVFGEdge>(edge);
-            PointsTo pts = e->getPointsTo();
+            NodeBS pts = e->getPointsTo();
             if(pts.test(o))
                 worklist.insert(edge->getDstNode());
         }
@@ -427,7 +427,7 @@ MTASVFGBuilder::SVFGNodeIDSet MTASVFGBuilder::getSuccNodes(const StmtSVFGNode* n
                 if (edge->isIndirectVFGEdge() && visited.find(edge->getDstNode()) == visited.end())
                 {
                     IndirectSVFGEdge* e = SVFUtil::cast<IndirectSVFGEdge>(edge);
-                    PointsTo pts = e->getPointsTo();
+                    NodeBS pts = e->getPointsTo();
                     if(pts.test(o))
                         worklist.insert(edge->getDstNode());
                 }
@@ -649,7 +649,7 @@ void MTASVFGBuilder::readPrecision()
                 const StmtSVFGNode* n2 = SVFUtil::cast<StmtSVFGNode>(edge->getSrcNode());
 
                 IndirectSVFGEdge* e = SVFUtil::cast<IndirectSVFGEdge>(edge);
-                PointsTo pts = e->getPointsTo();
+                NodeBS pts = e->getPointsTo();
                 PointsTo remove_pts;
 
                 for (NodeBS::iterator o = pts.begin(), eo = pts.end(); o != eo; ++o)

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

@@ -345,7 +345,7 @@ void PointerAnalysis::dumpPts(NodeID ptr, const PointsTo& pts)
 
     outs() << "";
 
-    for (NodeBS::iterator it = pts.begin(), eit = pts.end(); it != eit; ++it)
+    for (PointsTo::iterator it = pts.begin(), eit = pts.end(); it != eit; ++it)
     {
         const PAGNode* node = pag->getPAGNode(*it);
         if(SVFUtil::isa<ObjPN>(node) == 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/SABER/SaberSVFGBuilder.cpp

@@ -29,6 +29,7 @@
 
 #include "SABER/SaberSVFGBuilder.h"
 #include "SABER/SaberCheckerAPI.h"
+#include "MemoryModel/PointerAnalysisImpl.h"
 #include "Graphs/SVFG.h"
 
 using namespace SVF;
@@ -97,7 +98,7 @@ void SaberSVFGBuilder::collectGlobals(BVDataPTAImpl* pta)
     }
 }
 
-NodeBS& SaberSVFGBuilder::CollectPtsChain(BVDataPTAImpl* pta,NodeID id, NodeToPTSSMap& cachedPtsMap)
+PointsTo& SaberSVFGBuilder::CollectPtsChain(BVDataPTAImpl* pta,NodeID id, NodeToPTSSMap& cachedPtsMap)
 {
     PAG* pag = svfg->getPAG();
 

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

@@ -326,7 +326,7 @@ bool FlowSensitive::propAlongIndirectEdge(const IndirectSVFGEdge* edge)
 
     // Get points-to targets may be used by next SVFG node.
     // Propagate points-to set for node used in dst.
-    const PointsTo& pts = edge->getPointsTo();
+    const NodeBS& pts = edge->getPointsTo();
     for (PointsTo::iterator ptdIt = pts.begin(), ptdEit = pts.end(); ptdIt != ptdEit; ++ptdIt)
     {
         NodeID ptd = *ptdIt;
@@ -703,7 +703,7 @@ void FlowSensitive::updateConnectedNodes(const SVFGEdgeSetTy& edges)
 
             SVFGNode* srcNode = edge->getSrcNode();
 
-            const PointsTo& pts = SVFUtil::cast<IndirectSVFGEdge>(edge)->getPointsTo();
+            const NodeBS& pts = SVFUtil::cast<IndirectSVFGEdge>(edge)->getPointsTo();
             for (PointsTo::iterator ptdIt = pts.begin(), ptdEit = pts.end(); ptdIt != ptdEit; ++ptdIt)
             {
                 NodeID ptd = *ptdIt;

package/lib/WPA/FlowSensitiveTBHC.cpp

@@ -96,11 +96,11 @@ bool FlowSensitiveTBHC::propAlongIndirectEdge(const IndirectSVFGEdge* edge)
 
     // Get points-to targets may be used by next SVFG node.
     // Propagate points-to set for node used in dst.
-    const PointsTo& pts = edge->getPointsTo();
+    const NodeBS & pts = edge->getPointsTo();
 
     // Since the base Andersen's analysis does NOT perform type-based heap cloning,
     // it uses only the base objects; we want to account for clones too.
-    PointsTo edgePtsAndClones;
+    NodeBS edgePtsAndClones;
 
     // TODO: the conditional bool may be unnecessary.
     // Adding all clones is redundant, and introduces too many calls to propVarPts...

package/lib/WPA/VersionedFlowSensitive.cpp

@@ -391,7 +391,7 @@ void VersionedFlowSensitive::updateConnectedNodes(const SVFGEdgeSetTy& newEdges)
             const IndirectSVFGEdge *ie = SVFUtil::dyn_cast<IndirectSVFGEdge>(e);
             assert(ie != nullptr && "VFS::updateConnectedNodes: given direct edge?");
 
-            const PointsTo &ept = ie->getPointsTo();
+            const NodeBS &ept = ie->getPointsTo();
             // For every o, such that src --o--> dst, we need to set up reliance (and propagate).
             for (const NodeID o : ept)
             {

package/package.json

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