remove code depenencies to boost::filesystem

Martin Mory · Martin Mory · commit 7a39346073c8 · 2022-05-09T10:46:23.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,8 +125,8 @@ endif()
 find_package(Threads)
 
 # Boost
-find_package(Boost 1.65.1 COMPONENTS filesystem graph system program_options log ${BOOST_THREAD} REQUIRED)
-#find_package(Boost 1.72.0 COMPONENTS filesystem graph system program_options log ${BOOST_THREAD} REQUIRED)
+find_package(Boost 1.65.1 COMPONENTS graph system program_options log ${BOOST_THREAD} REQUIRED)
+#find_package(Boost 1.72.0 COMPONENTS graph system program_options log ${BOOST_THREAD} REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # Disable clang-tidy for the external projects
@@ -408,7 +408,6 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${MAJOR_VERSION}.${MIN
 # better use autogenerated dependency information
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost_program_options (>= 1.66.0),
-#                                   libboost_filesystem (>= 1.66.0),
 #                                   libboost_graph (>= 1.66.0),
 #                                   libboost_system (>= 1.66.0),
 #                                   libboost_log (>= 1.66.0),
diff --git a/examples/use-phasar-as-library/myphasartool.cpp b/examples/use-phasar-as-library/myphasartool.cpp
@@ -7,11 +7,10 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
+#include <filesystem>
 #include <fstream>
 #include <iostream>
 
-#include "boost/filesystem/operations.hpp"
-
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
@@ -30,8 +29,8 @@ class Value;
 using namespace psr;
 
 int main(int argc, const char **argv) {
-  if (argc < 2 || !boost::filesystem::exists(argv[1]) ||
-      boost::filesystem::is_directory(argv[1])) {
+  if (argc < 2 || !std::filesystem::exists(argv[1]) ||
+      std::filesystem::is_directory(argv[1])) {
     std::cerr << "myphasartool\n"
                  "A small PhASAR-based example program\n\n"
                  "Usage: myphasartool <LLVM IR file>\n";
diff --git a/include/phasar/Config/Configuration.h b/include/phasar/Config/Configuration.h
@@ -18,8 +18,8 @@
 #define PHASAR_CONFIG_CONFIGURATION_H_
 
 #include <string>
+#include <filesystem>
 
-#include "boost/filesystem.hpp"
 #include "boost/program_options.hpp"
 
 #include "llvm/ADT/iterator_range.h"
@@ -129,8 +129,8 @@ class PhasarConfig {
     std::string ConfigFolder = "config/";
     if (EnvHome) { // Check if HOME was defined in the environment
       std::string PhasarConfDir = std::string(EnvHome) + "/.config/phasar/";
-      if (boost::filesystem::exists(PhasarConfDir) &&
-          boost::filesystem::is_directory(PhasarConfDir)) {
+      if (std::filesystem::exists(PhasarConfDir) &&
+          std::filesystem::is_directory(PhasarConfDir)) {
         ConfigFolder = PhasarConfDir;
       }
     }
diff --git a/include/phasar/Controller/AnalysisController.h b/include/phasar/Controller/AnalysisController.h
@@ -15,7 +15,6 @@
 #include <string>
 #include <vector>
 
-#include "boost/filesystem.hpp"
 
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
@@ -62,7 +61,7 @@ class AnalysisController {
       AnalysisControllerEmitterOptions::None;
   std::string ProjectID;
   std::string OutDirectory;
-  boost::filesystem::path ResultDirectory;
+  std::filesystem::path ResultDirectory;
   IFDSIDESolverConfig SolverConfig;
   [[maybe_unused]] Soundness SoundnessLevel;
   [[maybe_unused]] bool AutoGlobalSupport;
diff --git a/lib/Config/CMakeLists.txt b/lib/Config/CMakeLists.txt
@@ -16,7 +16,7 @@ else()
   )
 endif()
 
-find_package(Boost COMPONENTS filesystem program_options REQUIRED)
+find_package(Boost COMPONENTS program_options REQUIRED)
 
 target_link_libraries(phasar_config
   LINK_PUBLIC
diff --git a/lib/Config/Configuration.cpp b/lib/Config/Configuration.cpp
@@ -18,7 +18,6 @@
 
 #include "boost/algorithm/string/classification.hpp"
 #include "boost/algorithm/string/split.hpp"
-#include "boost/filesystem.hpp"
 
 #include "phasar/Config/Configuration.h"
 #include "phasar/Config/Version.h"
@@ -38,8 +37,7 @@ PhasarConfig::PhasarConfig() {
 std::string PhasarConfig::readConfigFile(const std::string &Path) {
   // We use a local file reading function to make phasar_config independent of
   // other phasar libraries.
-  if (boost::filesystem::exists(Path) &&
-      !boost::filesystem::is_directory(Path)) {
+  if (std::filesystem::exists(Path) && !std::filesystem::is_directory(Path)) {
     std::ifstream Ifs(Path, std::ios::binary);
     if (Ifs.is_open()) {
       Ifs.seekg(0, std::ifstream::end);
@@ -58,7 +56,7 @@ void PhasarConfig::loadGlibcSpecialFunctionNames() {
   const std::string GLIBCFunctionListFilePath =
       ConfigurationDirectory() + GLIBCFunctionListFileName;
 
-  if (boost::filesystem::exists(GLIBCFunctionListFilePath)) {
+  if (std::filesystem::exists(GLIBCFunctionListFilePath)) {
     // Load glibc function names specified in the config file
     std::vector<std::string> GlibcFunctions;
     std::string Glibc = readConfigFile(GLIBCFunctionListFilePath);
@@ -76,7 +74,7 @@ void PhasarConfig::loadGlibcSpecialFunctionNames() {
 void PhasarConfig::loadLLVMSpecialFunctionNames() {
   const std::string LLVMFunctionListFilePath =
       ConfigurationDirectory() + LLVMIntrinsicFunctionListFileName;
-  if (boost::filesystem::exists(LLVMFunctionListFilePath)) {
+  if (std::filesystem::exists(LLVMFunctionListFilePath)) {
     // Load LLVM function names specified in the config file
     std::string LLVMIntrinsics = readConfigFile(LLVMFunctionListFilePath);
 
@@ -94,7 +92,7 @@ void PhasarConfig::loadLLVMSpecialFunctionNames() {
 }
 
 const std::string PhasarConfig::PhasarDir = std::string([]() {
-  std::string CurrPath = boost::filesystem::current_path().string();
+  std::string CurrPath = std::filesystem::current_path().string();
   size_t I = CurrPath.rfind("build", CurrPath.length());
   return CurrPath.substr(0, I);
 }());
diff --git a/lib/Config/phasar_config-config.cmake b/lib/Config/phasar_config-config.cmake
@@ -4,4 +4,4 @@ list(APPEND
   PHASAR_LLVM_DEPS
   Support)
 
-find_package(Boost COMPONENTS filesystem program_options REQUIRED)
+find_package(Boost COMPONENTS program_options REQUIRED)
diff --git a/lib/Controller/AnalysisController.cpp b/lib/Controller/AnalysisController.cpp
@@ -13,6 +13,7 @@
 #include <iostream>
 #include <set>
 #include <utility>
+#include <filesystem>
 
 #include "llvm/Support/ErrorHandling.h"
 
@@ -97,7 +98,7 @@ AnalysisController::AnalysisController(
   if (!OutDirectory.empty()) {
     // create directory for results
     ResultDirectory = OutDirectory + "/" + ProjectID + "-" + createTimeStamp();
-    boost::filesystem::create_directory(ResultDirectory);
+    std::filesystem::create_directory(ResultDirectory);
   }
   emitRequestedHelperAnalysisResults();
   executeAs(Strategy);
diff --git a/lib/DB/ProjectIRDB.cpp b/lib/DB/ProjectIRDB.cpp
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <filesystem>
 #include <iostream>
 #include <ostream>
 #include <string>
@@ -26,8 +27,6 @@
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Transforms/Utils.h"
 
-#include "boost/filesystem.hpp"
-
 #include "phasar/Config/Configuration.h"
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/LLVMZeroValue.h"
@@ -66,7 +65,7 @@ ProjectIRDB::ProjectIRDB(const std::vector<std::string> &IRFiles,
 
     if ((File.find(".ll") != std::string::npos ||
          File.find(".bc") != std::string::npos) &&
-        boost::filesystem::exists(File)) {
+        std::filesystem::exists(File)) {
       llvm::SMDiagnostic Diag;
       std::unique_ptr<llvm::LLVMContext> C(new llvm::LLVMContext);
       std::unique_ptr<llvm::Module> M = llvm::parseIRFile(File, Diag, *C);
diff --git a/lib/PhasarLLVM/DataFlowSolver/WPDS/CMakeLists.txt b/lib/PhasarLLVM/DataFlowSolver/WPDS/CMakeLists.txt
@@ -22,7 +22,7 @@ else()
   )
 endif()
 
-find_package(Boost COMPONENTS filesystem program_options REQUIRED)
+find_package(Boost COMPONENTS program_options REQUIRED)
 target_link_libraries(phasar_wpds
   LINK_PUBLIC
   ${Boost_LIBRARIES}
diff --git a/lib/PhasarLLVM/DataFlowSolver/WPDS/phasar_wpds-config.cmake b/lib/PhasarLLVM/DataFlowSolver/WPDS/phasar_wpds-config.cmake
@@ -1,6 +1,6 @@
 set(PHASAR_wpds_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS filesystem program_options REQUIRED)
+find_package(Boost COMPONENTS program_options REQUIRED)
 
 list(APPEND
   PHASAR_LLVM_DEPS
diff --git a/lib/PhasarLLVM/Passes/CMakeLists.txt b/lib/PhasarLLVM/Passes/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
   )
 endif()
 
-find_package(Boost COMPONENTS log filesystem REQUIRED)
+find_package(Boost COMPONENTS log REQUIRED)
 target_link_libraries(phasar_passes
   LINK_PUBLIC
   ${Boost_LIBRARIES}
diff --git a/lib/PhasarLLVM/Passes/phasar_passes-config.cmake b/lib/PhasarLLVM/Passes/phasar_passes-config.cmake
@@ -1,6 +1,6 @@
 set(PHASAR_passes_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS log filesystem REQUIRED)
+find_package(Boost COMPONENTS log REQUIRED)
 
 list(APPEND
   PHASAR_LLVM_DEPS
diff --git a/lib/PhasarLLVM/Plugins/AnalysisPluginController.cpp b/lib/PhasarLLVM/Plugins/AnalysisPluginController.cpp
@@ -10,7 +10,6 @@
 #include <iostream>
 
 #include "boost/dll.hpp"
-#include "boost/filesystem.hpp"
 
 #include "llvm/Support/ErrorHandling.h"
 
@@ -37,9 +36,9 @@ AnalysisPluginController::AnalysisPluginController(
     const LLVMBasedICFG * /*ICF*/, const LLVMPointsToInfo * /*PT*/,
     const std::set<std::string> & /*EntryPoints*/) {
   for (const auto &AnalysisPlugin : AnalysisPlygins) {
-    boost::filesystem::path LibPath(AnalysisPlugin);
+    std::filesystem::path LibPath(AnalysisPlugin);
     boost::system::error_code Err;
-    boost::dll::shared_library SharedLib(LibPath,
+    boost::dll::shared_library SharedLib(LibPath.string(),
                                          boost::dll::load_mode::rtld_lazy, Err);
     if (Err) {
       llvm::report_fatal_error(Err.message());
diff --git a/lib/PhasarLLVM/Plugins/CMakeLists.txt b/lib/PhasarLLVM/Plugins/CMakeLists.txt
@@ -27,7 +27,7 @@ else()
 endif()
 
 
-find_package(Boost COMPONENTS log filesystem program_options REQUIRED)
+find_package(Boost COMPONENTS log program_options REQUIRED)
 if(USE_LLVM_FAT_LIB)
   llvm_config(phasar_plugins USE_SHARED ${LLVM_LINK_COMPONENTS})
 else()
diff --git a/lib/PhasarLLVM/Plugins/phasar_plugins-config.cmake b/lib/PhasarLLVM/Plugins/phasar_plugins-config.cmake
@@ -1,6 +1,6 @@
 set(PHASAR_plugins_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS log filesystem program_options REQUIRED)
+find_package(Boost COMPONENTS log program_options REQUIRED)
 
 list(APPEND
   PHASAR_LLVM_DEPS
diff --git a/lib/PhasarLLVM/Pointer/CMakeLists.txt b/lib/PhasarLLVM/Pointer/CMakeLists.txt
@@ -26,7 +26,7 @@ else()
   )
 endif()
 
-find_package(Boost COMPONENTS log filesystem graph REQUIRED)
+find_package(Boost COMPONENTS log graph REQUIRED)
 target_link_libraries(phasar_pointer
   LINK_PUBLIC
   ${Boost_LIBRARIES}
diff --git a/lib/PhasarLLVM/Pointer/phasar_pointer-config.cmake b/lib/PhasarLLVM/Pointer/phasar_pointer-config.cmake
@@ -1,6 +1,6 @@
 set(PHASAR_pointer_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS log filesystem graph REQUIRED)
+find_package(Boost COMPONENTS log graph REQUIRED)
 
 list(APPEND
   PHASAR_LLVM_DEPS
diff --git a/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt b/lib/PhasarLLVM/TypeHierarchy/CMakeLists.txt
@@ -23,7 +23,7 @@ else()
   )
 endif()
 
-find_package(Boost COMPONENTS log filesystem graph REQUIRED)
+find_package(Boost COMPONENTS log graph REQUIRED)
 target_link_libraries(phasar_typehierarchy
   LINK_PUBLIC
   ${Boost_LIBRARIES}
diff --git a/lib/PhasarLLVM/TypeHierarchy/phasar_typehierarchy-config.cmake b/lib/PhasarLLVM/TypeHierarchy/phasar_typehierarchy-config.cmake
@@ -1,6 +1,6 @@
 set(PHASAR_typehierarchy_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS log filesystem graph REQUIRED)
+find_package(Boost COMPONENTS log graph REQUIRED)
 
 list(APPEND
   PHASAR_LLVM_DEPS
diff --git a/lib/PhasarLLVM/Utils/CMakeLists.txt b/lib/PhasarLLVM/Utils/CMakeLists.txt
@@ -23,10 +23,8 @@ else()
   )
 endif()
 
-find_package(Boost COMPONENTS filesystem REQUIRED)
 target_link_libraries(phasar_phasarllvm_utils
   LINK_PUBLIC
-  ${Boost_LIBRARIES}
 )
 
 set_target_properties(phasar_phasarllvm_utils
diff --git a/lib/PhasarLLVM/Utils/DOTGraph.cpp b/lib/PhasarLLVM/Utils/DOTGraph.cpp
@@ -15,12 +15,12 @@
  */
 
 #include <algorithm>
+#include <filesystem>
+#include <fstream>
 #include <iterator>
 #include <ostream>
 #include <utility>
 
-#include "boost/filesystem.hpp"
-
 #include "nlohmann/json.hpp"
 
 #include "phasar/PhasarLLVM/Utils/DOTGraph.h"
@@ -245,10 +245,10 @@ DOTConfig &DOTConfig::getDOTConfig() {
 }
 
 void DOTConfig::importDOTConfig(std::string ConfigPath) {
-  boost::filesystem::path FilePath(ConfigPath);
-  FilePath /= boost::filesystem::path("config/DOTGraphConfig.json");
-  if (boost::filesystem::exists(FilePath) &&
-      !boost::filesystem::is_directory(FilePath)) {
+  std::filesystem::path FilePath(ConfigPath);
+  FilePath /= std::filesystem::path("config/DOTGraphConfig.json");
+  if (std::filesystem::exists(FilePath) &&
+      !std::filesystem::is_directory(FilePath)) {
     std::ifstream Ifs(FilePath.string());
     if (Ifs.is_open()) {
       std::stringstream Iss;
diff --git a/lib/PhasarLLVM/Utils/phasar_phasarllvm_utils-config.cmake b/lib/PhasarLLVM/Utils/phasar_phasarllvm_utils-config.cmake
@@ -1,7 +1,5 @@
 set(PHASAR_phasarllvm_utils_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS filesystem REQUIRED)
-
 list(APPEND
   PHASAR_LLVM_DEPS
   Support
diff --git a/lib/PhasarPass/CMakeLists.txt b/lib/PhasarPass/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 # We specifically link internal phasar libs into phasar_pass so on that the
 # llvm user side only has to specify one library.
 
-find_package(Boost COMPONENTS log filesystem graph program_options REQUIRED)
+find_package(Boost COMPONENTS log graph program_options REQUIRED)
 target_link_libraries(phasar_pass
   LINK_PUBLIC
   ${PHASAR_LINK_LIBS}
diff --git a/lib/PhasarPass/phasar_pass-config.cmake b/lib/PhasarPass/phasar_pass-config.cmake
@@ -1,6 +1,6 @@
 set(PHASAR_pass_COMPONENT_FOUND 1)
 
-find_package(Boost COMPONENTS log filesystem graph program_options REQUIRED)
+find_package(Boost COMPONENTS log graph program_options REQUIRED)
 
 list(APPEND
   PHASAR_LLVM_DEPS
diff --git a/lib/Utils/LLVMIRToSrc.cpp b/lib/Utils/LLVMIRToSrc.cpp
diff --git a/lib/Utils/Logger.cpp b/lib/Utils/Logger.cpp
diff --git a/lib/Utils/PAMM.cpp b/lib/Utils/PAMM.cpp
diff --git a/tools/boomerang/CMakeLists.txt b/tools/boomerang/CMakeLists.txt
diff --git a/tools/boomerang/boomerang.cpp b/tools/boomerang/boomerang.cpp
diff --git a/tools/example-tool/CMakeLists.txt b/tools/example-tool/CMakeLists.txt
diff --git a/tools/example-tool/myphasartool.cpp b/tools/example-tool/myphasartool.cpp
diff --git a/tools/phasar-clang/CMakeLists.txt b/tools/phasar-clang/CMakeLists.txt
diff --git a/tools/phasar-clang/phasar-clang.cpp b/tools/phasar-clang/phasar-clang.cpp
diff --git a/tools/phasar-llvm/CMakeLists.txt b/tools/phasar-llvm/CMakeLists.txt
diff --git a/tools/phasar-llvm/phasar-llvm.cpp b/tools/phasar-llvm/phasar-llvm.cpp
diff --git a/unittests/PhasarLLVM/DataFlowSolver/WPDS/Solver/WPDSSolverTest.cpp b/unittests/PhasarLLVM/DataFlowSolver/WPDS/Solver/WPDSSolverTest.cpp

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ else()`
`16`	`16`	`)`
`17`	`17`	`endif()`
`18`	`18`
`19`		`-find_package(Boost COMPONENTS filesystem program_options REQUIRED)`
	`19`	`+find_package(Boost COMPONENTS program_options REQUIRED)`
`20`	`20`
`21`	`21`	`target_link_libraries(phasar_config`
`22`	`22`	`LINK_PUBLIC`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ else()`
`22`	`22`	`)`
`23`	`23`	`endif()`
`24`	`24`
`25`		`-find_package(Boost COMPONENTS filesystem program_options REQUIRED)`
	`25`	`+find_package(Boost COMPONENTS program_options REQUIRED)`
`26`	`26`	`target_link_libraries(phasar_wpds`
`27`	`27`	`LINK_PUBLIC`
`28`	`28`	`${Boost_LIBRARIES}`