Skip to content

Commit b5b859c

Browse files
Upgrade halide-llvm to 23.0.0.dev89730+g2c6ce151 (#9099)
* Upgrade halide-llvm to 23.0.0.dev89730+g2c6ce151 * Fix JITModule build against LLVM 23 ObjectLinkingLayerCreator LLVM 23 threads a jitlink::JITLinkMemoryManager& argument through LLJITBuilderState::ObjectLinkingLayerCreator (llvm-project b78e9faa7026). Add the new parameter to both linker builder lambdas, gated on LLVM_VERSION >= 230. --------- Co-authored-by: halide-ci[bot] <266445882+halide-ci[bot]@users.noreply.github.com> Co-authored-by: Alex Reinking <areinking@adobe.com>
1 parent 22f8fe5 commit b5b859c

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

src/JITModule.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,23 @@ void compile_module_impl(
408408
// i386: "JIT session error: Unsupported i386 relocation:4" (R_386_PLT32)
409409
// ARM 32bit: Unsupported target machine architecture in ELF object shared runtime-jitted-objectbuffer
410410
// Windows 64-bit: JIT session error: could not register eh-frame: __register_frame function not found
411-
linkerBuilder = [&](llvm::orc::ExecutionSession &session) {
411+
linkerBuilder = [&](llvm::orc::ExecutionSession &session
412+
#if LLVM_VERSION >= 230
413+
,
414+
llvm::jitlink::JITLinkMemoryManager &
415+
#endif
416+
) {
412417
return std::make_unique<llvm::orc::RTDyldObjectLinkingLayer>(session, [&](const llvm::MemoryBuffer &) {
413418
return std::make_unique<HalideJITMemoryManager>(dependencies);
414419
});
415420
};
416421
} else {
417-
linkerBuilder = [](llvm::orc::ExecutionSession &session) {
422+
linkerBuilder = [](llvm::orc::ExecutionSession &session
423+
#if LLVM_VERSION >= 230
424+
,
425+
llvm::jitlink::JITLinkMemoryManager &
426+
#endif
427+
) {
418428
return std::make_unique<llvm::orc::ObjectLinkingLayer>(session);
419429
};
420430
}

uv.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)