[cppinterop] Upgrade to latest for cppyy migration#22728
Open
aaronj0 wants to merge 7 commits into
Open
Conversation
Test Results 23 files 23 suites 3d 13h 41m 12s ⏱️ For more details on these failures, see this check. Results for commit a0a483b. ♻️ This comment has been updated with latest results. |
Member
|
@aaronj0, I believe we need to also move |
Contributor
Author
Yes, I have that obvious change and more patches in the pipeline.. (adapting to the new types, etc) |
aaronj0
force-pushed
the
cppinterop-upgrade
branch
3 times, most recently
from
7618eb1 to
8f4c938
Compare
aaronj0
force-pushed
the
cppinterop-upgrade
branch
from
7fa2272 to
3427288
Compare
aaronj0
force-pushed
the
cppinterop-upgrade
branch
from
3427288 to
09a28ec
Compare
The latest CppInterOp upgrade introduces opaque-handle structs Cpp::ObjectRef, Cpp::DeclRef, and Cpp::InterpRef (CppInterOpTypes.h) to replace void*/typedef pointer arguments.
The latest CppInterOp upgrade changes UseExternalInterpreter to also install a CppInteropDiagConsumer onto Cling's DiagnosticsEngine. Rootcling later wraps the current diag client with CheckModuleBuildClient via DiagnosticsEngine::setClient which deletes CppInterOp's previously-owned client. This leads to CheckModuleBuildClient holding a dangling fChild pointer. Without this patch, cling::Interpreter::ShutDown crashes. Since rootcling does not use CppInterOp, we can avoid registering the interpreter with CppInterOp if we are running in rootcling.
In this test, the handle-taking pointer comes from dlsym at runtime, so the compiler cannot see through it. Here the pointer is a compile-time constant and GCC 11 exploits the type mismatch (which is UB) to constant- fold the call giving a wrong reslt. Route the call through a volatile local so the compiler treats the pointer as runtime-opaque, matching dispatch
aaronj0
force-pushed
the
cppinterop-upgrade
branch
from
09a28ec to
4dbc826
Compare
Contributor
Author
|
I believe this upgrade now passes the CI, the windows x64 failures are visible on master. I will upstream the required patches and bump this upgrade to the latest commit. cc @guitargeek |
… MSVC Add __thiscall to the bitcast type on _M_IX86 so the caller reproduces the compiler's virtual-dispatch ABI
CreateInterpreter built ClingArgv from pointers of function-local strings (main executable path, extracted resource dir, libc++ include dir, CPPINTEROP_EXTRA_INTERPRETER_ARGS). But the interpreter keeps the raw argv pointers for its whole lifetime (cling::CompilerOptions, analagous for clang-repl), so asan reports accesses to them after CreateInterpreter returns. Fix: Collect owned copies of every argument and store it as a part of per-interpreter info, so it is released when DeleteInterpreter is called
aaronj0
force-pushed
the
cppinterop-upgrade
branch
from
4dbc826 to
a0a483b
Compare
vgvassilev
reviewed
Jul 3, 2026
| return static_cast<int>(static_cast<B*>(self)->m_x + | ||
| static_cast<B*>(self)->m_d); | ||
| // Replacement functions installed into vtable slots. | ||
| struct Repl { |
Member
There was a problem hiding this comment.
Why we changed that to a struct?
guitargeek
approved these changes
Jul 3, 2026
guitargeek
left a comment
guitargeek
left a comment
Contributor
There was a problem hiding this comment.
LGTM! Thanks for the update. Unfortunately we don't have green builds on Windows, but that problem is also present in the nightlies.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Test and land the latest upgrade, required to rebase the cppyy migration PR on top