Fix args passed by stack ref in the CallStubGenerator #117399
Merged
Conversation
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
The CallStubGenerator was missing support for arguments passed by reference using stack slots. Only references in registers were implemented. There was also a bug in passing return buffer argument when there was "this" at the same time. Only the m_r1 was set to 1, but the m_r2 was left unchanged, being 0. That resulted in the routine fetched for that register range being NULL. This change fixes both of these issues and adds a test.
|
Tagging subscribers to this area: @BrzVlad, @janvorli, @kg |
There was a problem hiding this comment.
Pull Request Overview
This PR adds support for arguments passed by reference on the stack, fixes return-buffer register setup when a this parameter is present on Windows AMD64, and adds a new interpreter/JIT calling convention test.
- Introduce
GetStackRefRoutineand corresponding assembly helpers for stack-based by-ref args. - Initialize
m_r2to properly handle return-buffer +thison Windows AMD64. - Add
TestCallingConvention13suite to validate the new stack-ref code paths.
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| src/tests/JIT/interpreter/Interpreter.cs | Add TestCallingConvention13* methods and integrate into test runners |
| src/coreclr/vm/callstubgenerator.h | Declare new GetStackRefRoutine method |
| src/coreclr/vm/callstubgenerator.cpp | Define GetStackRefRoutine, handle by-ref stack args, fix m_r2 init |
| src/coreclr/vm/arm64/asmhelpers.asm | Add Load_Stack_Ref/Store_Stack_Ref and ref-copy macro |
| src/coreclr/vm/arm64/asmhelpers.S | Mirror new stack-ref routines and macro in assembler |
| src/coreclr/vm/amd64/AsmHelpers.asm | Add Load_Stack_Ref/Store_Stack_Ref routines for AMD64 |
kg
reviewed
Jul 8, 2025
kg
reviewed
Jul 8, 2025
kg
reviewed
Jul 8, 2025
This was referenced Jul 8, 2025
Open
BrzVlad
approved these changes
Jul 8, 2025
|
/ba-g build failure is unrelated, I've created #117413 to track it. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The CallStubGenerator was missing support for arguments passed by reference using stack slots. Only references in registers were implemented. There was also a bug in passing return buffer argument when there was "this" at the same time. Only the m_r1 was set to 1, but the m_r2 was left unchanged, being 0. That resulted in the routine fetched for that register range being NULL.
This change fixes both of these issues and adds a test.