[NativeAOT/x86] Fix funclet unwinding #100732
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
…/FEATURE_EH_FUNCLETS instead of UNIX_X86_ABI
ghost
added
the
Contributor
|
Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas |
dotnet-policy-service
bot
added
the
community-contribution
This comment was marked as outdated.
This comment was marked as outdated.
jkotas
reviewed
Apr 7, 2024
Member
|
@dotnet/jit-contrib Could you please review the JIT changes? |
BruceForstall
approved these changes
Apr 8, 2024
matouskozak
pushed a commit
to matouskozak/runtime
that referenced
this pull request
Apr 30, 2024
* Guard ABI changes necessary for funclet unwinding with UsesFunclets()/FEATURE_EH_FUNCLETS instead of UNIX_X86_ABI * Fix the emitFullArgInfo condition. * Update comments, add test case
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
Fixes #100507
The x86 funclet unwinding code depends on
GetPushedArgSizereturning the correct value when there are any arguments pushed to the stack inside the funclet code. Normally that information is not recorded for methods with EBP frames. The ABI was modified in dotnet/coreclr#10782 for x86/Linux to generate the additional information. However, it was guarded byUNIX_X86_ABI#define. This PR changes the guard toUsesFunclets()(for JIT) /FEATURE_EH_FUNCLETS(for runtime code) so the same logic can be reused.