Merge branch 'development' into f-RemovePlugins

Author: Martin Mory

CMakeLists.txt

@@ -125,8 +125,8 @@ endif()
 find_package(Threads)
 
 # Boost
-find_package(Boost 1.65.1 COMPONENTS graph program_options log ${BOOST_THREAD} REQUIRED)
-#find_package(Boost 1.72.0 COMPONENTS graph program_options log ${BOOST_THREAD} REQUIRED)
+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)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # Disable clang-tidy for the external projects
@@ -407,7 +407,6 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${MAJOR_VERSION}.${MIN
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost_program_options (>= 1.66.0),
 #                                   libboost_graph (>= 1.66.0),
-#                                   libboost_log (>= 1.66.0),
 #                                   libboost_thread (>= 1.66.0),
 #                                   libsqlite3 (>= 4.5.0),
 #                                   libpthread (>= 4.5.0),

bootstrap.sh

@@ -100,7 +100,7 @@ else
             # install missing packages if necessary
             boostlibnames=("libboost-system" "libboost-filesystem"
                     "libboost-graph" "libboost-program-options"
-                    "libboost-log" "libboost-thread")
+                    "libboost-thread")
             additional_boost_libs=()
             for boost_lib in ${boostlibnames[@]}; do
                 dpkg -s "$boost_lib${DESIRED_BOOST_VERSION}" >/dev/null 2>&1 ||

cmake/phasar_macros.cmake

@@ -76,7 +76,7 @@ function(generate_ll_file)
   set(test_code_file_target "${parent_dir}_${test_code_file_name}${ll_file_suffix}")
 
   # define compilation flags
-  set(GEN_CXX_FLAGS -std=c++14 -fno-discard-value-names -emit-llvm -S)
+  set(GEN_CXX_FLAGS -std=c++17 -fno-discard-value-names -emit-llvm -S)
   set(GEN_C_FLAGS -fno-discard-value-names -emit-llvm -S)
   set(GEN_CMD_COMMENT "[LL]")
   if(GEN_LL_MEM2REG)

examples/llvm-hello-world/main.cpp

@@ -1,4 +1,3 @@
-#include <iostream>
 #include <memory>
 #include <string>
 
@@ -20,7 +19,7 @@
 
 int main(int argc, char **argv) {
   if (argc != 2) {
-    std::cout << "usage: <prog> <IR file>\n";
+    llvm::errs() << "usage: <prog> <IR file>\n";
     return 1;
   }
   // parse an IR file into an LLVM module

examples/use-phasar-as-library/myphasartool.cpp

@@ -9,7 +9,6 @@
 
 #include <filesystem>
 #include <fstream>
-#include <iostream>
 
 #include "phasar/DB/ProjectIRDB.h"
 #include "phasar/PhasarLLVM/AnalysisStrategy/WholeProgramAnalysis.h"
@@ -31,12 +30,11 @@ using namespace psr;
 int main(int argc, const char **argv) {
   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";
+    llvm::errs() << "myphasartool\n"
+                    "A small PhASAR-based example program\n\n"
+                    "Usage: myphasartool <LLVM IR file>\n";
     return 1;
   }
-  initializeLogger(false);
   ProjectIRDB DB({argv[1]});
   if (auto F = DB.getFunctionDefinition("main")) {
     LLVMTypeHierarchy H(DB);
@@ -49,21 +47,21 @@ int main(int argc, const char **argv) {
     // print inter-procedural control-flow graph
     I.print();
     // IFDS template parametrization test
-    std::cout << "Testing IFDS:\n";
+    llvm::outs() << "Testing IFDS:\n";
     IFDSLinearConstantAnalysis L(&DB, &H, &I, &P, {"main"});
     IFDSSolver_P<IFDSLinearConstantAnalysis> S(L);
     S.solve();
     S.dumpResults();
     // use PhASAR's strategy concept that allows for even easier analysis set-up
-    std::cout << "Testing IDE:\n";
+    llvm::outs() << "Testing IDE:\n";
     WholeProgramAnalysis<IDESolver_P<IDELinearConstantAnalysis>,
                          IDELinearConstantAnalysis>
         WPA(DB, {"main"}, &P, &I, &H);
     WPA.solve();
     WPA.dumpResults();
     WPA.releaseAllHelperAnalyses();
   } else {
-    std::cerr << "error: file does not contain a 'main' function!\n";
+    llvm::errs() << "error: file does not contain a 'main' function!\n";
   }
   return 0;
 }

include/phasar/Controller/AnalysisController.h

@@ -10,7 +10,6 @@
 #ifndef PHASAR_CONTROLLER_ANALYSISCONTROLLER_H
 #define PHASAR_CONTROLLER_ANALYSISCONTROLLER_H
 
-#include <iostream>
 #include <set>
 #include <string>
 #include <vector>
@@ -149,34 +148,41 @@ class AnalysisController {
     }
   }
 
