Remove boost::program_options (#534)

* Remove boost::program_options from phasar-llvm

* Remove boost PO from CMakeLists.txt

* pre-commit

* Fix PAMM

* some cleanup

* pre-commit

* Fixes compile errors around logger statments

* Fixes include guard to a standard compliant one

It seems that the build process of LLVM gets confused here.

* Links phasar_controlflow into phasar_mono

Co-authored-by: Florian Sattler <vuld3r@gmail.com>

Author: fabianbs96

CMakeLists.txt

@@ -125,8 +125,8 @@ endif()
 find_package(Threads)
 
 # Boost
-find_package(Boost 1.65.1 COMPONENTS graph program_options ${BOOST_THREAD} REQUIRED)
-#find_package(Boost 1.72.0 COMPONENTS graph program_options ${BOOST_THREAD} REQUIRED)
+find_package(Boost 1.65.1 COMPONENTS graph ${BOOST_THREAD} REQUIRED)
+#find_package(Boost 1.72.0 COMPONENTS graph  ${BOOST_THREAD} REQUIRED)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # Disable clang-tidy for the external projects

include/phasar/Config/Configuration.h

@@ -21,9 +21,8 @@
 
 #include "llvm/ADT/iterator_range.h"
 
-#include "boost/program_options.hpp"
-
 #include <filesystem>
+#include <set>
 #include <string>
 
 #define XSTR(S) STR(S)
@@ -105,13 +104,6 @@ class PhasarConfig {
     SpecialFuncNames.insert(std::move(SFName));
   }
 
-  /// Variables map of the parsed command-line parameters
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  [[nodiscard]] static boost::program_options::variables_map &VariablesMap() {
-    static boost::program_options::variables_map VMap;
-    return VMap;
-  }
-
   ~PhasarConfig() = default;
   PhasarConfig(const PhasarConfig &) = delete;
   PhasarConfig operator=(const PhasarConfig &) = delete;

include/phasar/Controller/AnalysisController.h

@@ -18,6 +18,7 @@
 #include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.h"
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
 #include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IFDSSolver.h"

include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.def

@@ -8,14 +8,13 @@
  *****************************************************************************/
 
 #ifndef ANALYSIS_STRATEGY_TYPES
-#define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, TYPE)
+#define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, DESC)
 #endif
 
-ANALYSIS_STRATEGY_TYPES("DemandDrivenAnalysis", "DD", DemandDriven)
-ANALYSIS_STRATEGY_TYPES("IncrementalUpdateAnalysis", "INC", Incremental)
-ANALYSIS_STRATEGY_TYPES("ModuleWiseAnalysis", "MWA", ModuleWise)
-ANALYSIS_STRATEGY_TYPES("VariationalAnalysis", "VAR", Variational)
-ANALYSIS_STRATEGY_TYPES("WholeProgramAnalysis", "WPA", WholeProgram)
-ANALYSIS_STRATEGY_TYPES("None", "none", None)
+ANALYSIS_STRATEGY_TYPES(WholeProgram, "WPA", "Whole-program analysis (default)")
+ANALYSIS_STRATEGY_TYPES(DemandDriven, "DD", "Demand-driven analysis")
+ANALYSIS_STRATEGY_TYPES(Incremental, "INC", "Incremental-update analysis")
+ANALYSIS_STRATEGY_TYPES(ModuleWise, "MWA", "Module-wise analysis")
+ANALYSIS_STRATEGY_TYPES(Variational, "VAR", "Variational analysis")
 
 #undef ANALYSIS_STRATEGY_TYPES

include/phasar/PhasarLLVM/AnalysisStrategy/Strategies.h

@@ -10,13 +10,17 @@
 #ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_STRATEGIES_H
 #define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_STRATEGIES_H
 
+#include "llvm/Support/raw_ostream.h"
+
 #include <string>
 
 namespace psr {
 
 enum class AnalysisStrategy {
-#define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, TYPE) TYPE,
+  None,
+#define ANALYSIS_STRATEGY_TYPES(NAME, CMDFLAG, DESC) NAME,
 #include "phasar/PhasarLLVM/AnalysisStrategy/Strategies.def"
+
 };
 
 std::string toString(const AnalysisStrategy &S);

include/phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.h

@@ -10,19 +10,19 @@
 #ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_WHOLEPROGRAMANALYSIS_H_
 #define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_WHOLEPROGRAMANALYSIS_H_
 
+#include "phasar/DB/ProjectIRDB.h"
+#include "phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h"
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
+#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
+#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
+
 #include <iosfwd>
 #include <memory>
 #include <set>
 #include <string>
 #include <type_traits>
 #include <utility>
 
-#include "phasar/DB/ProjectIRDB.h"
-#include "phasar/PhasarLLVM/AnalysisStrategy/AnalysisSetup.h"
-#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSIDESolverConfig.h"
-#include "phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h"
-
 namespace psr {
 
 template <typename Solver, typename ProblemDescription,

include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def

@@ -0,0 +1,21 @@
+/******************************************************************************
+ * Copyright (c) 2019 Philipp Schubert.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of LICENSE.txt.
+ *
+ * Contributors:
+ *     Philipp Schubert and others
+ *****************************************************************************/
+
+#ifndef CALL_GRAPH_ANALYSIS_TYPE
+#define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC)
+#endif
+
+CALL_GRAPH_ANALYSIS_TYPE(NORESOLVE, "nores", "Don't resolve indirect- and virtual calls")
+CALL_GRAPH_ANALYSIS_TYPE(CHA, "cha", "Class hierarchy analysis")
+CALL_GRAPH_ANALYSIS_TYPE(RTA, "rta", "Rapid type analysis")
+CALL_GRAPH_ANALYSIS_TYPE(DTA, "dta", "Declared type analysis")
+CALL_GRAPH_ANALYSIS_TYPE(VTA, "vta", "Variable type analysis")
+CALL_GRAPH_ANALYSIS_TYPE(OTF, "otf", "On-the-fly analysis based on points-to info")
+
+#undef CALL_GRAPH_ANALYSIS_TYPE

include/phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.h

@@ -11,17 +11,14 @@
 #define PHASAR_PHASARLLVM_CALLGRAPHANALYSISTYPE_H
 
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/raw_ostream.h"
 
 #include <string>
 
-namespace llvm {
-class raw_ostream;
-} // namespace llvm
-
 namespace psr {
 enum class CallGraphAnalysisType {
-#define ANALYSIS_SETUP_CALLGRAPH_TYPE(NAME, CMDFLAG, TYPE) TYPE,
-#include "phasar/PhasarLLVM/Utils/AnalysisSetups.def"
+#define CALL_GRAPH_ANALYSIS_TYPE(NAME, CMDFLAG, DESC) NAME,
+#include "phasar/PhasarLLVM/ControlFlow/Resolver/CallGraphAnalysisType.def"
   Invalid
 };
 

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSTabulationProblem.h

@@ -65,7 +65,7 @@ class IFDSTabulationProblem
   PointsToInfo<v_t, n_t> *PT;
   d_t ZeroValue;
   std::set<std::string> EntryPoints;
-  [[maybe_unused]] Soundness SF = Soundness::Unused;
+  [[maybe_unused]] Soundness SF = Soundness::Soundy;
 
 public:
   using ConfigurationTy = HasNoConfigurationType;

include/phasar/PhasarLLVM/DataFlowSolver/Mono/IntraMonoProblem.h

@@ -61,7 +61,7 @@ class IntraMonoProblem : public NodePrinter<AnalysisDomainTy>,
   const c_t *CF;
   const PointsToInfo<v_t, n_t> *PT;
   std::set<std::string> EntryPoints;
-  [[maybe_unused]] Soundness S = Soundness::Unused;
+  [[maybe_unused]] Soundness S = Soundness::Soundy;
 
 public:
   // denote that a problem does not require a configuration (type/file)