Use covariant returns in ILCompiler.TypeSystem #120542
Merged
+253
−282
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
…pe.MetadataBaseType and remove EcmaType.EcmaModule
There was a problem hiding this comment.
Pull Request Overview
This PR updates the ILCompiler.TypeSystem to use covariant returns now that the code uses $(NetCoreAppToolCurrent), allowing for more modern C# language features. The main change is replacing MetadataType.MetadataBaseType with MetadataType.BaseType that returns MetadataType instead of DefType, and updating many property and method return types to be more specific subtypes.
Key changes:
- Replaced
MetadataBaseTypeproperty with covariantBaseTypereturningMetadataType - Updated various method signatures to return more specific types (e.g.,
EcmaType,EcmaMethod,EcmaField) - Removed unnecessary type casts throughout the codebase by leveraging the improved type system
Reviewed Changes
Copilot reviewed 76 out of 76 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
src/coreclr/tools/Common/TypeSystem/Common/MetadataType.cs |
Removed MetadataBaseType property and made BaseType abstract with MetadataType return type |
src/coreclr/tools/Common/TypeSystem/Ecma/EcmaType.cs |
Updated to use covariant return types for methods like GetMethods(), GetFields(), and ContainingType |
src/coreclr/tools/Common/TypeSystem/Ecma/EcmaMethod.cs |
Changed OwningType to return EcmaType and added covariant overrides |
src/coreclr/tools/Common/TypeSystem/Ecma/EcmaField.cs |
Changed OwningType to return EcmaType |
src/coreclr/tools/Common/TypeSystem/Common/FieldDesc.cs |
Updated OwningType to return MetadataType |
| Multiple other files | Removed explicit casts by leveraging improved type system and updated references from MetadataBaseType to BaseType |
This was referenced Oct 8, 2025
This was referenced Oct 9, 2025
Open
|
/ba-g failures are #120577 but BA didn't pick them up for some reason |
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.
Now that all usages of this code use
$(NetCoreAppToolCurrent), we can use more modern C# language features that require runtime support.This PR changes a number of the return types of various properties and methods to help narrow the result types and avoid having to add "known to succeed" casts and instead rely on the type system to give correct answers by design.
This PR also removes
MetadataType.MetadataBaseTypeand replaces it withMetadataType.BaseTypewithMetadataTypeas the return type (as the comments on it and all implementations effectively described it as such).This should make it easier for us to avoid adding hard casts and instead represent constraints via the type system.