Fix interpreter helper and stack size computation #118477
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
This change fixes two issues: * INTOP_CALL_HELPER_P_S was taking arguments from wrong locations in the instruction * The total stack size computation in the call stub generator was incorrect in case arguments smaller than 8 bytes were passed on the stack.
There was a problem hiding this comment.
Pull Request Overview
This PR fixes two critical bugs in the CoreCLR interpreter and call stub generator that could cause incorrect execution behavior.
- Fixes argument ordering bug in
INTOP_CALL_HELPER_P_Sinstruction handling - Corrects stack size computation in call stub generator to avoid double counting
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/coreclr/vm/interpexec.cpp | Swaps ip[2] and ip[3] arguments in INTOP_CALL_HELPER_P_S to fix incorrect parameter ordering |
| src/coreclr/vm/callstubgenerator.cpp | Removes duplicate stack size calculations and uses SizeOfArgStack() for accurate total |
|
Tagging subscribers to this area: @BrzVlad, @janvorli, @kg |
|
@davidwrighton this fixes the interpreter test issue that occurred in your PR. |
kg
approved these changes
Aug 7, 2025
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.
This change fixes two issues: