svf-tools 1.0.664 → 1.0.666

package/svf/lib/Util/NodeIDAllocator.cpp

@@ -64,7 +64,7 @@ NodeID NodeIDAllocator::allocateObjectId(void)
         // Everything is sequential and intermixed.
         id = numNodes;
     }
-    else if (strategy == Strategy::DEBUG)
+    else if (strategy == Strategy::DBUG)
     {
         // Non-GEPs just grab the next available ID.
         // We may have "holes" because GEPs increment the total
@@ -101,7 +101,7 @@ NodeID NodeIDAllocator::allocateGepObjectId(NodeID base, u32_t offset, u32_t max
         // Everything is sequential and intermixed.
         id = numNodes;
     }
-    else if (strategy == Strategy::DEBUG)
+    else if (strategy == Strategy::DBUG)
     {
         // For a gep id, base id is set at lower bits, and offset is set at higher bits
         // e.g., 1100050 denotes base=50 and offset=10
@@ -146,7 +146,7 @@ NodeID NodeIDAllocator::allocateValueId(void)
         // Everything is sequential and intermixed.
         id = numNodes;
     }
-    else if (strategy == Strategy::DEBUG)
+    else if (strategy == Strategy::DBUG)
     {
         id = numNodes;
     }

package/svf/lib/Util/Options.cpp

@@ -29,7 +29,7 @@ const OptionMap<NodeIDAllocator::Strategy> Options::NodeAllocStrat(
     {NodeIDAllocator::Strategy::DENSE, "dense", "allocate objects together [0-n] and values together [m-MAX], separately"},
     {NodeIDAllocator::Strategy::REVERSE_DENSE, "reverse-dense", "like dense but flipped, objects are [m-MAX], values are [0-n]"},
     {NodeIDAllocator::Strategy::SEQ, "seq", "allocate values and objects sequentially, intermixed (default)"},
-    {NodeIDAllocator::Strategy::DEBUG, "debug", "allocate value and objects sequentially, intermixed, except GEP objects as offsets"},
+    {NodeIDAllocator::Strategy::DBUG, "debug", "allocate value and objects sequentially, intermixed, except GEP objects as offsets"},
 }
 );
 

package/svf-llvm/lib/LLVMModule.cpp

@@ -30,6 +30,7 @@
 #include "Util/Options.h"
 #include <queue>
 #include "SVFIR/SVFModule.h"
+#include "SVFIR/SVFModuleRW.h"
 #include "Util/SVFUtil.h"
 #include "SVF-LLVM/BasicTypes.h"
 #include "SVF-LLVM/LLVMUtil.h"
@@ -68,6 +69,9 @@ using namespace SVF;
 #define SVF_GLOBAL_CTORS             "llvm.global_ctors"
 #define SVF_GLOBAL_DTORS             "llvm.global_dtors"
 
+static Option<std::string> dumpJson("dump-json",
+                                    "Dump the SVFModule to JSON file", "");
+
 LLVMModuleSet *LLVMModuleSet::llvmModuleSet = nullptr;
 std::string SVFModule::pagReadFromTxt = "";
 
@@ -119,8 +123,11 @@ SVFModule* LLVMModuleSet::buildSVFModule(const std::vector<std::string> &moduleN
 
     build_symbol_table();
 
+    svfModule->writeToJson(dumpJson());
+
     return svfModule.get();
 }
+
 void LLVMModuleSet::build_symbol_table() const
 {
     double startSymInfoTime = SVFStat::getClk(true);

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

@@ -36,21 +36,23 @@ using namespace llvm;
 using namespace std;
 using namespace SVF;
 
-int main(int argc, char ** argv)
+int main(int argc, char** argv)
 {
 
-    char **arg_value = new char*[argc];
+    char** arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
-    moduleNameVec = OptionBase::parseOptions(
-                        argc, argv, "Whole Program Points-to Analysis", "[options] <input-bitcode...>"
-                    );
+    moduleNameVec =
+        OptionBase::parseOptions(argc, argv, "Whole Program Points-to Analysis",
+                                 "[options] <input-bitcode...>");
 
     if (Options::WriteAnder() == "ir_annotator")
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }
 
-    SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+    SVFModule* svfModule =
+        LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
+
     /// Build SVFIR
     SVFIRBuilder builder(svfModule);
     SVFIR* pag = builder.build();