Merge pull request #79 from ksromanov/patch-1

Enable LLVM17

Author: samanpa

.travis.yml

@@ -36,3 +36,10 @@ matrix:
           language: cpp
           sudo: true
           script: docker build --build-arg TARGET_LLVM_VERSION=15 --build-arg BASE_IMAGE=ubuntu:22.04 --build-arg GCC_VERSION=9 --build-arg IMAGE_REPO=jammy .
+        - os: linux
+          dist: jammy
+          compiler: gcc
+          language: cpp
+          sudo: true
+          script: docker build --build-arg TARGET_LLVM_VERSION=17 --build-arg BASE_IMAGE=ubuntu:22.04 --build-arg GCC_VERSION=9 --build-arg IMAGE_REPO=jammy .
+

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
 
 project(clangmetatool C CXX)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Clang REQUIRED)

Dockerfile

@@ -79,4 +79,4 @@ RUN mkdir skeleton/build && cd skeleton/build && \
     cd - && rm -rf skeleton/build
 
 # Run the tool on itself
-RUN yourtoolname $(find src skeleton -name '*.cpp') -- -std=gnu++14 -I$(llvm-config-$TARGET_LLVM_VERSION --includedir)
+RUN yourtoolname $(find src skeleton -name '*.cpp') -- -std=gnu++17 -I$(llvm-config-$TARGET_LLVM_VERSION --includedir)

skeleton/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
 
 project( yourtoolname C CXX)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Clang REQUIRED)

src/collectors/definitions.cpp

@@ -25,7 +25,13 @@ class DefinitionsDataAppender : public MatchFinder::MatchCallback {
 
     clang::SourceManager *sm = r.SourceManager;
     const clang::FileID fid = sm->getFileID(e->getLocation());
-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR >= 17
+    const clang::OptionalFileEntryRef entry = sm->getFileEntryRefForID(fid);
+    if (!entry.has_value()) {
+      return;
+    }
+    const types::FileUID fuid = entry.value().getUID();
+#elif LLVM_VERSION_MAJOR >= 15
     const llvm::Optional<clang::FileEntryRef> entry = sm->getFileEntryRefForID(fid);
     if (!entry.has_value()) {
       return;

src/collectors/include_graph/include_finder.cpp

@@ -36,7 +36,12 @@
 #include <clang/Tooling/Core/Replacement.h>
 #include <clang/Tooling/Tooling.h>
 
+#if LLVM_VERSION_MAJOR >= 17
+#include <optional>
+#else
 #include <llvm/ADT/Optional.h>
+#endif
+
 #include <llvm/ADT/StringRef.h>
 #include <llvm/Support/CommandLine.h>
 
@@ -55,7 +60,9 @@ using clangmetatool::types::MacroReferenceInfo;
 void IncludeFinder::InclusionDirective(
     clang::SourceLocation hashLoc, const clang::Token &includeToken,
     llvm::StringRef filename, bool isAngled,
-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR >= 17
+    clang::CharSourceRange filenameRange, clang::OptionalFileEntryRef file,
+#elif LLVM_VERSION_MAJOR >= 15
     clang::CharSourceRange filenameRange, llvm::Optional<clang::FileEntryRef> file,
 #else
     clang::CharSourceRange filenameRange, const clang::FileEntry *file,

src/collectors/include_graph/include_finder.h

@@ -35,7 +35,9 @@ class IncludeFinder : public clang::PPCallbacks {
   InclusionDirective(clang::SourceLocation hashLoc,
                      const clang::Token &includeToken, llvm::StringRef filename,
                      bool isAngled, clang::CharSourceRange filenameRange,
-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR >= 17
+                     clang::OptionalFileEntryRef File, llvm::StringRef SearchPath,
+#elif LLVM_VERSION_MAJOR >= 15
                      llvm::Optional<clang::FileEntryRef> File, llvm::StringRef SearchPath,
 #else
                      const clang::FileEntry *file, llvm::StringRef searchPath,

src/propagation/util/get_stmt_from_cfg_element.cpp

@@ -1,14 +1,23 @@
 #include "get_stmt_from_cfg_element.h"
 
+#if LLVM_VERSION_MAJOR >= 17
+#include <optional>
+#else
 #include <llvm/ADT/Optional.h>
+#endif
 
 namespace clangmetatool {
 namespace propagation {
 namespace util {
 
 bool getStmtFromCFGElement(const clang::Stmt *&result,
                            const clang::CFGElement &element) {
+#if LLVM_VERSION_MAJOR >= 17
+  if (std::optional<clang::CFGStmt> opStmt = element.getAs<clang::CFGStmt>()) {
+#else
   if (llvm::Optional<clang::CFGStmt> opStmt = element.getAs<clang::CFGStmt>()) {
+#endif
+
     result = opStmt->getStmt();
 
     return true;

src/tool_application_support.cpp

@@ -45,7 +45,11 @@ std::string getExecutablePathFromArgv(const std::string &argv0) {
     // Fall back to locating 'argv0' on $PATH if the parent path is not provided
     exePath = argv0;
     if (!llvm::sys::path::has_parent_path(exePath)) {
+#if LLVM_VERSION_MAJOR >= 17
+      std::optional<std::string> maybeExePath =
+#else
       llvm::Optional<std::string> maybeExePath =
+#endif
           llvm::sys::Process::FindInEnvPath("PATH", argv0);
 #if LLVM_VERSION_MAJOR >= 15
       exePath = maybeExePath.value_or("");