Fix LDTOKEN in interpreter #116234
Merged
Fix LDTOKEN in interpreter #116234
+6
−6
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 CEE_LDTOKEN compilation incorrectly assumes that the resolved token contains either hClass or hField or hMethod and it checks for the hClass first. But the hClass is present always, so resolving token for method or field doesn't work correctly. This change fixes it by reordering the checks in an order matching what JIT does.
There was a problem hiding this comment.
Pull Request Overview
This PR fixes the token resolution logic in the interpreter's LDTOKEN handling by reordering the conditional checks to correctly distinguish between field, method, and class tokens.
- Reordered the conditionals to check for hField first, followed by hMethod and then hClass.
- Updated helper functions and data index assignments accordingly.
github-actions
bot
added
the
needs-area-label
BrzVlad
approved these changes
Jun 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 CEE_LDTOKEN compilation incorrectly assumes that the resolved token contains either hClass or hField or hMethod and it checks for the hClass first. But the hClass is present always, so resolving token for method or field doesn't work correctly.
This change fixes it by reordering the checks in an order matching what JIT does.