svf-tools 1.0.1073 → 1.0.1074

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1073",
+  "version": "1.0.1074",
   "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/AE/Core/ICFGWTO.h

@@ -36,6 +36,7 @@
 
 #include "Graphs/ICFG.h"
 #include "Graphs/WTO.h"
+#include "Graphs/CallGraph.h"
 
 namespace SVF
 {
@@ -77,6 +78,58 @@ public:
         }
     }
 };
+
+// Added for IWTO
+class ICFGIWTO : public ICFGWTO
+{
+public:
+    typedef ICFGWTO Base;
+    typedef WTOComponentVisitor<ICFG>::WTONodeT ICFGWTONode;
+    NodeBS &funcPar;
+    CallGraph *cg;
+
+    explicit ICFGIWTO(ICFG* graph, const ICFGNode* node, NodeBS & funcPar, CallGraph* cg) :
+          Base(graph, node), funcPar(funcPar), cg(cg) {}
+
+    virtual ~ICFGIWTO()
+    {
+    }
+
+    inline void forEachSuccessor(
+        const ICFGNode* node,
+        std::function<void(const ICFGNode*)> func) const override
+    {
+        if (const auto* callNode = SVFUtil::dyn_cast<CallICFGNode>(node))
+        {
+
+            for (const auto &e : callNode->getOutEdges())
+            {
+                ICFGNode *calleeEntryICFGNode = e->getDstNode();
+                CallGraphNode * calleeCGNode = cg->getCallGraphNode(calleeEntryICFGNode->getFun());
+
+                const ICFGNode* succ = nullptr;
+                if (funcPar.test(calleeCGNode->getId()))
+                    succ = calleeEntryICFGNode;
+                else
+                    succ = callNode->getRetICFGNode();
+
+                func(succ);
+            }
+        }
+        else
+        {
+            for (const auto& e : node->getOutEdges())
+            {
+                ICFGNode *succ = e->getDstNode();
+                CallGraphNode *succCGNode = cg->getCallGraphNode(succ->getFun());
+                if (!funcPar.test(succCGNode->getId()))
+                    continue;
+                func(succ);
+            }
+        }
+    }
+};
+
 } // namespace SVF
 
 #endif // SVF_ICFGWTO_H

package/svf/include/AE/Svfexe/AbsExtAPI.h

@@ -28,9 +28,7 @@
 #include "AE/Core/AbstractState.h"
 #include "AE/Core/ICFGWTO.h"
 #include "AE/Svfexe/AEDetector.h"
-#include "AE/Svfexe/AbsExtAPI.h"
 #include "Util/SVFBugReport.h"
-#include "WPA/Andersen.h"
 
 namespace SVF
 {

package/svf/include/AE/Svfexe/AbstractInterpretation.h

@@ -33,7 +33,8 @@
 #include "AE/Svfexe/AEDetector.h"
 #include "AE/Svfexe/AbsExtAPI.h"
 #include "Util/SVFBugReport.h"
-#include "WPA/Andersen.h"
+#include "Util/SVFStat.h"
+#include "Graphs/SCC.h"
 
 namespace SVF
 {
@@ -107,6 +108,29 @@ class AbstractInterpretation
 
 public:
     typedef SCCDetection<CallGraph*> CallGraphSCC;
+
+    /*
+     * For recursive test case
+     * int demo(int a) {
+        if (a >= 10000)
+            return a;
+            demo(a+1);
+        }
+
+        int main() {
+            int result = demo(0);
+        }
+     * if set TOP, result = [-oo, +oo] since the return value, and any stored object pointed by q at *q = p in recursive functions will be set to the top value.
+     * if set WIDEN_ONLY, result = [10000, +oo] since only widening is applied at the cycle head of recursive functions without narrowing.
+     * if set WIDEN_NARROW, result = [10000, 10000] since both widening and narrowing are applied at the cycle head of recursive functions.
+     * */
+    enum HandleRecur
+    {
+        TOP,
+        WIDEN_ONLY,
+        WIDEN_NARROW
+    };
+
     /// Constructor
     AbstractInterpretation();
 
@@ -135,7 +159,7 @@ private:
     /// Global ICFGNode is handled at the entry of the program,
     virtual void handleGlobalNode();
 
-    /// Mark recursive functions in the call graph
+    /// Compute IWTO for each function partition entry
     void initWTO();
 
     /**
@@ -251,7 +275,8 @@ private:
     AEStat* stat;
 
     std::vector<const CallICFGNode*> callSiteStack;
-    Map<const FunObjVar*, ICFGWTO*> funcToWTO;
+    Map<const FunObjVar*, const ICFGWTO*> funcToWTO;
+    Set<std::pair<const CallICFGNode*, NodeID>> nonRecursiveCallSites;
     Set<const FunObjVar*> recursiveFuns;
 
 
@@ -282,8 +307,10 @@ private:
     // helper functions in handleCallSite
     virtual bool isExtCall(const CallICFGNode* callNode);
     virtual void extCallPass(const CallICFGNode* callNode);
+    virtual bool isRecursiveFun(const FunObjVar* fun);
     virtual bool isRecursiveCall(const CallICFGNode* callNode);
-    virtual void recursiveCallPass(const CallICFGNode* callNode);
+    virtual void recursiveCallPass(const CallICFGNode *callNode);
+    virtual bool isRecursiveCallSite(const CallICFGNode* callNode, const FunObjVar *);
     virtual bool isDirectCall(const CallICFGNode* callNode);
     virtual void directCallFunPass(const CallICFGNode* callNode);
     virtual bool isIndirectCall(const CallICFGNode* callNode);

package/svf/include/Util/Options.h

@@ -11,6 +11,7 @@
 #include "Util/NodeIDAllocator.h"
 #include "MSSA/MemSSA.h"
 #include "WPA/WPAPass.h"
+#include "AE/Svfexe/AbstractInterpretation.h"
 
 namespace SVF
 {
@@ -244,6 +245,8 @@ public:
 
     // Abstract Execution
     static const Option<u32_t> WidenDelay;
+    /// recursion handling mode, Default: TOP
+    static const OptionMap<AbstractInterpretation::HandleRecur> 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/AE/Svfexe/AbsExtAPI.cpp

@@ -26,6 +26,8 @@
 //
 #include "AE/Svfexe/AbsExtAPI.h"
 #include "AE/Svfexe/AbstractInterpretation.h"
+#include "WPA/Andersen.h"
+#include "Util/Options.h"
 
 using namespace SVF;
 AbsExtAPI::AbsExtAPI(Map<const ICFGNode*, AbstractState>& traces): abstractTrace(traces)