svf-tools 1.0.1064 → 1.0.1066

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1064",
+  "version": "1.0.1066",
   "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/CallGraph.h

@@ -194,7 +194,7 @@ public:
     }
 
     /// Return TRUE if this function can be reached from main.
-    bool isReachableFromProgEntry() const;
+    bool isReachableFromProgEntry(Map<NodeID, bool> &reachableFromEntry, NodeBS &visitedNodes) const;
 
 
     /// Overloading operator << for dumping ICFG node ID

package/svf/lib/Graphs/CallGraph.cpp

@@ -30,6 +30,7 @@
 
 #include "Graphs/CallGraph.h"
 #include "SVFIR/SVFIR.h"
+#include "Util/Options.h"
 #include "Util/SVFUtil.h"
 #include <sstream>
 
@@ -89,30 +90,29 @@ const FunObjVar *CallGraph::getCallerOfCallSite(CallSiteID id) const
     return getCallSite(id)->getCaller();
 }
 
-bool CallGraphNode::isReachableFromProgEntry() const
+bool CallGraphNode::isReachableFromProgEntry(Map<NodeID, bool> &reachableFromEntry, NodeBS &visitedNodes) const
 {
-    std::stack<const CallGraphNode*> nodeStack;
-    NodeBS visitedNodes;
-    nodeStack.push(this);
-    visitedNodes.set(getId());
-
-    while (nodeStack.empty() == false)
-    {
-        CallGraphNode* node = const_cast<CallGraphNode*>(nodeStack.top());
-        nodeStack.pop();
+    std::function<bool(const CallGraphNode*)> dfs =
+            [&reachableFromEntry, &visitedNodes, &dfs](const CallGraphNode *v) {
+        NodeID id = v->getId();
+        if (!visitedNodes.test_and_set(id))
+            return reachableFromEntry[id];
 
-        if (SVFUtil::isProgEntryFunction(node->getFunction()))
-            return true;
+        if (SVFUtil::isProgEntryFunction(v->getFunction()))
+            return reachableFromEntry[id] = true;
 
-        for (const_iterator it = node->InEdgeBegin(), eit = node->InEdgeEnd(); it != eit; ++it)
+        bool result = false;
+        for (const_iterator it = v->InEdgeBegin(), eit = v->InEdgeEnd(); it != eit; ++it)
         {
             CallGraphEdge* edge = *it;
-            if (visitedNodes.test_and_set(edge->getSrcID()))
-                nodeStack.push(edge->getSrcNode());
+            result |= dfs(edge->getSrcNode());
+            if (result)
+                break;
         }
-    }
+        return reachableFromEntry[id] = result;
+    };
 
-    return false;
+    return dfs(this);
 }
 
 
@@ -285,6 +285,11 @@ void CallGraph::getIndCallSitesInvokingCallee(const FunObjVar* callee, CallGraph
  */
 void CallGraph::verifyCallGraph()
 {
+    if (Options::DisableWarn())
+        return;
+
+    Map<NodeID, bool> reachableFromEntry;
+    NodeBS visitedNodes;
     CallEdgeMap::const_iterator it = indirectCallMap.begin();
     CallEdgeMap::const_iterator eit = indirectCallMap.end();
     for (; it != eit; ++it)
@@ -294,7 +299,8 @@ void CallGraph::verifyCallGraph()
         {
             const CallICFGNode* cs = it->first;
             const FunObjVar* func = cs->getCaller();
-            if (getCallGraphNode(func)->isReachableFromProgEntry() == false)
+            if (getCallGraphNode(func)->
+                isReachableFromProgEntry(reachableFromEntry, visitedNodes) == false)
                 writeWrnMsg(func->getName() + " has indirect call site but not reachable from main");
         }
     }