svf-tools 1.0.1243 → 1.0.1245

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.1243",
+  "version": "1.0.1245",
   "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/Svfexe/AbstractInterpretation.h

@@ -189,16 +189,6 @@ public:
         return abstractTrace[node];
     }
 
-    // ---- Def/Use site queries (sparsity-aware) ------------------------
-
-    virtual Set<const ICFGNode*> getUseSitesOfObjVar(const ObjVar* obj, const ICFGNode* node) const;
-    virtual Set<const ICFGNode*> getUseSitesOfValVar(const ValVar* var) const;
-    virtual const ICFGNode* getDefSiteOfValVar(const ValVar* var) const;
-    virtual const ICFGNode* getDefSiteOfObjVar(const ObjVar* obj, const ICFGNode* node) const;
-
-    /// Propagate an ObjVar's abstract value from defSite to all its use-sites.
-    void propagateObjVarAbsVal(const ObjVar* var, const ICFGNode* defSite);
-
 protected:
     /// Factory-only construction.  External callers must use getAEInstance();
     /// `SparseAbstractInterpretation` reaches this via its own ctor.

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

@@ -98,10 +98,14 @@ public:
     bool hasAbsValue(const ValVar* var, const ICFGNode* node) const override;
     using SemiSparseAbstractInterpretation::hasAbsValue;
 
-    Set<const ICFGNode*> getUseSitesOfObjVar(const ObjVar* obj, const ICFGNode* node) const override;
-    Set<const ICFGNode*> getUseSitesOfValVar(const ValVar* var) const override;
-    const ICFGNode* getDefSiteOfValVar(const ValVar* var) const override;
-    const ICFGNode* getDefSiteOfObjVar(const ObjVar* obj, const ICFGNode* node) const override;
+    const Set<const ICFGNode*> getUseSitesOfValVar(const ValVar* var) const;
+    const ICFGNode* getDefSiteOfValVar(const ValVar* var) const;
+    /// Given an ObjVar and its def-site ICFGNode, find all use-site ICFGNodes
+    /// by following outgoing IndirectSVFGEdges whose pts contains the ObjVar
+    const Set<const ICFGNode*> getDefSiteOfObjVar(const ObjVar* obj, const ICFGNode* node) const;
+    /// Given an ObjVar and its def-site ICFGNode, find all use-site ICFGNodes
+    /// by following outgoing IndirectSVFGEdges whose pts contains the ObjVar
+    const Set<const ICFGNode*> getUseSitesOfObjVar(const ObjVar* obj, const ICFGNode* node) const;
 
 protected:
     /// Build the SVFG on top of the semi-sparse precompute.

package/svf/include/Graphs/SVFG.h

@@ -179,21 +179,21 @@ public:
         return hasDef(valVar) && hasSVFGNode(getDef(valVar));
     }
 
-    /// Given a ValVar and its SVFGNode, find the definition-site ICFGNode
+    /// Given a ValVar and its SVFGNode, find the definition-site SVFGNode
     /// by following incoming direct VFGEdges (asserts unique definition)
-    const ICFGNode* getDefSiteOfValVar(const ValVar* var) const;
+    const SVFGNode* getDefSiteOfValVar(const ValVar* var) const;
 
-    /// Given an ObjVar and its use-site ICFGNode, find the definition-site ICFGNode
+    /// Given an ObjVar and its use-site SVFGNode, find the definition-site ICFGNode
     /// by following incoming IndirectSVFGEdges whose pts contains the ObjVar (asserts unique definition)
-    const ICFGNode* getDefSiteOfObjVar(const ObjVar* obj, const ICFGNode* node) const;
+    const Set<const SVFGNode*> getDefSiteOfObjVar(const ObjVar* obj, const SVFGNode* node) const;
 
-    /// Given a ValVar, find all use-site ICFGNodes
+    /// Given a ValVar, find all use-site SVFGNodes
     /// by following outgoing direct VFGEdges from its unique definition SVFGNode
-    const Set<const ICFGNode*> getUseSitesOfValVar(const ValVar* var) const;
+    const Set<const SVFGNode*> getUseSitesOfValVar(const ValVar* var) const;
 
-    /// Given an ObjVar and its def-site ICFGNode, find all use-site ICFGNodes
+    /// Given an ObjVar and its def-site SVFGNodes, find all use-site SVFGNodes
     /// by following outgoing IndirectSVFGEdges whose pts contains the ObjVar
-    const Set<const ICFGNode*> getUseSitesOfObjVar(const ObjVar* obj, const ICFGNode* node) const;
+    const Set<const SVFGNode*> getUseSitesOfObjVar(const ObjVar* obj, const SVFGNode* node) const;
 
     /// Perform statistics
     void performStat();

package/svf/lib/AE/Svfexe/AbstractInterpretation.cpp

@@ -96,19 +96,6 @@ AbstractInterpretation& AbstractInterpretation::getAEInstance()
     return *instance;
 }
 
-// State-access methods (getAbsValue / hasAbsValue / updateAbsValue,
-// state ops, GEP / load-store / type helpers, def-use queries) are
-// implemented in AbstractStateManager.cpp for both dense and sparse.
-
-void AbstractInterpretation::propagateObjVarAbsVal(const ObjVar* var, const ICFGNode* defSite)
-{
-    const AbstractValue& val = getAbsValue(var, defSite);
-    for (const ICFGNode* useSite : getUseSitesOfObjVar(var, defSite))
-    {
-        updateAbsValue(var, val, useSite);
-    }
-}
-
 
 /// Destructor
 AbstractInterpretation::~AbstractInterpretation()

package/svf/lib/AE/Svfexe/AbstractStateManager.cpp

@@ -397,36 +397,6 @@ u32_t AbstractInterpretation::getAllocaInstByteSize(const AddrStmt* addr)
     abort();
 }
 
-Set<const ICFGNode*> AbstractInterpretation::getUseSitesOfObjVar(const ObjVar*, const ICFGNode* node) const
-{
-    Set<const ICFGNode*> succs;
-    for (const auto* edge : node->getOutEdges())
-        succs.insert(edge->getDstNode());
-    return succs;
-}
-
-Set<const ICFGNode*> AbstractInterpretation::getUseSitesOfValVar(const ValVar* var) const
-{
-    Set<const ICFGNode*> succs;
-    if (const ICFGNode* node = var->getICFGNode())
-    {
-        for (const auto* edge : node->getOutEdges())
-            succs.insert(edge->getDstNode());
-    }
-    return succs;
-}
-
-const ICFGNode* AbstractInterpretation::getDefSiteOfValVar(const ValVar* var) const
-{
-    return var->getICFGNode();
-}
-
-const ICFGNode* AbstractInterpretation::getDefSiteOfObjVar(const ObjVar*, const ICFGNode* node) const
-{
-    for (const auto* edge : node->getInEdges())
-        return edge->getSrcNode();
-    return nullptr;
-}
 
 // =====================================================================
 //  Semi-sparse state-access overrides (used by both SemiSparse and

package/svf/lib/AE/Svfexe/SparseAbstractInterpretation.cpp

@@ -74,34 +74,54 @@ bool FullSparseAbstractInterpretation::hasAbsValue(
     abort();
 }
 
-Set<const ICFGNode*> FullSparseAbstractInterpretation::getUseSitesOfObjVar(
-    const ObjVar* obj, const ICFGNode* node) const
+const Set<const ICFGNode*> FullSparseAbstractInterpretation::getUseSitesOfValVar(
+    const ValVar* var) const
 {
     assert(svfg && "SVFG is not built for full-sparse AE");
-    return svfg->getUseSitesOfObjVar(obj, node);
+    Set<const ICFGNode*> useSites;
+    for(const SVFGNode* svfgNode : svfg->getUseSitesOfValVar(var))
+    {
+        useSites.insert(svfgNode->getICFGNode());
+    }
+    return useSites;
 }
 
-Set<const ICFGNode*> FullSparseAbstractInterpretation::getUseSitesOfValVar(
+const ICFGNode* FullSparseAbstractInterpretation::getDefSiteOfValVar(
     const ValVar* var) const
 {
     assert(svfg && "SVFG is not built for full-sparse AE");
-    return svfg->getUseSitesOfValVar(var);
+    return svfg->getDefSiteOfValVar(var)->getICFGNode();
 }
 
-const ICFGNode* FullSparseAbstractInterpretation::getDefSiteOfValVar(
-    const ValVar* var) const
+const Set<const ICFGNode*> FullSparseAbstractInterpretation::getDefSiteOfObjVar(
+    const ObjVar* obj, const ICFGNode* node) const
 {
     assert(svfg && "SVFG is not built for full-sparse AE");
-    return svfg->getDefSiteOfValVar(var);
+    Set<const ICFGNode*> defSites;
+    for(auto* vNode : node->getVFGNodes())
+    {
+        for(const SVFGNode* svfgNode : svfg->getDefSiteOfObjVar(obj, vNode))
+        {
+            defSites.insert(svfgNode->getICFGNode());
+        }
+    }
+    return defSites;
 }
 
-const ICFGNode* FullSparseAbstractInterpretation::getDefSiteOfObjVar(
+const Set<const ICFGNode*> FullSparseAbstractInterpretation::getUseSitesOfObjVar(
     const ObjVar* obj, const ICFGNode* node) const
 {
     assert(svfg && "SVFG is not built for full-sparse AE");
-    return svfg->getDefSiteOfObjVar(obj, node);
+    Set<const ICFGNode*> useSites;
+    for(auto* vNode : node->getVFGNodes())
+    {
+        for(const SVFGNode* svfgNode : svfg->getUseSitesOfObjVar(obj, vNode))
+        {
+            useSites.insert(svfgNode->getICFGNode());
+        }
+    }
+    return useSites;
 }
-
 // =====================================================================
 //  Semi-sparse cycle helpers (sparse-shape gather / scatter).
 // =====================================================================

package/svf/lib/Graphs/SVFG.cpp

@@ -760,78 +760,64 @@ void SVFG::performStat()
     stat->performStat();
 }
 
-/// Given a ValVar and its SVFGNode, find the definition-site ICFGNode
+/// Given a ValVar, find the definition-site SVFGNode
 /// by following incoming direct VFGEdges (asserts unique definition)
-const ICFGNode* SVFG::getDefSiteOfValVar(const ValVar* var) const
+const SVFGNode* SVFG::getDefSiteOfValVar(const ValVar* var) const
 {
-    return getDefSVFGNode(var)->getICFGNode();
+    return getDefSVFGNode(var);
 }
 
-/// Given an ObjVar and its use-site ICFGNode, find the definition-site ICFGNode
+/// Given an ObjVar and its use-site SVFGNode, find the definition-site SVFGNodes
 /// by following incoming IndirectSVFGEdges whose pts contains the ObjVar (asserts unique definition)
-const ICFGNode* SVFG::getDefSiteOfObjVar(const ObjVar* obj, const ICFGNode* node) const
+const Set<const SVFGNode*> SVFG::getDefSiteOfObjVar(const ObjVar* obj, const SVFGNode* vNode) const
 {
-    const ICFGNode* defSite = nullptr;
-    NodeID objId = obj->getId();
-    for (const VFGNode* vNode : node->getVFGNodes())
+    Set<const SVFGNode*> defSites;
+    for (auto it = vNode->InEdgeBegin(), eit = vNode->InEdgeEnd(); it != eit; ++it)
     {
-        for (auto it = vNode->InEdgeBegin(), eit = vNode->InEdgeEnd(); it != eit; ++it)
+        if (const IndirectSVFGEdge* indEdge = SVFUtil::dyn_cast<IndirectSVFGEdge>(*it))
         {
-            if (const IndirectSVFGEdge* indEdge = SVFUtil::dyn_cast<IndirectSVFGEdge>(*it))
+            if (indEdge->getPointsTo().test(obj->getId()))
             {
-                if (indEdge->getPointsTo().test(objId))
-                {
-                    assert(defSite == nullptr && "ObjVar should have a unique indirect definition!");
-                    defSite = indEdge->getSrcNode()->getICFGNode();
-                }
+                defSites.insert(indEdge->getSrcNode());
             }
         }
     }
-    return defSite;
+    return defSites;
 }
 
 /// Given a ValVar, find all use-site ICFGNodes
 /// by following outgoing direct VFGEdges from its unique definition SVFGNode
-const Set<const ICFGNode*> SVFG::getUseSitesOfValVar(const ValVar* var) const
+const Set<const SVFGNode*> SVFG::getUseSitesOfValVar(const ValVar* var) const
 {
     const SVFGNode* defNode = getDefSVFGNode(var);
-    Set<const ICFGNode*> useSites;
+    Set<const SVFGNode*> useSites;
     for (auto it = defNode->OutEdgeBegin(), eit = defNode->OutEdgeEnd(); it != eit; ++it)
     {
         const VFGEdge* edge = *it;
         if (edge->isDirectVFGEdge())
         {
-            if (const ICFGNode* icfgNode = edge->getDstNode()->getICFGNode())
-                useSites.insert(icfgNode);
-            else
-                assert(false && "The destination node of a direct VFG edge should have an ICFG node!");
+            useSites.insert(edge->getDstNode());
         }
     }
     return useSites;
 }
 
-/// Given an ObjVar and its def-site ICFGNode, find all use-site ICFGNodes
+/// Given an ObjVar and its def-site SVFGNode, find all use-site SVFGNodes
 /// by following outgoing IndirectSVFGEdges whose pts contains the ObjVar
-const Set<const ICFGNode*> SVFG::getUseSitesOfObjVar(const ObjVar* obj, const ICFGNode* node) const
+const Set<const SVFGNode*> SVFG::getUseSitesOfObjVar(const ObjVar* obj, const SVFGNode* vNode) const
 {
-    Set<const ICFGNode*> useSites;
-    NodeID objId = obj->getId();
-    for (const VFGNode* vNode : node->getVFGNodes())
+    Set<const SVFGNode*> useSites;
+    for (auto it = vNode->OutEdgeBegin(), eit = vNode->OutEdgeEnd(); it != eit; ++it)
     {
-        for (auto it = vNode->OutEdgeBegin(), eit = vNode->OutEdgeEnd(); it != eit; ++it)
+        if (const IndirectSVFGEdge* indEdge = SVFUtil::dyn_cast<IndirectSVFGEdge>(*it))
         {
-            if (const IndirectSVFGEdge* indEdge = SVFUtil::dyn_cast<IndirectSVFGEdge>(*it))
+            if (indEdge->getPointsTo().test(obj->getId()))
             {
-                if (indEdge->getPointsTo().test(objId))
-                {
-                    if (const ICFGNode* icfgNode = indEdge->getDstNode()->getICFGNode())
-                        useSites.insert(icfgNode);
-                    else
-                        assert(false && "The destination node of an indirect SVFG edge should have an ICFG node!");
-                }
+                useSites.insert(indEdge->getDstNode());
             }
         }
     }
+
     return useSites;
 }