svf-tools 1.0.619 → 1.0.621

package/tools/MTA/MTAResultValidator.cpp

@@ -375,7 +375,7 @@ bool MTAResultValidator::validateCxtThread()
     if (tct->getTCTNodeNum() != vthdToCxt.size())
     {
         res = false;
-        if (Options::PrintValidRes)
+        if (Options::PrintValidRes())
         {
             outs() << errMsg("\nValidate CxtThread: The number of CxtThread is different from given result!!!\n");
             outs() << "Given threads:\t" << vthdToCxt.size() << "\nAnalysis result:\t" << tct->getTCTNodeNum() << "\n";
@@ -397,7 +397,7 @@ bool MTAResultValidator::validateCxtThread()
                 if (visitedvthd.find(vthdid) != visitedvthd.end())
                 {
                     res = false;
-                    if (Options::PrintValidRes)
+                    if (Options::PrintValidRes())
                     {
                         outs() << "\nValidate CxtThread: Repeat real CxtThread !!!\n";
                         rthd.dump();
@@ -414,7 +414,7 @@ bool MTAResultValidator::validateCxtThread()
         if (!matched)
         {
             res = false;
-            if (Options::PrintValidRes)
+            if (Options::PrintValidRes())
             {
                 SVFUtil::errs() << errMsg("\nValidate CxtThread: Cannot match real CxtThread !!!\n");
                 rthd.dump();
@@ -425,7 +425,7 @@ bool MTAResultValidator::validateCxtThread()
     if (visitedvthd.size() != vthdToCxt.size())
     {
         res = false;
-        if (Options::PrintValidRes)
+        if (Options::PrintValidRes())
         {
             SVFUtil::errs() << errMsg("\nValidate CxtThread: Some given CxtThreads cannot be found !!!\n");
             assert(false && "test case failed!");
@@ -471,7 +471,7 @@ bool MTAResultValidator::validateTCT()
                 res_node = false;
             }
         }
-        if ((!res_node) && Options::PrintValidRes)
+        if ((!res_node) && Options::PrintValidRes())
         {
             outs() << errMsg("\nValidate TCT: Wrong at TID ") << rthdTovthd[i] << "\n";
             outs() << "Given children: \t";
@@ -505,7 +505,7 @@ MTAResultValidator::INTERLEV_FLAG MTAResultValidator::validateInterleaving()
 
         if ((*seti).second.size() != tsSet.size())
         {
-            if (Options::PrintValidRes)
+            if (Options::PrintValidRes())
             {
                 outs() << errMsg("\n Validate Interleaving: Wrong at : ") << inst->getSourceLoc() << "\n";
                 outs() << "Reason: The number of thread running on stmt is wrong\n";
@@ -542,7 +542,7 @@ MTAResultValidator::INTERLEV_FLAG MTAResultValidator::validateInterleaving()
                     NodeBS lev2 = threadStmtToInterLeaving[ts2];
                     if (lev != lev2)
                     {
-                        if (Options::PrintValidRes)
+                        if (Options::PrintValidRes())
                         {
                             outs() << errMsg("\nValidate Interleaving: Wrong at: ") << inst->getSourceLoc() << "\n";
                             outs() << "Reason: thread interleaving on stmt is wrong\n";
@@ -578,7 +578,7 @@ MTAResultValidator::INTERLEV_FLAG MTAResultValidator::validateInterleaving()
 
             if (!matched)
             {
-                if (Options::PrintValidRes)
+                if (Options::PrintValidRes())
                 {
                     outs() << errMsg("\nValidate Interleaving: Wrong at:") << inst->getSourceLoc() << "\n";
                     outs() << "Reason: analysis thread cxt is not matched by given thread cxt\n";

package/tools/MTA/mta.cpp

@@ -1,6 +1,7 @@
 #include "SVF-LLVM/LLVMUtil.h"
 #include "SVF-LLVM/SVFIRBuilder.h"
 #include "MTA/MTA.h"
+#include "Util/CommandLine.h"
 #include "Util/Options.h"
 #include "MTAResultValidator.h"
 #include "LockResultValidator.h"
@@ -8,20 +9,16 @@ using namespace llvm;
 using namespace std;
 using namespace SVF;
 
-static llvm::cl::opt<std::string> InputFilename(llvm::cl::Positional,
-        llvm::cl::desc("<input bitcode>"), llvm::cl::init("-"));
-
 int main(int argc, char ** argv)
 {
 
-    int arg_num = 0;
     char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
-    LLVMUtil::processArguments(argc, argv, arg_num, arg_value, moduleNameVec);
-    cl::ParseCommandLineOptions(arg_num, arg_value,
-                                "MTA Analysis\n");
+    moduleNameVec = OptionBase::parseOptions(
+                        argc, argv, "MTA Analysis", "[options] <input-bitcode...>"
+                    );
 
-    if (Options::WriteAnder == "ir_annotator")
+    if (Options::WriteAnder() == "ir_annotator")
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }

package/tools/SABER/saber.cpp

@@ -31,6 +31,7 @@
 #include "SABER/LeakChecker.h"
 #include "SABER/FileChecker.h"
 #include "SABER/DoubleFreeChecker.h"
+#include "Util/CommandLine.h"
 #include "Util/Options.h"
 #include "Util/Z3Expr.h"
 
@@ -38,29 +39,34 @@
 using namespace llvm;
 using namespace SVF;
 
-static llvm::cl::opt<std::string> InputFilename(cl::Positional,
-        llvm::cl::desc("<input bitcode>"), llvm::cl::init("-"));
+static Option<bool> LEAKCHECKER(
+    "leak",
+    "Memory Leak Detection",
+    false
+);
 
-static llvm::cl::opt<bool> LEAKCHECKER("leak", llvm::cl::init(false),
-                                       llvm::cl::desc("Memory Leak Detection"));
+static Option<bool> FILECHECKER(
+    "fileck",
+    "File Open/Close Detection",
+    false
+);
 
-static llvm::cl::opt<bool> FILECHECKER("fileck", llvm::cl::init(false),
-                                       llvm::cl::desc("File Open/Close Detection"));
-
-static llvm::cl::opt<bool> DFREECHECKER("dfree", llvm::cl::init(false),
-                                        llvm::cl::desc("Double Free Detection"));
+static Option<bool> DFREECHECKER(
+    "dfree",
+    "Double Free Detection",
+    false
+);
 
 int main(int argc, char ** argv)
 {
 
-    int arg_num = 0;
     char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
-    LLVMUtil::processArguments(argc, argv, arg_num, arg_value, moduleNameVec);
-    cl::ParseCommandLineOptions(arg_num, arg_value,
-                                "Source-Sink Bug Detector\n");
+    moduleNameVec = OptionBase::parseOptions(
+                        argc, argv, "Source-Sink Bug Detector", "[options] <input-bitcode...>"
+                    );
 
-    if (Options::WriteAnder == "ir_annotator")
+    if (Options::WriteAnder() == "ir_annotator")
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }
@@ -71,11 +77,11 @@ int main(int argc, char ** argv)
 
     std::unique_ptr<LeakChecker> saber;
 
-    if(LEAKCHECKER)
+    if(LEAKCHECKER())
         saber = std::make_unique<LeakChecker>();
-    else if(FILECHECKER)
+    else if(FILECHECKER())
         saber = std::make_unique<FileChecker>();
-    else if(DFREECHECKER)
+    else if(DFREECHECKER())
         saber = std::make_unique<DoubleFreeChecker>();
     else
         saber = std::make_unique<LeakChecker>();  // if no checker is specified, we use leak checker as the default one.

package/tools/WPA/wpa.cpp

@@ -29,26 +29,23 @@
 #include "SVF-LLVM/LLVMUtil.h"
 #include "SVF-LLVM/SVFIRBuilder.h"
 #include "WPA/WPAPass.h"
+#include "Util/CommandLine.h"
 #include "Util/Options.h"
 
 using namespace llvm;
 using namespace std;
 using namespace SVF;
 
-static llvm::cl::opt<std::string> InputFilename(llvm::cl::Positional,
-        llvm::cl::desc("<input bitcode>"), llvm::cl::init("-"));
-
 int main(int argc, char ** argv)
 {
 
-    int arg_num = 0;
     char **arg_value = new char*[argc];
     std::vector<std::string> moduleNameVec;
-    LLVMUtil::processArguments(argc, argv, arg_num, arg_value, moduleNameVec);
-    cl::ParseCommandLineOptions(arg_num, arg_value,
-                                "Whole Program Points-to Analysis\n");
+    moduleNameVec = OptionBase::parseOptions(
+                        argc, argv, "Whole Program Points-to Analysis", "[options] <input-bitcode...>"
+                    );
 
-    if (Options::WriteAnder == "ir_annotator")
+    if (Options::WriteAnder() == "ir_annotator")
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }
@@ -63,4 +60,4 @@ int main(int argc, char ** argv)
 
     delete[] arg_value;
     return 0;
-}
+}