Add LLVM 18 support

mull-project · Dec 13, 2024 · bceb923 · bceb923
1 parent c5ab574
commit bceb923
Show file tree

Hide file tree

Showing 12 changed files with 95 additions and 15 deletions.
diff --git a/.devcontainer/ubuntu_24.04_18/Dockerfile b/.devcontainer/ubuntu_24.04_18/Dockerfile
diff --git a/.devcontainer/ubuntu_24.04_18/devcontainer.json b/.devcontainer/ubuntu_24.04_18/devcontainer.json
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        LLVM_VERSION: [13, 14, 15, 16, 17]
+        LLVM_VERSION: [13, 14, 15, 16, 17, 18]
 
     steps:
       - name: Debugging

diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml
@@ -41,6 +41,9 @@ jobs:
           - OS_NAME: "ubuntu"
             OS_VERSION: "24.04"
             LLVM_VERSION: 17
+          - OS_NAME: "ubuntu"
+            OS_VERSION: "24.04"
+            LLVM_VERSION: 18
     name: Ubuntu ${{ matrix.OS_VERSION }} - LLVM ${{ matrix.LLVM_VERSION }}
     steps:
       - uses: actions/checkout@v4

diff --git a/docs/HowMullWorks.rst b/docs/HowMullWorks.rst
@@ -85,7 +85,7 @@ Platform support
 ----------------
 
 Mull has a great support of macOS and various Linux systems across all modern
-versions of LLVM from 11.0 to 15.0. All the new versions of LLVM are supported as
+versions of LLVM from 12.0 to 18.0. All the new versions of LLVM are supported as
 soon as they released.
 
 Mull is reported to work on Windows Subsystem for Linux, but no official support

diff --git a/infrastructure/generator.py b/infrastructure/generator.py
@@ -9,7 +9,7 @@
     "ubuntu": {
         "20.04": [12],
         "22.04": [13, 14, 15],
-        "24.04": [14, 15, 16, 17]
+        "24.04": [14, 15, 16, 17, 18]
     }
 }
 

diff --git a/infrastructure/helpers/variables.yaml b/infrastructure/helpers/variables.yaml
@@ -6,6 +6,12 @@ SDKROOT: /
 
 llvm_mapping:
   macos:
+    "18":
+      cmake_search_paths: "/opt/homebrew/opt/llvm@18/lib/cmake/llvm/;/opt/homebrew/opt/llvm@18/lib/cmake/clang/"
+      packages:
+        - llvm@18
+      cmake_cc: /opt/homebrew/opt/llvm@18/bin/clang
+      cmake_cxx: /opt/homebrew/opt/llvm@18/bin/clang++
     "17":
       cmake_search_paths: "/opt/homebrew/opt/llvm@17/lib/cmake/llvm/;/opt/homebrew/opt/llvm@17/lib/cmake/clang/"
       packages:

