Skip to content

Minor patches to unittests, improve offset initialization in getExecutionEngine #459

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 2 commits into from
Jan 18, 2025
Merged

Minor patches to unittests, improve offset initialization in getExecutionEngine #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
638de2a
Improve offset initialization in getExecutionEngine
aaronj0 Jan 18, 2025
4f2c976
Minor patches to unittests
aaronj0 Jan 18, 2025
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
10 changes: 6 additions & 4 deletions lib/Interpreter/Compatibility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,23 @@ inline llvm::orc::LLJIT* getExecutionEngine(cling::Interpreter& I) {
return I.getExecutionEngine();
#endif

unsigned m_ExecutorOffset = 0;

#if CLANG_VERSION_MAJOR == 13
#ifdef __APPLE__
const unsigned m_ExecutorOffset = 62;
m_ExecutorOffset = 62;
#else
const unsigned m_ExecutorOffset = 72;
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__
const unsigned m_ExecutorOffset = 68;
m_ExecutorOffset = 68;
#else
const unsigned m_ExecutorOffset = 78;
m_ExecutorOffset = 78;
#endif // __APPLE__
#endif

Expand Down
1 change: 1 addition & 0 deletions unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ endif()
add_test(NAME cppinterop-${name} COMMAND ${name})
set_tests_properties(cppinterop-${name} PROPERTIES
TIMEOUT "${TIMEOUT_VALUE}"
ENVIRONMENT "CPLUS_INCLUDE_PATH=${CMAKE_BINARY_DIR}/etc"
LABELS
DEPENDS)
# FIXME: Just call gtest_add_tests this function is available.
Expand Down
2 changes: 1 addition & 1 deletion unittests/CppInterOp/ScopeReflectionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ TEST(ScopeReflectionTest, IncludeVector) {
#include <vector>
#include <iostream>
)";
Interp->process(code);
Interp->declare(code);
}

TEST(ScopeReflectionTest, GetOperator) {
Expand Down
Loading