Fix two ExInfo offsets and add missing asserts for them#120307
Merged
janvorli merged 1 commit intodotnet:mainfrom Oct 3, 2025
Merged
Fix two ExInfo offsets and add missing asserts for them#120307janvorli merged 1 commit intodotnet:mainfrom
janvorli merged 1 commit intodotnet:mainfrom
Conversation
There was a missing assert in AsmOffsets.cs for the ExInfo::m_propagateExceptionCallback/Context and the offset was incorrect for 64 bit architectures. This change fixes it.
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes assembly offset calculations for ExInfo structure fields on 64-bit architectures and adds missing compile-time assertions to verify the correctness of these offsets.
- Updates offset values for
m_pReversePInvokePropagationCallbackandm_pReversePInvokePropagationContextfields to account for ARM64 vs other 64-bit architectures - Adds static assertions to validate that the calculated offsets match the actual structure layout at compile time
Member
Author
|
@jkotas this change is already part of the backport of the 2nd pass EH in native code to .NET 10, I've realized this was missing when manually backporting it. So this puts it to main too. |
jkotas
approved these changes
Oct 1, 2025
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.
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.
There was a missing assert in AsmOffsets.cs for the ExInfo::m_propagateExceptionCallback/Context and the offset was incorrect for 64 bit architectures.
This change fixes it.