svf-tools 1.0.286 → 1.0.287

package/include/SABER/SaberSVFGBuilder.h

@@ -44,7 +44,7 @@ class SaberSVFGBuilder : public SVFGBuilder
 
 public:
     typedef Set<const SVFGNode*> SVFGNodeSet;
-    typedef Map<NodeID, NodeBS> NodeToPTSSMap;
+    typedef Map<NodeID, PointsTo> NodeToPTSSMap;
     typedef FIFOWorkList<NodeID> WorkList;
 
     /// Constructor
@@ -94,9 +94,9 @@ private:
     bool accessGlobal(BVDataPTAImpl* pta,const PAGNode* pagNode);
 
     /// Collect objects along points-to chains
-    NodeBS& CollectPtsChain(BVDataPTAImpl* pta,NodeID id, NodeToPTSSMap& cachedPtsMap);
+    PointsTo& CollectPtsChain(BVDataPTAImpl* pta,NodeID id, NodeToPTSSMap& cachedPtsMap);
 
-    NodeBS globs;
+    PointsTo globs;
     /// Store all global SVFG nodes
     SVFGNodeSet globSVFGNodes;
 };

package/lib/Graphs/SVFGStat.cpp

@@ -321,7 +321,7 @@ void SVFGStat::calculateNodeDegrees(SVFGNode* node, NodeSet& nodeHasIndInEdge, N
             nodeHasIndInEdge.insert(node->getId());
             // get edge's weight
             // TODO: try a new method to calculate weight.
-            const PointsTo& cpts = edge->getPointsTo();
+            const NodeBS& cpts = edge->getPointsTo();
             avgWeight += cpts.count();
             totalIndEdgeLabels += cpts.count();
         }

package/lib/Graphs/ThreadCallGraph.cpp

@@ -74,8 +74,8 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
         if(SVFUtil::dyn_cast<Function>(forkedval)==nullptr)
         {
             PAG* pag = pta->getPAG();
-            const PointsTo& targets = pta->getPts(pag->getValueNode(forkedval));
-            for (PointsTo::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
+            const NodeBS targets = pta->getPts(pag->getValueNode(forkedval));
+            for (NodeBS::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
             {
                 if(ObjPN* objPN = SVFUtil::dyn_cast<ObjPN>(pag->getPAGNode(*ii)))
                 {
@@ -98,8 +98,8 @@ void ThreadCallGraph::updateCallGraph(PointerAnalysis* pta)
         if(SVFUtil::dyn_cast<Function>(forkedval)==nullptr)
         {
             PAG* pag = pta->getPAG();
-            const PointsTo& targets = pta->getPts(pag->getValueNode(forkedval));
-            for (PointsTo::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
+            const NodeBS targets = pta->getPts(pag->getValueNode(forkedval));
+            for (NodeBS::iterator ii = targets.begin(), ie = targets.end(); ii != ie; ii++)
             {
                 if(ObjPN* objPN = SVFUtil::dyn_cast<ObjPN>(pag->getPAGNode(*ii)))
                 {

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/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/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/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.286",
+  "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": {