svf-tools 1.0.619 → 1.0.621

package/lib/MemoryModel/PointerAnalysisImpl.cpp

@@ -51,37 +51,37 @@ BVDataPTAImpl::BVDataPTAImpl(SVFIR* p, PointerAnalysis::PTATY type, bool alias_c
     {
         // Only maintain reverse points-to when the analysis is field-sensitive, as objects turning
         // field-insensitive is all it is used for.
-        bool maintainRevPts = Options::MaxFieldLimit != 0;
-        if (Options::ptDataBacking == PTBackingType::Mutable) ptD = std::make_unique<MutDiffPTDataTy>(maintainRevPts);
-        else if (Options::ptDataBacking == PTBackingType::Persistent) ptD = std::make_unique<PersDiffPTDataTy>(getPtCache(), maintainRevPts);
+        bool maintainRevPts = Options::MaxFieldLimit() != 0;
+        if (Options::ptDataBacking() == PTBackingType::Mutable) ptD = std::make_unique<MutDiffPTDataTy>(maintainRevPts);
+        else if (Options::ptDataBacking() == PTBackingType::Persistent) ptD = std::make_unique<PersDiffPTDataTy>(getPtCache(), maintainRevPts);
         else assert(false && "BVDataPTAImpl::BVDataPTAImpl: unexpected points-to backing type!");
     }
     else if (type == Steensgaard_WPA)
     {
         // Steensgaard is only field-insensitive (for now?), so no reverse points-to.
-        if (Options::ptDataBacking == PTBackingType::Mutable) ptD = std::make_unique<MutDiffPTDataTy>(false);
-        else if (Options::ptDataBacking == PTBackingType::Persistent) ptD = std::make_unique<PersDiffPTDataTy>(getPtCache(), false);
+        if (Options::ptDataBacking() == PTBackingType::Mutable) ptD = std::make_unique<MutDiffPTDataTy>(false);
+        else if (Options::ptDataBacking() == PTBackingType::Persistent) ptD = std::make_unique<PersDiffPTDataTy>(getPtCache(), false);
         else assert(false && "BVDataPTAImpl::BVDataPTAImpl: unexpected points-to backing type!");
     }
     else if (type == FSSPARSE_WPA)
     {
-        if (Options::INCDFPTData)
+        if (Options::INCDFPTData())
         {
-            if (Options::ptDataBacking == PTBackingType::Mutable) ptD = std::make_unique<MutIncDFPTDataTy>(false);
-            else if (Options::ptDataBacking == PTBackingType::Persistent) ptD = std::make_unique<PersIncDFPTDataTy>(getPtCache(), false);
+            if (Options::ptDataBacking() == PTBackingType::Mutable) ptD = std::make_unique<MutIncDFPTDataTy>(false);
+            else if (Options::ptDataBacking() == PTBackingType::Persistent) ptD = std::make_unique<PersIncDFPTDataTy>(getPtCache(), false);
             else assert(false && "BVDataPTAImpl::BVDataPTAImpl: unexpected points-to backing type!");
         }
         else
         {
-            if (Options::ptDataBacking == PTBackingType::Mutable) ptD = std::make_unique<MutDFPTDataTy>(false);
-            else if (Options::ptDataBacking == PTBackingType::Persistent) ptD = std::make_unique<PersDFPTDataTy>(getPtCache(), false);
+            if (Options::ptDataBacking() == PTBackingType::Mutable) ptD = std::make_unique<MutDFPTDataTy>(false);
+            else if (Options::ptDataBacking() == PTBackingType::Persistent) ptD = std::make_unique<PersDFPTDataTy>(getPtCache(), false);
             else assert(false && "BVDataPTAImpl::BVDataPTAImpl: unexpected points-to backing type!");
         }
     }
     else if (type == VFS_WPA)
     {
-        if (Options::ptDataBacking == PTBackingType::Mutable) ptD = std::make_unique<MutVersionedPTDataTy>(false);
-        else if (Options::ptDataBacking == PTBackingType::Persistent) ptD = std::make_unique<PersVersionedPTDataTy>(getPtCache(), false);
+        if (Options::ptDataBacking() == PTBackingType::Mutable) ptD = std::make_unique<MutVersionedPTDataTy>(false);
+        else if (Options::ptDataBacking() == PTBackingType::Persistent) ptD = std::make_unique<PersVersionedPTDataTy>(getPtCache(), false);
         else assert(false && "BVDataPTAImpl::BVDataPTAImpl: unexpected points-to backing type!");
     }
     else assert(false && "no points-to data available");
@@ -94,7 +94,7 @@ void BVDataPTAImpl::finalize()
     normalizePointsTo();
     PointerAnalysis::finalize();
 
-    if (Options::ptDataBacking == PTBackingType::Persistent && print_stat)
+    if (Options::ptDataBacking() == PTBackingType::Persistent && print_stat)
     {
         std::string moduleName(pag->getModule()->getModuleIdentifier());
         std::vector<std::string> names = SVFUtil::split(moduleName,'/');

package/lib/MemoryModel/PointsTo.cpp

@@ -23,7 +23,7 @@ PointsTo::MappingPtr PointsTo::currentBestNodeMapping = nullptr;
 PointsTo::MappingPtr PointsTo::currentBestReverseNodeMapping = nullptr;
 
 PointsTo::PointsTo()
-    : type(Options::PtType), nodeMapping(currentBestNodeMapping),
+    : type(Options::PtType()), nodeMapping(currentBestNodeMapping),
       reverseNodeMapping(currentBestReverseNodeMapping)
 {
     if (type == SBV) new (&sbv) SparseBitVector<>();

package/lib/SABER/DoubleFreeChecker.cpp

@@ -45,7 +45,7 @@ void DoubleFreeChecker::reportBug(ProgSlice* slice)
                         << cs->getCallSite()->getSourceLoc() << ")\n";
         SVFUtil::errs() << "\t\t double free path: \n" << slice->evalFinalCond() << "\n";
     }
-    if(Options::ValidateTests)
+    if(Options::ValidateTests())
         testsValidation(slice);
 }
 

package/lib/SABER/LeakChecker.cpp

@@ -175,7 +175,7 @@ void LeakChecker::reportBug(ProgSlice* slice)
         SVFUtil::errs() << "\t\t conditional free path: \n" << slice->evalFinalCond() << "\n";
     }
 
