Fix handling invalid type map states#125870
Merged
jkoritzinsky merged 1 commit intodotnet:mainfrom Mar 21, 2026
Merged
Conversation
davidwrighton
approved these changes
Mar 20, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes a ReadyToRun (CrossGen2) type map encoding edge case where “invalid type map state” entries were emitted in a shape that the CoreCLR runtime parser can’t consume, leading to malformed fixup index assertions when reading precached type maps.
Changes:
- Emit the type map group type fixup reference even when the type map is marked invalid (state = 0).
- Encode invalid entries as a tuple
(groupTypeFixup, state)instead of emitting juststate.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunProxyTypeMapNode.cs | Ensures invalid proxy type map entries still begin with the group type fixup reference, matching runtime parsing expectations. |
| src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/ReadyToRunExternalTypeMapNode.cs | Ensures invalid external type map entries still begin with the group type fixup reference, matching runtime parsing expectations. |
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.
Fixes #125718