Support LLVM 21

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-15]
-        llvm: [19, 20]
+        llvm: [19, 20, 21]
     name: Build os=${{ matrix.os }} llvm=${{ matrix.llvm }}
     runs-on: ${{ matrix.os }}
     steps:

expr2/reactor/LLVMJIT.cpp

@@ -31,6 +31,10 @@ __pragma(warning(push))
 #include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
 
+#if LLVM_VERSION_MAJOR >= 21
+	#include "llvm/ExecutionEngine/Orc/SelfExecutorProcessControl.h"
+#endif
+
 #if LLVM_VERSION_MAJOR >= 20
 	#include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h"
 #endif
@@ -41,6 +45,10 @@ __pragma(warning(push))
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/TargetSelect.h"
 #include "llvm/TargetParser/Host.h"
+#if LLVM_VERSION_MAJOR >= 21
+	#include "llvm/TargetParser/Triple.h"
+	#include "llvm/Support/MemoryBuffer.h"
+#endif
 #include "llvm/Transforms/InstCombine/InstCombine.h"
 #include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
 #include "llvm/Transforms/Scalar/ADCE.h"
@@ -749,9 +757,17 @@ class JITRoutine : public rr::Routine
 		    return std::move(*p);
 	    }())
 #endif
-	    , objectLayer(session, [this]() {
-		    return std::make_unique<llvm::SectionMemoryManager>(&memoryMapper);
-	    })
+	    , objectLayer(session,
+#if LLVM_VERSION_MAJOR >= 21
+	                   [this](const llvm::MemoryBuffer &) {
+		                   return std::make_unique<llvm::SectionMemoryManager>(&memoryMapper);
+	                   }
+#else
+	                   [this]() {
+		                   return std::make_unique<llvm::SectionMemoryManager>(&memoryMapper);
+	                   }
+#endif
+	    )
 	    , addresses(count)
 	{
 		bool fatalCompileIssue = false;
@@ -873,7 +889,11 @@ JITBuilder::JITBuilder(const rr::Config &config)
     , module(new llvm::Module("", *context))
     , builder(new llvm::IRBuilder<>(*context))
 {
+	#if LLVM_VERSION_MAJOR >= 21
+	module->setTargetTriple(llvm::Triple(LLVM_DEFAULT_TARGET_TRIPLE));
+	#else
 	module->setTargetTriple(LLVM_DEFAULT_TARGET_TRIPLE);
+	#endif
 	module->setDataLayout(JITGlobals::get()->getDataLayout());
 	if (config.getOptimization().getFMF() == Optimization::FMF::FastMath)
 		builder->setFastMathFlags(llvm::FastMathFlags::getFast());

flake.nix

@@ -17,7 +17,8 @@
         packages = rec {
           llvm_19 = pkgs.callPackage ./package.nix {};
           llvm_20 = pkgs.callPackage ./package.nix {libllvm = pkgs.llvmPackages_20.libllvm;};
-          default = llvm_20;
+          llvm_21 = pkgs.callPackage ./package.nix {libllvm = pkgs.llvmPackages_21.libllvm;};
+          default = llvm_21;
         };
 
         formatter = pkgs.alejandra;

meson.build

@@ -87,7 +87,7 @@ if use_asmjit
 else
   sources = sources_common + sources_expr2
   incdir += include_directories('expr2/reactor')
-  deps += dependency('llvm', version: ['>= 10.0', '< 21'], method: 'config-tool', static: static_llvm,
+  deps += dependency('llvm', version: ['>= 10.0', '< 22'], method: 'config-tool', static: static_llvm,
     modules: [
       'asmprinter', 'executionengine', 'target', 'orcjit', 'native',
     ])