-    if(Options::ValidateTests)
+    if(Options::ValidateTests())
         testsValidation(slice);
 }
 

package/lib/SABER/SaberCondAllocator.cpp

@@ -72,7 +72,7 @@ void SaberCondAllocator::allocate(const SVFModule *M)
         }
     }
 
-    if (Options::PrintPathCond)
+    if (Options::PrintPathCond())
         printPathCond();
 
     DBOUT(DGENERAL, outs() << pasMsg("path condition allocation ends\n"));

package/lib/SABER/SrcSnkDDA.cpp

@@ -43,7 +43,7 @@ void SrcSnkDDA::initialize(SVFModule* module)
     SVFIR* pag = PAG::getPAG();
 
     AndersenWaveDiff* ander = AndersenWaveDiff::createAndersenWaveDiff(pag);
-    if(Options::SABERFULLSVFG)
+    if(Options::SABERFULLSVFG())
         svfg =  memSSA.buildFullSVFG(ander);
     else
         svfg =  memSSA.buildPTROnlySVFG(ander);
@@ -62,7 +62,7 @@ void SrcSnkDDA::analyze(SVFModule* module)
 
     initialize(module);
 
-    ContextCond::setMaxCxtLen(Options::CxtLimit);
+    ContextCond::setMaxCxtLen(Options::CxtLimit());
 
     for (SVFGNodeSetIter iter = sourcesBegin(), eiter = sourcesEnd();
             iter != eiter; ++iter)
@@ -94,7 +94,7 @@ void SrcSnkDDA::analyze(SVFModule* module)
 
             DBOUT(DSaber, outs() << "Backward process for slice:" << (*iter)->getId() << " (size = " << getCurSlice()->getBackwardSliceSize() << ")\n");
 
-            if(Options::DumpSlice)
+            if(Options::DumpSlice())
                 annotateSlice(_curSlice);
 
             if(_curSlice->AllPathReachableSolve())
@@ -133,7 +133,7 @@ bool SrcSnkDDA::isInAWrapper(const SVFGNode* src, CallSiteSet& csIdSet)
         else
             continue;
         // reaching maximum steps when traversing on SVFG to identify a memory allocation wrapper
