svf-tools 1.0.582 → 1.0.583

package/SVF-doxygen/html/html/wpa_8cpp_source.html

@@ -66,7 +66,7 @@ $(function() {
 <div class="title">wpa.cpp</div>  </div>
 </div><!--header-->
 <div class="contents">
-<a href="wpa_8cpp.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">//===- wpa.cpp -- Whole program analysis -------------------------------------//</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">//                     SVF: Static Value-Flow Analysis</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// Copyright (C) &lt;2013-2017&gt;  &lt;Yulei Sui&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">// This program is free software: you can redistribute it and/or modify</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment">// it under the terms of the GNU General Public License as published by</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment">// the Free Software Foundation, either version 3 of the License, or</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment">// (at your option) any later version.</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment">// This program is distributed in the hope that it will be useful,</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment">// but WITHOUT ANY WARRANTY; without even the implied warranty of</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment">// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment">// GNU General Public License for more details.</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment">// You should have received a copy of the GNU General Public License</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment">// along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">//===-----------------------------------------------------------------------===//</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment"> // Whole Program Pointer Analysis</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment"> //</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="comment"> // Author: Yulei Sui,</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="LLVMUtil_8h.html">SVF-FE/LLVMUtil.h</a>&quot;</span></div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="WPAPass_8h.html">WPA/WPAPass.h</a>&quot;</span></div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="Options_8h.html">Util/Options.h</a>&quot;</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keyword">using namespace </span><a class="code" href="namespacellvm.html">llvm</a>;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">using namespace </span><a class="code" href="namespacestd.html">std</a>;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keyword">using namespace </span><a class="code" href="namespaceSVF.html">SVF</a>;</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">static</span> llvm::cl::opt&lt;std::string&gt; <a class="code" href="wpa_8cpp.html#a139199e1f33675df72b018c31e0be35c">InputFilename</a>(llvm::cl::Positional,</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;        llvm::cl::desc(<span class="stringliteral">&quot;&lt;input bitcode&gt;&quot;</span>), llvm::cl::init(<span class="stringliteral">&quot;-&quot;</span>));</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno"><a class="line" href="wpa_8cpp.html#a3c04138a5bfe5d72780bb7e82a18e627">   40</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="wpa_8cpp.html#a3c04138a5bfe5d72780bb7e82a18e627">main</a>(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> ** argv)</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;{</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    <span class="keywordtype">int</span> arg_num = 0;</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordtype">char</span> **arg_value = <span class="keyword">new</span> <span class="keywordtype">char</span>*[argc];</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    std::vector&lt;std::string&gt; moduleNameVec;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <a class="code" href="namespaceSVF_1_1LLVMUtil.html#accdd44093d6d145dc92edeaaff3f5732">LLVMUtil::processArguments</a>(argc, argv, arg_num, arg_value, moduleNameVec);</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    cl::ParseCommandLineOptions(arg_num, arg_value,</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                                <span class="stringliteral">&quot;Whole Program Points-to Analysis\n&quot;</span>);</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordflow">if</span> (Options::WriteAnder == <span class="stringliteral">&quot;ir_annotator&quot;</span>)</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    {</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        LLVMModuleSet::getLLVMModuleSet()-&gt;preProcessBCs(moduleNameVec);</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    }</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <a class="code" href="classSVF_1_1SVFModule.html">SVFModule</a>* svfModule = LLVMModuleSet::getLLVMModuleSet()-&gt;buildSVFModule(moduleNameVec);</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    svfModule-&gt;<a class="code" href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">buildSymbolTableInfo</a>();</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <a class="code" href="classSVF_1_1WPAPass.html">WPAPass</a> *wpa = <span class="keyword">new</span> <a class="code" href="classSVF_1_1WPAPass.html">WPAPass</a>();</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    wpa-&gt;<a class="code" href="classSVF_1_1WPAPass.html#a394dcd976c1ef08d9cadcba8f5d07c75">runOnModule</a>(svfModule);</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="keywordflow">return</span> 0;</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;}</div><div class="ttc" id="namespacellvm_html"><div class="ttname"><a href="namespacellvm.html">llvm</a></div><div class="ttdef"><b>Definition:</b> <a href="CFLGraph_8h_source.html#l00182">CFLGraph.h:182</a></div></div>
+<a href="wpa_8cpp.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;<span class="comment">//===- wpa.cpp -- Whole program analysis -------------------------------------//</span></div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;<span class="comment">//                     SVF: Static Value-Flow Analysis</span></div><div class="line"><a name="l00004"></a><span class="lineno">    4</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00005"></a><span class="lineno">    5</span>&#160;<span class="comment">// Copyright (C) &lt;2013-2017&gt;  &lt;Yulei Sui&gt;</span></div><div class="line"><a name="l00006"></a><span class="lineno">    6</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00007"></a><span class="lineno">    7</span>&#160;</div><div class="line"><a name="l00008"></a><span class="lineno">    8</span>&#160;<span class="comment">// This program is free software: you can redistribute it and/or modify</span></div><div class="line"><a name="l00009"></a><span class="lineno">    9</span>&#160;<span class="comment">// it under the terms of the GNU General Public License as published by</span></div><div class="line"><a name="l00010"></a><span class="lineno">   10</span>&#160;<span class="comment">// the Free Software Foundation, either version 3 of the License, or</span></div><div class="line"><a name="l00011"></a><span class="lineno">   11</span>&#160;<span class="comment">// (at your option) any later version.</span></div><div class="line"><a name="l00012"></a><span class="lineno">   12</span>&#160;</div><div class="line"><a name="l00013"></a><span class="lineno">   13</span>&#160;<span class="comment">// This program is distributed in the hope that it will be useful,</span></div><div class="line"><a name="l00014"></a><span class="lineno">   14</span>&#160;<span class="comment">// but WITHOUT ANY WARRANTY; without even the implied warranty of</span></div><div class="line"><a name="l00015"></a><span class="lineno">   15</span>&#160;<span class="comment">// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span></div><div class="line"><a name="l00016"></a><span class="lineno">   16</span>&#160;<span class="comment">// GNU General Public License for more details.</span></div><div class="line"><a name="l00017"></a><span class="lineno">   17</span>&#160;</div><div class="line"><a name="l00018"></a><span class="lineno">   18</span>&#160;<span class="comment">// You should have received a copy of the GNU General Public License</span></div><div class="line"><a name="l00019"></a><span class="lineno">   19</span>&#160;<span class="comment">// along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</span></div><div class="line"><a name="l00020"></a><span class="lineno">   20</span>&#160;<span class="comment">//</span></div><div class="line"><a name="l00021"></a><span class="lineno">   21</span>&#160;<span class="comment">//===-----------------------------------------------------------------------===//</span></div><div class="line"><a name="l00022"></a><span class="lineno">   22</span>&#160;</div><div class="line"><a name="l00023"></a><span class="lineno">   23</span>&#160;<span class="comment">/*</span></div><div class="line"><a name="l00024"></a><span class="lineno">   24</span>&#160;<span class="comment"> // Whole Program Pointer Analysis</span></div><div class="line"><a name="l00025"></a><span class="lineno">   25</span>&#160;<span class="comment"> //</span></div><div class="line"><a name="l00026"></a><span class="lineno">   26</span>&#160;<span class="comment"> // Author: Yulei Sui,</span></div><div class="line"><a name="l00027"></a><span class="lineno">   27</span>&#160;<span class="comment"> */</span></div><div class="line"><a name="l00028"></a><span class="lineno">   28</span>&#160;</div><div class="line"><a name="l00029"></a><span class="lineno">   29</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="LLVMUtil_8h.html">SVF-FE/LLVMUtil.h</a>&quot;</span></div><div class="line"><a name="l00030"></a><span class="lineno">   30</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="WPAPass_8h.html">WPA/WPAPass.h</a>&quot;</span></div><div class="line"><a name="l00031"></a><span class="lineno">   31</span>&#160;<span class="preprocessor">#include &quot;<a class="code" href="Options_8h.html">Util/Options.h</a>&quot;</span></div><div class="line"><a name="l00032"></a><span class="lineno">   32</span>&#160;</div><div class="line"><a name="l00033"></a><span class="lineno">   33</span>&#160;<span class="keyword">using namespace </span><a class="code" href="namespacellvm.html">llvm</a>;</div><div class="line"><a name="l00034"></a><span class="lineno">   34</span>&#160;<span class="keyword">using namespace </span><a class="code" href="namespacestd.html">std</a>;</div><div class="line"><a name="l00035"></a><span class="lineno">   35</span>&#160;<span class="keyword">using namespace </span><a class="code" href="namespaceSVF.html">SVF</a>;</div><div class="line"><a name="l00036"></a><span class="lineno">   36</span>&#160;</div><div class="line"><a name="l00037"></a><span class="lineno">   37</span>&#160;<span class="keyword">static</span> llvm::cl::opt&lt;std::string&gt; <a class="code" href="wpa_8cpp.html#a139199e1f33675df72b018c31e0be35c">InputFilename</a>(llvm::cl::Positional,</div><div class="line"><a name="l00038"></a><span class="lineno">   38</span>&#160;        llvm::cl::desc(<span class="stringliteral">&quot;&lt;input bitcode&gt;&quot;</span>), llvm::cl::init(<span class="stringliteral">&quot;-&quot;</span>));</div><div class="line"><a name="l00039"></a><span class="lineno">   39</span>&#160;</div><div class="line"><a name="l00040"></a><span class="lineno"><a class="line" href="wpa_8cpp.html#a3c04138a5bfe5d72780bb7e82a18e627">   40</a></span>&#160;<span class="keywordtype">int</span> <a class="code" href="wpa_8cpp.html#a3c04138a5bfe5d72780bb7e82a18e627">main</a>(<span class="keywordtype">int</span> argc, <span class="keywordtype">char</span> ** argv)</div><div class="line"><a name="l00041"></a><span class="lineno">   41</span>&#160;{</div><div class="line"><a name="l00042"></a><span class="lineno">   42</span>&#160;</div><div class="line"><a name="l00043"></a><span class="lineno">   43</span>&#160;    <span class="keywordtype">int</span> arg_num = 0;</div><div class="line"><a name="l00044"></a><span class="lineno">   44</span>&#160;    <span class="keywordtype">char</span> **arg_value = <span class="keyword">new</span> <span class="keywordtype">char</span>*[argc];</div><div class="line"><a name="l00045"></a><span class="lineno">   45</span>&#160;    std::vector&lt;std::string&gt; moduleNameVec;</div><div class="line"><a name="l00046"></a><span class="lineno">   46</span>&#160;    <a class="code" href="namespaceSVF_1_1LLVMUtil.html#accdd44093d6d145dc92edeaaff3f5732">LLVMUtil::processArguments</a>(argc, argv, arg_num, arg_value, moduleNameVec);</div><div class="line"><a name="l00047"></a><span class="lineno">   47</span>&#160;    cl::ParseCommandLineOptions(arg_num, arg_value,</div><div class="line"><a name="l00048"></a><span class="lineno">   48</span>&#160;                                <span class="stringliteral">&quot;Whole Program Points-to Analysis\n&quot;</span>);</div><div class="line"><a name="l00049"></a><span class="lineno">   49</span>&#160;</div><div class="line"><a name="l00050"></a><span class="lineno">   50</span>&#160;    <span class="keywordflow">if</span> (Options::WriteAnder == <span class="stringliteral">&quot;ir_annotator&quot;</span>)</div><div class="line"><a name="l00051"></a><span class="lineno">   51</span>&#160;    {</div><div class="line"><a name="l00052"></a><span class="lineno">   52</span>&#160;        LLVMModuleSet::getLLVMModuleSet()-&gt;preProcessBCs(moduleNameVec);</div><div class="line"><a name="l00053"></a><span class="lineno">   53</span>&#160;    }</div><div class="line"><a name="l00054"></a><span class="lineno">   54</span>&#160;</div><div class="line"><a name="l00055"></a><span class="lineno">   55</span>&#160;    <a class="code" href="classSVF_1_1SVFModule.html">SVFModule</a>* svfModule = LLVMModuleSet::getLLVMModuleSet()-&gt;buildSVFModule(moduleNameVec);</div><div class="line"><a name="l00056"></a><span class="lineno">   56</span>&#160;    svfModule-&gt;<a class="code" href="classSVF_1_1SVFModule.html#aa03ab5272652290f30870c6e2d053d98">buildSymbolTableInfo</a>();</div><div class="line"><a name="l00057"></a><span class="lineno">   57</span>&#160;</div><div class="line"><a name="l00058"></a><span class="lineno">   58</span>&#160;    <a class="code" href="classSVF_1_1WPAPass.html">WPAPass</a> *wpa = <span class="keyword">new</span> <a class="code" href="classSVF_1_1WPAPass.html">WPAPass</a>();</div><div class="line"><a name="l00059"></a><span class="lineno">   59</span>&#160;    wpa-&gt;<a class="code" href="classSVF_1_1WPAPass.html#a394dcd976c1ef08d9cadcba8f5d07c75">runOnModule</a>(svfModule);</div><div class="line"><a name="l00060"></a><span class="lineno">   60</span>&#160;</div><div class="line"><a name="l00061"></a><span class="lineno">   61</span>&#160;    <span class="keywordflow">return</span> 0;</div><div class="line"><a name="l00062"></a><span class="lineno">   62</span>&#160;}</div><div class="ttc" id="namespacellvm_html"><div class="ttname"><a href="namespacellvm.html">llvm</a></div><div class="ttdef"><b>Definition:</b> <a href="CFLGraph_8h_source.html#l00192">CFLGraph.h:192</a></div></div>
 <div class="ttc" id="namespacestd_html"><div class="ttname"><a href="namespacestd.html">std</a></div></div>
 <div class="ttc" id="wpa_8cpp_html_a3c04138a5bfe5d72780bb7e82a18e627"><div class="ttname"><a href="wpa_8cpp.html#a3c04138a5bfe5d72780bb7e82a18e627">main</a></div><div class="ttdeci">int main(int argc, char **argv)</div><div class="ttdef"><b>Definition:</b> <a href="wpa_8cpp_source.html#l00040">wpa.cpp:40</a></div></div>
 <div class="ttc" id="classSVF_1_1SVFModule_html"><div class="ttname"><a href="classSVF_1_1SVFModule.html">SVF::SVFModule</a></div><div class="ttdef"><b>Definition:</b> <a href="SVFModule_8h_source.html#l00041">SVFModule.h:41</a></div></div>

package/include/CFL/CFLBase.h

@@ -94,6 +94,8 @@ public:
     static double numOfNonterminalEdges;            // Number of nonterminal labeled edges
     static double numOfStartEdges;                  // Number of start nonterminal labeled edges
     // Solver
+    static double numOfIteration;                   // Number solving Iteration
+    static double numOfChecks;                      // Number of checks
     static double timeOfSolving;                    // time of solving CFL Reachability
     //@}
 

package/include/CFL/CFLSolver.h

@@ -47,6 +47,8 @@ public:
     typedef CFLGrammar::Production Production;
     typedef CFLGrammar::Symbol Symbol;
 
+    static double numOfChecks;
+
     CFLSolver(CFLGraph* _graph, CFLGrammar* _grammar): graph(_graph), grammar(_grammar)
     {
     }
@@ -57,6 +59,12 @@ public:
         delete grammar;
     }
 
+    /// Initialize worklist
+    void initialize();
+
+    /// Process CFLEdge
+    void processCFLEdge(const CFLEdge* Y_edge);
+
     /// Start solving
     void solve();
 

package/include/CFL/CFLStat.h

@@ -38,36 +38,28 @@
 namespace SVF
 {
 
-class CFLAlias;
-class CFLVF;
-class SVFIR;
-class ConstraintGraph;
-
 /*!
  * Statistics of CFL's analysis
  */
 class CFLStat : public PTAStat
 {
-
 private:
     CFLBase* pta;
 
 public:
-    /// CFL Stat
-    u32_t _NumofCFLGraphNode;
-
     CFLStat(CFLBase* p);
 
     virtual ~CFLStat()
     {
-
     }
 
     virtual void performStat();
 
-    void collectCFLInfo(CFLGraph* CFLGraph);
+    void CFLGraphStat();
 
     void CFLGrammarStat();
+
+    void CFLSolverStat();
 };
 
 } // End namespace SVF

package/include/Graphs/CFLGraph.h

@@ -84,47 +84,57 @@ public:
     ~CFLNode() override = default;
 
     /// Different Kind(label) associated edges set
-    typedef std::map <CFLEdge::GEdgeKind, CFLEdge::CFLEdgeSetTy> CFLEdgeDataTy;
+    typedef std::map <GrammarBase::Symbol, CFLEdge::CFLEdgeSetTy> CFLEdgeDataTy;
 
 private:
     CFLEdgeDataTy inCFLEdges;
     CFLEdgeDataTy outCFLEdges;
 
 public:
-    inline const CFLEdge::CFLEdgeSetTy& getInEdgeWithTy(CFLEdge::GEdgeKind k)
+    inline const CFLEdge::CFLEdgeSetTy& getInEdgeWithTy(GrammarBase::Symbol s)
     {
-        return inCFLEdges[k];
+        return inCFLEdges[s];
     }
 
-    inline const CFLEdge::CFLEdgeSetTy& getOutEdgeWithTy(CFLEdge::GEdgeKind k)
+    inline const CFLEdge::CFLEdgeSetTy& getOutEdgeWithTy(GrammarBase::Symbol s)
     {
-        return outCFLEdges[k];
+        return outCFLEdges[s];
     }
 
-    inline bool addInEdgeWithKind(CFLEdge* inEdge, CFLEdge::GEdgeKind k)
+    inline bool addInEdgeWithKind(CFLEdge* inEdge, GrammarBase::Symbol s)
     {
         assert(inEdge->getDstID() == this->getId());
-        bool added1 = addIncomingEdge(inEdge);
-        bool added2 = inCFLEdges[k].insert(inEdge).second;
+        bool added1 = GenericNode::addIncomingEdge(inEdge);
+        bool added2 = inCFLEdges[s].insert(inEdge).second;
 
         return added1 && added2;
     }
 
-    inline bool addOutEdgeWithKind(CFLEdge* outEdge, CFLEdge::GEdgeKind k)
+    inline bool addIngoingEdge(CFLEdge* inEdge)
+    {
+        return addInEdgeWithKind(inEdge, inEdge->getEdgeKind());
+    }
+
+    inline bool addOutEdgeWithKind(CFLEdge* outEdge, GrammarBase::Symbol s)
     {
         assert(outEdge->getSrcID() == this->getId());
-        bool added1 = addOutgoingEdge(outEdge);
-        bool added2 = outCFLEdges[k].insert(outEdge).second;
+        bool added1 = GenericNode::addOutgoingEdge(outEdge);
+        bool added2 = outCFLEdges[s].insert(outEdge).second;
 
         return added1 && added2;
     }
 
+    inline bool addOutgoingEdge(CFLEdge* OutEdge)
+    {
+        return addOutEdgeWithKind(OutEdge, OutEdge->getEdgeKind());
+    }
+
     inline bool removeCFLInEdge(CFLEdge* inEdge)
     {
         u32_t num1 = removeIncomingEdge(inEdge);
 
-        CFLEdge::GEdgeKind k = inEdge->getEdgeKind();
-        u32_t num2 = inCFLEdges[k].erase(inEdge);
+        GrammarBase::Symbol s = inEdge->getEdgeKind();
+        u32_t num2 = inCFLEdges[s].erase(inEdge);
 
         return num1 && num2;
     }
@@ -133,8 +143,8 @@ public:
     {
         u32_t num1 = removeOutgoingEdge(outEdge);
 
-        CFLEdge::GEdgeKind k = outEdge->getEdgeKind();
-        u32_t num2 = outCFLEdges[k].erase(outEdge);
+        GrammarBase::Symbol s = outEdge->getEdgeKind();
+        u32_t num2 = outCFLEdges[s].erase(outEdge);
 
         return num1 && num2;
     }

package/lib/CFL/CFLAlias.cpp

@@ -33,6 +33,8 @@ using namespace SVF;
 using namespace cppUtil;
 using namespace SVFUtil;
 
+double CFLBase::numOfIteration = 1;
+
 /*!
  * On the fly call graph construction
  * callsites is candidate indirect callsites need to be analyzed based on points-to results
@@ -226,7 +228,10 @@ void CFLAlias::solve()
     if (Options::CFLGraph.empty())
     {
         while (updateCallGraph(svfir->getIndirectCallsites()))
+        {
+            numOfIteration++;
             solver->solve();
+        }
     } // Only cflgraph built from bc could reanlyze by update call graph
 
     double end = stat->getClk(true);

package/lib/CFL/CFLSolver.cpp

@@ -31,9 +31,10 @@
 
 using namespace SVF;
 
-void CFLSolver::solve()
+double CFLSolver::numOfChecks = 0;
+
+void CFLSolver::initialize()
 {
-    /// initial worklist
     for(auto it = graph->begin(); it!= graph->end(); it++)
     {
         for(const CFLEdge* edge : (*it).second->getOutEdges())
@@ -56,65 +57,77 @@ void CFLSolver::solve()
             }
         }
     }
+}
 
-    while(!isWorklistEmpty())
-    {
-        /// Select and remove an edge Y(i,j) from worklist
-        const CFLEdge* Y_edge = popFromWorklist();
-        CFLNode* i = Y_edge->getSrcNode();
-        CFLNode* j = Y_edge->getDstNode();
-
-        /// For each production X -> Y
-        ///     add X(i,j) if not exist to E and to worklist
-        Symbol Y = Y_edge->getEdgeKind();
-        if (grammar->hasProdsFromSingleRHS(Y))
-            for(const Production& prod : grammar->getProdsFromSingleRHS(Y))
+void CFLSolver::processCFLEdge(const CFLEdge* Y_edge)
+{
+    CFLNode* i = Y_edge->getSrcNode();
+    CFLNode* j = Y_edge->getDstNode();
+
+    /// For each production X -> Y
+    ///     add X(i,j) if not exist to E and to worklist
+    Symbol Y = Y_edge->getEdgeKind();
+    if (grammar->hasProdsFromSingleRHS(Y))
+        for(const Production& prod : grammar->getProdsFromSingleRHS(Y))
+        {
+            Symbol X = grammar->getLHSSymbol(prod);
+            if(const CFLEdge* newEdge = graph->addCFLEdge(i, j, X))
             {
-                Symbol X = grammar->getLHSSymbol(prod);
-                if(const CFLEdge* newEdge = graph->addCFLEdge(i, j, X))
-                {
-                    pushIntoWorklist(newEdge);
-                }
+                pushIntoWorklist(newEdge);
             }
+        }
 
-        /// For each production X -> Y Z
-        /// Foreach outgoing edge Z(j,k) from node j do
-        ///     add X(i,k) if not exist to E and to worklist
-        if (grammar->hasProdsFromFirstRHS(Y))
-            for(const Production& prod : grammar->getProdsFromFirstRHS(Y))
+    /// For each production X -> Y Z
+    /// Foreach outgoing edge Z(j,k) from node j do
+    ///     add X(i,k) if not exist to E and to worklist
+    if (grammar->hasProdsFromFirstRHS(Y))
+        for(const Production& prod : grammar->getProdsFromFirstRHS(Y))
+        {
+            Symbol X = grammar->getLHSSymbol(prod);
+            for(const CFLEdge* Z_edge : j->getOutEdges())
             {
-                Symbol X = grammar->getLHSSymbol(prod);
-                for(const CFLEdge* Z_edge : j->getOutEdges())
+                if (Z_edge->getEdgeKind() == grammar->getSecondRHSSymbol(prod))
                 {
-                    if (Z_edge->getEdgeKind() == grammar->getSecondRHSSymbol(prod))
+                    CFLNode* k = Z_edge->getDstNode();
+                    if(const CFLEdge* newEdge = graph->addCFLEdge(i, k, X))
                     {
-                        CFLNode* k = Z_edge->getDstNode();
-                        if(const CFLEdge* newEdge = graph->addCFLEdge(i, k, X))
-                        {
-                            pushIntoWorklist(newEdge);
-                        }
+                        pushIntoWorklist(newEdge);
                     }
                 }
             }
+        }
 
-        /// For each production X -> Z Y
-        /// Foreach incoming edge Z(k,i) to node i do
-        ///     add X(k,j) if not exist to E and to worklist
-        if(grammar->hasProdsFromSecondRHS(Y))
-            for(const Production& prod : grammar->getProdsFromSecondRHS(Y))
+    /// For each production X -> Z Y
+    /// Foreach incoming edge Z(k,i) to node i do
+    ///     add X(k,j) if not exist to E and to worklist
+    if(grammar->hasProdsFromSecondRHS(Y))
+        for(const Production& prod : grammar->getProdsFromSecondRHS(Y))
+        {
+            Symbol X = grammar->getLHSSymbol(prod);
+            for(const CFLEdge* Z_edge : i->getInEdges())
             {
-                Symbol X = grammar->getLHSSymbol(prod);
-                for(const CFLEdge* Z_edge : i->getInEdges())
+                if(Z_edge->getEdgeKind() == grammar->getFirstRHSSymbol(prod))
                 {
-                    if(Z_edge->getEdgeKind() == grammar->getFirstRHSSymbol(prod))
+                    CFLNode* k = Z_edge->getSrcNode();
+                    if(const CFLEdge* newEdge = graph->addCFLEdge(k, j, X))
                     {
-                        CFLNode* k = Z_edge->getSrcNode();
-                        if(const CFLEdge* newEdge = graph->addCFLEdge(k, j, X))
-                        {
-                            pushIntoWorklist(newEdge);
-                        }
+                        pushIntoWorklist(newEdge);
                     }
                 }
             }
+        }
+}
+
+
+void CFLSolver::solve()
+{
+    /// initial worklist
+    initialize();
+
+    while(!isWorklistEmpty())
+    {
+        /// Select and remove an edge Y(i,j) from worklist
+        const CFLEdge* Y_edge = popFromWorklist();
+        processCFLEdge(Y_edge);
     }
 }

package/lib/CFL/CFLStat.cpp

@@ -44,8 +44,11 @@ CFLStat::CFLStat(CFLBase* p): PTAStat(p),pta(p)
 /*!
  * Collect CFLGraph information
  */
-void  CFLStat::collectCFLInfo(CFLGraph* CFLGraph)
+void  CFLStat::CFLGraphStat()
 {
+    pta->countSumEdges();
+    CFLGraph* CFLGraph = pta->getCFLGraph();
+
     timeStatMap["BuildingTime"] = pta->timeOfBuildCFLGraph;
     PTNumStatMap["NumOfNodes"] = CFLGraph->getTotalNodeNum();
     PTNumStatMap["NumOfEdges"] = CFLGraph->getCFLEdges().size();
@@ -57,9 +60,19 @@ void CFLStat::CFLGrammarStat()
 {
     timeStatMap["BuildingTime"] = pta->timeOfBuildCFLGrammar;
     timeStatMap["NormalizationTime"] = pta->timeOfNormalizeGrammar;
+
     PTAStat::printStat("CFLGrammar Stats");
 }
 
+void CFLStat::CFLSolverStat()
+{
+    timeStatMap["AnalysisTime"] = pta->timeOfSolving;
+    PTNumStatMap["numOfIteration"] = pta->numOfIteration;
+    PTNumStatMap["SumEdges"] = pta->numOfStartEdges;
+
+    PTAStat::printStat("CFL-reachability Solver Stats");
+}
+
 /*!
  * Start here
  */
@@ -72,14 +85,10 @@ void CFLStat::performStat()
     CFLGrammarStat();
 
     // CFLGraph stat
-    pta->countSumEdges();
-    CFLGraph* CFLGraph = pta->getCFLGraph();
-    collectCFLInfo(CFLGraph);
+    CFLGraphStat();
 
     // Solver stat
-    timeStatMap["AnalysisTime"] = pta->timeOfSolving;
-    PTNumStatMap["SumEdges"] = pta->numOfStartEdges;
-    PTAStat::printStat("CFL-reachability analysis Stats");
+    CFLSolverStat();
 
     // Stat about Call graph and General stat
     PTAStat::performStat();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.582",
+  "version": "1.0.583",
   "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": {