svf-tools 1.0.990 → 1.0.992

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.990",
+  "version": "1.0.992",
   "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/ICFGEdge.h

@@ -192,6 +192,12 @@ public:
     {
         callPEs.push_back(callPE);
     }
+    /// Return call ICFGNode at the callsite
+    inline const CallICFGNode* getCallSite() const
+    {
+        assert(SVFUtil::isa<CallICFGNode>(getSrcNode()) && "not a CallICFGNode?");
+        return SVFUtil::cast<CallICFGNode>(getSrcNode());
+    }
     /// Add get parameter edge to this CallCFGEdge
     inline const std::vector<const CallPE*>& getCallPEs() const
     {
@@ -243,6 +249,9 @@ public:
     {
         return retPE;
     }
+    /// Return call ICFGNode at the callsite
+    const CallICFGNode* getCallSite() const;
+
     /// Methods for support type inquiry through isa, cast, and dyn_cast:
     //@{
     static inline bool classof(const RetCFGEdge*)

package/svf/lib/Graphs/ConsG.cpp

@@ -149,6 +149,15 @@ void ConstraintGraph::buildCG()
  */
 void ConstraintGraph::clearSolitaries()
 {
+    /// We don't remove return SVFVar from an indirect callsite
+    NodeSet retFromIndCalls;
+    for(auto cs_pair : pag->getIndirectCallsites())
+    {
+        const RetICFGNode* retBlockNode = cs_pair.first->getRetICFGNode();
+        if(pag->callsiteHasRet(retBlockNode))
+            retFromIndCalls.insert(pag->getCallSiteRet(retBlockNode)->getId());
+    }
+
     Set<ConstraintNode*> nodesToRemove;
     for (auto it = this->begin(); it != this->end(); ++it)
     {
@@ -156,6 +165,8 @@ void ConstraintGraph::clearSolitaries()
             continue;
         if (pag->getGNode(it->first)->isPointer())
             continue;
+        if (retFromIndCalls.find(it->first)!=retFromIndCalls.end())
+            continue;
         nodesToRemove.insert(it->second);
     }
 

package/svf/lib/Graphs/ICFG.cpp

@@ -192,6 +192,13 @@ const std::string RetCFGEdge::toString() const
     return rawstr.str();
 }
 
+/// Return call ICFGNode at the callsite
+const CallICFGNode* RetCFGEdge::getCallSite() const
+{
+    assert(SVFUtil::isa<RetICFGNode>(getDstNode()) && "not a RetICFGNode?");
+    return SVFUtil::cast<RetICFGNode>(getDstNode())->getCallICFGNode();
+}
+
 /*!
  * Constructor
  *  * Build ICFG