svf-tools 1.0.708 → 1.0.709

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.708",
+  "version": "1.0.709",
   "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/SVFIR/SVFModule.h

@@ -63,6 +63,7 @@ public:
     typedef OtherValueType::const_iterator const_ovalue_iterator;
 
 private:
+    static SVFModule* svfModule;
     static std::string pagReadFromTxt;
     std::string moduleIdentifier;
     FunctionSetType FunctionSet;  ///< The Functions in the module
@@ -71,9 +72,12 @@ private:
     ConstantType ConstantSet;     ///< The ConstantData in the module
     OtherValueType OtherValueSet; ///< All other values in the module
 
-public:
     /// Constructors
-    SVFModule(std::string moduleName = "") : moduleIdentifier(moduleName) {}
+    SVFModule() = default;
+
+public:
+    static SVFModule* getSVFModule();
+    static void releaseSVFModule();
 
     ~SVFModule();
 
@@ -82,6 +86,11 @@ public:
         pagReadFromTxt = txt;
     }
 
+    inline void setModuleIdentifier(const std::string& moduleIdentifier)
+    {
+        this->moduleIdentifier = moduleIdentifier;
+    }
+
     static inline std::string pagFileName()
     {
         return pagReadFromTxt;

package/svf/lib/Graphs/ICFG.cpp

@@ -193,7 +193,7 @@ const std::string RetCFGEdge::toString() const
  * 2) connect ICFG edges
  *    between two statements (PAGEdges)
  */
-ICFG::ICFG(): totalICFGNode(0)
+ICFG::ICFG(): totalICFGNode(0), globalBlockNode(nullptr)
 {
 }
 

package/svf/lib/SVFIR/SVFFileSystem.cpp

@@ -1337,7 +1337,7 @@ SVFIR* SVFIRReader::read(const cJSON* root)
     SVFIR* svfIR = SVFIR::getPAG(); // SVFIR constructor sets symInfo
     IRGraph* irGraph = svfIR;
 
-    auto svfModule = new SVFModule();
+    auto svfModule = SVFModule::getSVFModule();
     auto icfg = new ICFG();
     auto chgraph = new CHGraph(svfModule);
     auto symInfo = SymbolTableInfo::SymbolInfo();

package/svf/lib/SVFIR/SVFIR.cpp

@@ -562,6 +562,8 @@ void SVFIR::destroy()
     icfg = nullptr;
     delete chgraph;
     chgraph = nullptr;
