Skip to content

[interpreter] Drop IncrementalExecutor offsets to obtain LLJIT for Cling #589

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 23, 2025
Merged

[interpreter] Drop IncrementalExecutor offsets to obtain LLJIT for Cling #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 5 additions & 35 deletions lib/Interpreter/Compatibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,43 +104,13 @@ inline void maybeMangleDeclName(const clang::GlobalDecl& GD,
cling::utils::Analyze::maybeMangleDeclName(GD, mangledName);
}

/// For Cling <= LLVM 16, this is a horrible hack obtaining the private
/// llvm::orc::LLJIT by computing the object offsets in the cling::Interpreter
/// instance(IncrementalExecutor): sizeof (m_Opts) + sizeof(m_LLVMContext). The
/// IncrementalJIT and JIT itself have an offset of 0 as the first datamember.
///
/// The getExecutionEngine() interface has been added for Cling based on LLVM
/// >=18 and should be used in future releases.
/// The getExecutionEngine() interface was been added for Cling based on LLVM
/// >=18. For previous versions, the LLJIT was obtained by computing the object
/// offsets in the cling::Interpreter instance(IncrementalExecutor):
/// sizeof (m_Opts) + sizeof(m_LLVMContext). The IncrementalJIT and JIT itself
/// have an offset of 0 as the first datamember.
inline llvm::orc::LLJIT* getExecutionEngine(cling::Interpreter& I) {
#if CLANG_VERSION_MAJOR >= 18
return I.getExecutionEngine();
#endif

unsigned m_ExecutorOffset = 0;

#if CLANG_VERSION_MAJOR == 13
#ifdef __APPLE__
m_ExecutorOffset = 62;
#else
m_ExecutorOffset = 72;
#endif // __APPLE__
#endif

// Note: The offsets changed in Cling based on LLVM 16 with the introduction of
// a thread safe context - llvm::orc::ThreadSafeContext
#if CLANG_VERSION_MAJOR == 16
#ifdef __APPLE__
m_ExecutorOffset = 68;
#else
m_ExecutorOffset = 78;
#endif // __APPLE__
#endif

int* IncrementalExecutor =
((int*)(const_cast<cling::Interpreter*>(&I))) + m_ExecutorOffset;
int* IncrementalJit = *(int**)IncrementalExecutor + 0;
int* LLJIT = *(int**)IncrementalJit + 0;
return *(llvm::orc::LLJIT**)LLJIT;
}

inline llvm::Expected<llvm::JITTargetAddress>
Expand Down
Loading