svf-tools 1.0.779 → 1.0.781

package/svf/lib/Util/Options.cpp

@@ -770,10 +770,11 @@ const Option<bool> Options::VtableInSVFIR(
     false
 );
 
-
 //WPAPass.cpp
-const Option<std::string> Options::ExtAPIInput(
-    "extapi", "External API extapi.bc", ExtAPI::getExtAPI()->getExtBcPath()
+const Option<std::string> Options::ExtAPIPath(
+    "extapi",
+    "External API extapi.bc",
+    ""
 );
 
 const Option<bool> Options::AnderSVFG(

package/svf-llvm/include/SVF-LLVM/LLVMModule.h

@@ -240,7 +240,7 @@ public:
     bool isCalledExtFunction(Function* func)
     {
         /// if this function func defined in extapi.bc but never used in application code (without any corresponding declared functions).
-        if (func->getParent()->getName().str() == Options::ExtAPIInput()
+        if (func->getParent()->getName().str() == ExtAPI::getExtAPI()->getExtBcPath()
                 && FunDefToDeclsMap.find(func) == FunDefToDeclsMap.end()
                 && std::find(ExtFuncsVec.begin(), ExtFuncsVec.end(), func) == ExtFuncsVec.end())
         {

package/svf-llvm/lib/LLVMModule.cpp

@@ -530,10 +530,10 @@ void LLVMModuleSet::loadModules(const std::vector<std::string> &moduleNameVec)
 
 void LLVMModuleSet::loadExtAPIModules()
 {
-    // has external bc
-    if (Options::ExtAPIInput().size() > 0)
+    // Load external API module (extapi.bc)
+    if (!ExtAPI::getExtAPI()->getExtBcPath().empty())
     {
-        std::string extModuleName = Options::ExtAPIInput();
+        std::string extModuleName = ExtAPI::getExtAPI()->getExtBcPath();
         if (!LLVMUtil::isIRFile(extModuleName))
         {
             SVFUtil::errs() << "not an external IR file: " << extModuleName << std::endl;
@@ -809,7 +809,7 @@ void LLVMModuleSet::buildFunToFunMap()
     for (Module& mod : modules)
     {
         // extapi.bc functions
-        if (mod.getName().str() == Options::ExtAPIInput())
+        if (mod.getName().str() == ExtAPI::getExtAPI()->getExtBcPath())
         {
             for (const Function& fun : mod.functions())
             {

package/svf-llvm/lib/LLVMUtil.cpp

@@ -599,7 +599,7 @@ void LLVMUtil::removeUnusedFuncsAndAnnotationsAndGlobalVariables(std::vector<Fun
         return;
 
     Module* mod = removedFuncList[0]->getParent();
-    if (mod->getName().str() != Options::ExtAPIInput())
+    if (mod->getName().str() != ExtAPI::getExtAPI()->getExtBcPath())
         return;
 
     /// Delete unused function annotations