Fix getAsyncOtherVariant JIT-EE implementation in VM#125225
Merged
jakobbotsch merged 1 commit intodotnet:mainfrom Mar 6, 2026
Merged
Fix getAsyncOtherVariant JIT-EE implementation in VM#125225jakobbotsch merged 1 commit intodotnet:mainfrom
getAsyncOtherVariant JIT-EE implementation in VM#125225jakobbotsch merged 1 commit intodotnet:mainfrom
Conversation
We could end up calling GetAsyncOtherVariant for explicitly-async methods like AsyncHelpers.Await, which do not have other variants.
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes VM/JIT handling of async “other variant” lookups so explicitly-async (non-variant-paired) methods don’t trigger invalid GetAsyncOtherVariant calls, and streamlines SuperPMI recording for the query.
Changes:
- Introduce
MethodDesc::HasAsyncOtherVariant()and assertGetAsyncOtherVariant()is only used when a paired variant exists. - Update VM call sites (method table builder and JIT-EE
getAsyncOtherVariant) to gate lookups onHasAsyncOtherVariant(). - Simplify SuperPMI shim collector recording API for
getAsyncOtherVariant.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/coreclr/vm/methodtablebuilder.cpp | Uses HasAsyncOtherVariant() to avoid requesting non-existent async variants during decl lookup. |
| src/coreclr/vm/method.hpp | Adds HasAsyncOtherVariant() and asserts GetAsyncOtherVariant() precondition. |
| src/coreclr/vm/jitinterface.cpp | Prevents JIT-EE from calling GetAsyncOtherVariant() for explicitly-async methods with no pair. |
| src/coreclr/tools/superpmi/superpmi-shim-collector/icorjitinfo.cpp | Simplifies SPMI interception/recording for getAsyncOtherVariant. |
| src/coreclr/tools/superpmi/superpmi-shared/methodcontext.h | Updates recorder signature to take bool instead of bool*. |
| src/coreclr/tools/superpmi/superpmi-shared/methodcontext.cpp | Records variantIsThunk by value in the SPMI method context. |
| src/coreclr/inc/corinfo.h | Clarifies variantIsThunk meaning in API comment. |
jkotas
approved these changes
Mar 5, 2026
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
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.
We could end up calling GetAsyncOtherVariant for explicitly-async methods like AsyncHelpers.Await, which do not have other variants.
This was happening under
EnableExtraSuperPmiQueriesmode that queries both variants proactively. Also simplify SPMI implementation of the recording of this function.