svf-tools 1.0.1092 → 1.0.1094

package/package.json

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

package/svf/include/Graphs/VFG.h

@@ -192,20 +192,21 @@ public:
     }
 
     // Given an VFG node, return true if it has a left hand side top level pointer (PAGnode)
-    inline bool hasLHSTopLevPtr(const VFGNode* node) const {
+    inline bool hasLHSTopLevPtr(const VFGNode* node) const
+    {
         return node && SVFUtil::isa<AddrVFGNode,
-                                    CopyVFGNode,
-                                    GepVFGNode,
-                                    LoadVFGNode,
-                                    PHIVFGNode,
-                                    CmpVFGNode,
-                                    BinaryOPVFGNode,
-                                    UnaryOPVFGNode,
-                                    ActualParmVFGNode,
-                                    FormalParmVFGNode,
-                                    ActualRetVFGNode,
-                                    FormalRetVFGNode,
-                                    NullPtrVFGNode>(node);
+               CopyVFGNode,
+               GepVFGNode,
+               LoadVFGNode,
+               PHIVFGNode,
+               CmpVFGNode,
+               BinaryOPVFGNode,
+               UnaryOPVFGNode,
+               ActualParmVFGNode,
+               FormalParmVFGNode,
+               ActualRetVFGNode,
+               FormalRetVFGNode,
+               NullPtrVFGNode>(node);
     }
 
     // Given an VFG node, return its left hand side top level pointer (PAGnode)

package/svf/include/Util/Options.h

@@ -4,14 +4,10 @@
 #define OPTIONS_H_
 
 #include <sstream>
-#include "FastCluster/fastcluster.h"
 #include "Util/CommandLine.h"
 #include "Util/PTAStat.h"
 #include "MemoryModel/PointerAnalysisImpl.h"
 #include "Util/NodeIDAllocator.h"
-#include "MSSA/MemSSA.h"
-#include "WPA/WPAPass.h"
-#include "AE/Svfexe/AbstractInterpretation.h"
 
 namespace SVF
 {
@@ -54,7 +50,7 @@ public:
     /// TODO: we can separate it into two options, and make Clusterer::cluster take in a method
     ///       argument rather than plugging Options::ClusterMethod *inside* Clusterer::cluster
     ///       directly, but it seems we will always want single anyway, and this is for testing.
-    static const OptionMap<enum hclust_fast_methods> ClusterMethod;
+    static const OptionMap<u32_t> ClusterMethod;
 
     /// Cluster partitions separately.
     static const Option<bool> RegionedClustering;
@@ -143,7 +139,7 @@ public:
     static const Option<bool> DumpMSSA;
     static const Option<std::string> MSSAFun;
     // static const llvm::cl::opt<string> MSSAFun;
-    static const OptionMap<MemSSA::MemPartition> MemPar;
+    static const OptionMap<u32_t> MemPar;
 
     // SVFG builder (SVFGBuilder.cpp)
     static const Option<bool> SVFGWithIndirectCall;
@@ -223,7 +219,7 @@ public:
     static const Option<bool> SABERFULLSVFG;
     static const Option<bool> PrintAliases;
     static OptionMultiple<PointerAnalysis::PTATY> PASelected;
-    static OptionMultiple<WPAPass::AliasCheckRule> AliasRule;
+    static OptionMultiple<u32_t> AliasRule;
 
     // DOTGraphTraits
     static const Option<bool> ShowHiddenNode;
@@ -246,7 +242,7 @@ public:
     // Abstract Execution
     static const Option<u32_t> WidenDelay;
     /// recursion handling mode, Default: TOP
-    static const OptionMap<AbstractInterpretation::HandleRecur> HandleRecur;
+    static const OptionMap<u32_t> HandleRecur;
     /// the max time consumptions (seconds). Default: 4 hours 14400s
     static const Option<u32_t> Timeout;
     /// bug info output file, Default: output.db

package/svf/lib/Graphs/SVFGOPT.cpp

@@ -65,7 +65,8 @@ void SVFGOPT::buildSVFG()
 }
 
 /// Separate function to optimise the SVFG to avoid duplicate code
-void SVFGOPT::optimiseSVFG() {
+void SVFGOPT::optimiseSVFG()
+{
     if(Options::DumpVFG())
         dump("SVFG_before_opt");
 

package/svf/lib/MSSA/SVFGBuilder.cpp

@@ -40,13 +40,13 @@ using namespace SVFUtil;
 SVFG* SVFGBuilder::buildPTROnlySVFG(BVDataPTAImpl* pta)
 {
     return this->SVFGWithPostOpts ? build(pta, VFG::PTRONLYSVFG_OPT)
-                                  : build(pta, VFG::PTRONLYSVFG);
+           : build(pta, VFG::PTRONLYSVFG);
 }
 
 SVFG* SVFGBuilder::buildFullSVFG(BVDataPTAImpl* pta)
 {
     return this->SVFGWithPostOpts ? build(pta, VFG::FULLSVFG_OPT)
-                                  : build(pta, VFG::FULLSVFG);
+           : build(pta, VFG::FULLSVFG);
 }
 
 /*!
@@ -62,7 +62,7 @@ SVFG* SVFGBuilder::build(BVDataPTAImpl* pta, VFG::VFGK kind)
 {
 
     auto mssa = buildMSSA(
-        pta, (VFG::PTRONLYSVFG == kind || VFG::PTRONLYSVFG_OPT == kind));
+                    pta, (VFG::PTRONLYSVFG == kind || VFG::PTRONLYSVFG_OPT == kind));
 
     DBOUT(DGENERAL, outs() << pasMsg("Build Sparse Value-Flow Graph \n"));
     if (kind == VFG::FULLSVFG_OPT || kind == VFG::PTRONLYSVFG_OPT)
@@ -93,7 +93,7 @@ void SVFGBuilder::releaseMemory()
 }
 
 std::unique_ptr<MemSSA> SVFGBuilder::buildMSSA(BVDataPTAImpl* pta,
-                                               bool ptrOnlyMSSA)
+        bool ptrOnlyMSSA)
 {
 
     DBOUT(DGENERAL, outs() << pasMsg("Build Memory SSA \n"));

package/svf/lib/Util/NodeIDAllocator.cpp

@@ -306,7 +306,7 @@ std::vector<NodeID> NodeIDAllocator::Clusterer::cluster(BVDataPTAImpl *pta, cons
     overallStats[NumRegions] = std::to_string(numRegions);
 
     std::vector<hclust_fast_methods> methods;
-    if (Options::ClusterMethod() == HCLUST_METHOD_SVF_BEST)
+    if ((enum hclust_fast_methods)Options::ClusterMethod() == HCLUST_METHOD_SVF_BEST)
     {
         methods.push_back(HCLUST_METHOD_SINGLE);
         methods.push_back(HCLUST_METHOD_COMPLETE);
@@ -314,7 +314,7 @@ std::vector<NodeID> NodeIDAllocator::Clusterer::cluster(BVDataPTAImpl *pta, cons
     }
     else
     {
-        methods.push_back(Options::ClusterMethod());
+        methods.push_back((enum hclust_fast_methods)Options::ClusterMethod());
     }
 
     for (const hclust_fast_methods method : methods)
@@ -655,7 +655,7 @@ std::pair<hclust_fast_methods, std::vector<NodeID>> NodeIDAllocator::Clusterer::
     std::pair<hclust_fast_methods, std::vector<NodeID>> bestMapping = candidates[0];
     // Number of bits required for the best candidate.
     size_t bestWords = std::numeric_limits<size_t>::max();
-    if (evalSubtitle != "" || Options::ClusterMethod() == HCLUST_METHOD_SVF_BEST)
+    if (evalSubtitle != "" || (enum hclust_fast_methods)Options::ClusterMethod() == HCLUST_METHOD_SVF_BEST)
     {
         for (const std::pair<hclust_fast_methods, std::vector<NodeID>> &candidate : candidates)
         {

package/svf/lib/Util/Options.cpp

@@ -2,7 +2,11 @@
 
 #include "Util/Options.h"
 #include "Util/CommandLine.h"
+#include "FastCluster/fastcluster.h"
 #include "Util/ExtAPI.h"
+#include "MSSA/MemSSA.h"
+#include "WPA/WPAPass.h"
+#include "AE/Svfexe/AbstractInterpretation.h"
 
 namespace SVF
 {
@@ -356,7 +360,7 @@ const OptionMap<PointsTo::Type> Options::PtType(
 }
 );
 
-const OptionMap<enum hclust_fast_methods> Options::ClusterMethod(
+const OptionMap<u32_t> Options::ClusterMethod(
     "cluster-method",
     "hierarchical clustering method for objects",
     HCLUST_METHOD_SVF_BEST,
@@ -408,7 +412,7 @@ const Option<std::string> Options::MSSAFun(
     ""
 );
 
-const OptionMap<MemSSA::MemPartition> Options::MemPar(
+const OptionMap<u32_t> Options::MemPar(
     "mem-par",
     "Memory region partition strategies (e.g., for SVFG construction)",
     MemSSA::MemPartition::IntraDisjoint,
@@ -697,7 +701,7 @@ OptionMultiple<PointerAnalysis::PTATY> Options::PASelected(
 );
 
 
-OptionMultiple<WPAPass::AliasCheckRule> Options::AliasRule(
+OptionMultiple<u32_t> Options::AliasRule(
     "Select alias check rule",
 {
     {WPAPass::Conservative, "conservative", "return MayAlias if any pta says alias"},
@@ -779,7 +783,7 @@ const Option<u32_t> Options::LoopBound(
 
 const Option<u32_t> Options::WidenDelay(
     "widen-delay", "Loop Widen Delay", 3);
-const OptionMap<AbstractInterpretation::HandleRecur> Options::HandleRecur(
+const OptionMap<u32_t> Options::HandleRecur(
     "handle-recur",
     "Recursion handling mode in abstract execution (Default -widen-narrow)",
     AbstractInterpretation::HandleRecur::WIDEN_NARROW,