[Wasm R2R] Bypass dynamic LDVIRTFTN helper#129075
Merged
Merged
Conversation
Wasm does not implement the DelayLoad_Helper_Obj stub backing CORINFO_HELP_READYTORUN_VIRTUAL_FUNC_PTR, so route virtual function pointer lookups through the runtime CORINFO_HELP_VIRTUAL_FUNC_PTR helper instead. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Member
Author
|
@davidwrighton PTAL Fixes some more pri0 test failures. |
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts impImportLdvirtftn in the CoreCLR JIT importer so that the ReadyToRun-specific CORINFO_HELP_READYTORUN_VIRTUAL_FUNC_PTR path is not used when targeting Wasm, causing Wasm AOT/R2R to use the normal runtime CORINFO_HELP_VIRTUAL_FUNC_PTR helper instead.
Changes:
- Gates the ReadyToRun
IsAot()fast-path forldvirtftnbehind!TARGET_WASM. - Adds an explanatory comment indicating why Wasm cannot use the R2R helper path.
davidwrighton
approved these changes
Jun 6, 2026
Address Copilot review feedback: place the explanatory comment immediately before the '#if defined(FEATURE_READYTORUN) && !defined(TARGET_WASM)' guard so it clearly applies to the conditional that excludes WASM, instead of sitting unconditionally after the '#endif' where it could be read as standalone on non-WASM targets. 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 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.
Wasm does not implement the DelayLoad_Helper_Obj stub backing CORINFO_HELP_READYTORUN_VIRTUAL_FUNC_PTR, so route virtual function pointer lookups through the runtime CORINFO_HELP_VIRTUAL_FUNC_PTR helper instead.