svf-lib 1.0.1521 → 1.0.1522

package/SVF-osx/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-osx/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-lib",
-  "version": "1.0.1521",
+  "version": "1.0.1522",
   "description": "SVF's npm support",
   "main": "index.js",
   "scripts": {