Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compatibility fix for ORC JIT in llvm 14 #45007

Merged
merged 1 commit into from
Apr 18, 2022

Conversation

alexfanqi
Copy link
Contributor

ORC JIT api has changed a bit in llvm 14. Although currently arm on Mac uses orc jit, the riscv port will need this.

Changes are introduced in llvm/llvm-project@118e953

@alexfanqi alexfanqi changed the title compatibilty fix for ORC JIT in llvm 14 compatibility fix for ORC JIT in llvm 14 Apr 17, 2022
@giordano giordano added the compiler:llvm For issues that relate to LLVM label Apr 17, 2022
@giordano
Copy link
Contributor

Build of aarch64-apple-darwin, the only platform using ORC JIT, is failing https://buildkite.com/julialang/julia-master/builds/11178#4c047e50-b0fd-4c39-836f-33e9d815c074:

/Users/administrator/.julia/scratchspaces/a66863c6-20e8-4ff4-8a62-49f30b1f605e/agent-cache/default-macmini-aarch64-1.0/build/default-macmini-aarch64-1-0/julialang/julia-master/src/jitlayers.cpp:669:8: error: expected value in expression
#  elif
       ^
/Users/administrator/.julia/scratchspaces/a66863c6-20e8-4ff4-8a62-49f30b1f605e/agent-cache/default-macmini-aarch64-1.0/build/default-macmini-aarch64-1-0/julialang/julia-master/src/jitlayers.cpp:1039:41: error: unknown type name 'JLEHFrameRegistrar'; did you mean 'llvm::jitlink::EHFrameRegistrar'?
    auto ehRegistrar = std::make_unique<JLEHFrameRegistrar>();
                                        ^~~~~~~~~~~~~~~~~~
                                        llvm::jitlink::EHFrameRegistrar
/Users/administrator/.julia/scratchspaces/a66863c6-20e8-4ff4-8a62-49f30b1f605e/agent-cache/default-macmini-aarch64-1.0/build/default-macmini-aarch64-1-0/julialang/julia-master/usr/include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h:25:7: note: 'llvm::jitlink::EHFrameRegistrar' declared here
class EHFrameRegistrar {
      ^

src/jitlayers.cpp Outdated Show resolved Hide resolved
@alexfanqi
Copy link
Contributor Author

Sorry, my bad. It was a silly mistake.

Address comment. Use toPtr

src/jitlayers.cpp Outdated Show resolved Hide resolved
@vchuravy vchuravy merged commit 6f8662b into JuliaLang:master Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler:llvm For issues that relate to LLVM
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants