svf-tools 1.0.619 → 1.0.621

package/lib/DDA/DDAPass.cpp

@@ -62,7 +62,8 @@ void DDAPass::runOnModule(SVFIR* pag)
     for (u32_t i = PointerAnalysis::FlowS_DDA;
             i < PointerAnalysis::Default_PTA; i++)
     {
-        if (Options::DDASelected.isSet(i))
+        PointerAnalysis::PTATY iPtTy = static_cast<PointerAnalysis::PTATY>(i);
+        if (Options::DDASelected(iPtTy))
             runPointerAnalysis(pag, i);
     }
 }
@@ -71,14 +72,14 @@ void DDAPass::runOnModule(SVFIR* pag)
 void DDAPass::selectClient(SVFModule* module)
 {
 
-    if (!Options::UserInputQuery.empty())
+    if (!Options::UserInputQuery().empty())
     {
         /// solve function pointer
-        if (Options::UserInputQuery == "funptr")
+        if (Options::UserInputQuery() == "funptr")
         {
             _client = new FunptrDDAClient(module);
         }
-        else if (Options::UserInputQuery == "alias")
+        else if (Options::UserInputQuery() == "alias")
         {
             _client = new AliasDDAClient(module);
         }
@@ -86,10 +87,10 @@ void DDAPass::selectClient(SVFModule* module)
         else
         {
             _client = new DDAClient(module);
-            if (Options::UserInputQuery != "all")
+            if (Options::UserInputQuery() != "all")
             {
                 u32_t buf; // Have a buffer
-                stringstream ss(Options::UserInputQuery); // Insert the user input string into a stream
+                stringstream ss(Options::UserInputQuery()); // Insert the user input string into a stream
                 while (ss >> buf)
                     _client->setQuery(buf);
             }
@@ -107,8 +108,8 @@ void DDAPass::selectClient(SVFModule* module)
 void DDAPass::runPointerAnalysis(SVFIR* pag, u32_t kind)
 {
 
-    ContextCond::setMaxPathLen(Options::MaxPathLen);
-    ContextCond::setMaxCxtLen(Options::MaxContextLen);
+    ContextCond::setMaxPathLen(Options::MaxPathLen());
+    ContextCond::setMaxCxtLen(Options::MaxContextLen());
 
     /// Initialize pointer analysis.
     switch (kind)
@@ -128,7 +129,7 @@ void DDAPass::runPointerAnalysis(SVFIR* pag, u32_t kind)
         break;
     }
 
-    if(Options::WPANum)
+    if(Options::WPANum())
     {
         _client->collectWPANum(pag->getModule());
     }
@@ -140,13 +141,13 @@ void DDAPass::runPointerAnalysis(SVFIR* pag, u32_t kind)
         _client->answerQueries(_pta.get());
         ///finalize
         _pta->finalize();
-        if(Options::PrintCPts)
+        if(Options::PrintCPts())
             _pta->dumpCPts();
 
         if (_pta->printStat())
             _client->performStat(_pta.get());
 
-        if (Options::PrintQueryPts)
+        if (Options::PrintQueryPts())
             printQueryPTS();
     }
 }
@@ -157,9 +158,9 @@ void DDAPass::runPointerAnalysis(SVFIR* pag, u32_t kind)
  */
 void DDAPass::initCxtInsensitiveEdges(PointerAnalysis* pta, const SVFG* svfg,const SVFGSCC* svfgSCC, SVFGEdgeSet& insensitveEdges)
 {
-    if(Options::InsenRecur)
+    if(Options::InsenRecur())
         collectCxtInsenEdgeForRecur(pta,svfg,insensitveEdges);
-    else if(Options::InsenCycle)
+    else if(Options::InsenCycle())
         collectCxtInsenEdgeForVFCycle(pta,svfg,svfgSCC,insensitveEdges);
 }
 

package/lib/DDA/FlowDDA.cpp

@@ -43,7 +43,7 @@ using namespace SVFUtil;
 void FlowDDA::computeDDAPts(NodeID id)
 {
     resetQuery();
-    LocDPItem::setMaxBudget(Options::FlowBudget);
+    LocDPItem::setMaxBudget(Options::FlowBudget());
 
     PAGNode* node = getPAG()->getGNode(id);
     LocDPItem dpm = getDPIm(node->getId(),getDefSVFGNode(node));

package/lib/Graphs/ConsG.cpp

@@ -632,7 +632,7 @@ void ConstraintGraph::view()
 //@{
 ConstraintNode::iterator ConstraintNode::directOutEdgeBegin()
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directOutEdges.begin();
     else
         return copyOutEdges.begin();
@@ -640,7 +640,7 @@ ConstraintNode::iterator ConstraintNode::directOutEdgeBegin()
 
 ConstraintNode::iterator ConstraintNode::directOutEdgeEnd()
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directOutEdges.end();
     else
         return copyOutEdges.end();
@@ -648,7 +648,7 @@ ConstraintNode::iterator ConstraintNode::directOutEdgeEnd()
 
 ConstraintNode::iterator ConstraintNode::directInEdgeBegin()
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directInEdges.begin();
     else
         return copyInEdges.begin();
@@ -656,7 +656,7 @@ ConstraintNode::iterator ConstraintNode::directInEdgeBegin()
 
 ConstraintNode::iterator ConstraintNode::directInEdgeEnd()
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directInEdges.end();
     else
         return copyInEdges.end();
@@ -664,7 +664,7 @@ ConstraintNode::iterator ConstraintNode::directInEdgeEnd()
 
 ConstraintNode::const_iterator ConstraintNode::directOutEdgeBegin() const
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directOutEdges.begin();
     else
         return copyOutEdges.begin();
@@ -672,7 +672,7 @@ ConstraintNode::const_iterator ConstraintNode::directOutEdgeBegin() const
 
 ConstraintNode::const_iterator ConstraintNode::directOutEdgeEnd() const
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directOutEdges.end();
     else
         return copyOutEdges.end();
@@ -680,7 +680,7 @@ ConstraintNode::const_iterator ConstraintNode::directOutEdgeEnd() const
 
 ConstraintNode::const_iterator ConstraintNode::directInEdgeBegin() const
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directInEdges.begin();
     else
         return copyInEdges.begin();
@@ -688,7 +688,7 @@ ConstraintNode::const_iterator ConstraintNode::directInEdgeBegin() const
 
 ConstraintNode::const_iterator ConstraintNode::directInEdgeEnd() const
 {
-    if (Options::DetectPWC)
+    if (Options::DetectPWC())
         return directInEdges.end();
     else
         return copyInEdges.end();
@@ -723,7 +723,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
     static bool isNodeHidden(NodeType *n)
     {
 #endif
-        if (Options::ShowHiddenNode) return false;
+        if (Options::ShowHiddenNode()) return false;
         else return (n->getInEdges().empty() && n->getOutEdges().empty());
     }
 
@@ -732,7 +732,7 @@ struct DOTGraphTraits<ConstraintGraph*> : public DOTGraphTraits<SVFIR*>
     static std::string getNodeLabel(NodeType *n, ConstraintGraph*)
     {
         PAGNode* node = SVFIR::getPAG()->getGNode(n->getId());
-        bool briefDisplay = Options::BriefConsCGDotGraph;
+        bool briefDisplay = Options::BriefConsCGDotGraph();
         bool nameDisplay = true;
         std::string str;
         std::stringstream rawstr(str);

package/lib/Graphs/ICFG.cpp

@@ -508,7 +508,7 @@ void ICFG::updateCallGraph(PTACallGraph* callgraph)
         }
     }
     // dump ICFG
-    if (Options::DumpICFG)
+    if (Options::DumpICFG())
     {
         dump("icfg_final");
     }

package/lib/Graphs/IRGraph.cpp

@@ -144,7 +144,7 @@ struct DOTGraphTraits<IRGraph*> : public DefaultDOTGraphTraits
     static bool isNodeHidden(SVFVar *node)
     {
 #endif
-        if (Options::ShowHiddenNode) return false;
+        if (Options::ShowHiddenNode()) return false;
         else return node->isIsolatedNode();
     }
 
@@ -289,4 +289,4 @@ struct DOTGraphTraits<IRGraph*> : public DefaultDOTGraphTraits
         return "";
     }
 };
