[release/8.0-staging] [mono][interp] Attempt to interpret m2n wrapper if it is not found in aot image#105477
Merged
ivanpovazan merged 2 commits intorelease/8.0-stagingfrom Jul 29, 2024
Conversation
interp_create_method_pointer should only ever return a function pointer callable from compiled code.
… aot image On ios with interpreter enabled it can happen to mark an assembly as aot and have the rest interpreted, including SPC.dll. If the aot code attempts to do an icall, for example Math.Ceiling defined in SPC.dll, it will fail to find the m2n wrapper, since SPC.dll is not aot-ed. We fix this by obtaining an interp entry thunk, in order to execute the wrapper in interp, if we can't find the aot version of wrapper.
github-actions
bot
requested review from
BrzVlad,
SamMonoRT,
kotlarmilos and
lambdageek
as code owners
ghost
added
the
Contributor
|
Tagging subscribers to this area: @BrzVlad, @kotlarmilos |
ivanpovazan
approved these changes
Jul 25, 2024
rbhanda
added
Servicing-approved
Member
|
This PR also fixes: #105510 |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Backport of #100025 to release/8.0-staging
/cc @BrzVlad
Customer Impact
In an ios application, if the user chooses to enable interpreter and mix it with aot compiled code (by using the
MtouchInterpreterproperty), the application will crash if we attempt to do a pinvoke call from a compiled assembly into a pinvoke declared in an interpreted image. This seems to be easily reproducible ifSystem.Private.CoreLib.dllis interpreted and the rest of the code is aot-ed (even the ios template fails with this configuration).Regression
Testing
Fix was tested on the provided repro project.
Risk
Low Risk. The fix represents a fallback for cases when we couldn't find a m2n wrapper, in which case we would have been always crashing before.