Expand covariant constructed generic types in 'cswinrtgen' #2193
+261
−108
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
There was a problem hiding this comment.
Pull request overview
This PR enhances the cswinrt generator so that it can recognize and expand covariant constructed generic Windows Runtime interface types (e.g., IEnumerable<T> hierarchies) when discovering and emitting interop types.
Changes:
- Introduced
WindowsRuntimeTypeAnalyzerto encapsulate logic for finding the most derived Windows Runtime interface implemented by a type and for computing covariant interface combinations (e.g.,IEnumerable<IEnumerable<object>>). - Extended
TypeSignatureExtensionsandTypeDefinitionExtensionswith base-type enumeration helpers and wired those intoInteropTypeDiscovery.TryTrackExposedUserDefinedTypeto track both direct and covariant Windows Runtime interfaces for exposed user-defined types. - Updated proxy generation to use the new analyzer instead of the removed
UserDefinedTypeAnalyzer, ensuring runtime class names are based on the most derived Windows Runtime interface.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
src/WinRT.Interop.Generator/Helpers/WindowsRuntimeTypeAnalyzer.cs |
New helper that finds the most derived Windows Runtime interface and enumerates covariant generic interface combinations (e.g., for IEnumerable<T>, IEnumerator<T>, IReadOnlyList<T>). |
src/WinRT.Interop.Generator/Helpers/UserDefinedTypeAnalyzer.cs |
Removed now-redundant helper; its functionality (most-derived Windows Runtime interface lookup) is moved into WindowsRuntimeTypeAnalyzer. |
src/WinRT.Interop.Generator/Extensions/TypeSignatureExtensions.cs |
Makes EnumerateAllInterfaces’s working variable nullable and adds EnumerateBaseTypes() for TypeSignature, used by covariant expansion. |
src/WinRT.Interop.Generator/Extensions/TypeDefinitionExtensions.cs |
Adds EnumerateBaseTypes() for TypeDefinition and aligns comments in EnumerateBaseTypesAndSelf() with the new helper. |
src/WinRT.Interop.Generator/Discovery/InteropTypeDiscovery.cs |
In TryTrackExposedUserDefinedType, uses WindowsRuntimeTypeAnalyzer.EnumerateCovariantInterfaceTypes(...) plus the original interface to track all relevant projected Windows Runtime interfaces and their constructed generic instances. |
src/WinRT.Interop.Generator/Builders/InteropTypeDefinitionBuilder.UserDefinedType.cs |
Changes proxy generation to use WindowsRuntimeTypeAnalyzer.TryGetMostDerivedWindowsRuntimeInterfaceType when selecting the interface that drives the runtime class name. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Renamed the UserDefinedTypeAnalyzer class and its file to WindowsRuntimeTypeAnalyzer for improved clarity and accuracy. Updated all references to use the new class name.
Introduces a new EnumerateBaseTypes method to enumerate all base types of a given type. This provides a way to traverse the type hierarchy, complementing the existing method that includes the type itself.
Introduces EnumerateBaseTypes to enumerate all base types of a given type signature. This complements the existing interface enumeration and improves type hierarchy traversal capabilities.
Enhanced interface discovery to enumerate covariant combinations for Windows Runtime interfaces, ensuring vtable entries match .NET expectations. Introduced EnumerateCovariantInterfaceTypes in WindowsRuntimeTypeAnalyzer and updated InteropTypeDiscovery to use it. Also refactored TryGetMostDerivedWindowsRuntimeInterfaceType to accept a generic type parameter.
Sergio0694
force-pushed
the
user/sergiopedri/covariant-expansion
branch
from
24d04bb to
48426d4
Compare
Introduces IsNotExclusiveToWindowsRuntimeType to determine if a TypeSignature represents a Windows Runtime type that is not marked as '[exclusiveto]'. This is inferred by checking if the type is an interface and whether it is public, as '[exclusiveto]' interfaces are not public.
Updated InteropTypeDiscovery to skip [exclusiveto] Windows Runtime interfaces during covariant interface expansion, preventing unnecessary binary size increase and avoiding interfaces that cannot be resolved. Also clarified documentation in WindowsRuntimeTypeAnalyzer regarding validation of returned generic instantiations.
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.
Title.
Example of codegen: