svf-tools 1.0.784 → 1.0.786

package/SVF-doxygen/html/structSVF_1_1GenericGraphTraits_3_01Inverse_3_01SVF_1_1CFBasicBlockNode_01_5_01_4_01_4.html

@@ -95,7 +95,7 @@ Additional Inherited Members</h2></td></tr>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p><a class="el" href="structSVF_1_1Inverse.html">Inverse</a> <a class="el" href="structSVF_1_1GenericGraphTraits.html">GenericGraphTraits</a> specializations for call graph node, it is used for inverse ICFGTraversal. </p>
 
-<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00519">519</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
+<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00528">528</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>/home/runner/work/SVF/SVF/svf/include/Graphs/<a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a></li>
 </ul>

package/SVF-doxygen/html/structSVF_1_1GenericGraphTraits_3_01SVF_1_1CFBasicBlockGraph_01_5_01_4.html

@@ -94,7 +94,7 @@ Public Types</h2></td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00525">525</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
+<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00534">534</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
 </div><h2 class="groupheader">Member Typedef Documentation</h2>
 <a id="a0d7eb2f1c00f0499d99f5508ce5055f5"></a>
 <h2 class="memtitle"><span class="permalink"><a href="#a0d7eb2f1c00f0499d99f5508ce5055f5">&#9670;&nbsp;</a></span>NodeRef</h2>
@@ -108,7 +108,7 @@ Public Types</h2></td></tr>
       </table>
 </div><div class="memdoc">
 
-<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00528">528</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
+<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00537">537</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
 
 </div>
 </div>

package/SVF-doxygen/html/structSVF_1_1GenericGraphTraits_3_01SVF_1_1CFBasicBlockNode_01_5_01_4.html

@@ -91,7 +91,7 @@ Additional Inherited Members</h2></td></tr>
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock">
-<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00512">512</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
+<p class="definition">Definition at line <a class="el" href="CFBasicBlockG_8h_source.html#l00521">521</a> of file <a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a>.</p>
 </div><hr/>The documentation for this struct was generated from the following file:<ul>
 <li>/home/runner/work/SVF/SVF/svf/include/Graphs/<a class="el" href="CFBasicBlockG_8h_source.html">CFBasicBlockG.h</a></li>
 </ul>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.784",
+  "version": "1.0.786",
   "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/CFBasicBlockG.h

@@ -71,6 +71,11 @@ public:
     {
     }
 
+    CFBasicBlockEdge(CFBasicBlockNode* src, CFBasicBlockNode* dst)
+        : GenericCFBasicBlockEdgeTy(src, dst, 0), _icfgEdge(nullptr)
+    {
+    }
+
     friend std::ostream &operator<<(std::ostream &o, const CFBasicBlockEdge &edge)
     {
         o << edge.toString();
@@ -350,8 +355,7 @@ class CFBasicBlockGraph : public GenericCFBasicBlockGTy
 private:
     u32_t _totalCFBasicBlockNode{0};
     u32_t _totalCFBasicBlockEdge{0};
-    Map<const SVFBasicBlock*, CFBasicBlockNode*> _bbToNode;
-
+    Map<const SVFFunction*, CFBasicBlockNode*> _funToFirstNode;
 public:
 
     CFBasicBlockGraph() = default;
@@ -375,23 +379,28 @@ public:
         return hasGNode(id);
     }
 
-    inline CFBasicBlockNode* getCFBasicBlockNode(const SVFBasicBlock* bb) const
+    inline CFBasicBlockNode* getFirstCFBasicBlockNode(const SVFFunction* fun) const
     {
-        if (bb && _bbToNode.find(bb) != _bbToNode.end())
+        if (fun && _funToFirstNode.find(fun) != _funToFirstNode.end())
         {
-            return _bbToNode.at(bb);
+            return _funToFirstNode.at(fun);
         }
         else
         {
             return nullptr;
         }
     }
+    inline bool hasFirstCFBasicBlockNode(const SVFFunction* fun) const
+    {
+        return fun && _funToFirstNode.find(fun) != _funToFirstNode.end();
+    }
 
-    inline bool hasCFBasicBlockNode(const SVFBasicBlock* bb) const
+    inline void setFirstCFBasicBlockNode(const Map<const SVFFunction*, CFBasicBlockNode*>& svfNodeMap)
     {
-        return bb && _bbToNode.find(bb) != _bbToNode.end();
+        _funToFirstNode = svfNodeMap;
     }
 
+
     bool hasCFBasicBlockEdge(CFBasicBlockNode *src, CFBasicBlockNode *dst, ICFGEdge *icfgEdge)
     {
         CFBasicBlockEdge edge(src, dst, icfgEdge);

package/svf/lib/Graphs/CFBasicBlockG.cpp

@@ -130,13 +130,13 @@ void CFBasicBlockGBuilder::build(SVFModule* module)
             }
         }
     }
-    _CFBasicBlockG->_bbToNode = bbToNode;
 }
 
 void CFBasicBlockGBuilder::build(ICFG* icfg)
 {
     _CFBasicBlockG = new CFBasicBlockGraph();
     Map<const SVFBasicBlock*, CFBasicBlockNode*> bbToNode;
+    Map<const SVFFunction*, CFBasicBlockNode*> funToFirstNode;
     for (const auto& node : *icfg)
     {
         CFBasicBlockNode* pNode  = nullptr;
@@ -153,6 +153,11 @@ void CFBasicBlockGBuilder::build(ICFG* icfg)
                 pNode = bbToNode[node.second->getBB()];
                 pNode->addNode(node.second);
             }
+            const SVFFunction* fun = node.second->getFun();
+            if (funToFirstNode.find(fun) == funToFirstNode.end())
+            {
+                funToFirstNode[fun] = nullptr;
+            }
         }
     }
 
@@ -174,6 +179,13 @@ void CFBasicBlockGBuilder::build(ICFG* icfg)
             }
         }
     }
-    _CFBasicBlockG->_bbToNode = bbToNode;
+
+    for (auto it = funToFirstNode.begin(); it != funToFirstNode.end(); ++it)
+    {
+        const SVFFunction* fun = it->first;
+        const SVFBasicBlock* bb = *fun->getBasicBlockList().begin();
+        funToFirstNode[fun] = bbToNode[bb];
+    }
+    _CFBasicBlockG->_funToFirstNode = funToFirstNode;
 }
 }