+  std::unique_ptr<llvm::raw_fd_ostream>
+  openFileStream(llvm::StringRef Filename);
+
   template <typename T> void emitRequestedDataFlowResults(T &WPA) {
     if (EmitterOptions & AnalysisControllerEmitterOptions::EmitTextReport) {
       if (!ResultDirectory.empty()) {
-        std::ofstream OFS(ResultDirectory.string() + "/psr-report.txt");
-        WPA.emitTextReport(OFS);
+        if (auto OFS = openFileStream("/psr-report.txt")) {
+          WPA.emitTextReport(*OFS);
+        }
       } else {
-        WPA.emitTextReport(std::cout);
+        WPA.emitTextReport(llvm::outs());
       }
     }
     if (EmitterOptions &
         AnalysisControllerEmitterOptions::EmitGraphicalReport) {
       if (!ResultDirectory.empty()) {
-        std::ofstream OFS(ResultDirectory.string() + "/psr-report.html");
-        WPA.emitGraphicalReport(OFS);
+        if (auto OFS = openFileStream("/psr-report.html")) {
+          WPA.emitGraphicalReport(*OFS);
+        }
       } else {
-        WPA.emitGraphicalReport(std::cout);
+        WPA.emitGraphicalReport(llvm::outs());
       }
     }
     if (EmitterOptions & AnalysisControllerEmitterOptions::EmitRawResults) {
       if (!ResultDirectory.empty()) {
-        std::ofstream OFS(ResultDirectory.string() + "/psr-raw-results.txt");
-        WPA.dumpResults(OFS);
+        if (auto OFS = openFileStream("/psr-raw-results.txt")) {
+          WPA.dumpResults(*OFS);
+        }
       } else {
-        WPA.dumpResults(std::cout);
+        WPA.dumpResults(llvm::outs());
       }
     }
     if (EmitterOptions & AnalysisControllerEmitterOptions::EmitESGAsDot) {
-      std::cout << "Front-end support for 'EmitESGAsDot' to be implemented\n";
+      llvm::outs()
+          << "Front-end support for 'EmitESGAsDot' to be implemented\n";
     }
   }
 

include/phasar/DB/DBConn.h

@@ -18,7 +18,6 @@
 #define PHASAR_DB_DBCONN_H_
 
 #include <initializer_list>
-#include <iostream> // Because of SQL_STD_ERROR_HANDLING
 #include <memory>
 #include <set>
 #include <string>

include/phasar/DB/Hexastore.h

@@ -11,10 +11,11 @@
 #define PHASAR_DB_HEXASTORE_H_
 
 #include <array>
-#include <iosfwd>
 #include <string>
 #include <vector>
 
+#include "llvm/Support/raw_ostream.h"
+
 #include "boost/format.hpp"
 
 #include "sqlite3.h"
@@ -39,7 +40,8 @@ struct HSResult {
       : Subject(Subject), Predicate(std::move(Predicate)),
         Object(std::move(Object)) {}
   /// Prints an entry of the results to the command-line
-  friend std::ostream &operator<<(std::ostream &OS, const HSResult &Result) {
+  friend llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
+                                       const HSResult &Result) {
     return OS << "[ subject: " << Result.Subject
               << " | predicate: " << Result.Predicate
               << " | object: " << Result.Object << " ]";

include/phasar/DB/ProjectIRDB.h

@@ -10,7 +10,6 @@
 #ifndef PHASAR_DB_PROJECTIRDB_H_
 #define PHASAR_DB_PROJECTIRDB_H_
 
-#include <iostream>
 #include <map>
 #include <memory>
 #include <set>
@@ -180,7 +179,7 @@ class ProjectIRDB {
 
   void print() const;
 
-  void emitPreprocessedIR(std::ostream &OS = std::cout,
+  void emitPreprocessedIR(llvm::raw_ostream &OS = llvm::outs(),
                           bool ShortenIR = false) const;
 
   /**