upgraded to llvm 21

Author: drblallo

build.py

@@ -111,6 +111,7 @@ def build_llvm(
         "-DCMAKE_INSTALL_PREFIX={}".format(install_dir),
         "-DLLVM_ENABLE_PROJECTS=clang;clang-tools-extra;mlir;compiler-rt;lld;",
         "-DLLVM_USE_LINKER=lld" if use_lld else "",
+        "-DLLVM_USE_STATIC_ZSTD=ON",
         "-DCMAKE_EXPORT_COMPILE_COMMANDS=True",
         f"-DCMAKE_C_COMPILER={clang}",
         f"-DCMAKE_CXX_COMPILER={clang_plus_plus}",
@@ -237,7 +238,7 @@ def main():
             "--depth",
             "1",
             "-b",
-            "release/20.x",
+            "release/21.x",
         )
 
     if debug_llvm and not exists(llvm_install_debug_dir) and args.llvm_dir == "":

lib/backend/include/rlc/backend/BackEnd.hpp

@@ -18,6 +18,8 @@ limitations under the License.
 #include <memory>
 #include <string>
 
+#include "llvm/TargetParser/Triple.h"
+
 namespace llvm
 {
 	class DataLayout;
@@ -37,6 +39,7 @@ namespace mlir::rlc
 		bool isMacOS() const;
 		bool isWindows() const;
 		std::string tripleToString() const;
+		llvm::Triple triple() const;
 		const llvm::DataLayout& getDataLayout() const;
 
 		TargetInfo(TargetInfo&& other): pimpl(other.pimpl)

lib/backend/src/BackEnd.cpp

@@ -261,6 +261,8 @@ bool mlir::rlc::TargetInfo::isWindows() const
 	return pimpl->triple.isOSWindows();
 }
 
+llvm::Triple mlir::rlc::TargetInfo::triple() const { return pimpl->triple; }
+
 std::string mlir::rlc::TargetInfo::tripleToString() const
 {
 	return pimpl->triple.getTriple();
@@ -326,7 +328,7 @@ static mlir::LogicalResult getLinkerInvocation(
 	llvm::IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> VFS =
 			new llvm::vfs::OverlayFileSystem(llvm::vfs::getRealFileSystem());
 	llvm::IntrusiveRefCntPtr diagIds(new clang::DiagnosticIDs());
-	llvm::IntrusiveRefCntPtr opts(new clang::DiagnosticOptions());
+	auto opts = clang::DiagnosticOptions();
 	clang::DiagnosticsEngine engine(diagIds, opts);
 	engine.setClient(new clang::DiagnosticConsumer(), true);
 	clang::driver::Driver driver(
@@ -335,7 +337,7 @@ static mlir::LogicalResult getLinkerInvocation(
 	auto binDir = llvm::sys::path::parent_path(clangPath);
 	auto installDir = llvm::sys::path::parent_path(binDir);
 	llvm::SmallVector<char, 4> clangResourceDir;
-	llvm::sys::path::append(clangResourceDir, installDir, "lib", "clang", "20");
+	llvm::sys::path::append(clangResourceDir, installDir, "lib", "clang", "21");
 	driver.ResourceDir =
 			llvm::StringRef(clangResourceDir.data(), clangResourceDir.size());
 	if (targetMac and not llvm::sys::Process::GetEnv("SDKROOT"))
@@ -552,7 +554,7 @@ namespace mlir::rlc
 			auto Module = mlir::translateModuleToLLVMIR(
 					getOperation(), LLVMcontext, getOperation().getName().value());
 			assert(Module);
-			Module->setTargetTriple(targetInfo->tripleToString());
+			Module->setTargetTriple(targetInfo->triple());
 
 			runOptimizer(
 					*Module,