-        if (step++ > Options::MaxStepInWrapper)
+        if (step++ > Options::MaxStepInWrapper())
             return false;
 
         for (SVFGNode::const_iterator it = node->OutEdgeBegin(), eit =
@@ -295,7 +295,7 @@ void SrcSnkDDA::annotateSlice(ProgSlice* slice)
 void SrcSnkDDA::dumpSlices()
 {
 
-    if(Options::DumpSlice)
+    if(Options::DumpSlice())
         const_cast<SVFG*>(getSVFG())->dump("Slice",true);
 }
 

package/lib/SVF-LLVM/CHGBuilder.cpp

@@ -82,7 +82,7 @@ void CHGBuilder::buildCHG()
     timeEnd = PTAStat::getClk(true);
     chg->buildingCHGTime = (timeEnd - timeStart) / TIMEINTERVAL;
 
-    if (Options::DumpCHA)
+    if (Options::DumpCHA())
         chg->dump("cha");
 }
 

package/lib/SVF-LLVM/DCHG.cpp

@@ -529,7 +529,7 @@ void DCHGraph::buildCHG(bool extend)
         }
     }
 
-    if (Options::PrintDCHG)
+    if (Options::PrintDCHG())
     {
         print();
     }

package/lib/SVF-LLVM/LLVMLoopAnalysis.cpp

@@ -111,7 +111,7 @@ void LLVMLoopAnalysis::buildSVFLoops(ICFG *icfg, std::vector<const Loop *> &llvm
                 nodes.insert(icfg->getICFGNode(svfInst));
             }
         }
-        SVFLoop *svf_loop = new SVFLoop(nodes, Options::LoopBound);
+        SVFLoop *svf_loop = new SVFLoop(nodes, Options::LoopBound());
         for (const auto &node: nodes)
         {
             icfg->addNodeToSVFLoop(node, svf_loop);
@@ -168,4 +168,4 @@ void LLVMLoopAnalysis::buildSVFLoops(ICFG *icfg, std::vector<const Loop *> &llvm
             }
         }
     }
-}
+}

package/lib/SVF-LLVM/LLVMModule.cpp

@@ -140,7 +140,7 @@ void LLVMModuleSet::build()
     buildFunToFunMap();
     buildGlobalDefToRepMap();
 
-    if (Options::SVFMain)
+    if (Options::SVFMain())
         addSVFMain();
 
     createSVFDataStructure();
