svf-tools 1.0.577 → 1.0.579

package/lib/CFL/CFLVF.cpp

@@ -28,62 +28,52 @@
  */
 
 #include "CFL/CFLVF.h"
-#include "Util/SVFBasicTypes.h"
-#include "WPA/Andersen.h"
 
 using namespace SVF;
 using namespace cppUtil;
 using namespace SVFUtil;
 
-
-
-void CFLVF::analyze()
+void CFLVF::buildCFLGraph()
 {
-    GrammarBuilder grammarBuilder = GrammarBuilder(Options::GrammarFilename);
-    CFGNormalizer normalizer = CFGNormalizer();
+    // Build CFL Graph
     VFCFLGraphBuilder cflGraphBuilder = VFCFLGraphBuilder();
-    CFLGramGraphChecker cflChecker = CFLGramGraphChecker();
-    if (Options::CFLGraph.empty())
+    if (Options::CFLGraph.empty()) // built from svfir
     {
         PointerAnalysis::initialize();
-        GrammarBase *grammarBase = grammarBuilder.build();
         AndersenWaveDiff* ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
         svfg =  memSSA.buildFullSVFG(ander);
-        ConstraintGraph *consCG = new ConstraintGraph(svfir);
-        if (Options::PEGTransfer)
-        {
-            graph = cflGraphBuilder.buildBiPEGgraph(consCG, grammarBase->getStartKind(), grammarBase, svfir);
-        }
-        else
-        {
-            graph = cflGraphBuilder.buildBigraph(svfg, grammarBase->getStartKind(), grammarBase);
-        }
-
-        cflChecker.check(grammarBase, &cflGraphBuilder, graph);
-        grammar = normalizer.normalize(grammarBase);
-        cflChecker.check(grammar, &cflGraphBuilder, graph);
-        delete consCG;
-        delete grammarBase;
+        graph = cflGraphBuilder.buildBigraph(svfg, grammarBase->getStartKind(), grammarBase);
     }
     else
-    {
-        GrammarBase *grammarBase = grammarBuilder.build();
         graph = cflGraphBuilder.buildFromDot(Options::CFLGraph, grammarBase);
-        cflChecker.check(grammarBase, &cflGraphBuilder, graph);
-        grammar = normalizer.normalize(grammarBase);
-        cflChecker.check(grammar, &cflGraphBuilder, graph);
-        delete grammarBase;
-    }
+
+    // Check CFL Graph and Grammar are accordance with grammar
+    CFLGramGraphChecker cflChecker = CFLGramGraphChecker();
+    cflChecker.check(grammarBase, &cflGraphBuilder, graph);
+}
+
+void CFLVF::initialize()
+{
+    // Build CFL Grammar
+    buildCFLGrammar();
+
+    // Build CFL Graph
+    buildCFLGraph();
+
+    // Normalize grammar
+    normalizeCFLGrammar();
+
+    // Initialize sovler
     solver = new CFLSolver(graph, grammar);
-    solver->solve();
+}
+
+void CFLVF::finalize()
+{
     if(Options::PrintCFL == true)
     {
-        svfir->dump("IR");
+        if (Options::CFLGraph.empty())
+            svfir->dump("IR");
         grammar->dump("Grammar");
         graph->dump("CFLGraph");
     }
-    if (Options::CFLGraph.empty())
-    {
-        PointerAnalysis::finalize();
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.577",
+  "version": "1.0.579",
   "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/tools/CFL/cfl.cpp

@@ -28,11 +28,9 @@
 
 
 #include "SVF-FE/LLVMUtil.h"
-#include "Util/Options.h"
+#include "SVF-FE/SVFIRBuilder.h"
 #include "CFL/CFLAlias.h"
 #include "CFL/CFLVF.h"
-#include "SVF-FE/SVFIRBuilder.h"
-#include "CFL/CFGNormalizer.h"
 
 using namespace llvm;
 using namespace SVF;
@@ -57,35 +55,24 @@ int main(int argc, char ** argv)
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }
+
+    SVFIR* svfir = nullptr;
     if (Options::CFLGraph.empty())
     {
         SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
         svfModule->buildSymbolTableInfo();
-
-        /// Build Program Assignment Graph (SVFIR)
         SVFIRBuilder builder;
-        SVFIR* svfir = builder.build(svfModule);
-        if (Options::CFLSVFG)
-        {
-            CFLVF* cflvf = new CFLVF(svfir);
-            cflvf->analyze();
-            delete cflvf;
-        }
-        else
-        {
-            CFLAlias* cflaa = new CFLAlias(svfir);
-            cflaa->analyze();
-            delete cflaa;
-        }
-    }
+        svfir = builder.build(svfModule);
+    }  // if no dot form CFLGraph is specified, we use svfir from .bc.
+
+    CFLBase* cfl;
+    if (Options::CFLSVFG)
+        cfl = new CFLVF(svfir);
     else
-    {
-        SVFIR* svfir = nullptr;
-        CFLAlias* cflaa = new CFLAlias(svfir);
-        cflaa->analyze();
-        delete cflaa;
-    }
+        cfl = new CFLAlias(svfir); // if no svfg is specified, we use CFLAlias as the default one.
+    cfl->analyze();
 
+    delete cfl;
     SVFIR::releaseSVFIR();
     SVF::LLVMModuleSet::releaseLLVMModuleSet();