Update to LLVM 18

Author: arch1t3cht

expr2/reactor/LLVMJIT.cpp

@@ -34,8 +34,8 @@ __pragma(warning(push))
 #include "llvm/IR/PassManager.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Host.h"
 #include "llvm/Support/TargetSelect.h"
+#include "llvm/TargetParser/Host.h"
 #include "llvm/Transforms/InstCombine/InstCombine.h"
 #include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
 #include "llvm/Transforms/Scalar/ADCE.h"
@@ -148,7 +148,7 @@ class JITGlobals
 private:
 	JITGlobals(llvm::orc::JITTargetMachineBuilder &&jitTargetMachineBuilder, llvm::DataLayout &&dataLayout);
 
-	static llvm::CodeGenOpt::Level toLLVM(rr::Optimization::Level level);
+	static llvm::CodeGenOptLevel toLLVM(rr::Optimization::Level level);
 
 	const llvm::orc::JITTargetMachineBuilder jitTargetMachineBuilder;
 	const llvm::DataLayout dataLayout;
@@ -257,26 +257,26 @@ JITGlobals::JITGlobals(llvm::orc::JITTargetMachineBuilder &&jitTargetMachineBuil
 {
 }
 
-llvm::CodeGenOpt::Level JITGlobals::toLLVM(rr::Optimization::Level level)
+llvm::CodeGenOptLevel JITGlobals::toLLVM(rr::Optimization::Level level)
 {
 	// TODO(b/173257647): MemorySanitizer instrumentation produces IR which takes
 	// a lot longer to process by the machine code optimization passes. Disabling
 	// them has a negligible effect on code quality but compiles much faster.
 	if(__has_feature(memory_sanitizer))
 	{
-		return llvm::CodeGenOpt::None;
+		return llvm::CodeGenOptLevel::None;
 	}
 
 	switch(level)
 	{
-	case rr::Optimization::Level::None: return llvm::CodeGenOpt::None;
-	case rr::Optimization::Level::Less: return llvm::CodeGenOpt::Less;
-	case rr::Optimization::Level::Default: return llvm::CodeGenOpt::Default;
-	case rr::Optimization::Level::Aggressive: return llvm::CodeGenOpt::Aggressive;
+	case rr::Optimization::Level::None: return llvm::CodeGenOptLevel::None;
+	case rr::Optimization::Level::Less: return llvm::CodeGenOptLevel::Less;
+	case rr::Optimization::Level::Default: return llvm::CodeGenOptLevel::Default;
+	case rr::Optimization::Level::Aggressive: return llvm::CodeGenOptLevel::Aggressive;
 	default: UNREACHABLE("Unknown Optimization Level %d", int(level));
 	}
 
-	return llvm::CodeGenOpt::Default;
+	return llvm::CodeGenOptLevel::Default;
 }
 
 class MemoryMapper final : public llvm::SectionMemoryManager::MemoryMapper

expr2/reactor/LLVMReactor.cpp

@@ -4511,7 +4511,7 @@ RValue<Int4> pmovsxwd(RValue<Short8> x)
 void VPrintf(const std::vector<Value *> &vals)
 {
 	auto i32Ty = llvm::Type::getInt32Ty(*jit->context);
-	auto i8PtrTy = llvm::Type::getInt8PtrTy(*jit->context);
+	auto i8PtrTy = llvm::PointerType::getUnqual(*jit->context);
 	auto funcTy = llvm::FunctionType::get(i32Ty, { i8PtrTy }, true);
 	auto func = jit->module->getOrInsertFunction("rr::DebugPrintf", funcTy);
 	jit->builder->CreateCall(func, V(vals));
@@ -4580,7 +4580,7 @@ void promoteFunctionToCoroutine()
 	auto i1Ty = llvm::Type::getInt1Ty(*jit->context);
 	auto i8Ty = llvm::Type::getInt8Ty(*jit->context);
 	auto i32Ty = llvm::Type::getInt32Ty(*jit->context);
-	auto i8PtrTy = llvm::Type::getInt8PtrTy(*jit->context);
+	auto i8PtrTy = llvm::PointerType::getUnqual(*jit->context);
 	auto promiseTy = jit->coroutine.yieldType;
 	auto promisePtrTy = promiseTy->getPointerTo();
 
@@ -4745,7 +4745,7 @@ void Nucleus::createCoroutine(Type *YieldType, const std::vector<Type *> &Params
 	// coroutine.
 	auto voidTy = llvm::Type::getVoidTy(*jit->context);
 	auto i1Ty = llvm::Type::getInt1Ty(*jit->context);
-	auto i8PtrTy = llvm::Type::getInt8PtrTy(*jit->context);
+	auto i8PtrTy = llvm::PointerType::getUnqual(*jit->context);
 	auto handleTy = i8PtrTy;
 	auto boolTy = i1Ty;
 	auto promiseTy = T(YieldType);

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', '< 18'], method: 'config-tool', static: get_option('static-llvm'),
+  deps += dependency('llvm', version: ['>= 10.0', '< 19'], method: 'config-tool', static: get_option('static-llvm'),
     modules: [
       'asmprinter', 'executionengine', 'target', 'orcjit', 'native',
     ])