diff --git a/lib/JunkDetection/CXX/ASTStorage.cpp b/lib/JunkDetection/CXX/ASTStorage.cpp
@@ -76,10 +76,19 @@ const clang::FileEntry *ThreadSafeASTUnit::findFileEntry(const std::string &file
   auto end = sourceManager.fileinfo_end();
   const clang::FileEntry *file = nullptr;
   for (auto it = begin; it != end; it++) {
+#if LLVM_VERSION_MAJOR >= 18
+    llvm::StringRef currentSourceFilePath = it->first.getFileEntry().getName();
+#else
     llvm::StringRef currentSourceFilePath = it->first->getName();
+#endif
+
     /// In LLVM 6, it->first->getName() does not expand to full path for header files.
     if (!llvm::sys::path::is_absolute(currentSourceFilePath)) {
+#if LLVM_VERSION_MAJOR >= 18
+      currentSourceFilePath = it->first.getFileEntry().tryGetRealPathName();
+#else
       currentSourceFilePath = it->first->tryGetRealPathName();
+#endif
     }
     llvm::SmallString<PATH_MAX> realFilePath;
     llvm::sys::fs::real_path(filePath, realFilePath);

diff --git a/tests/Helpers/InMemoryCompiler.cpp b/tests/Helpers/InMemoryCompiler.cpp
@@ -8,7 +8,11 @@
 #include <clang/Lex/PreprocessorOptions.h>
 
 #include <llvm/IR/Module.h>
+#if LLVM_VERSION_MAJOR >= 18
+#include <llvm/TargetParser/Host.h>
+#else
 #include <llvm/Support/Host.h>
+#endif
 #include <llvm/Support/TargetSelect.h>
 
 using namespace mull_test;
@@ -39,10 +43,16 @@ std::unique_ptr<llvm::Module> InMemoryCompiler::compile(const std::string &code,
       compilerInvocation, args, clangCompilerInstance.getDiagnostics());
   /// Configure options
 
-  const auto languageOptions = compilerInvocation.getLangOpts();
+  auto languageOptions = compilerInvocation.getLangOpts();
+#if LLVM_VERSION_MAJOR >= 18
+  languageOptions.CPlusPlus = 1;
+  languageOptions.CPlusPlus11 = 1;
+  languageOptions.Bool = 1;
+#else
   languageOptions->CPlusPlus = 1;
   languageOptions->CPlusPlus11 = 1;
   languageOptions->Bool = 1;
+#endif
 
   /// auto& preprocessorOptions = compilerInvocation->getPreprocessorOpts();
   /// auto& targetOptions = compilerInvocation->getTargetOpts();

diff --git a/tools/mull-cxx-frontend/src/ASTInstrumentation.cpp b/tools/mull-cxx-frontend/src/ASTInstrumentation.cpp
@@ -11,13 +11,13 @@ namespace cxx {
 
 void ASTInstrumentation::instrumentTranslationUnit() {
   /// Create an external getenv() declaration within extern "C" {} block.
-  clang::LinkageSpecDecl *cLinkageSpecDecl =
-      clang::LinkageSpecDecl::Create(context,
-                                     context.getTranslationUnitDecl(),
-                                     NULL_LOCATION,
-                                     NULL_LOCATION,
-                                     clang::LinkageSpecDecl::LanguageIDs::lang_c,
-                                     true);
+#if LLVM_VERSION_MAJOR >= 18
+  auto langID = clang::LinkageSpecLanguageIDs::C;
+#else
+  auto langID = clang::LinkageSpecDecl::LanguageIDs::lang_c;
+#endif
+  clang::LinkageSpecDecl *cLinkageSpecDecl = clang::LinkageSpecDecl::Create(
+      context, context.getTranslationUnitDecl(), NULL_LOCATION, NULL_LOCATION, langID, true);
   getenvFuncDecl = createGetEnvFuncDecl(cLinkageSpecDecl);
   cLinkageSpecDecl->addDecl(getenvFuncDecl);
   context.getTranslationUnitDecl()->addDecl(cLinkageSpecDecl);

diff --git a/tools/mull-cxx-frontend/src/ASTNodeFactory.cpp b/tools/mull-cxx-frontend/src/ASTNodeFactory.cpp
@@ -50,7 +50,9 @@ clang::StringLiteral *ASTNodeFactory::createStringLiteral(std::string value) {
   return clang::StringLiteral::Create(
       context,
       value,
-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR >= 18
+      clang::StringLiteralKind::Ordinary,
+#elif LLVM_VERSION_MAJOR >= 15
       clang::StringLiteral::StringKind::Ordinary,
 #else
       clang::StringLiteral::StringKind::Ascii,
@@ -175,8 +177,12 @@ clang::QualType ASTNodeFactory::getStringLiteralArrayType(clang::QualType type,
 }
 
 clang::QualType ASTNodeFactory::getConstantArrayType(clang::QualType type, unsigned size) {
-  return context.getConstantArrayType(
-      type, llvm::APInt(8, size + 1), nullptr, clang::ArrayType::ArraySizeModifier::Normal, 0);
+#if LLVM_VERSION_MAJOR >= 18
+  auto sizeModifier = clang::ArraySizeModifier::Normal;
+#else
+  auto sizeModifier = clang::ArrayType::ArraySizeModifier::Normal;
+#endif
+  return context.getConstantArrayType(type, llvm::APInt(8, size + 1), nullptr, sizeModifier, 0);
 }
 
 } // namespace cxx

diff --git a/tools/mull-cxx-frontend/src/ClangASTMutator.cpp b/tools/mull-cxx-frontend/src/ClangASTMutator.cpp
@@ -159,7 +159,9 @@ clang::CallExpr *ClangASTMutator::createGetenvCallExpr(std::string identifier) {
   clang::StringLiteral *stringLiteral = clang::StringLiteral::Create(
       context,
       identifier,
-#if LLVM_VERSION_MAJOR >= 15
+#if LLVM_VERSION_MAJOR >= 18
+      clang::StringLiteralKind::Ordinary,
+#elif LLVM_VERSION_MAJOR >= 15
       clang::StringLiteral::StringKind::Ordinary,
 #else
       clang::StringLiteral::StringKind::Ascii,