svf-tools 1.0.302 → 1.0.306

package/lib/WPA/VersionedFlowSensitiveStat.cpp

@@ -95,9 +95,7 @@ void VersionedFlowSensitiveStat::performStat()
     timeStatMap["PhiTime"]            = vfspta->phiTime;
     timeStatMap["meldLabelingTime"]   = vfspta->meldLabelingTime;
     timeStatMap["PrelabelingTime"]    = vfspta->prelabelingTime;
-    timeStatMap["RelianceTime"]       = vfspta->relianceTime;
     timeStatMap["VersionPropTime"]    = vfspta->versionPropTime;
-    timeStatMap["MeldMappingTime"]    = vfspta->meldMappingTime;
 
     PTNumStatMap[TotalNumOfPointers]  = pag->getValueNodeNum() + pag->getFieldValNodeNum();
     PTNumStatMap[TotalNumOfObjects]   = pag->getObjectNodeNum() + pag->getFieldObjNodeNum();
@@ -153,48 +151,35 @@ void VersionedFlowSensitiveStat::performStat()
 
 void VersionedFlowSensitiveStat::versionStat(void)
 {
-    Map<NodeID, Set<Version>> versions;
-    for (VersionedFlowSensitive::LocVersionMap::value_type &lov : vfspta->consume)
-    {
-        for (VersionedFlowSensitive::ObjToVersionMap::value_type &ov : lov.second)
-        {
-            versions[ov.first].insert(ov.second);
-        }
-    }
+    // TODO! Need to merge yield/consume.
+    _NumSingleVersion = 0;
+    _MaxVersions = 0;
 
-    for (VersionedFlowSensitive::LocVersionMap::value_type &lov : vfspta->yield)
+    u32_t totalVersionPtsSize = 0;
+    for (const VersionedFlowSensitive::LocVersionMap *lvm : { &vfspta->consume, &vfspta->yield })
     {
-        for (VersionedFlowSensitive::ObjToVersionMap::value_type &ov : lov.second)
+        for (const VersionedFlowSensitive::ObjToVersionMap  &lov : *lvm)
         {
-            versions[ov.first].insert(ov.second);
-        }
-    }
+            for (const VersionedFlowSensitive::ObjToVersionMap::value_type &ov : lov)
+            {
+                const NodeID o = ov.first;
+                const Version v = ov.second;
 
-    u32_t totalVersionPtsSize = 0;
-    for (Map<NodeID, Set<Version>>::value_type &ovs : versions)
-    {
-        NodeID o = ovs.first;
-        Set<Version> vs = ovs.second;
+                ++_NumVersions;
 
-        u32_t numOVersions = vs.size();
-        _NumVersions += numOVersions;
-        if (numOVersions > _MaxVersions) _MaxVersions = numOVersions;
-        if (numOVersions == 1) ++_NumSingleVersion;
+                // If the version was just over-approximate and never accessed, ignore.
+                // TODO: with vPtD changed there is no interface to check if the PTS
+                //       exists; an emptiness check is *not* an existence check.
+                if (vfspta->vPtD->getPts(vfspta->atKey(o, v)).empty()) continue;
 
-        for (const Set<Version>::value_type &v : vs)
-        {
-            // If the version was just over-approximate and never accessed, ignore.
-            // TODO: with vPtD changed there is no interface to check if the PTS
-            //       exists; an emptiness check is *not* an existence check.
-            if (vfspta->vPtD->getPts(vfspta->atKey(o, v)).empty()) continue;
-
-            const PointsTo &ovPts = vfspta->vPtD->getPts(vfspta->atKey(o, v));
-            if (!ovPts.empty()) ++_NumNonEmptyVersions;
-            else ++_NumEmptyVersions;
-
-            _TotalPtsSize += ovPts.count();
-            totalVersionPtsSize += ovPts.count();
-            if (ovPts.count() > _MaxVersionPtsSize) _MaxVersionPtsSize = ovPts.count();
+                const PointsTo &ovPts = vfspta->vPtD->getPts(vfspta->atKey(o, v));
+                if (!ovPts.empty()) ++_NumNonEmptyVersions;
+                else ++_NumEmptyVersions;
+
+                _TotalPtsSize += ovPts.count();
+                totalVersionPtsSize += ovPts.count();
+                if (ovPts.count() > _MaxVersionPtsSize) _MaxVersionPtsSize = ovPts.count();
+            }
         }
     }
 

package/package.json

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