+    SVFModule::releaseSVFModule();
+    svfModule = nullptr;
 }
 
 /*!

package/svf/lib/SVFIR/SVFModule.cpp

@@ -29,6 +29,9 @@
 
 using namespace SVF;
 
+std::string SVFModule::pagReadFromTxt = "";
+SVFModule* SVFModule::svfModule = nullptr;
+
 SVFModule::~SVFModule()
 {
     for (const SVFFunction* f : FunctionSet)
@@ -53,3 +56,19 @@ const SVFFunction* SVFModule::getSVFFunction(const std::string& name)
     }
     return nullptr;
 }
+
+SVFModule* SVFModule::getSVFModule()
+{
+    if (svfModule == nullptr)
+    {
+        svfModule = new SVFModule;
+    }
+    return svfModule;
+}
+
+void SVFModule::releaseSVFModule()
+{
+    assert(svfModule != nullptr && "SVFModule is not initialized?");
+    delete svfModule;
+    svfModule = nullptr;
+}

package/svf-llvm/include/SVF-LLVM/LLVMModule.h

@@ -62,8 +62,9 @@ public:
 
 private:
     static LLVMModuleSet* llvmModuleSet;
-    SymbolTableInfo *symInfo;
-    std::unique_ptr<SVFModule> svfModule;
+    static bool preProcessed;
+    SymbolTableInfo* symInfo;
+    SVFModule* svfModule; ///< Borrowed from singleton SVFModule::svfModule
     std::unique_ptr<LLVMContext> cxts;
     std::vector<std::unique_ptr<Module>> owned_modules;
     std::vector<std::reference_wrapper<Module>> modules;
@@ -87,35 +88,34 @@ private:
 
     /// Constructor
     LLVMModuleSet();
-    ~LLVMModuleSet() = default;
 
     void build();
 
 public:
+    ~LLVMModuleSet() = default;
+
     static inline LLVMModuleSet* getLLVMModuleSet()
     {
-        if (llvmModuleSet == nullptr)
-            llvmModuleSet = new LLVMModuleSet();
+        if (!llvmModuleSet)
+            llvmModuleSet = new LLVMModuleSet;
         return llvmModuleSet;
     }
 
     static void releaseLLVMModuleSet()
     {
-        if (llvmModuleSet)
-            delete llvmModuleSet;
+        delete llvmModuleSet;
         llvmModuleSet = nullptr;
     }
 
-    SVFModule* buildSVFModule(Module& mod);
-    SVFModule* buildSVFModule(const std::vector<std::string>& moduleNameVec);
+    static SVFModule* buildSVFModule(Module& mod);
+    static SVFModule* buildSVFModule(const std::vector<std::string>& moduleNameVec);
 
     inline SVFModule* getSVFModule()
     {
-        assert(svfModule && "svfModule has not been built yet!");
-        return svfModule.get();
+        return svfModule;
     }
 
-    void preProcessBCs(std::vector<std::string>& moduleNameVec);
+    static void preProcessBCs(std::vector<std::string>& moduleNameVec);
 
     u32_t getModuleNum() const
     {
@@ -139,7 +139,7 @@ public:
     }
 
     // Dump modules to files
-    void dumpModulesToFile(const std::string suffix);
+    void dumpModulesToFile(const std::string& suffix);
 
     inline void addFunctionMap(const Function* func, SVFFunction* svfFunc)
     {
@@ -350,7 +350,6 @@ private:
     void buildGlobalDefToRepMap();
     /// Invoke llvm passes to modify module
     void prePassSchedule();
-    bool preProcessed;
     void buildSymbolTable() const;
 };
 

package/svf-llvm/lib/LLVMModule.cpp

@@ -69,50 +69,54 @@ using namespace SVF;
 #define SVF_GLOBAL_CTORS             "llvm.global_ctors"
 #define SVF_GLOBAL_DTORS             "llvm.global_dtors"
 
-LLVMModuleSet *LLVMModuleSet::llvmModuleSet = nullptr;
-std::string SVFModule::pagReadFromTxt = "";
+LLVMModuleSet* LLVMModuleSet::llvmModuleSet = nullptr;
+bool LLVMModuleSet::preProcessed = false;
 
-LLVMModuleSet::LLVMModuleSet(): svfModule(nullptr), cxts(nullptr), preProcessed(false)
+LLVMModuleSet::LLVMModuleSet()
+    : symInfo(SymbolTableInfo::SymbolInfo()),
+      svfModule(SVFModule::getSVFModule()), cxts(nullptr)
 {
-    symInfo = SymbolTableInfo::SymbolInfo();
 }
 
 SVFModule* LLVMModuleSet::buildSVFModule(Module &mod)
 {
+    LLVMModuleSet* mset = getLLVMModuleSet();
+
     double startSVFModuleTime = SVFStat::getClk(true);
-    svfModule = std::make_unique<SVFModule>(mod.getModuleIdentifier());
-    modules.emplace_back(mod);
+    SVFModule::getSVFModule()->setModuleIdentifier(mod.getModuleIdentifier());
+    mset->modules.emplace_back(mod);
 
-    build();
+    mset->build();
     double endSVFModuleTime = SVFStat::getClk(true);
     SVFStat::timeOfBuildingLLVMModule = (endSVFModuleTime - startSVFModuleTime)/TIMEINTERVAL;
 
-    buildSymbolTable();
-
-    return svfModule.get();
+    mset->buildSymbolTable();
+    // Don't releaseLLVMModuleSet() here, as IRBuilder might still need LLVMMoudleSet
+    return SVFModule::getSVFModule();
 }
 
 SVFModule* LLVMModuleSet::buildSVFModule(const std::vector<std::string> &moduleNameVec)
 {
     double startSVFModuleTime = SVFStat::getClk(true);
 
-    assert(llvmModuleSet && "LLVM Module set needs to be created!");
+    LLVMModuleSet* mset = getLLVMModuleSet();
 
-    loadModules(moduleNameVec);
+    mset->loadModules(moduleNameVec);
 
     if (!moduleNameVec.empty())
-        svfModule = std::make_unique<SVFModule>(*moduleNameVec.begin());
-    else
-        svfModule = std::make_unique<SVFModule>();
+    {
+        SVFModule::getSVFModule()->setModuleIdentifier(moduleNameVec.front());
+    }
 
-    build();
+    mset->build();
 
     double endSVFModuleTime = SVFStat::getClk(true);
-    SVFStat::timeOfBuildingLLVMModule = (endSVFModuleTime - startSVFModuleTime)/TIMEINTERVAL;
-
-    buildSymbolTable();
+    SVFStat::timeOfBuildingLLVMModule =
+        (endSVFModuleTime - startSVFModuleTime) / TIMEINTERVAL;
 
-    return svfModule.get();
+    mset->buildSymbolTable();
+    // Don't releaseLLVMModuleSet() here, as IRBuilder might still need LLVMMoudleSet
+    return SVFModule::getSVFModule();
 }
 
 void LLVMModuleSet::buildSymbolTable() const
@@ -123,7 +127,7 @@ void LLVMModuleSet::buildSymbolTable() const
         /// building symbol table
         DBOUT(DGENERAL, SVFUtil::outs() << SVFUtil::pasMsg("Building Symbol table ...\n"));
         SymbolTableBuilder builder(symInfo);
-        builder.buildMemModel(svfModule.get());
+        builder.buildMemModel(svfModule);
     }
     double endSymInfoTime = SVFStat::getClk(true);
     SVFStat::timeOfBuildingSymbolTable =
@@ -366,7 +370,7 @@ void LLVMModuleSet::prePassSchedule()
     /// MergeFunctionRets Pass
     std::unique_ptr<UnifyFunctionExitNodes> p2 =
         std::make_unique<UnifyFunctionExitNodes>();
-    for (Module &M : LLVMModuleSet::getLLVMModuleSet()->getLLVMModules())
+    for (Module &M : getLLVMModules())
     {
         for (auto F = M.begin(), E = M.end(); F != E; ++F)
         {
@@ -380,8 +384,9 @@ void LLVMModuleSet::prePassSchedule()
 
 void LLVMModuleSet::preProcessBCs(std::vector<std::string> &moduleNameVec)
 {
-    loadModules(moduleNameVec);
-    prePassSchedule();
+    LLVMModuleSet* mset = getLLVMModuleSet();
+    mset->loadModules(moduleNameVec);
+    mset->prePassSchedule();
 
     std::string preProcessSuffix = ".pre.bc";
     // Get the existing module names, remove old extention, add preProcessSuffix
@@ -392,9 +397,8 @@ void LLVMModuleSet::preProcessBCs(std::vector<std::string> &moduleNameVec)
         moduleNameVec[i] = (rawName + preProcessSuffix);
     }
 
-    dumpModulesToFile(preProcessSuffix);
+    mset->dumpModulesToFile(preProcessSuffix);
     preProcessed = true;
-
     releaseLLVMModuleSet();
 }
 
@@ -767,7 +771,7 @@ void LLVMModuleSet::buildGlobalDefToRepMap()
 }
 
 // Dump modules to files
-void LLVMModuleSet::dumpModulesToFile(const std::string suffix)
+void LLVMModuleSet::dumpModulesToFile(const std::string& suffix)
 {
     for (Module& mod : modules)
     {

package/svf-llvm/tools/CFL/cfl.cpp

@@ -37,7 +37,6 @@ using namespace SVF;
 
 int main(int argc, char ** argv)
 {
-    char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
     moduleNameVec = OptionBase::parseOptions(
                         argc, argv, "CFL Reachability Analysis", "[options] <input-bitcode...>"
@@ -45,13 +44,13 @@ int main(int argc, char ** argv)
 
     if (Options::WriteAnder() == "ir_annotator")
     {
-        LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
+        LLVMModuleSet::preProcessBCs(moduleNameVec);
     }
 
     SVFIR* svfir = nullptr;
     if (Options::CFLGraph().empty())
     {
-        SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+        SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
         SVFIRBuilder builder(svfModule);
         svfir = builder.build();
     }  // if no dot form CFLGraph is specified, we use svfir from .bc.
@@ -70,8 +69,6 @@ int main(int argc, char ** argv)
     SVFIR::releaseSVFIR();
     SVF::LLVMModuleSet::releaseLLVMModuleSet();
 
-    delete[] arg_value;
-
     return 0;
 
 }

package/svf-llvm/tools/DDA/dda.cpp

@@ -77,8 +77,6 @@ static Option<bool> ENABLEFLOW(
 
 int main(int argc, char ** argv)
 {
-
-    char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
     moduleNameVec = OptionBase::parseOptions(
                         argc, argv, "Demand-Driven Points-to Analysis", "[options] <input-bitcode...>"
@@ -86,17 +84,17 @@ int main(int argc, char ** argv)
 
     if (Options::WriteAnder() == "ir_annotator")
     {
-        LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
+        LLVMModuleSet::preProcessBCs(moduleNameVec);
     }
 
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
     SVFIRBuilder builder(svfModule);
     SVFIR* pag = builder.build();
 
     DDAPass dda;
     dda.runOnModule(pag);
 
-    delete[] arg_value;
+    LLVMModuleSet::releaseLLVMModuleSet();
     return 0;
 
 }

package/svf-llvm/tools/Example/svf-ex.cpp

@@ -142,7 +142,6 @@ void traverseOnVFG(const SVFG* vfg, SVFValue* val)
 int main(int argc, char ** argv)
 {
 
-    char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
     moduleNameVec = OptionBase::parseOptions(
                         argc, argv, "Whole Program Points-to Analysis", "[options] <input-bitcode...>"
@@ -150,10 +149,10 @@ int main(int argc, char ** argv)
 
     if (Options::WriteAnder() == "ir_annotator")
     {
-        LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
+        LLVMModuleSet::preProcessBCs(moduleNameVec);
     }
 
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
 
     /// Build Program Assignment Graph (SVFIR)
     SVFIRBuilder builder(svfModule);
@@ -198,7 +197,6 @@ int main(int argc, char ** argv)
     SVF::LLVMModuleSet::releaseLLVMModuleSet();
 
     llvm::llvm_shutdown();
-    delete[] arg_value;
     return 0;
 }
 

package/svf-llvm/tools/LLVM2SVF/llvm2svf.cpp

@@ -55,18 +55,18 @@ int main(int argc, char** argv)
     auto moduleNameVec = OptionBase::parseOptions(
                              argc, argv, "llvm2svf", "[options] <input-bitcode...>");
 
-    LLVMModuleSet* moduleSet = LLVMModuleSet::getLLVMModuleSet();
     if (Options::WriteAnder() == "ir_annotator")
     {
-        moduleSet->preProcessBCs(moduleNameVec);
+        LLVMModuleSet::preProcessBCs(moduleNameVec);
     }
 
-    SVFModule* svfModule = moduleSet->buildSVFModule(moduleNameVec);
+    SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
     const std::string jsonPath = replaceExtension(moduleNameVec.front());
     // PAG is borrowed from a unique_ptr, so we don't need to delete it.
     const SVFIR* pag = SVFIRBuilder(svfModule).build();
     SVFIRWriter::writeJsonToPath(pag, jsonPath);
     SVFUtil::outs() << "SVF IR is written to '" << jsonPath << "'\n";
 
+    LLVMModuleSet::releaseLLVMModuleSet();
     return 0;
 }

package/svf-llvm/tools/MTA/mta.cpp

@@ -34,7 +34,6 @@ using namespace SVF;
 int main(int argc, char ** argv)
 {
 
-    char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
     moduleNameVec = OptionBase::parseOptions(
                         argc, argv, "MTA Analysis", "[options] <input-bitcode...>"
@@ -42,10 +41,10 @@ int main(int argc, char ** argv)
 
     if (Options::WriteAnder() == "ir_annotator")
     {
-        LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
+        LLVMModuleSet::preProcessBCs(moduleNameVec);
     }
 
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
     SVFIRBuilder builder(svfModule);
     SVFIR* pag = builder.build();
 
@@ -59,7 +58,6 @@ int main(int argc, char ** argv)
     LockResultValidator lockvalidator(mta.getLockAnalysis());
     lockvalidator.analyze();
 
-    delete[] arg_value;
-
+    LLVMModuleSet::releaseLLVMModuleSet();
     return 0;
 }

package/svf-llvm/tools/SABER/saber.cpp

@@ -60,7 +60,6 @@ static Option<bool> DFREECHECKER(
 int main(int argc, char ** argv)
 {
 
-    char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
     moduleNameVec = OptionBase::parseOptions(
                         argc, argv, "Source-Sink Bug Detector", "[options] <input-bitcode...>"
@@ -68,10 +67,10 @@ int main(int argc, char ** argv)
 
     if (Options::WriteAnder() == "ir_annotator")
     {
-        LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
+        LLVMModuleSet::preProcessBCs(moduleNameVec);
     }
 
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
     SVFIRBuilder builder(svfModule);
     SVFIR* pag = builder.build();
 
@@ -88,7 +87,7 @@ int main(int argc, char ** argv)
 
     saber->runOnModule(pag);
 
-    delete[] arg_value;
+    LLVMModuleSet::releaseLLVMModuleSet();
 
     return 0;
 

package/svf-llvm/tools/WPA/wpa.cpp

@@ -44,6 +44,7 @@ int main(int argc, char** argv)
         OptionBase::parseOptions(argc, argv, "Whole Program Points-to Analysis",
                                  "[options] <input-bitcode...>");
 
+    // Refers to content of a singleton unique_ptr<SVFIR> in SVFIR.
     SVFIR* pag;
 
     if (Options::ReadJson())
@@ -52,13 +53,12 @@ int main(int argc, char** argv)
     }
     else
     {
-        LLVMModuleSet* moduleSet = LLVMModuleSet::getLLVMModuleSet();
         if (Options::WriteAnder() == "ir_annotator")
         {
-            moduleSet->preProcessBCs(moduleNameVec);
+            LLVMModuleSet::preProcessBCs(moduleNameVec);
         }
 
-        SVFModule* svfModule = moduleSet->buildSVFModule(moduleNameVec);
+        SVFModule* svfModule = LLVMModuleSet::buildSVFModule(moduleNameVec);
 
         /// Build SVFIR
         SVFIRBuilder builder(svfModule);
@@ -68,5 +68,7 @@ int main(int argc, char** argv)
     WPAPass wpa;
     wpa.runOnModule(pag);
 
+    LLVMModuleSet::releaseLLVMModuleSet();
+
     return 0;
 }