[clr-interp] Fix Swift error handling for marshaled P/Invokes in interpreter#125177
Merged
kotlarmilos merged 2 commits intodotnet:mainfrom Mar 12, 2026
Merged
Conversation
Contributor
|
Tagging subscribers to this area: @BrzVlad, @janvorli, @kg |
72a25d1 to
fb5fadb
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Comments suppressed due to low confidence (1)
src/coreclr/vm/wasm/helpers.cpp:732
pContextMDis unused in the WASM implementation ofGetCookieForCalliSig, which can trigger-Wunused-parameter//WXbuild breaks. Either remove the parameter name (keep the type for signature compatibility) or explicitly mark it unused (e.g.,UNREFERENCED_PARAMETER(pContextMD)).
void* GetCookieForCalliSig(MetaSig metaSig, MethodDesc *pContextMD)
{
STANDARD_VM_CONTRACT;
void* thunk = ComputeCalliSigThunk(metaSig);
if (thunk == NULL)
{
PORTABILITY_ASSERT("GetCookieForCalliSig: unknown thunk signature");
You can also share your feedback on Copilot code review. Take the survey.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fb5fadb to
8c9b943
Compare
janvorli
reviewed
Mar 11, 2026
…ling for Swift on ARM64
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.
You can also share your feedback on Copilot code review. Take the survey.
This was referenced Mar 11, 2026
Open
Copilot AI
pushed a commit
that referenced
this pull request
Mar 13, 2026
…rpreter (#125177) ## Description When a Swift P/Invoke requires marshaling (e.g. ref SwiftError), the interpreter creates an IL stub with a calli to the native function. Previously, the P/Invoke MethodDesc had no interpreter code, so INTOP_CALL fell through to InvokeManagedMethod, creating an outer native transition via InterpreterStub. The inner calli created a second transition. The inner Load_SwiftError captured x21 correctly, but ExecuteInterpretedMethod could save/restore x21 as a callee-saved register, causing the outer epilog to read a stale value. Debug actually also had two native transitions but it just passed by coincidence because the unoptimized C compiler didn't use x21 as a scratch register, so the SwiftError value survived through ExecuteInterpretedMethod. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
When a Swift P/Invoke requires marshaling (e.g. ref SwiftError), the interpreter creates an IL stub with a calli to the native function. Previously, the P/Invoke MethodDesc had no interpreter code, so INTOP_CALL fell through to InvokeManagedMethod, creating an outer native transition via InterpreterStub. The inner calli created a second transition. The inner Load_SwiftError captured x21 correctly, but ExecuteInterpretedMethod could save/restore x21 as a callee-saved register, causing the outer epilog to read a stale value.
Debug actually also had two native transitions but it just passed by coincidence because the unoptimized C compiler didn't use x21 as a scratch register, so the SwiftError value survived through ExecuteInterpretedMethod.