[release/10.0-rc1] JIT: fix issue with EH clause class types for fault/filters from C++/CLI #118905
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
C++/CLI appears to leave the CORINFO_EH_CLAUSE ClassToken/FilterOffset union set to some nonzero value for fault/filter clauses. The JIT currently just passes this value along to the runtime. If a method with such a nonzero field is inlined into a dynamic method, this trips up a check in the runtime where a nonzero entry for such a field is interpreted as a class handle, even for fault/filter clauses where it should be ignored. Tolerate this by zeroing the field in the JIT. Note this could not have happened in pre .NET10 as methods with EH could not be inlined, so a dynamic method would never see such an EH clause, and in non-dynamic methods this field is ignored for faults and filters. Fixes #118837.
|
@dotnet/jit-contrib PTAL |
jeffschwMSFT
approved these changes
Aug 19, 2025
jeffschwMSFT
added
Servicing-consider
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
jakobbotsch
approved these changes
Aug 20, 2025
artl93
added
Servicing-approved
|
If this PR should still go into RC1, please merge it asap. cc @jeffschwMSFT |
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.
Backport of #118870 to release/10.0-rc1
/cc @AndyAyersMS
Customer Impact
Reported by @thoenissen in #118837.
Regression
In .NET 10 the JIT can now inline some methods with EH. When a C++/CLI method with a fault or filter clause is inlined into a dynamic method, it exposes a pre-existing issue where the runtime will try and interpret the
classTokenfield of the finally/filter EH clause as a class handle, despite the fact that this field has no meaning for those kinds of clauses. C++/CLI leaves garbage values these fields and the JIT simply passes that field along to the runtime, leading to unexpectedInvalidProgramExceptionsfrom the runtime.Testing
Tested the fix using the example from the customer.
Risk
Low. The JIT now zeros the
classTokenfield for finally/fault clauses, and the runtime no longer looks at the field values.