Merge pull request #1210 from shuangxiangkan/master

Fix some issues about ExtAPI
SVF-tools · Oct 2, 2023 · 62e1cf4 · 62e1cf4
2 parents 84da638 + 41a3a06
commit 62e1cf4
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 18 deletions.
diff --git a/.config.in b/.config.in
@@ -2,6 +2,6 @@
 #define CONFIG_H_IN
 
 #define PROJECT_PATH "@CMAKE_CURRENT_SOURCE_DIR@"
-#define EXTAPI_PATH PROJECT_PATH "/@CMAKE_BUILD_TYPE@-build/svf-llvm"
+#define EXTAPI_DIR PROJECT_PATH "/@CMAKE_BUILD_TYPE@-build/svf-llvm"
 
 #endif
diff --git a/svf-llvm/include/SVF-LLVM/LLVMModule.h b/svf-llvm/include/SVF-LLVM/LLVMModule.h
@@ -240,7 +240,7 @@ class LLVMModuleSet
     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())
         {

diff --git a/svf-llvm/lib/LLVMModule.cpp b/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())
             {

diff --git a/svf-llvm/lib/LLVMUtil.cpp b/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

diff --git a/svf/include/Util/ExtAPI.h b/svf/include/Util/ExtAPI.h
@@ -53,7 +53,7 @@ class ExtAPI
 
 public:
 
-    static ExtAPI *getExtAPI(const std::string& = "");
+    static ExtAPI *getExtAPI();
 
     static void destory();
 

diff --git a/svf/include/Util/Options.h b/svf/include/Util/Options.h
@@ -248,7 +248,6 @@ class Options
     static const Option<bool> VtableInSVFIR;
 
     // WPAPass.cpp
-    static const Option<std::string> ExtAPIInput;
     static const Option<bool> AnderSVFG;
     static const Option<bool> SABERFULLSVFG;
     static const Option<bool> PrintAliases;

diff --git a/svf/lib/Util/ExtAPI.cpp b/svf/lib/Util/ExtAPI.cpp
@@ -35,7 +35,7 @@ using namespace SVF;
 
 ExtAPI* ExtAPI::extOp = nullptr;
 
-ExtAPI* ExtAPI::getExtAPI(const std::string& path)
+ExtAPI* ExtAPI::getExtAPI()
 {
     if (extOp == nullptr)
     {
@@ -108,7 +108,7 @@ static std::string getFilePath(const std::string& path)
 std::string ExtAPI::getExtBcPath()
 {
     struct stat statbuf;
-    std::string bcFilePath = std::string(EXTAPI_PATH) + "/extapi.bc";
+    std::string bcFilePath = std::string(EXTAPI_DIR) + "/extapi.bc";
     if (!stat(bcFilePath.c_str(), &statbuf))
         return bcFilePath;
 
@@ -120,7 +120,7 @@ std::string ExtAPI::getExtBcPath()
     if (!stat(bcFilePath.c_str(), &statbuf))
         return bcFilePath;
 
-    SVFUtil::errs() << "No extpai.bc found at " << bcFilePath << " for getExtAPI(); set $SVF_DIR first!\n";
+    SVFUtil::errs() << "No extapi.bc found at " << bcFilePath << " for getExtAPI(); The default path for extapi.bc is: SVF_IR_PATH/CMAKE_BUILD_TYPE-build/svf-llvm/extapi.bc !\n";
     abort();
 }
 

diff --git a/svf/lib/Util/Options.cpp b/svf/lib/Util/Options.cpp
@@ -770,12 +770,6 @@ const Option<bool> Options::VtableInSVFIR(
     false
 );
 
-
-//WPAPass.cpp
-const Option<std::string> Options::ExtAPIInput(
-    "extapi", "External API extapi.bc", ExtAPI::getExtAPI()->getExtBcPath()
-);
-
 const Option<bool> Options::AnderSVFG(
     "svfg",
     "Generate SVFG after Andersen's Analysis",
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ class ExtAPI @@
     public:
-        static ExtAPI *getExtAPI(const std::string& = "");
+        static ExtAPI *getExtAPI();
         static void destory();
@@ Expand Down @@