-} // End namespace llvm
+} // End namespace llvm

package/lib/Graphs/SVFG.cpp

@@ -226,9 +226,9 @@ void SVFG::buildSVFG()
     DBOUT(DGENERAL, outs() << pasMsg("Build Sparse Value-Flow Graph \n"));
 
     stat->startClk();
-    if (!Options::ReadSVFG.empty())
+    if (!Options::ReadSVFG().empty())
     {
-        readFile(Options::ReadSVFG);
+        readFile(Options::ReadSVFG());
     }
     else
     {
@@ -240,8 +240,8 @@ void SVFG::buildSVFG()
         stat->indVFEdgeStart();
         connectIndirectSVFGEdges();
         stat->indVFEdgeEnd();
-        if (!Options::WriteSVFG.empty())
-            writeToFile(Options::WriteSVFG);
+        if (!Options::WriteSVFG().empty())
+            writeToFile(Options::WriteSVFG());
     }
 }
 
@@ -788,7 +788,7 @@ struct DOTGraphTraits<SVFG*> : public DOTGraphTraits<SVFIR*>
     static bool isNodeHidden(SVFGNode *node)
     {
 #endif
-        if (Options::ShowHiddenNode) return false;
+        if (Options::ShowHiddenNode()) return false;
         else return node->getInEdges().empty() && node->getOutEdges().empty();
     }
 