@@ -407,7 +407,7 @@ void LLVMModuleSet::loadModules(const std::vector<std::string> &moduleNameVec)
 {
 
     // We read SVFIR from LLVM IR
-    if(Options::Graphtxt.getValue().empty())
+    if(Options::Graphtxt().empty())
     {
         if(moduleNameVec.empty())
         {
@@ -418,7 +418,7 @@ void LLVMModuleSet::loadModules(const std::vector<std::string> &moduleNameVec)
     }
     // We read SVFIR from a user-defined txt instead of parsing SVFIR from LLVM IR
     else
-        SVFModule::setPagFromTXT(Options::Graphtxt.getValue());
+        SVFModule::setPagFromTXT(Options::Graphtxt());
 
     //
     // To avoid the following type bugs (t1 != t3) when parsing multiple modules,
@@ -439,6 +439,12 @@ void LLVMModuleSet::loadModules(const std::vector<std::string> &moduleNameVec)
 
     for (const std::string& moduleName : moduleNameVec)
     {
+        if (!LLVMUtil::isIRFile(moduleName))
+        {
+            SVFUtil::errs() << "not an IR file: " << moduleName << std::endl;
+            abort();
+        }
+
         SMDiagnostic Err;
         std::unique_ptr<Module> mod = parseIRFile(moduleName, Err, *cxts);
         if (mod == nullptr)
@@ -1174,4 +1180,4 @@ StInfo* LLVMModuleSet::collectSimpleTypeInfo(StInfo * stinfo, const Type* ty)
     stinfo->setNumOfFieldsAndElems(1,1);
 
     return stinfo;
-}
+}

package/lib/SVF-LLVM/SVFIRBuilder.cpp

@@ -144,18 +144,18 @@ SVFIR* SVFIRBuilder::build()
     pag->setNodeNumAfterPAGBuild(pag->getTotalNodeNum());
 
     // dump SVFIR
-    if (Options::PAGDotGraph)
+    if (Options::PAGDotGraph())
         pag->dump("svfir_initial");
 
     // print to command line of the SVFIR graph
-    if (Options::PAGPrint)
+    if (Options::PAGPrint())
         pag->print();
 
     // dump ICFG
-    if (Options::DumpICFG)
+    if (Options::DumpICFG())
         pag->getICFG()->dump("icfg_initial");
 
-    if (Options::LoopAnalysis)
+    if (Options::LoopAnalysis())
     {
         LLVMLoopAnalysis loopAnalysis;
         loopAnalysis.build(pag->getICFG());
@@ -281,7 +281,7 @@ bool SVFIRBuilder::computeGepOffset(const User *V, LocationSet& ls)
         //The int value of the current index operand
         const ConstantInt* op = SVFUtil::dyn_cast<ConstantInt>(offsetVal);
 
-        // if Options::ModelConsts is disabled. We will treat whole array as one,
+        // if Options::ModelConsts() is disabled. We will treat whole array as one,
         // but we can distinguish different field of an array of struct, e.g. s[1].f1 is differet from s[0].f2
         if(const ArrayType* arrTy = SVFUtil::dyn_cast<ArrayType>(gepTy))
         {
@@ -513,7 +513,7 @@ void SVFIRBuilder::InitialGlobal(const GlobalVariable *gvar, Constant *C,
     }
     else if (SVFUtil::isa<ConstantArray, ConstantStruct>(C))
     {
-        if(cppUtil::isValVtbl(gvar) && !Options::VtableInSVFIR)
+        if(cppUtil::isValVtbl(gvar) && !Options::VtableInSVFIR())
             return;
         for (u32_t i = 0, e = C->getNumOperands(); i != e; i++)
         {
@@ -523,7 +523,7 @@ void SVFIRBuilder::InitialGlobal(const GlobalVariable *gvar, Constant *C,
     }
     else if(ConstantData* data = SVFUtil::dyn_cast<ConstantData>(C))
     {
-        if(Options::ModelConsts)
+        if(Options::ModelConsts())
         {
             if(ConstantDataSequential* seq = SVFUtil::dyn_cast<ConstantDataSequential>(data))
             {
@@ -1540,7 +1540,7 @@ void SVFIRBuilder::updateCallGraph(PTACallGraph* callgraph)
     }
 
     // dump SVFIR
-    if (Options::PAGDotGraph)
+    if (Options::PAGDotGraph())
         pag->dump("svfir_final");
 }
 

package/lib/SVF-LLVM/SymbolTableBuilder.cpp

@@ -213,7 +213,7 @@ void SymbolTableBuilder::buildMemModel(SVFModule* svfModule)
     }
 
     symInfo->totalSymNum = NodeIDAllocator::get()->endSymbolAllocation();
-    if (Options::SymTabPrint)
+    if (Options::SymTabPrint())
     {
         symInfo->dump();
     }
@@ -514,7 +514,7 @@ void SymbolTableBuilder::handleGlobalInitializerCE(const Constant *C)
     }
     else if(const ConstantData* data = SVFUtil::dyn_cast<ConstantData>(C))
     {
-        if(Options::ModelConsts)
+        if(Options::ModelConsts())
         {
             if(const ConstantDataSequential* seq = SVFUtil::dyn_cast<ConstantDataSequential>(data))
             {
@@ -559,7 +559,7 @@ ObjTypeInfo* SymbolTableBuilder::createObjTypeInfo(const Value *val)
     if (refTy)
     {
         Type* objTy = getPtrElementType(refTy);
-        ObjTypeInfo* typeInfo = new ObjTypeInfo(LLVMModuleSet::getLLVMModuleSet()->getSVFType(objTy), Options::MaxFieldLimit);
+        ObjTypeInfo* typeInfo = new ObjTypeInfo(LLVMModuleSet::getLLVMModuleSet()->getSVFType(objTy), Options::MaxFieldLimit());
         initTypeInfo(typeInfo,val, objTy);
         return typeInfo;
     }
@@ -748,7 +748,7 @@ u32_t SymbolTableBuilder::getObjSize(const Type* ety)
 /// Number of flattenned elements of an array or struct
 u32_t SymbolTableBuilder::getNumOfFlattenElements(const Type* T)
 {
-    if(Options::ModelArrays)
+    if(Options::ModelArrays())
         return getOrAddSVFTypeInfo(T)->getNumOfFlattenElements();
     else
         return getOrAddSVFTypeInfo(T)->getNumOfFlattenFields();
@@ -757,4 +757,4 @@ u32_t SymbolTableBuilder::getNumOfFlattenElements(const Type* T)
 StInfo* SymbolTableBuilder::getOrAddSVFTypeInfo(const Type* T)
 {
     return LLVMModuleSet::getLLVMModuleSet()->getSVFType(T)->getTypeInfo();
-}
+}

package/lib/SVFIR/SVFIR.cpp

@@ -276,7 +276,7 @@ RetPE* SVFIR::addRetPE(NodeID src, NodeID dst, const CallICFGNode* cs, const Fun
  */
 SVFStmt* SVFIR::addBlackHoleAddrStmt(NodeID node)
 {
-    if(Options::HandBlackHole)
+    if(Options::HandBlackHole())
         return pag->addAddrStmt(pag->getBlackHoleNode(), node);
     else
         return pag->addCopyStmt(pag->getNullPtr(), node);
@@ -430,7 +430,7 @@ NodeID SVFIR::getGepObjVar(const MemObj* obj, const LocationSet& ls)
     LocationSet newLS = pag->getSymbolInfo()->getModulusOffset(obj,ls);
 
     // Base and first field are the same memory location.
-    if (Options::FirstFieldEqBase && newLS.accumulateConstantFieldIdx() == 0) return base;
+    if (Options::FirstFieldEqBase() && newLS.accumulateConstantFieldIdx() == 0) return base;
 
     NodeLocationSetMap::iterator iter = GepObjVarMap.find(std::make_pair(base, newLS));
     if (iter == GepObjVarMap.end())
@@ -450,7 +450,7 @@ NodeID SVFIR::addGepObjNode(const MemObj* obj, const LocationSet& ls)
     assert(0==GepObjVarMap.count(std::make_pair(base, ls))
            && "this node should not be created before");
 
-    NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, ls.accumulateConstantFieldIdx(), Options::MaxFieldLimit);
+    NodeID gepId = NodeIDAllocator::get()->allocateGepObjectId(base, ls.accumulateConstantFieldIdx(), Options::MaxFieldLimit());
     GepObjVarMap[std::make_pair(base, ls)] = gepId;
     GepObjVar *node = new GepObjVar(obj, gepId, ls);
     memToFieldsMap[base].set(gepId);
@@ -719,7 +719,7 @@ bool SVFIR::isValidTopLevelPtr(const SVFVar* node)
  */
 void SVFIR::handleBlackHole(bool b)
 {
-    Options::HandBlackHole = b;
+    Options::HandBlackHole.setValue(b);
 }
 
 

package/lib/SVFIR/SVFStatements.cpp

@@ -74,7 +74,7 @@ const std::string AddrStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "AddrStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -87,7 +87,7 @@ const std::string CopyStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "CopyStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -103,7 +103,7 @@ const std::string PhiStmt::toString() const
     for(u32_t i = 0; i < getOpVarNum(); i++)
         rawstr << "[Var" << getOpVar(i)->getId() << ", ICFGNode" << getOpICFGNode(i)->getId() <<  "],";
     rawstr << ")]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -119,7 +119,7 @@ const std::string SelectStmt::toString() const
     for(const SVFVar* op : getOpndVars())
         rawstr << op->getId() << ",";
     rawstr << ")]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -132,7 +132,7 @@ const std::string CmpStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "CmpStmt: [Var" << getResID() << " <-- (Var" << getOpVarID(0) << " predicate" << getPredicate() << " Var" << getOpVarID(1) << ")]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -145,7 +145,7 @@ const std::string BinaryOPStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "BinaryOPStmt: [Var" << getResID() << " <-- (Var" << getOpVarID(0) << " opcode" << getOpcode() << " Var" << getOpVarID(1) << ")]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -158,7 +158,7 @@ const std::string UnaryOPStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "UnaryOPStmt: [Var" << getResID() << " <-- " << " opcode" << getOpcode() << " Var" << getOpVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -178,7 +178,7 @@ const std::string BranchStmt::toString() const
     for(u32_t i = 0; i < getNumSuccessors(); i++)
         rawstr << "Successor " << i << " ICFGNode" << getSuccessor(i)->getId() << "   ";
 
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -192,7 +192,7 @@ const std::string LoadStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "LoadStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -205,7 +205,7 @@ const std::string StoreStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "StoreStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -218,7 +218,7 @@ const std::string GepStmt::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "GepStmt: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -231,7 +231,7 @@ const std::string CallPE::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "CallPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -244,7 +244,7 @@ const std::string RetPE::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "RetPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -257,7 +257,7 @@ const std::string TDForkPE::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "TDForkPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -270,7 +270,7 @@ const std::string TDJoinPE::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "TDJoinPE: [Var" << getLHSVarID() << " <-- Var" << getRHSVarID() << "]\t";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << getValue()->toString();
@@ -321,4 +321,4 @@ const SVFVar* BranchStmt::getCondition() const
 {
     //assert(isConditional() && "this is a unconditional branch");
     return cond;
-}
+}

package/lib/SVFIR/SVFVariables.cpp

@@ -107,7 +107,7 @@ const std::string ValVar::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ValVar ID: " << getId();
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << value->toString();
@@ -120,7 +120,7 @@ const std::string ObjVar::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "ObjVar ID: " << getId();
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << value->toString();
@@ -133,7 +133,7 @@ const std::string GepValVar::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "GepValVar ID: " << getId() << " with offset_" + std::to_string(getConstantFieldIdx());
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << value->toString();
@@ -146,7 +146,7 @@ const std::string GepObjVar::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "GepObjVar ID: " << getId() << " with offset_" + std::to_string(ls.accumulateConstantFieldIdx());
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << value->toString();
@@ -159,7 +159,7 @@ const std::string FIObjVar::toString() const
     std::string str;
     std::stringstream rawstr(str);
     rawstr << "FIObjVar ID: " << getId() << " (base object)";
-    if (Options::ShowSVFIRValue)
+    if (Options::ShowSVFIRValue())
     {
         rawstr << "\n";
         rawstr << value->toString();

package/lib/SVFIR/SymbolTableInfo.cpp

@@ -66,7 +66,7 @@ const StInfo* SymbolTableInfo::getTypeInfo(const SVFType* T) const
  */
 ObjTypeInfo* SymbolTableInfo::createObjTypeInfo(const SVFType* type)
 {
-    ObjTypeInfo* typeInfo = new ObjTypeInfo(type, Options::MaxFieldLimit);
+    ObjTypeInfo* typeInfo = new ObjTypeInfo(type, Options::MaxFieldLimit());
     if(type && type->isPointerTy())
     {
         typeInfo->setFlag(ObjTypeInfo::HEAP_OBJ);
@@ -83,7 +83,7 @@ SymbolTableInfo* SymbolTableInfo::SymbolInfo()
     if (symInfo == nullptr)
     {
         symInfo = new SymbolTableInfo();
-        symInfo->setModelConstants(Options::ModelConsts);
+        symInfo->setModelConstants(Options::ModelConsts());
     }
     return symInfo;
 }
@@ -146,7 +146,7 @@ const MemObj* SymbolTableInfo::createDummyObj(SymID symId, const SVFType* type)
 /// Number of flattenned elements of an array or struct
 u32_t SymbolTableInfo::getNumOfFlattenElements(const SVFType* T)
 {
-    if(Options::ModelArrays)
+    if(Options::ModelArrays())
         return getTypeInfo(T)->getNumOfFlattenElements();
     else
         return getTypeInfo(T)->getNumOfFlattenFields();
@@ -155,7 +155,7 @@ u32_t SymbolTableInfo::getNumOfFlattenElements(const SVFType* T)
 /// Flatterned offset information of a struct or an array including its array fields
 u32_t SymbolTableInfo::getFlattenedElemIdx(const SVFType* T, u32_t origId)
 {
-    if(Options::ModelArrays)
+    if(Options::ModelArrays())
     {
         const std::vector<u32_t>& so = getTypeInfo(T)->getFlattenedElemIdxVec();
         assert ((unsigned)origId < so.size() && !so.empty() && "element index out of bounds, can't get flattened index!");
@@ -186,7 +186,7 @@ const SVFType* SymbolTableInfo::getOriginalElemType(const SVFType* baseType, u32
 /// Return the type of a flattened element given a flattened index
 const SVFType* SymbolTableInfo::getFlatternedElemType(const SVFType* baseType, u32_t flatten_idx)
 {
-    if(Options::ModelArrays)
+    if(Options::ModelArrays())
     {
         const std::vector<const SVFType*>& so = getTypeInfo(baseType)->getFlattenElementTypes();
         assert (flatten_idx < so.size() && !so.empty() && "element index out of bounds or struct opaque type, can't get element type!");
@@ -365,7 +365,7 @@ bool ObjTypeInfo::isNonPtrFieldObj(const LocationSet& ls)
     if (SVFUtil::isa<SVFStructType, SVFArrayType>(ety))
     {
         u32_t sz = 0;
-        if(Options::ModelArrays)
+        if(Options::ModelArrays())
             sz = SymbolTableInfo::SymbolInfo()->getTypeInfo(ety)->getFlattenElementTypes().size();
         else
             sz = SymbolTableInfo::SymbolInfo()->getTypeInfo(ety)->getFlattenFieldTypes().size();