svf-tools 1.0.619 → 1.0.621

package/lib/Util/SVFStat.cpp

@@ -40,21 +40,21 @@ double SVFStat::timeOfBuildingSymbolTable = 0;
 
 SVFStat::SVFStat() : startTime(0), endTime(0)
 {
-    assert((Options::ClockType == ClockType::Wall || Options::ClockType == ClockType::CPU)
+    assert((Options::ClockType() == ClockType::Wall || Options::ClockType() == ClockType::CPU)
            && "PTAStat: unknown clock type!");
 }
 
 double SVFStat::getClk(bool mark)
 {
-    if (Options::MarkedClocksOnly && !mark) return 0.0;
+    if (Options::MarkedClocksOnly() && !mark) return 0.0;
 
-    if (Options::ClockType == ClockType::Wall)
+    if (Options::ClockType() == ClockType::Wall)
     {
         struct timespec time;
         clock_gettime(CLOCK_MONOTONIC, &time);
         return (double)(time.tv_nsec + time.tv_sec * 1000000000) / 1000000.0;
     }
-    else if (Options::ClockType == ClockType::CPU)
+    else if (Options::ClockType() == ClockType::CPU)
     {
         return CLOCK_IN_MS();
     }
@@ -255,4 +255,4 @@ void PTAStat::bitcastInstStat()
 
     generalNumMap["BitCastNumber"] = numberOfBitCast;
 }
-*/
+*/

package/lib/Util/SVFUtil.cpp

@@ -65,7 +65,7 @@ std::string SVFUtil::wrnMsg(std::string msg)
 
 void SVFUtil::writeWrnMsg(std::string msg)
 {
-    if(Options::DisableWarn) return;
+    if(Options::DisableWarn()) return;
     outs() << wrnMsg(msg) << "\n";
 }
 

package/lib/Util/Z3Expr.cpp

@@ -107,7 +107,7 @@ Z3Expr Z3Expr::AND(const Z3Expr &lhs, const Z3Expr &rhs)
     {
         Z3Expr expr = lhs && rhs;
         // check subexpression size and option limit
-        if (Z3Expr::getExprSize(expr) > Options::MaxZ3Size)
+        if (Z3Expr::getExprSize(expr) > Options::MaxZ3Size())
         {
             getSolver().push();
             getSolver().add(expr.getExpr());
@@ -145,7 +145,7 @@ Z3Expr Z3Expr::OR(const Z3Expr &lhs, const Z3Expr &rhs)
     {
         Z3Expr expr = lhs || rhs;
         // check subexpression size and option limit
-        if (Z3Expr::getExprSize(expr) > Options::MaxZ3Size)
+        if (Z3Expr::getExprSize(expr) > Options::MaxZ3Size())
         {
             getSolver().push();
             getSolver().add(expr.getExpr());

package/lib/WPA/Andersen.cpp

@@ -79,7 +79,7 @@ void AndersenBase::initialize()
     setGraph(consCG);
     /// Create statistic class
     stat = new AndersenStat(this);
-    if (Options::ConsCGDotGraph)
+    if (Options::ConsCGDotGraph())
         consCG->dump("consCG_initial");
 }
 
@@ -89,10 +89,10 @@ void AndersenBase::initialize()
 void AndersenBase::finalize()
 {
     /// dump constraint graph if PAGDotGraph flag is enabled
-    if (Options::ConsCGDotGraph)
+    if (Options::ConsCGDotGraph())
         consCG->dump("consCG_final");
 
-    if (Options::PrintCGGraph)
+    if (Options::PrintCGGraph())
         consCG->print();
     BVDataPTAImpl::finalize();
 }
@@ -106,22 +106,22 @@ void AndersenBase::analyze()
     initialize();
 
     bool readResultsFromFile = false;
-    if(!Options::ReadAnder.empty())
+    if(!Options::ReadAnder().empty())
     {
-        readResultsFromFile = this->readFromFile(Options::ReadAnder);
+        readResultsFromFile = this->readFromFile(Options::ReadAnder());
         // Finalize the analysis
         PointerAnalysis::finalize();
     }
 
-    if (!Options::WriteAnder.empty())
-        this->writeObjVarToFile(Options::WriteAnder);
+    if (!Options::WriteAnder().empty())
+        this->writeObjVarToFile(Options::WriteAnder());
 
     if(!readResultsFromFile)
     {
         // Start solving constraints
         DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("Start Solving Constraints\n"));
 
-        bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::AnderTimeLimit);
+        bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::AnderTimeLimit());
 
         initWorklist();
         do
@@ -147,9 +147,9 @@ void AndersenBase::analyze()
 
     }
 
-    if (!Options::WriteAnder.empty())
+    if (!Options::WriteAnder().empty())
     {
-        this->writeToFile(Options::WriteAnder);
+        this->writeToFile(Options::WriteAnder());
     }
 
     if (!readResultsFromFile)
@@ -196,7 +196,7 @@ void Andersen::initialize()
     resetData();
     AndersenBase::initialize();
 
-    if (Options::ClusterAnder) cluster();
+    if (Options::ClusterAnder()) cluster();
 
     /// Initialize worklist
     processAllAddr();
@@ -209,7 +209,7 @@ void Andersen::finalize()
 {
     // TODO: check -stat too.
     // TODO: broken
-    if (Options::ClusterAnder)
+    if (Options::ClusterAnder())
     {
         Map<std::string, std::string> stats;
         const PTDataTy *ptd = getPTDataTy();
@@ -844,7 +844,7 @@ void Andersen::updateNodeRepAndSubs(NodeID nodeId, NodeID newRepId)
 
 void Andersen::cluster(void) const
 {
-    assert(Options::MaxFieldLimit == 0 && "Andersen::cluster: clustering for Andersen's is currently only supported in field-insesnsitive analysis");
+    assert(Options::MaxFieldLimit() == 0 && "Andersen::cluster: clustering for Andersen's is currently only supported in field-insesnsitive analysis");
     Steensgaard *steens = Steensgaard::createSteensgaard(pag);
     std::vector<std::pair<unsigned, unsigned>> keys;
     for (SVFIR::iterator pit = pag->begin(); pit != pag->end(); ++pit)

package/lib/WPA/AndersenSCD.cpp

@@ -108,7 +108,7 @@ NodeStack& AndersenSCD::SCCDetect()
     double mergeEnd = stat->getClk();
     timeOfSCCMerges +=  (mergeEnd - mergeStart)/TIMEINTERVAL;
 
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
     {
         sccStart = stat->getClk();
         PWCDetect();
@@ -133,7 +133,7 @@ void AndersenSCD::PWCDetect()
     tmpSccCandidates.clear();
 
     // set scc edge type as direct edge
-    bool pwcFlag = Options::DetectPWC;
+    bool pwcFlag = Options::DetectPWC();
     setDetectPWC(true);
 
     getSCCDetector()->find(sccCandidates);
@@ -150,7 +150,7 @@ void AndersenSCD::handleCopyGep(ConstraintNode* node)
 {
     NodeID nodeId = node->getId();
 
-    if (!Options::DetectPWC && getSCCDetector()->subNodes(nodeId).count() > 1)
+    if (!Options::DetectPWC() && getSCCDetector()->subNodes(nodeId).count() > 1)
         processPWC(node);
     else if(isInWorklist(nodeId))
         Andersen::handleCopyGep(node);

package/lib/WPA/FlowSensitive.cpp

@@ -49,20 +49,20 @@ void FlowSensitive::initialize()
     stat = new FlowSensitiveStat(this);
 
     // TODO: support clustered aux. Andersen's.
-    assert(!Options::ClusterAnder && "FlowSensitive::initialize: clustering auxiliary Andersen's unsupported.");
+    assert(!Options::ClusterAnder() && "FlowSensitive::initialize: clustering auxiliary Andersen's unsupported.");
     ander = AndersenWaveDiff::createAndersenWaveDiff(getPAG());
 
     // If cluster option is not set, it will give us a no-mapping points-to set.
-    assert(!(Options::ClusterFs && Options::PlainMappingFs)
+    assert(!(Options::ClusterFs() && Options::PlainMappingFs())
            && "FS::init: plain-mapping and cluster-fs are mutually exclusive.");
-    if (Options::ClusterFs)
+    if (Options::ClusterFs())
     {
         cluster();
         // Reset the points-to cache although empty so the new mapping could
         // be applied to the inserted empty set.
         getPtCache().reset();
     }
-    else if (Options::PlainMappingFs)
+    else if (Options::PlainMappingFs())
     {
         plainMap();
         // As above.
@@ -80,7 +80,7 @@ void FlowSensitive::initialize()
  */
 void FlowSensitive::analyze()
 {
-    bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::FsTimeLimit);
+    bool limitTimerSet = SVFUtil::startAnalysisLimitTimer(Options::FsTimeLimit());
 
     /// Initialization for the Solver
     initialize();
@@ -120,7 +120,7 @@ void FlowSensitive::analyze()
  */
 void FlowSensitive::finalize()
 {
-    if(Options::DumpVFG)
+    if(Options::DumpVFG())
         svfg->dump("fs_solved", true);
 
     NodeStack& nodeStack = WPASolver<SVFG*>::SCCDetect();
@@ -139,7 +139,7 @@ void FlowSensitive::finalize()
     }
 
     // TODO: check -stat too.
-    if (Options::ClusterFs)
+    if (Options::ClusterFs())
     {
         Map<std::string, std::string> stats;
         const PTDataTy *ptd = getPTDataTy();
@@ -791,7 +791,7 @@ void FlowSensitive::cluster(void)
 
 void FlowSensitive::plainMap(void) const
 {
-    assert(Options::NodeAllocStrat == NodeIDAllocator::Strategy::DENSE
+    assert(Options::NodeAllocStrat() == NodeIDAllocator::Strategy::DENSE
            && "FS::cluster: plain mapping requires dense allocation strategy.");
 
     const size_t numObjects = NodeIDAllocator::get()->getNumObjects();

package/lib/WPA/TypeAnalysis.cpp

@@ -44,7 +44,7 @@ using namespace std;
 void TypeAnalysis::initialize()
 {
     AndersenBase::initialize();
-    if (Options::DumpICFG)
+    if (Options::DumpICFG())
     {
         icfg = SVFIR::getPAG()->getICFG();
         icfg->dump("icfg_initial");

package/lib/WPA/VersionedFlowSensitive.cpp

@@ -39,7 +39,7 @@ VersionedFlowSensitive::VersionedFlowSensitive(SVFIR *_pag, PTATY type)
         if (SVFUtil::isa<ObjVar>(it->second)) equivalentObject[it->first] = it->first;
     }
 
-    assert(!Options::OPTSVFG && "VFS: -opt-svfg not currently supported with VFS.");
+    assert(!Options::OPTSVFG() && "VFS: -opt-svfg not currently supported with VFS.");
 }
 
 void VersionedFlowSensitive::initialize()
@@ -121,7 +121,7 @@ void VersionedFlowSensitive::meldLabel(void)
 {
     double start = stat->getClk(true);
 
-    assert(Options::VersioningThreads > 0 && "VFS::meldLabel: number of versioning threads must be > 0!");
+    assert(Options::VersioningThreads() > 0 && "VFS::meldLabel: number of versioning threads must be > 0!");
 
     // Nodes which have at least one object on them given a prelabel + the Andersen's points-to
     // set of interest so we don't keep calling getPts. For Store nodes, we'll fill that in, for
@@ -414,7 +414,7 @@ void VersionedFlowSensitive::meldLabel(void)
     };
 
     std::vector<std::thread> workers;
-    for (unsigned i = 0; i < Options::VersioningThreads; ++i) workers.push_back(std::thread(meldVersionWorker, i));
+    for (unsigned i = 0; i < Options::VersioningThreads(); ++i) workers.push_back(std::thread(meldVersionWorker, i));
     for (std::thread &worker : workers) worker.join();
 
     delete[] versionMutexes;
@@ -777,7 +777,7 @@ void VersionedFlowSensitive::cluster(void)
     {
         unsigned occ = 1;
         unsigned v = pit->first;
-        if (Options::PredictPtOcc && pag->getObject(v) != nullptr) occ = stmtReliance[v].size() + 1;
+        if (Options::PredictPtOcc() && pag->getObject(v) != nullptr) occ = stmtReliance[v].size() + 1;
         assert(occ != 0);
         keys.push_back(std::make_pair(v, occ));
     }

package/lib/WPA/WPAPass.cpp

@@ -70,7 +70,8 @@ void WPAPass::runOnModule(SVFIR* pag)
 {
     for (u32_t i = 0; i<= PointerAnalysis::Default_PTA; i++)
     {
-        if (Options::PASelected.isSet(i))
+        PointerAnalysis::PTATY iPtaTy = static_cast<PointerAnalysis::PTATY>(i);
+        if (Options::PASelected(iPtaTy))
             runPointerAnalysis(pag, i);
     }
     assert(!ptaVector.empty() && "No pointer analysis is specified.\n");
@@ -115,17 +116,17 @@ void WPAPass::runPointerAnalysis(SVFIR* pag, u32_t kind)
 
     ptaVector.push_back(_pta);
     _pta->analyze();
-    if (Options::AnderSVFG)
+    if (Options::AnderSVFG())
     {
         SVFGBuilder memSSA(true);
         assert(SVFUtil::isa<AndersenBase>(_pta) && "supports only andersen/steensgaard for pre-computed SVFG");
         SVFG *svfg = memSSA.buildFullSVFG((BVDataPTAImpl*)_pta);
         /// support mod-ref queries only for -ander
-        if (Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA))
+        if (Options::PASelected(PointerAnalysis::AndersenWaveDiff_WPA))
             _svfg = svfg;
     }
 
-    if (Options::PrintAliases)
+    if (Options::PrintAliases())
         PrintAliasPairs(_pta);
 }
 
@@ -172,7 +173,7 @@ AliasResult WPAPass::alias(const SVFValue* V1, const SVFValue* V2)
     if (pag->hasValueNode(V1) && pag->hasValueNode(V2))
     {
         /// Veto is used by default
-        if (Options::AliasRule.getBits() == 0 || Options::AliasRule.isSet(Veto))
+        if (Options::AliasRule.nothingSet() || Options::AliasRule(Veto))
         {
             /// Return NoAlias if any PTA gives NoAlias result
             result = AliasResult::MayAlias;
@@ -184,7 +185,7 @@ AliasResult WPAPass::alias(const SVFValue* V1, const SVFValue* V2)
                     result = AliasResult::NoAlias;
             }
         }
-        else if (Options::AliasRule.isSet(Conservative))
+        else if (Options::AliasRule(Conservative))
         {
             /// Return MayAlias if any PTA gives MayAlias result
             result = AliasResult::NoAlias;
@@ -206,7 +207,7 @@ AliasResult WPAPass::alias(const SVFValue* V1, const SVFValue* V2)
  */
 ModRefInfo WPAPass::getModRefInfo(const CallSite callInst)
 {
-    assert(Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG && "mod-ref query is only support with -ander and -svfg turned on");
+    assert(Options::PASelected(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG() && "mod-ref query is only support with -ander and -svfg turned on");
     ICFG* icfg = _svfg->getPAG()->getICFG();
     const CallICFGNode* cbn = icfg->getCallICFGNode(callInst.getInstruction());
     return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(cbn);
@@ -217,7 +218,7 @@ ModRefInfo WPAPass::getModRefInfo(const CallSite callInst)
  */
 ModRefInfo WPAPass::getModRefInfo(const CallSite callInst, const SVFValue* V)
 {
-    assert(Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG && "mod-ref query is only support with -ander and -svfg turned on");
+    assert(Options::PASelected(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG() && "mod-ref query is only support with -ander and -svfg turned on");
     ICFG* icfg = _svfg->getPAG()->getICFG();
     const CallICFGNode* cbn = icfg->getCallICFGNode(callInst.getInstruction());
     return _svfg->getMSSA()->getMRGenerator()->getModRefInfo(cbn, V);
@@ -228,7 +229,7 @@ ModRefInfo WPAPass::getModRefInfo(const CallSite callInst, const SVFValue* V)
  */
 ModRefInfo WPAPass::getModRefInfo(const CallSite callInst1, const CallSite callInst2)
 {
-    assert(Options::PASelected.isSet(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG && "mod-ref query is only support with -ander and -svfg turned on");
+    assert(Options::PASelected(PointerAnalysis::AndersenWaveDiff_WPA) && Options::AnderSVFG() && "mod-ref query is only support with -ander and -svfg turned on");
     ICFG* icfg = _svfg->getPAG()->getICFG();
     const CallICFGNode* cbn1 = icfg->getCallICFGNode(callInst1.getInstruction());
     const CallICFGNode* cbn2 = icfg->getCallICFGNode(callInst2.getInstruction());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svf-tools",
-  "version": "1.0.619",
+  "version": "1.0.621",
   "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

@@ -35,29 +35,21 @@
 using namespace llvm;
 using namespace SVF;
 
-static cl::opt<bool>
-StandardCompileOpts("std-compile-opts",
-                    cl::desc("Include the standard compile time optimizations"));
-
-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,
-                                "CFL Reachability Analysis\n");
+    moduleNameVec = OptionBase::parseOptions(
+                        argc, argv, "CFL Reachability Analysis", "[options] <input-bitcode...>"
+                    );
 
-    if (Options::WriteAnder == "ir_annotator")
+    if (Options::WriteAnder() == "ir_annotator")
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }
 
     SVFIR* svfir = nullptr;
-    if (Options::CFLGraph.empty())
+    if (Options::CFLGraph().empty())
     {
         SVFModule* svfModule = LLVMModuleSet::getLLVMModuleSet()->buildSVFModule(moduleNameVec);
         SVFIRBuilder builder(svfModule);
@@ -65,8 +57,10 @@ int main(int argc, char ** argv)
     }  // if no dot form CFLGraph is specified, we use svfir from .bc.
 
     std::unique_ptr<CFLBase> cfl;
-    if (Options::CFLSVFG)
+    if (Options::CFLSVFG())
         cfl = std::make_unique<CFLVF>(svfir);
+    else if (Options::POCRAlias())
+        cfl = std::make_unique<POCRAlias>(svfir);
     else
         cfl = std::make_unique<CFLAlias>(svfir); // if no svfg is specified, we use CFLAlias as the default one.
     cfl->analyze();

package/tools/DDA/dda.cpp

@@ -14,45 +14,55 @@
 using namespace llvm;
 using namespace SVF;
 
-static cl::opt<bool>
-StandardCompileOpts("std-compile-opts",
-                    cl::desc("Include the standard compile time optimizations"));
-
-static llvm::cl::opt<std::string> InputFilename(llvm::cl::Positional,
-        llvm::cl::desc("<input bitcode>"), llvm::cl::init("-"));
-
 //static cl::list<const PassInfo*, bool, PassNameParser>
 //PassList(cl::desc("Optimizations available:"));
 
-static cl::opt<bool> DAA("daa", cl::init(false),
-                         cl::desc("Demand-Driven Alias Analysis Pass"));
-
-static cl::opt<bool> REGPT("dreg", cl::init(false),
-                           cl::desc("Demand-driven regular points-to analysis"));
-
-static cl::opt<bool> RFINEPT("dref", cl::init(false),
-                             cl::desc("Demand-driven refinement points-to analysis"));
-
-static cl::opt<bool> ENABLEFIELD("fdaa", cl::init(false),
-                                 cl::desc("enable field-sensitivity for demand-driven analysis"));
-
-static cl::opt<bool> ENABLECONTEXT("cdaa", cl::init(false),
-                                   cl::desc("enable context-sensitivity for demand-driven analysis"));
-
-static cl::opt<bool> ENABLEFLOW("ldaa", cl::init(false),
-                                cl::desc("enable flow-sensitivity for demand-driven analysis"));
+static Option<bool> DAA(
+    "daa",
+    "Demand-Driven Alias Analysis Pass",
+    false
+);
+
+static Option<bool> REGPT(
+    "dreg",
+    "Demand-driven regular points-to analysis",
+    false
+);
+
+static Option<bool> RFINEPT(
+    "dref",
+    "Demand-driven refinement points-to analysis",
+    false
+);
+
+static Option<bool> ENABLEFIELD(
+    "fdaa",
+    "enable field-sensitivity for demand-driven analysis",
+    false
+);
+
+static Option<bool> ENABLECONTEXT(
+    "cdaa",
+    "enable context-sensitivity for demand-driven analysis",
+    false
+);
+
+static Option<bool> ENABLEFLOW(
+    "ldaa",
+    "enable flow-sensitivity for demand-driven analysis",
+    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,
-                                "Demand-Driven Points-to Analysis\n");
+    moduleNameVec = OptionBase::parseOptions(
+                        argc, argv, "Demand-Driven Points-to Analysis", "[options] <input-bitcode...>"
+                    );
 
-    if (Options::WriteAnder == "ir_annotator")
+    if (Options::WriteAnder() == "ir_annotator")
     {
         LLVMModuleSet::getLLVMModuleSet()->preProcessBCs(moduleNameVec);
     }

package/tools/Example/svf-ex.cpp

@@ -30,15 +30,13 @@
 #include "Graphs/SVFG.h"
 #include "WPA/Andersen.h"
 #include "SVF-LLVM/SVFIRBuilder.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("-"));
-
 /*!
  * An example to query alias results of two LLVM values
  */
@@ -145,14 +143,13 @@ void traverseOnVFG(const SVFG* vfg, SVFValue* val)
 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);
     }

package/tools/MTA/LockResultValidator.cpp

@@ -155,7 +155,7 @@ LockResultValidator::LOCK_FLAG LockResultValidator::validateStmtInLock()
         CxtLockSetStr LS = instToCxtLockSet[inst];
         if(LS.size() != (*it).second.size())
         {
-            if (Options::PrintValidRes)
+            if (Options::PrintValidRes())
             {
                 outs() << errMsg("\nValidate Stmt's Lock : Wrong at: ") << inst->toString() << "\n";
                 outs() << "Reason: The number of lock on current stmt is wrong\n";
@@ -185,7 +185,7 @@ LockResultValidator::LOCK_FLAG LockResultValidator::validateStmtInLock()
             std::string lockName = SVFUtil::getSVFCallSite(call).getArgOperand(0)->getName();
             if(!match(lockName, LS))
             {
-                if(Options::PrintValidRes)
+                if(Options::PrintValidRes())
                 {
                     outs() << "\nValidate Stmt's Lock : Wrong at (" << inst->toString() << ")\n";
                     outs() << "Reason: The number of lock on current stmt is wrong\n";

package/tools/MTA/MTAAnnotator.cpp

@@ -108,14 +108,14 @@ void MTAAnnotator::initialize(MHP* m, LockAnalysis* la)
 {
     mhp = m;
     lsa = la;
-    if (!Options::AnnoFlag)
+    if (!Options::AnnoFlag())
         return;
     collectLoadStoreInst(mhp->getTCT()->getPTA()->getModule());
 }
 
 void MTAAnnotator::pruneThreadLocal(PointerAnalysis* pta)
 {
-    bool AnnoLocal = Options::AnnoFlag & ANNO_LOCAL;
+    bool AnnoLocal = Options::AnnoFlag() & ANNO_LOCAL;
     if (!AnnoLocal)
         return;
 
@@ -202,8 +202,8 @@ void MTAAnnotator::pruneThreadLocal(PointerAnalysis* pta)
 void MTAAnnotator::pruneAliasMHP(PointerAnalysis* pta)
 {
 
-    bool AnnoMHP = Options::AnnoFlag & ANNO_MHP;
-    bool AnnoAlias = Options::AnnoFlag & ANNO_ALIAS;
+    bool AnnoMHP = Options::AnnoFlag() & ANNO_MHP;
+    bool AnnoAlias = Options::AnnoFlag() & ANNO_ALIAS;
 
     if (!AnnoMHP && !AnnoAlias)
         return;
@@ -280,7 +280,7 @@ void MTAAnnotator::pruneAliasMHP(PointerAnalysis* pta)
 }
 void MTAAnnotator::performAnnotate()
 {
-    if (!Options::AnnoFlag)
+    if (!Options::AnnoFlag())
         return;
     for (InstSet::iterator it = storeset.begin(), eit = storeset.end(); it != eit; ++it)
     {