package/lib/Graphs/SVFGOPT.cpp

@@ -48,12 +48,12 @@ void SVFGOPT::buildSVFG()
 {
     SVFG::buildSVFG();
 
-    if(Options::DumpVFG)
+    if(Options::DumpVFG())
         dump("SVFG_before_opt");
 
     DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("\tSVFG Optimisation\n"));
 
-    keepActualOutFormalIn = Options::KeepAOFI;
+    keepActualOutFormalIn = Options::KeepAOFI();
 
     stat->sfvgOptStart();
     handleInterValueFlow();
@@ -67,7 +67,7 @@ void SVFGOPT::buildSVFG()
  */
 SVFGEdge* SVFGOPT::addCallIndirectSVFGEdge(NodeID srcId, NodeID dstId, CallSiteID csid, const NodeBS& cpts)
 {
-    if (Options::ContextInsensitive)
+    if (Options::ContextInsensitive())
         return addIntraIndirectVFEdge(srcId, dstId, cpts);
     else
         return addCallIndirectVFEdge(srcId, dstId, cpts, csid);
@@ -78,7 +78,7 @@ SVFGEdge* SVFGOPT::addCallIndirectSVFGEdge(NodeID srcId, NodeID dstId, CallSiteI
  */
 SVFGEdge* SVFGOPT::addRetIndirectSVFGEdge(NodeID srcId, NodeID dstId, CallSiteID csid, const NodeBS& cpts)
 {
-    if (Options::ContextInsensitive)
+    if (Options::ContextInsensitive())
         return addIntraIndirectVFEdge(srcId, dstId, cpts);
     else
         return addRetIndirectVFEdge(srcId, dstId, cpts, csid);
@@ -371,7 +371,7 @@ bool SVFGOPT::canBeRemoved(const SVFGNode * node)
  */
 void SVFGOPT::parseSelfCycleHandleOption()
 {
-    std::string choice = (Options::SelfCycle.getValue().empty()) ? "" : Options::SelfCycle.getValue();
+    std::string choice = (Options::SelfCycle().empty()) ? "" : Options::SelfCycle();
     if (choice.empty() || choice == KeepAllSelfCycle)
         keepAllSelfCycle = true;
     else if (choice == KeepContextSelfCycle)

package/lib/Graphs/VFG.cpp

@@ -835,7 +835,7 @@ void VFG::connectDirectVFGEdges()
     }
 
     /// connect direct value-flow edges (parameter passing) for thread fork/join
-    if(Options::EnableThreadCallGraph)
+    if(Options::EnableThreadCallGraph())
     {
         /// add fork edge
         SVFStmt::SVFStmtSetTy& forks = getPAGEdgeSet(SVFStmt::ThreadFork);

package/lib/MSSA/MemRegion.cpp

@@ -178,7 +178,7 @@ void MRGenerator::collectModRefForLoadStore()
         const SVFFunction& fun = **fi;
 
         /// if this function does not have any caller, then we do not care its MSSA
-        if (Options::IgnoreDeadFun && fun.isUncalledFunction())
+        if (Options::IgnoreDeadFun() && fun.isUncalledFunction())
             continue;
 
         for (SVFFunction::const_iterator iter = fun.begin(), eiter = fun.end();
@@ -811,4 +811,4 @@ std::ostream& SVF::operator<<(std::ostream &o, const MRVer& mrver)
     o << "MRVERID: " << mrver.getID() <<" MemRegion: " << mrver.getMR()->dumpStr() << " MRVERSION: " << mrver.getSSAVersion() << " MSSADef: " << mrver.getDef()->getType() << ", "
       << mrver.getDef()->getMR()->dumpStr() ;
     return o;
-}
+}

package/lib/MSSA/MemSSA.cpp

@@ -49,11 +49,11 @@ MemSSA::MemSSA(BVDataPTAImpl* p, bool ptrOnlyMSSA)
     assert((pta->getAnalysisTy()!=PointerAnalysis::Default_PTA)
            && "please specify a pointer analysis");
 
-    if (Options::MemPar == MemPartition::Distinct)
+    if (Options::MemPar() == MemPartition::Distinct)
         mrGen = new DistinctMRG(pta, ptrOnlyMSSA);
-    else if (Options::MemPar == MemPartition::IntraDisjoint)
+    else if (Options::MemPar() == MemPartition::IntraDisjoint)
         mrGen = new IntraDisjointMRG(pta, ptrOnlyMSSA);
-    else if (Options::MemPar == MemPartition::InterDisjoint)
+    else if (Options::MemPar() == MemPartition::InterDisjoint)
         mrGen = new InterDisjointMRG(pta, ptrOnlyMSSA);
     else
         assert(false && "unrecognised memory partition strategy");
@@ -585,7 +585,7 @@ void MemSSA::dumpMSSA(OutStream& Out)
             fit != efit; ++fit)
     {
         const SVFFunction* fun = *fit;
-        if(Options::MSSAFun!="" && Options::MSSAFun!=fun->getName())
+        if(Options::MSSAFun()!="" && Options::MSSAFun()!=fun->getName())
             continue;
 
         Out << "==========FUNCTION: " << fun->getName() << "==========\n";

package/lib/MSSA/SVFGBuilder.cpp

@@ -40,7 +40,7 @@ using namespace SVFUtil;
 
 SVFG* SVFGBuilder::buildPTROnlySVFG(BVDataPTAImpl* pta)
 {
-    if(Options::OPTSVFG)
+    if(Options::OPTSVFG())
         return build(pta, VFG::PTRONLYSVFG_OPT);
     else
         return build(pta, VFG::PTRONLYSVFG);
@@ -74,13 +74,13 @@ SVFG* SVFGBuilder::build(BVDataPTAImpl* pta, VFG::VFGK kind)
     buildSVFG();
 
     /// Update call graph using pre-analysis results
-    if(Options::SVFGWithIndirectCall || SVFGWithIndCall)
+    if(Options::SVFGWithIndirectCall() || SVFGWithIndCall)
         svfg->updateCallGraph(pta);
 
     if(svfg->getMSSA()->getPTA()->printStat())
         svfg->performStat();
 
-    if(Options::DumpVFG)
+    if(Options::DumpVFG())
         svfg->dump("svfg_final");
 
     return svfg.get();
@@ -114,7 +114,7 @@ std::unique_ptr<MemSSA> SVFGBuilder::buildMSSA(BVDataPTAImpl* pta, bool ptrOnlyM
     }
 
     mssa->performStat();
-    if (Options::DumpMSSA)
+    if (Options::DumpMSSA())
     {
         mssa->dumpMSSA();
     }

package/lib/MTA/FSMPTA.cpp

@@ -48,7 +48,7 @@ void MTASVFGBuilder::buildSVFG()
 {
     MemSSA* mssa = svfg->getMSSA();
     svfg->buildSVFG();
-    if (ADDEDGE_NOEDGE != Options::AddModelFlag)
+    if (ADDEDGE_NOEDGE != Options::AddModelFlag())
     {
         DBOUT(DGENERAL, outs() << SVFUtil::pasMsg("FSMPTA adding edge\n"));
         DBOUT(DMTA, outs() << SVFUtil::pasMsg("FSMPTA adding edge\n"));
@@ -486,10 +486,10 @@ void MTASVFGBuilder::handleStoreLoad(const StmtSVFGNode* n1,const StmtSVFGNode*
     const SVFInstruction* i1 = n1->getInst();
     const SVFInstruction* i2 = n2->getInst();
     /// MHP
-    if (ADDEDGE_NOMHP!=Options::AddModelFlag && !mhp->mayHappenInParallel(i1, i2))
+    if (ADDEDGE_NOMHP!=Options::AddModelFlag() && !mhp->mayHappenInParallel(i1, i2))
         return;
     /// Alias
-    if (ADDEDGE_NOALIAS!=Options::AddModelFlag && !pta->alias(n1->getPAGDstNodeID(), n2->getPAGSrcNodeID()))
+    if (ADDEDGE_NOALIAS!=Options::AddModelFlag() && !pta->alias(n1->getPAGDstNodeID(), n2->getPAGSrcNodeID()))
         return;
 
 
@@ -502,7 +502,7 @@ void MTASVFGBuilder::handleStoreLoad(const StmtSVFGNode* n1,const StmtSVFGNode*
     /// This constrait is too strong. All cxt lock under different cxt cannot be identified.
 
 
-    if (ADDEDGE_NOLOCK!=Options::AddModelFlag && lockana->isProtectedByCommonLock(i1, i2))
+    if (ADDEDGE_NOLOCK!=Options::AddModelFlag() && lockana->isProtectedByCommonLock(i1, i2))
     {
         if (isTailofSpan(n1) && isHeadofSpan(n2))
             addTDEdges(n1->getId(), n2->getId(), pts);
@@ -520,17 +520,17 @@ void MTASVFGBuilder::handleStoreStore(const StmtSVFGNode* n1,const StmtSVFGNode*
     const SVFInstruction* i1 = n1->getInst();
     const SVFInstruction* i2 = n2->getInst();
     /// MHP
-    if (ADDEDGE_NOMHP!=Options::AddModelFlag && !mhp->mayHappenInParallel(i1, i2))
+    if (ADDEDGE_NOMHP!=Options::AddModelFlag() && !mhp->mayHappenInParallel(i1, i2))
         return;
     /// Alias
-    if (ADDEDGE_NOALIAS!=Options::AddModelFlag && !pta->alias(n1->getPAGDstNodeID(), n2->getPAGDstNodeID()))
+    if (ADDEDGE_NOALIAS!=Options::AddModelFlag() && !pta->alias(n1->getPAGDstNodeID(), n2->getPAGDstNodeID()))
         return;
 
     PointsTo pts = pta->getPts(n1->getPAGDstNodeID());
     pts &= pta->getPts(n2->getPAGDstNodeID());
 
     /// Lock
-    if (ADDEDGE_NOLOCK!=Options::AddModelFlag && lockana->isProtectedByCommonLock(i1, i2))
+    if (ADDEDGE_NOLOCK!=Options::AddModelFlag() && lockana->isProtectedByCommonLock(i1, i2))
     {
         if (isTailofSpan(n1) && isHeadofSpan(n2))
             addTDEdges(n1->getId(), n2->getId(), pts);
@@ -706,7 +706,7 @@ void MTASVFGBuilder::readPrecision()
 void MTASVFGBuilder::connectMHPEdges(PointerAnalysis* pta)
 {
     PCG* pcg = new PCG(pta);
-    if ((ADDEDGE_NONSPARSE==Options::AddModelFlag) && Options::UsePCG)
+    if ((ADDEDGE_NONSPARSE==Options::AddModelFlag()) && Options::UsePCG())
     {
         pcg->analyze();
     }
@@ -725,9 +725,9 @@ void MTASVFGBuilder::connectMHPEdges(PointerAnalysis* pta)
         {
             const StmtSVFGNode* n2 = SVFUtil::cast<StmtSVFGNode>(*it2);
             const SVFInstruction* i2 = n2->getInst();
-            if (ADDEDGE_NONSPARSE==Options::AddModelFlag)
+            if (ADDEDGE_NONSPARSE==Options::AddModelFlag())
             {
-                if (Options::UsePCG)
+                if (Options::UsePCG())
                 {
                     if (pcg->mayHappenInParallel(i1, i2) || mhp->mayHappenInParallel(i1, i2))
                         handleStoreLoadNonSparse(n1, n2, pta);
@@ -747,9 +747,9 @@ void MTASVFGBuilder::connectMHPEdges(PointerAnalysis* pta)
         {
             const StmtSVFGNode* n2 = SVFUtil::cast<StmtSVFGNode>(*it2);
             const SVFInstruction* i2 = n2->getInst();
-            if (ADDEDGE_NONSPARSE == Options::AddModelFlag)
+            if (ADDEDGE_NONSPARSE == Options::AddModelFlag())
             {
-                if (Options::UsePCG)
+                if (Options::UsePCG())
                 {
                     if(pcg->mayHappenInParallel(i1, i2) || mhp->mayHappenInParallel(i1, i2))
                         handleStoreStoreNonSparse(n1, n2, pta);
@@ -766,7 +766,7 @@ void MTASVFGBuilder::connectMHPEdges(PointerAnalysis* pta)
         }
     }
 
-    if(Options::ReadPrecisionTDEdge && ADDEDGE_NORP!=Options::AddModelFlag)
+    if(Options::ReadPrecisionTDEdge() && ADDEDGE_NORP!=Options::AddModelFlag())
     {
         DBOUT(DGENERAL,outs()<<"Read precision edge removing \n");
         DBOUT(DMTA,outs()<<"Read precision edge removing \n");

package/lib/MTA/MHP.cpp

@@ -134,7 +134,7 @@ void MHP::analyzeInterleaving()
     /// update non-candidate functions' interleaving
     updateNonCandidateFunInterleaving();
 
-    if (Options::PrintInterLev)
+    if (Options::PrintInterLev())
         printInterleaving();
 }
 

package/lib/MTA/MTA.cpp

@@ -67,12 +67,12 @@ bool MTA::runOnModule(SVFIR* pag)
 
 
     /*
-    if (Options::AndersenAnno) {
+    if (Options::AndersenAnno()) {
         pta = mhp->getTCT()->getPTA();
         if (pta->printStat())
             stat->performMHPPairStat(mhp,lsa);
         AndersenWaveDiff::releaseAndersenWaveDiff();
-    } else if (Options::FSAnno) {
+    } else if (Options::FSAnno()) {
 
         reportMemoryUsageKB("Mem before analysis");
         DBOUT(DGENERAL, outs() << pasMsg("FSMPTA analysis\n"));

package/lib/MTA/MTAStat.cpp

@@ -113,7 +113,7 @@ void MTAStat::performMHPPairStat(MHP* mhp, LockAnalysis* lsa)
 {
 
     SVFIR* pag = SVFIR::getPAG();
-    if(Options::AllPairMHP)
+    if(Options::AllPairMHP())
     {
         Set<const SVFInstruction*> instSet1;
         Set<const SVFInstruction*> instSet2;

package/lib/MTA/PCG.cpp

@@ -27,6 +27,7 @@
  *      Author: Yulei Sui, Peng Di
  */
 
+#include "Util/CommandLine.h"
 #include "Util/Options.h"
 #include "MTA/PCG.h"
 #include "Util/SVFUtil.h"
@@ -39,7 +40,12 @@ using namespace SVFUtil;
  * Whether two functions may happen in parallel
  */
 
-//static llvm::cl::opt<bool> TDPrint("print-td", llvm::cl::init(true), llvm::cl::desc("Print Thread Analysis Results"));
+//static Option<bool> TDPrint(
+//    "print-td",
+//    true,
+//    "Print Thread Analysis Results"
+//);
+
 bool PCG::analyze()
 {
 
@@ -53,7 +59,7 @@ bool PCG::analyze()
 
     //interferenceAnalysis();
 
-    //if (Options::TDPrint) {
+    //if (Options::TDPrint()) {
     //printResults();
     //tdAPI->performAPIStat(mod);
     //}

package/lib/MTA/TCT.cpp

@@ -429,7 +429,7 @@ void TCT::build()
 
     collectMultiForkedThreads();
 
-    if (Options::TCTDotGraph)
+    if (Options::TCTDotGraph())
     {
         print();
         dump("tct");
@@ -511,7 +511,7 @@ void TCT::dumpCxt(CallStrCxt& cxt)
  */
 void TCT::dump(const std::string& filename)
 {
-    if (Options::TCTDotGraph)
+    if (Options::TCTDotGraph())
         GraphPrinter::WriteGraphToFile(outs(), filename, this);
 }
 

package/lib/MemoryModel/PointerAnalysis.cpp

@@ -70,10 +70,10 @@ PointerAnalysis::PointerAnalysis(SVFIR* p, PTATY ty, bool alias_check) :
     svfMod(nullptr),ptaTy(ty),stat(nullptr),ptaCallGraph(nullptr),callGraphSCC(nullptr),icfg(nullptr),chgraph(nullptr),typeSystem(nullptr)
 {
     pag = p;
-    OnTheFlyIterBudgetForStat = Options::StatBudget;
-    print_stat = Options::PStat;
+    OnTheFlyIterBudgetForStat = Options::StatBudget();
+    print_stat = Options::PStat();
     ptaImplTy = BaseImpl;
-    alias_validation = (alias_check && Options::EnableAliasCheck);
+    alias_validation = (alias_check && Options::EnableAliasCheck());
 }
 
 /*!
@@ -110,7 +110,7 @@ void PointerAnalysis::initialize()
     chgraph = pag->getCHG();
 
     /// initialise pta call graph for every pointer analysis instance
-    if(Options::EnableThreadCallGraph)
+    if(Options::EnableThreadCallGraph())
     {
         ThreadCallGraph* cg = new ThreadCallGraph();
         ThreadCallGraphBuilder bd(cg, pag->getICFG());
@@ -125,7 +125,7 @@ void PointerAnalysis::initialize()
     callGraphSCCDetection();
 
     // dump callgraph
-    if (Options::CallGraphDotGraph)
+    if (Options::CallGraphDotGraph())
         getPTACallGraph()->dump("callgraph_initial");
 }
 
@@ -183,31 +183,31 @@ void PointerAnalysis::finalize()
     dumpStat();
 
     /// Dump results
-    if (Options::PTSPrint)
+    if (Options::PTSPrint())
     {
         dumpTopLevelPtsTo();
         //dumpAllPts();
         //dumpCPts();
     }
 
-    if (Options::TypePrint)
+    if (Options::TypePrint())
         dumpAllTypes();
 
-    if(Options::PTSAllPrint)
+    if(Options::PTSAllPrint())
         dumpAllPts();
 
-    if (Options::FuncPointerPrint)
+    if (Options::FuncPointerPrint())
         printIndCSTargets();
 
     getPTACallGraph()->verifyCallGraph();
 
-    if (Options::CallGraphDotGraph)
+    if (Options::CallGraphDotGraph())
         getPTACallGraph()->dump("callgraph_final");
 
     if(!pag->isBuiltFromFile() && alias_validation)
         validateTests();
 
-    if (!Options::UsePreCompFieldSensitive)
+    if (!Options::UsePreCompFieldSensitive())
         resetObjFieldSensitive();
 }
 
@@ -392,7 +392,7 @@ void PointerAnalysis::resolveIndCalls(const CallICFGNode* cs, const PointsTo& ta
             ii != ie; ii++)
     {
 
-        if(getNumOfResolvedIndCallEdge() >= Options::IndirectCallLimit)
+        if(getNumOfResolvedIndCallEdge() >= Options::IndirectCallLimit())
         {
             wrnMsg("Resolved Indirect Call Edges are Out-Of-Budget, please increase the limit");
             return;
@@ -504,7 +504,7 @@ void PointerAnalysis::resolveCPPIndCalls(const CallICFGNode* cs, const PointsTo&
     assert(SVFUtil::getSVFCallSite(cs->getCallSite()).isVirtualCall() && "not cpp virtual call");
 
     VFunSet vfns;
-    if (Options::ConnectVCallOnCHA)
+    if (Options::ConnectVCallOnCHA())
         getVFnsFromCHA(cs, vfns);
     else
         getVFnsFromPts(cs, target, vfns);