Allow ExternalTypeMap to have duplicates entries with identical mapping but different trimTarget #120519
+54
−15
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
…ng but different trimTarget
There was a problem hiding this comment.
Pull Request Overview
This PR allows ExternalTypeMap to have duplicate entries with identical mapping but different trim targets, fixing issue #120160. The change enables multiple TypeMap attributes with the same key and target type but different trim targets to coexist without throwing duplicate key exceptions.
Key changes:
- Modified duplicate detection logic to only throw exceptions when mappings conflict (same key but different target types)
- Added test cases to verify duplicate mappings with different trim targets are properly handled
- Updated nullable annotations in test code for better type safety
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| TypeMapLazyDictionary.cs | Modified duplicate detection logic and added Equals method for TypeNameUtf8 comparison |
| TypeMap.cs | Added test cases for duplicate mappings and updated nullable annotations |
...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.cs
Outdated
Show resolved
Hide resolved
|
Tagging subscribers to this area: @dotnet/interop-contrib |
…pServices/TypeMapLazyDictionary.cs Co-authored-by: Copilot <[email protected]>
jkoritzinsky
reviewed
Oct 8, 2025
...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.cs
Show resolved
Hide resolved
...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.cs
Outdated
Show resolved
Hide resolved
...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.cs
Show resolved
Hide resolved
This was referenced Oct 8, 2025
- Use Span for UTF8 string comparison - Negate name check for duplicate check - Add branch to avoid re-adding for duplicate entries
…r/runtime into AllowDuplicateTypeMaps
...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Runtime.InteropServices/tests/TrimmingTests/TypeMap.cs
Outdated
Show resolved
Hide resolved
src/libraries/System.Runtime.InteropServices/tests/TrimmingTests/TypeMap.cs
Show resolved
Hide resolved
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.
Fixes #120160